Merge branch 'upstream' into debian/sid

14 files changed, 24 insertions, 24 deletions

diff --git a/lib/sisu/v1/dal_syntax.rb b/lib/sisu/v1/dal_syntax.rb
index 3a3273c7..98886f51 100644
--- a/lib/sisu/v1/dal_syntax.rb
+++ b/lib/sisu/v1/dal_syntax.rb
@@ -253,7 +253,7 @@ module SiSU_Syntax
         line.gsub!(/~\[([^*+].+?)\]~/m,Mx[:en_b_o] + '* \1' + Mx[:en_b_c]) #default if markup does not specify
         line.gsub!(/~\[(.+?)\]~/m,Mx[:en_b_o] + '\1' + Mx[:en_b_c])
         if line =~/^#{Mx[:lv_o]}1:\S*?#{Mx[:lv_c]}/
-          if @md.subtitle and not @md.subtitle.empty? 
+          if @md.subtitle and not @md.subtitle.empty?
             line.gsub!(/\s*@title\b/," #{@md.title} - #{@md.subtitle}")
           else line.gsub!(/\s*@title\b/," #{@md.title}")
           end
diff --git a/lib/sisu/v1/help.rb b/lib/sisu/v1/help.rb
index 6cc5ca4b..2d6e4a1e 100644
--- a/lib/sisu/v1/help.rb
+++ b/lib/sisu/v1/help.rb
@@ -273,7 +273,7 @@ WOK
 
  #{@cX.ruby}-N#{@cX.off} #{@cX.green}[filename/wildcard/url]#{@cX.off} document content certificate as md5 digest tree of document produced (as digest.txt), the digest for the document, and digests for each object contained within the document (together with information on software versions that produced it). Try -mNV for verbose digest output to screen
 
- #{@cX.ruby}-n#{@cX.off} #{@cX.green}[filename/wildcard/url]#{@cX.off} skip the creation of intermediate processing files (document abstraction) if they already exist, this skips the equivalent of -m which is otherwise assumed by most processing flags.  
+ #{@cX.ruby}-n#{@cX.off} #{@cX.green}[filename/wildcard/url]#{@cX.off} skip the creation of intermediate processing files (document abstraction) if they already exist, this skips the equivalent of -m which is otherwise assumed by most processing flags.
 
  #{@cX.ruby}-p#{@cX.off} #{@cX.green}[filename/wildcard]#{@cX.off} produces LaTeX pdf (portrait & landscape). Default paper size is set in config file, or document header, or provided with additional command line parameter, e.g. --papersize='a4' preset sizes include: 'A4', U.S. 'letter' and 'legal' and book sizes 'A5' and 'B5' (system defaults to A4).
 
diff --git a/lib/sisu/v2/author_format.rb b/lib/sisu/v2/author_format.rb
index da03f324..dee83eb6 100644
--- a/lib/sisu/v2/author_format.rb
+++ b/lib/sisu/v2/author_format.rb
@@ -100,7 +100,7 @@ module FORMAT
           end
         end
       end
-      { 
+      {
         :last_first_a => authors,
         :last_first_format_a => @author_array,
         :authors_h => @authors,
diff --git a/lib/sisu/v2/constants.rb b/lib/sisu/v2/constants.rb
index 9eec8370..363bc65a 100644
--- a/lib/sisu/v2/constants.rb
+++ b/lib/sisu/v2/constants.rb
@@ -90,7 +90,7 @@ Mx[:gl_bullet]=       "#{Mx[:gl_o]}●#{Mx[:gl_c]}"
 Mx[:idx_o]='▢ ';                                         Mx[:idx_c]='▢ ' #
 Mx[:nbsp]=            '░' #'▭ '
 Mx[:br_line]=         '▌' #lB ▌  9612 #'┘' #'¶'
-Mx[:br_paragraph]=    '█' #FB █  9608 # PP ∥  8741 #'▐'  #'┘' #'¶' #FB █  9608  lB ▌  9612   RB ▐  9616  
+Mx[:br_paragraph]=    '█' #FB █  9608 # PP ∥  8741 #'▐'  #'┘' #'¶' #FB █  9608  lB ▌  9612   RB ▐  9616
 Mx[:br_nl]=           '』' #   '┘'
 Mx[:br_page]=         'break_page';                      Hx[:br_page]=        {:obj=>Mx[:br_page]}      # newpage
 Mx[:br_page_new]=     'break_page_new';                  Hx[:br_page_new]=    {:obj=>Mx[:br_page_new]}  # clearpage
@@ -192,9 +192,9 @@ p (__FILE__ + ' ' + __LINE__.to_s + '--> ' + dob.inspect) if dob.is=='heading'
 data.each {|o| p (__FILE__ + ' ' + __LINE__.to_s + '--> ' + o.inspect) if o.is=='heading'}
 puts "#{__FILE__} #{__LINE__} #{para}" if @opt.cmd =~/M/
 puts "#{__FILE__} #{__LINE__} #{t_o}" if @opt.cmd =~/M/
- dr ┌  9484   dR ┍  9485   Dr ┎  9486   DR ┏  9487   dl ┐  9488   dL ┑  9489   Dl ┒  9490   LD ┓  9491  ur └  9492   uR ┕  9493   Ur ┖  9494   UR ┗  9495   ul ┘  9496   uL ┙  9497   Ul ┚  9498   UL ┛  9499   vr ├  
- dr ┌  9484   dR ┍  9485   Dr ┎  9486   DR ┏  9487   dl ┐  9488   dL ┑  9489   Dl ┒  9490   LD ┓  9491  ur └  9492   uR ┕  9493   Ur ┖  9494   UR ┗  9495   ul ┘  9496   uL ┙  9497   Ul ┚  9498   UL ┛  9499   vr ├  
- └  ┘ 
-Iu ⌠  8992   Il ⌡ <7 ⌈  8968   >7 ⌉  8969   7< ⌊  8970   7> ⌋  8971 
+ dr ┌  9484   dR ┍  9485   Dr ┎  9486   DR ┏  9487   dl ┐  9488   dL ┑  9489   Dl ┒  9490   LD ┓  9491  ur └  9492   uR ┕  9493   Ur ┖  9494   UR ┗  9495   ul ┘  9496   uL ┙  9497   Ul ┚  9498   UL ┛  9499   vr ├
+ dr ┌  9484   dR ┍  9485   Dr ┎  9486   DR ┏  9487   dl ┐  9488   dL ┑  9489   Dl ┒  9490   LD ┓  9491  ur └  9492   uR ┕  9493   Ur ┖  9494   UR ┗  9495   ul ┘  9496   uL ┙  9497   Ul ┚  9498   UL ┛  9499   vr ├
+ └  ┘
+Iu ⌠  8992   Il ⌡ <7 ⌈  8968   >7 ⌉  8969   7< ⌊  8970   7> ⌋  8971
 <" 『 12302  >" 』 12303
 <' 「 12300  >' 」 12301
diff --git a/lib/sisu/v2/dal_numbering.rb b/lib/sisu/v2/dal_numbering.rb
index c62ff8d9..c052db29 100644
--- a/lib/sisu/v2/dal_numbering.rb
+++ b/lib/sisu/v2/dal_numbering.rb
@@ -303,7 +303,7 @@ module SiSU_numbering
             if not @md.seg_names.nil? \
             and not @md.seg_names.include?(possible_seg_name)
               dob.name=possible_seg_name
-              dob.tags=[dob.name,dob.tags].flatten if dob.name !~/^\d+$/ 
+              dob.tags=[dob.name,dob.tags].flatten if dob.name !~/^\d+$/
               @md.seg_names << possible_seg_name
             else puts 'warn, there may be a conflicting numbering scheme' if @md.cmd =~/[VM]/
             end
@@ -312,7 +312,7 @@ module SiSU_numbering
           and dob.name                                     #extract segment name from embedded document structure info
             if not @md.seg_names.nil? \
             and not @md.seg_names.include?(dob.name)
-              dob.tags=[dob.name,dob.tags].flatten if dob.name !~/^\d+$/ 
+              dob.tags=[dob.name,dob.tags].flatten if dob.name !~/^\d+$/
               @md.seg_names << dob.name
             end
           end
diff --git a/lib/sisu/v2/db_columns.rb b/lib/sisu/v2/db_columns.rb
index ba861f4d..c1fb6109 100644
--- a/lib/sisu/v2/db_columns.rb
+++ b/lib/sisu/v2/db_columns.rb
@@ -1967,7 +1967,7 @@ module SiSU_DB_columns
           'skin_name'
         end
         def create_column
-          "#{name}                 VARCHAR(#{Db[:col_filename]}) NULL," 
+          "#{name}                 VARCHAR(#{Db[:col_filename]}) NULL,"
         end
         def column_comment
           %{COMMENT ON COLUMN metadata_and_text.#{name}
@@ -2035,7 +2035,7 @@ module SiSU_DB_columns
         end
         def create_column
           "#{name}                TEXT NULL,"
-          #"#{name}                 VARCHAR(#{links.size}) NULL," 
+          #"#{name}                 VARCHAR(#{links.size}) NULL,"
         end
         def column_comment
           %{COMMENT ON COLUMN metadata_and_text.#{name}
diff --git a/lib/sisu/v2/defaults.rb b/lib/sisu/v2/defaults.rb
index 1f649b0a..849c430c 100644
--- a/lib/sisu/v2/defaults.rb
+++ b/lib/sisu/v2/defaults.rb
@@ -1718,7 +1718,7 @@ documents, books, digital libraries in plaintext, html, XHTML, XML,
 ODF (OpenDocument), EPUB, LaTeX, PDF, SQL (PostgreSQL and SQLite), and
 for search</title>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta name="dc.title" 
+<meta name="dc.title"
   content="SiSU information Structuring Universe, Structured information Serialised Units, #{@date.year_static}" />
 <meta name="dc.creator" content="Ralph Amissah" />
 <meta name="dc.subject" content=
diff --git a/lib/sisu/v2/harvest_authors.rb b/lib/sisu/v2/harvest_authors.rb
index 33042dcf..dfb2b654 100644
--- a/lib/sisu/v2/harvest_authors.rb
+++ b/lib/sisu/v2/harvest_authors.rb
@@ -177,7 +177,7 @@ module HARVEST_authors
       @output[:html]=File.new("#{@env.path.output_md_harvest}/harvest_authors.html",'w')
       @output[:html_mnt]=(@opt.cmd.inspect =~/M/) \
       ? File.new("#{@env.path.pwd}/harvest_authors.html",'w') \
-      : nil 
+      : nil
     end
     def html_file_close
       @output[:html].close
diff --git a/lib/sisu/v2/odf.rb b/lib/sisu/v2/odf.rb
index a7c77639..4eabbba5 100644
--- a/lib/sisu/v2/odf.rb
+++ b/lib/sisu/v2/odf.rb
@@ -236,7 +236,7 @@ module SiSU_ODF
       def text_link_odf(txt,url,trail)
         txt.gsub!(/(\\\+)/,'+') #this is convoluted, and risky :-(
         url.gsub!(/(\\\+)/,'+') #this is convoluted, and risky :-(
-        map_nametags=SiSU_Particulars::Combined_singleton.instance.get_map_nametags(@md).nametags_map 
+        map_nametags=SiSU_Particulars::Combined_singleton.instance.get_map_nametags(@md).nametags_map
         t=case url
         when /^https?:/
           %{<text:a xlink:type="simple" xlink:href="#{url}">#{txt.strip}</text:a>#{trail}}
diff --git a/lib/sisu/v2/param.rb b/lib/sisu/v2/param.rb
index 98478626..8b75edfc 100644
--- a/lib/sisu/v2/param.rb
+++ b/lib/sisu/v2/param.rb
@@ -152,7 +152,7 @@ module SiSU_Param
         @s,@opt,@env=str,opt,env
       end
       def validate_length(s,l,n)
-        #s=(s.length <= l) ? s : nil 
+        #s=(s.length <= l) ? s : nil
         s=if s.class==String \
         and s.length <= l
           s
@@ -160,9 +160,9 @@ module SiSU_Param
         elsif s.class !=String
           puts "#{n} is #{s.class}: programming error, String expected #{__FILE__}:#{__LINE__}"
           s
-        else 
+        else
           SiSU_Screen::Ansi.new('v',"#{n} length #{s.length} exceeds set db field length #{l}, metadata dropped",@opt.fns).warn unless @opt.cmd =~/q/
-          nil 
+          nil
         end
       end
       def name_format(name)
@@ -278,7 +278,7 @@ module SiSU_Param
           l,n=Db[:col_name],'creator.author'
           validate_length(s,l,n)
         end
-        def author_detail 
+        def author_detail
           s=(@h['author'] ? @h['author'] : @h['main'])
           names=name_format(s)
           names[:name_a_h]
@@ -1174,7 +1174,7 @@ module SiSU_Param
             dgst=@sys.sha256(@env.source_file_with_path)
             @dgst=dgst[1].length==64 ? dgst : nil
             puts 'check document (sha256) digest' if not @dgst
-            @dgst_skin=skin ? (@sys.sha256(skin)) : nil 
+            @dgst_skin=skin ? (@sys.sha256(skin)) : nil
           else
             dgst=@sys.md5(@env.source_file_with_path)
             @dgst=dgst[1].length==32 ? dgst : nil
diff --git a/lib/sisu/v2/shared_html_lite.rb b/lib/sisu/v2/shared_html_lite.rb
index 2743a450..bb27258c 100644
--- a/lib/sisu/v2/shared_html_lite.rb
+++ b/lib/sisu/v2/shared_html_lite.rb
@@ -86,7 +86,7 @@ module SiSU_Format_Shared
     end
     def urls(data)
       @words=[]
-      map_nametags=SiSU_Particulars::Combined_singleton.instance.get_map_nametags(@md).nametags_map 
+      map_nametags=SiSU_Particulars::Combined_singleton.instance.get_map_nametags(@md).nametags_map
       data.each do |word|
         @words << if word=~/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}(#{Mx[:url_o]}\S+?#{Mx[:url_c]}|#{Mx[:rel_o]}\S+?#{Mx[:rel_c]}|image)/
           if word =~/#{Mx[:lnk_o]}.+?#{Mx[:lnk_c]}#{Mx[:url_o]}\S+?#{Mx[:url_c]}/
diff --git a/lib/sisu/v2/shared_txt.rb b/lib/sisu/v2/shared_txt.rb
index abf5e035..598fc52d 100644
--- a/lib/sisu/v2/shared_txt.rb
+++ b/lib/sisu/v2/shared_txt.rb
@@ -62,7 +62,7 @@ module SiSU_text_utils
       @para,@n_char_max,@n_indent=para,n_char_max,n_indent
       @n_char_max_extend = n_char_max
       @br="\n"
-      @n_hang=n_hang ? n_hang : @n_indent 
+      @n_hang=n_hang ? n_hang : @n_indent
     end
     def line_wrap
       space=' '
diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb
index 26e842ec..1727e630 100644
--- a/lib/sisu/v2/sysenv.rb
+++ b/lib/sisu/v2/sysenv.rb
@@ -649,7 +649,7 @@ module SiSU_Env
       puts "\tWARN: #{program} is not installed #{program_ref}" unless found
       found
     end
-    def graphicksmagick                                                        #graphicsmagick is a image manipulation program 
+    def graphicksmagick                                                        #graphicsmagick is a image manipulation program
       program='gm'
       program_ref="\n\t\tsee http://www.graphicsmagick.org/"
       found=(program_found?(program)) ? true : false
diff --git a/lib/sisu/v2/texpdf.rb b/lib/sisu/v2/texpdf.rb
index 8b92270f..b9d9e2c0 100644
--- a/lib/sisu/v2/texpdf.rb
+++ b/lib/sisu/v2/texpdf.rb
@@ -711,7 +711,7 @@ WOK
           or @md.mod.inspect =~/--no-ocn/ \
           or not dob.ocn_
             ''
-          else 
+          else
             tags=''
             #[keep] code that follows inserts "name tags" as hypertargets, currently using ocn (converting nametags to ocn) for internal linking, related code: |texpdf_format.rb|@|uses nametags directly|
             #if dob.tags.length > 0 # insert tags "hypertargets"