Merge branch 'upstream' into debian/sid

9 files changed, 131 insertions, 21 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 0ccbf3ba..90a904f1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,7 +10,7 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
-%% 1.0.1.orig.tar.gz (2009-12-19:50/6)
+%% 1.0.1.orig.tar.gz (2010-02-08:06/1)
 http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.1.orig.tar.gz
   sisu_1.0.1.orig.tar.gz
   sisu_1.0.1-1.dsc
@@ -19,6 +19,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.1.orig.tar.gz
   * odf:odt odt.zip fix addressing issue with presentation of headings in
     produced open document text
 
+  *
+
 %% 1.0.0.orig.tar.gz (2009-12-19:50/6)
 http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.0.orig.tar.gz
   7bec7f47f6ad5b816226af0489bc2ae81d4c9092b8870ba939e9f58800245dfd 1554276 sisu_1.0.0.orig.tar.gz
diff --git a/conf/sisu/v1/version.yml b/conf/sisu/v1/version.yml
index 1abdc8d2..aa84f7a0 100644
--- a/conf/sisu/v1/version.yml
+++ b/conf/sisu/v1/version.yml
@@ -1,5 +1,5 @@
 --- 
 :version: 1.0.0
-:date_stamp: 2009w50/6
-:date: "2009-12-19"
+:date_stamp: 2010w06/1
+:date: "2010-02-08"
 :project: SiSU
diff --git a/data/doc/sisu/v1/CHANGELOG b/data/doc/sisu/v1/CHANGELOG
index 0ccbf3ba..32811cb1 100644
--- a/data/doc/sisu/v1/CHANGELOG
+++ b/data/doc/sisu/v1/CHANGELOG
@@ -10,7 +10,7 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
-%% 1.0.1.orig.tar.gz (2009-12-19:50/6)
+%% 1.0.1.orig.tar.gz (2010-02-08:06/1)
 http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.1.orig.tar.gz
   sisu_1.0.1.orig.tar.gz
   sisu_1.0.1-1.dsc
diff --git a/data/doc/sisu/v1/sisu_markup_samples/README b/data/doc/sisu/v1/sisu_markup_samples/README
new file mode 100644
index 00000000..6352a301
--- /dev/null
+++ b/data/doc/sisu/v1/sisu_markup_samples/README
@@ -0,0 +1,101 @@
+A few sample books prepared as sisu markup samples, output formats to be
+generated using SiSU are contained in a separate package sisu_markup_samples
+
+Online a few sample marked up documents, and their resulting outputs, can be
+found at:
+ <http://www.jus.uio.no/sisu>
+ <http://www.jus.uio.no/sisu/SiSU/examples.html>
+
+The package sisu contains fewer sample documents, that are published under the
+GPL or that are Debian Free Software Guideline license compatible, notably:
+
+  Text: Free as in Freedom - Richard Stallman's Crusade for Free Software
+    URL: <http://faifzilla.org/>
+  Author: Sam Williams
+  Copyright: Sam Williams 2002 
+  License: Permission is granted to copy, distribute and/or modify this
+    document under the terms of the GNU Free Document License, Version 1.1 or any
+    later version published by the Free Software Foundation; with the Invariant
+    Sections being no invariant sections, with the Front-Cover Texts being no
+    invariant sections, and with the Back-Cover Texts being no invariant sections
+    URL: <http://www.gnu.org/copyleft/fdl.html>
+
+sisu_markup_samples contains gpl content and additional material released under
+various licenses mostly different Creative Commons licences that do not permit
+inclusion in the Debian Project as they do not meet the DFSG for various
+reasons, most commonly in that they require the original substantive text me
+maintained and often that the works be used only non-commercially
+
+  Free as in Freedom - Richard Stallman's Crusade for Free Software, Sam Williams, [as above]
+
+  Text: Free Culture - How Big Media Uses Technology and the Law to Lock Down Culture and Control Creativity
+    URL: <http://www.free-culture.cc>
+  Author: Lawrence Lessig
+    URL: <http://www.lessig.org/>
+  Copyright: Lawrence Lessig, 2004
+  License:
+    URL: <http://creativecommons.org/licenses/by-nc/1.0/>
+  
+  Text: The Wealth of Networks - How Social Production Transforms Markets and Freedom
+    URL: <http://cyber.law.harvard.edu/wealth_of_networks/Main_Page>
+  Author: Yochai Benkler
+    URL: <http://www.benkler.org/>
+  Copyright: 2006 Yochai Benkler
+  License: 
+    URL: <http://creativecommons.org/licenses/by-nc-sa/2.5/>
+  
+  Text: Two Bits - The Cultural Significance of Free Software
+    URL: <http://twobits.net/>
+  Author: Christopher Kelty
+    URL: <http://kelty.org/>
+  Copyright: Duke University Press, 2008
+  License: 
+    URL: <http://creativecommons.org/licenses/by-nc-sa/3.0/>
+  
+  Text: Free For All - How Linux and the Free Software Movement Undercut the High Tech Titans
+    URL: <http://www.wayner.org/books/ffa>
+  Author: Peter Wayner
+    URL: <http://www.wayner.org>
+  Copyright: Peter Wayner, 2000
+  License: 
+    URL: <http://creativecommons.org/licenses/by-nc/1.0/>
+  
+  Text: The Cathederal and the Bazaar
+    URL: <http://www.catb.org/~esr/writings/cathedral-bazaar/cathedral-bazaar/>
+  Author: Eric Raymond
+    URL: <http://www.catb.org/~esr>
+  Copyright: Eric S Raymond, 2000 
+  License:  Open Publication License, v 2.0 
+    URL: 
+  
+  Text: Little Brother
+    URL: <http://craphound.com/littlebrother>
+  Author: Cory Doctorow
+    URL: <http://craphound.com>
+  Copyright: Cory Doctorow, 2008
+  License: 
+    URL: <http://creativecommons.org/licenses/by-nc-sa/3.0/>
+  
+  Text: Accelerando
+    URL: <http://www.accelerando.org/>
+  Author: Charles Stross
+    URL: <http://www.antipope.org/charlie/>
+  Copyright: Charles Stross, 2005
+  License: 
+    URL: <http://creativecommons.org/licenses/by-nc-nd/2.0/>
+  Note: The SiSU preparation (presentations) of Accelerando are done with the kind permission of the author Charles Stross
+  
+  Text: UN Contracts for International Sale of Goods
+  Author: UN, UNCITRAL
+    URL: <http://www.un.org/>
+  Copyright:
+  License:
+
+Most additional material contained in sisu_markup_samples were published under
+various Creative Commons licenses, check the rights section of each document
+for the copyright and license, or the COPYRIGHT file associated with the
+package for a listing of material and their associated licenses.
+
+A few document more markup samples can be found at
+  <http://www.jus.uio.no/sisu>
+  <http://www.jus.uio.no/sisu/SiSU/examples.html>
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/README b/data/doc/sisu/v1/sisu_markup_samples/samples/README
deleted file mode 100644
index ef602a54..00000000
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/README
+++ /dev/null
@@ -1,6 +0,0 @@
-A few document markup samples, note that more can be found at
-http://www.jus.uio.no/sisu
-http://www.jus.uio.no/sisu/SiSU/2
-
-"Free as in Freedom" on Richard Stallman by Sam Williams
-was published under the GNU Free Documentation License
diff --git a/lib/sisu/v1/html_scroll.rb b/lib/sisu/v1/html_scroll.rb
index 0cd34694..e4a14691 100644
--- a/lib/sisu/v1/html_scroll.rb
+++ b/lib/sisu/v1/html_scroll.rb
@@ -118,7 +118,12 @@ module SiSU_HTML_scroll
             when /^4:\S+?/; @sto.scroll_lev_para_ocn.heading_body4 # work on see Split_text_object4
             when /^5:\S*?/; @sto.scroll_lev_para_ocn.heading_body5
             when /^6:\S*?/; @sto.scroll_lev_para_ocn.heading_body6
-            when /^#{Mx[:gl_bullet]}/; @sto.scroll_lev_para_ocn.bullet
+            when /^#{Mx[:gl_bullet]}/
+              if para =~/#{Mx[:gr_o]}group#{Mx[:gr_c]}/
+                para.gsub!(/#{Mx[:gl_bullet]}/,'●&nbsp;&nbsp;') #watch
+              else
+                @sto.scroll_lev_para_ocn.bullet
+              end
             when /^#{Mx[:pa_o]}:i([1-9])#{Mx[:pa_c]}#{Mx[:gl_bullet]}/ #indent with bullet
               format_txt_obj.gsub_body
               @sto.scroll_lev_para_ocn.format('li',"i#{$1}")
@@ -140,7 +145,9 @@ module SiSU_HTML_scroll
                 end
               else para
               end
-            else para
+            else
+              para.gsub!(/#{Mx[:gl_bullet]}/,'●&nbsp;&nbsp;') #watch
+              para
             end
           elsif para =~/^#{Mx[:lv_o]}[1-9]:/ \
           and para !~/#{Mx[:id_o]}~\d+;(?:[oh]|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_c]}#@dp:#@dp#{Mx[:id_c]}$/
diff --git a/lib/sisu/v1/html_segments.rb b/lib/sisu/v1/html_segments.rb
index 66e04800..2b54447a 100644
--- a/lib/sisu/v1/html_segments.rb
+++ b/lib/sisu/v1/html_segments.rb
@@ -354,7 +354,8 @@ module SiSU_HTML_seg
             para=format_seg.no_paranum
           end
         end
-        if para[/#{Mx[:id_o]}~(\d+;(?:[ohmu]|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp)#{Mx[:id_c]}$/]
+        m=/#{Mx[:id_o]}~(\d+;(?:[ohmu]|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp)#{Mx[:id_c]}$/
+        if para =~m
           @sto=SiSU_HTML::Source::Split_text_object.new(@md,para).html_seg
           if @sto.format =~/i[1-9]|ordinary/ #watch
             txt_obj={:txt =>@sto.text}
@@ -393,7 +394,9 @@ module SiSU_HTML_seg
           @sto=nil
           table=SiSU_HTML_shared::Table.new(para)
           para=table.table
-        else @sto=nil
+        else
+          para.gsub!(/#{Mx[:gl_bullet]}/,'●&nbsp;&nbsp;') #watch
+          @sto=nil
         end
         if @md.flag_separate_endnotes
           para.gsub!(/"\s+href="#_(\d+)">/,%{" href=\"endnotes#{Sfx[:html]}#_\\1">})       #endnote- twice #removed file type
diff --git a/lib/sisu/v1/param.rb b/lib/sisu/v1/param.rb
index 72593207..889ec351 100644
--- a/lib/sisu/v1/param.rb
+++ b/lib/sisu/v1/param.rb
@@ -94,8 +94,8 @@ module SiSU_Param
         if File.exist?(@pstorefile)
           param_msg='Parameters from pstore'
           retrieve_store=PStore.new(@pstorefile)
-          retrieve_store.transaction do |s|
-            @md=s['md']
+          retrieve_store.transaction do
+            @md=retrieve_store['md']
           end
           @md
         else
@@ -979,10 +979,10 @@ module SiSU_Param
           tell=SiSU_Screen::Ansi.new(@md.cmd,"PStore -> #@pstorefile")
           tell.txt_grey if @md.cmd =~/v/
           store=PStore.new(@pstorefile)
-          store.transaction do |s|
-            s['md']=@md
+          store.transaction do
+            store['md']=@md
             #doc.each{|x,y| puts "#{x}, #{y}; "}
-            s.commit
+            store.commit
           end
           @@md=@md=nil
         end
diff --git a/lib/sisu/v1/sysenv.rb b/lib/sisu/v1/sysenv.rb
index 1adb3509..e542e680 100644
--- a/lib/sisu/v1/sysenv.rb
+++ b/lib/sisu/v1/sysenv.rb
@@ -213,7 +213,7 @@ module SiSU_Env
     stub_pwd=@@pwd[m,1]
     @@rc_path=["#@@pwd/_sisu","#@@home/.sisu","#@@sisu_etc/#{SiSU_version_dir}"]
     @@yamlrc_path=unless stub_pwd =~/^sisupod$/
-      ["#@@pwd/_sisu","#@@home/.sisu","#@@sisu_etc/#{SiSU_version_dir}"]
+      ["#{@@pwd}/_sisu/#{SiSU_version_dir}","#{@@pwd}/_sisu","#@@home/.sisu/#{SiSU_version_dir}","#@@home/.sisu","#@@sisu_etc/#{SiSU_version_dir}"]
     else #security policy: prevent reading of sisurc.yml in sisupod
       ["#@@home/.sisu","#@@sisu_etc/#{SiSU_version_dir}"]
     end
@@ -675,6 +675,9 @@ module SiSU_Env
           break
         end
       end
+      if @pdfetex_flag==false
+        @texpdf=prog.join(', ')
+      end
       @texpdf
     end
     def latex2pdf(md,papersize='a4')                                                              #convert from latex to pdf
@@ -701,7 +704,7 @@ module SiSU_Env
         when /pdflatex/; "#{texpdf} -interaction=#{mode} #@input #{tell}\n"
         end
         system(texpdf_cmd)
-      else puts "\tWARN: none of the following programs are installed: #{program[0]}, #{program[1]}, #{program[2]} is installed. #{program_ref}"
+      else puts "\tWARN: none of the following programs appear to be installed: #{texpdf}. #{program_ref}"
       end
     end
     def makeinfo                                                               #texinfo