Merge tag 'sisu_4.0.1' into debian/sid

123 files changed, 527 insertions, 387 deletions

diff --git a/lib/sisu/v4/air.rb b/lib/sisu/v4/air.rb
index 47c0f0ba..a4aa7fad 100644
--- a/lib/sisu/v4/air.rb
+++ b/lib/sisu/v4/air.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/author_format.rb b/lib/sisu/v4/author_format.rb
index 36d956b7..93fb1162 100644
--- a/lib/sisu/v4/author_format.rb
+++ b/lib/sisu/v4/author_format.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/cgi.rb b/lib/sisu/v4/cgi.rb
index b6653f51..cb308a61 100644
--- a/lib/sisu/v4/cgi.rb
+++ b/lib/sisu/v4/cgi.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/cgi_pgsql.rb b/lib/sisu/v4/cgi_pgsql.rb
index 1264d922..b5944a34 100644
--- a/lib/sisu/v4/cgi_pgsql.rb
+++ b/lib/sisu/v4/cgi_pgsql.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/cgi_sql_common.rb b/lib/sisu/v4/cgi_sql_common.rb
index eb766a4c..5cd0bad3 100644
--- a/lib/sisu/v4/cgi_sql_common.rb
+++ b/lib/sisu/v4/cgi_sql_common.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -78,7 +78,7 @@ module SiSU_CGI_SQL
 
  * Author: Ralph Amissah
 
- * Copyright: (C) 1997 - 2012, Ralph Amissah, All Rights Reserved.
+ * Copyright: (C) 1997 - 2013, Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -553,7 +553,7 @@ module SiSU_CGI_SQL
     <br />
     <a href="http://www.jus.uio.no/sisu" >
     <b>#{v[:project]}</b></a> <sup>&copy;</sup> Ralph Amissah
-    1993, current 2012.
+    1993, current 2013.
     All Rights Reserved.
     <br />
     <a href="http://www.jus.uio.no/sisu" >
@@ -589,7 +589,7 @@ module SiSU_CGI_SQL
     <br />Standard SiSU meta-markup syntax, and the
     <br />Standard SiSU <u>object citation numbering</u> and system, (object/text positioning system)
   <br />
-    <sup>&copy;</sup> Ralph Amissah 1997, current 2012.
+    <sup>&copy;</sup> Ralph Amissah 1997, current 2013.
     All Rights Reserved.
   </font></p>
 </td></tr>
diff --git a/lib/sisu/v4/cgi_sqlite.rb b/lib/sisu/v4/cgi_sqlite.rb
index 78ae0f9a..aa72b3ac 100644
--- a/lib/sisu/v4/cgi_sqlite.rb
+++ b/lib/sisu/v4/cgi_sqlite.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/composite.rb b/lib/sisu/v4/composite.rb
index 2f58567b..82b207f0 100644
--- a/lib/sisu/v4/composite.rb
+++ b/lib/sisu/v4/composite.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/concordance.rb b/lib/sisu/v4/concordance.rb
index f93fbd6a..8c122706 100644
--- a/lib/sisu/v4/concordance.rb
+++ b/lib/sisu/v4/concordance.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -118,20 +118,20 @@ module SiSU_Concordance
         @doc_details =<<WOK
 <table summary="links to text related to this rudimentary index" width="96%" border="0" bgcolor="white" cellpadding="0" align="center"><tr><td width="2%" align="right">&nbsp;</td><td width="94%" valign="top" align="justify"><h1 class="small"><a href="#{@md.file.base_filename.html_segtoc}"><b>#{@md.title.full}</b></a></h1><p class="bold">#{@md.author}</p></td></tr></table>
 WOK
+        @make=SiSU_Env::ProcessingSettings.new(@md)
       end
       def create
         head_banner=SiSU_HTML_Format::HeadToc.new(@md)
         minitoc=SiSU_HTML_MiniToc::TocMini.new(@md,@data).songsheet.join("\n")
         stylesheet=SiSU_Style::CSS_HeadInfo.new(@md).stylesheet
-        make=SiSU_Env::ProcessingSettings.new(@md)
-        if make.build.manifest_minitoc?
+        if @make.build.manifest_minitoc?
           toc='<div class="toc">' + minitoc + '</div>'
           div_class='content'
         else
           toc=''
           div_class='content0'
         end
-        top_band=if make.build.html_top_band?
+        top_band=if @make.build.html_top_band?
           head_banner.concordance_navigation_band
         else ''
         end
diff --git a/lib/sisu/v4/conf.rb b/lib/sisu/v4/conf.rb
index 8cd3e2ef..823e3346 100644
--- a/lib/sisu/v4/conf.rb
+++ b/lib/sisu/v4/conf.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/constants.rb b/lib/sisu/v4/constants.rb
index af5c13a4..08279630 100644
--- a/lib/sisu/v4/constants.rb
+++ b/lib/sisu/v4/constants.rb
@@ -9,7 +9,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -57,7 +57,7 @@
 
 =end
 #Ax,Xx,Mx,Rx,Hx,Dx,Px,Ep,Db,Gt,Tex=Array.new(11){{}}
-YEAR='2012'
+YEAR='2013'
 Sfx={ txt: '.txt', html: '.html', xhtml: '.xhtml', xml: '.xml', epub: '.epub', epub_xhtml: '.xhtml', odt: '.odt', pdf: '.pdf'}
 Ax={
   tab:                       "\t",
@@ -243,6 +243,27 @@ S_CONF={
   header_make: 'sisu_document_make',
   rc_yml: 'sisurc.yml',
 }
+ANSI_C={
+  red:                       "\033[#{31}m",
+  green:                     "\033[#{32}m",
+  yellow:                    "\033[#{33}m",
+  blue:                      "\033[#{34}m",
+  fuchsia:                   "\033[#{35}m",
+  cyan:                      "\033[#{36}m",
+  inv_red:                   "\033[#{41}m",
+  inv_green:                 "\033[#{42}m",
+  inv_yellow:                "\033[#{43}m",
+  inv_blue:                  "\033[#{44}m",
+  inv_fuchsia:               "\033[#{45}m",
+  inv_cyan:                  "\033[#{46}m",
+  b_red:                     "\033[#{91}m",
+  b_green:                   "\033[#{92}m",
+  b_yellow:                  "\033[#{93}m",
+  b_blue:                    "\033[#{94}m",
+  b_fuchsia:                 "\033[#{95}m",
+  b_cyan:                    "\033[#{96}m",
+  off:                       "\033[m"
+}
 DISABLE={
   epub: {
     internal_navigation:     true,
@@ -254,6 +275,12 @@ DEVELOPER={
   maintenance:               :false,
 }
 __END__
+puts SiSU_Debug::Mark.new(__LINE__,__FILE__,:red).set
+puts SiSU_Debug::Mark.new(__LINE__,__FILE__).set(:green)
+puts ANSI_C[:red] + __LINE__.to_s + ANSI_C[:off] + ' ' + __FILE__
+puts "#{ANSI_C[:red]} #{__LINE__.to_s} #{ANSI_C[:off]} #{__FILE__}"
+puts ANSI_C[:fuchsia] + __LINE__.to_s + ANSI_C[:off] + ' ' + __FILE__.gsub(/([^\/]+$)/,"#{ANSI_C[:fuchsia]}\\1#{ANSI_C[:off]}")
+puts ANSI_C[:red] + __LINE__.to_s + ANSI_C[:off] + ' ' + __FILE__.gsub(/([^\/]+$)/,"#{ANSI_C[:red]}\\1#{ANSI_C[:off]}")
 consider:
   〔comment〕
   〔links?????〕
diff --git a/lib/sisu/v4/css.rb b/lib/sisu/v4/css.rb
index f723853f..b1d47fce 100644
--- a/lib/sisu/v4/css.rb
+++ b/lib/sisu/v4/css.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/dal.rb b/lib/sisu/v4/dal.rb
index 0e816091..fa3261ab 100644
--- a/lib/sisu/v4/dal.rb
+++ b/lib/sisu/v4/dal.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -287,59 +287,51 @@ module SiSU_DAL
     end
     def read_fnm
       dal=[]
-      dal=if FileTest.file?(@fnm)
-        File.open(@fnm,'r:utf-8'){ |f| dal=Marshal.load(f)}
-      else SiSU_DAL::Source.new(@opt).create_dal
-      end
+      dal=(FileTest.file?(@fnm)) \
+      ? (File.open(@fnm,'r:utf-8'){ |f| dal=Marshal.load(f)})
+      : SiSU_DAL::Source.new(@opt).create_dal
     end
     def read_fnc
       dal=[]
-      dal=if FileTest.file?(@fnc)
-        File.open(@fnc,'r:utf-8'){ |f| dal=Marshal.load(f)}
-      else SiSU_DAL::Source.new(@opt).create_dal
-      end
+      dal=(FileTest.file?(@fnc)) \
+      ? (File.open(@fnc,'r:utf-8'){ |f| dal=Marshal.load(f)})
+      : SiSU_DAL::Source.new(@opt).create_dal
     end
     def read_idx_sst
       m=[]
-      m=if FileTest.file?(@idx_sst)
-        File.open(@idx_sst,'r:utf-8'){ |f| m=Marshal.load(f)}
-      else nil
-      end
+      m=(FileTest.file?(@idx_sst)) \
+      ? (File.open(@idx_sst,'r:utf-8'){ |f| m=Marshal.load(f)})
+      : nil
     end
     def read_idx_raw
       m=[]
-      m=if FileTest.file?(@idx_raw)
-        File.open(@idx_raw,'r:utf-8'){ |f| m=Marshal.load(f)}
-      else nil
-      end
+      m=(FileTest.file?(@idx_raw)) \
+      ? (File.open(@idx_raw,'r:utf-8'){ |f| m=Marshal.load(f)})
+      : nil
     end
     def read_idx_html
       m=[]
-      m=if FileTest.file?(@idx_html)
-        File.open(@idx_html,'r:utf-8'){ |f| m=Marshal.load(f)}
-      else nil
-      end
+      m=(FileTest.file?(@idx_html)) \
+      ? (File.open(@idx_html,'r:utf-8'){ |f| m=Marshal.load(f)})
+      : nil
     end
     def read_idx_xhtml
       m=[]
-      m=if FileTest.file?(@idx_xhtml)
-        File.open(@idx_xhtml,'r:utf-8'){ |f| m=Marshal.load(f)}
-      else nil
-      end
+      m=(FileTest.file?(@idx_xhtml)) \
+      ? (File.open(@idx_xhtml,'r:utf-8'){ |f| m=Marshal.load(f)})
+      : nil
     end
     def read_map_nametags
       m=[]
-      m=if FileTest.file?(@map_nametags)
-        File.open(@map_nametags,'r:utf-8'){ |f| m=Marshal.load(f)}
-      else nil
-      end
+      m=(FileTest.file?(@map_nametags)) \
+      ? (File.open(@map_nametags,'r:utf-8'){ |f| m=Marshal.load(f)})
+      : nil
     end
     def read_map_ocn_htmlseg
       m=[]
-      m=if FileTest.file?(@map_ocn_htmlseg)
-        File.open(@map_ocn_htmlseg,'r:utf-8'){ |f| m=Marshal.load(f)}
-      else nil
-      end
+      m=(FileTest.file?(@map_ocn_htmlseg)) \
+      ? (File.open(@map_ocn_htmlseg,'r:utf-8'){ |f| m=Marshal.load(f)})
+      : nil
     end
   end
   class Output
diff --git a/lib/sisu/v4/dal_character_check.rb b/lib/sisu/v4/dal_character_check.rb
index f20d4106..10d23b23 100644
--- a/lib/sisu/v4/dal_character_check.rb
+++ b/lib/sisu/v4/dal_character_check.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/dal_doc_objects.rb b/lib/sisu/v4/dal_doc_objects.rb
index f77348ec..70a4913d 100644
--- a/lib/sisu/v4/dal_doc_objects.rb
+++ b/lib/sisu/v4/dal_doc_objects.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/dal_doc_str.rb b/lib/sisu/v4/dal_doc_str.rb
index 012e7a33..40fad15e 100644
--- a/lib/sisu/v4/dal_doc_str.rb
+++ b/lib/sisu/v4/dal_doc_str.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/dal_endnotes.rb b/lib/sisu/v4/dal_endnotes.rb
index 4ef6f3ae..35b5794b 100644
--- a/lib/sisu/v4/dal_endnotes.rb
+++ b/lib/sisu/v4/dal_endnotes.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/dal_expand_insertions.rb b/lib/sisu/v4/dal_expand_insertions.rb
index 2ec4945f..a863e59f 100644
--- a/lib/sisu/v4/dal_expand_insertions.rb
+++ b/lib/sisu/v4/dal_expand_insertions.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/dal_hash_digest.rb b/lib/sisu/v4/dal_hash_digest.rb
index 8718c461..3dd1bb50 100644
--- a/lib/sisu/v4/dal_hash_digest.rb
+++ b/lib/sisu/v4/dal_hash_digest.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/dal_idx.rb b/lib/sisu/v4/dal_idx.rb
index db4ba9c1..63eb487e 100644
--- a/lib/sisu/v4/dal_idx.rb
+++ b/lib/sisu/v4/dal_idx.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/dal_images.rb b/lib/sisu/v4/dal_images.rb
index 9c6dd872..c5eeb820 100644
--- a/lib/sisu/v4/dal_images.rb
+++ b/lib/sisu/v4/dal_images.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/dal_metadata.rb b/lib/sisu/v4/dal_metadata.rb
index cfdf9606..ce0b756c 100644
--- a/lib/sisu/v4/dal_metadata.rb
+++ b/lib/sisu/v4/dal_metadata.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/dal_numbering.rb b/lib/sisu/v4/dal_numbering.rb
index f81563f3..b22015df 100644
--- a/lib/sisu/v4/dal_numbering.rb
+++ b/lib/sisu/v4/dal_numbering.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/dal_substitutions_and_insertions.rb b/lib/sisu/v4/dal_substitutions_and_insertions.rb
index 92e19034..3f12e83e 100644
--- a/lib/sisu/v4/dal_substitutions_and_insertions.rb
+++ b/lib/sisu/v4/dal_substitutions_and_insertions.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/dal_syntax.rb b/lib/sisu/v4/dal_syntax.rb
index b62fbad8..686155fc 100644
--- a/lib/sisu/v4/dal_syntax.rb
+++ b/lib/sisu/v4/dal_syntax.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/db_columns.rb b/lib/sisu/v4/db_columns.rb
index 9fc24bf8..2fd2fde2 100644
--- a/lib/sisu/v4/db_columns.rb
+++ b/lib/sisu/v4/db_columns.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/db_create.rb b/lib/sisu/v4/db_create.rb
index 784f37b1..673d11b3 100644
--- a/lib/sisu/v4/db_create.rb
+++ b/lib/sisu/v4/db_create.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/db_dbi.rb b/lib/sisu/v4/db_dbi.rb
index 4e8528fb..a9b35b2c 100644
--- a/lib/sisu/v4/db_dbi.rb
+++ b/lib/sisu/v4/db_dbi.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/db_drop.rb b/lib/sisu/v4/db_drop.rb
index 98db3b07..2faab7e6 100644
--- a/lib/sisu/v4/db_drop.rb
+++ b/lib/sisu/v4/db_drop.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/db_import.rb b/lib/sisu/v4/db_import.rb
index ae808cf8..95688b5f 100644
--- a/lib/sisu/v4/db_import.rb
+++ b/lib/sisu/v4/db_import.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/db_indexes.rb b/lib/sisu/v4/db_indexes.rb
index 99eb65cc..f37ff1a8 100644
--- a/lib/sisu/v4/db_indexes.rb
+++ b/lib/sisu/v4/db_indexes.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/db_load_tuple.rb b/lib/sisu/v4/db_load_tuple.rb
index 3df7ca3e..a2622404 100644
--- a/lib/sisu/v4/db_load_tuple.rb
+++ b/lib/sisu/v4/db_load_tuple.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/db_remove.rb b/lib/sisu/v4/db_remove.rb
index 3371a9be..14b6be05 100644
--- a/lib/sisu/v4/db_remove.rb
+++ b/lib/sisu/v4/db_remove.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/db_select.rb b/lib/sisu/v4/db_select.rb
index a013c00b..76917508 100644
--- a/lib/sisu/v4/db_select.rb
+++ b/lib/sisu/v4/db_select.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/db_sqltxt.rb b/lib/sisu/v4/db_sqltxt.rb
index 53c15ed3..02ce6fcf 100644
--- a/lib/sisu/v4/db_sqltxt.rb
+++ b/lib/sisu/v4/db_sqltxt.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/db_tests.rb b/lib/sisu/v4/db_tests.rb
index 07d6d488..ae30378b 100644
--- a/lib/sisu/v4/db_tests.rb
+++ b/lib/sisu/v4/db_tests.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/dbi.rb b/lib/sisu/v4/dbi.rb
index cd44b808..7a9cba58 100644
--- a/lib/sisu/v4/dbi.rb
+++ b/lib/sisu/v4/dbi.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/dbi_discreet.rb b/lib/sisu/v4/dbi_discreet.rb
index 07814a1a..e26e119c 100644
--- a/lib/sisu/v4/dbi_discreet.rb
+++ b/lib/sisu/v4/dbi_discreet.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/debug.rb b/lib/sisu/v4/debug.rb
new file mode 100644
index 00000000..a49cecb7
--- /dev/null
+++ b/lib/sisu/v4/debug.rb
@@ -0,0 +1,109 @@
+# encoding: utf-8
+=begin
+
+ * Name: SiSU
+
+ * Description: a framework for document structuring, publishing and search
+
+ * Author: Ralph Amissah
+
+ * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
+
+ * License: GPL 3 or later:
+
+   SiSU, a framework for document structuring, publishing and search
+
+   Copyright (C) Ralph Amissah
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the Free
+   Software Foundation, either version 3 of the License, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+   more details.
+
+   You should have received a copy of the GNU General Public License along with
+   this program. If not, see <http://www.gnu.org/licenses/>.
+
+   If you have Internet connection, the latest version of the GPL should be
+   available at these locations:
+   <http://www.fsf.org/licensing/licenses/gpl.html>
+   <http://www.gnu.org/licenses/gpl.html>
+
+   <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
+
+ * SiSU uses:
+   * Standard SiSU markup syntax,
+   * Standard SiSU meta-markup syntax, and the
+   * Standard SiSU object citation numbering and system
+
+ * Hompages:
+   <http://www.jus.uio.no/sisu>
+   <http://www.sisudoc.org>
+
+ * Download:
+   <http://www.sisudoc.org/sisu/en/SiSU/download.html>
+
+ * Ralph Amissah
+   <ralph@amissah.com>
+   <ralph.amissah@gmail.com>
+
+ ** Description: system environment, debug related
+
+=end
+module SiSU_Debug
+  class Mark
+    def initialize(line,file,color=:red)
+      @line,@file,@color=line.to_s,file,color
+    end
+    def ansi(color=nil)
+      @color=color ? color : @color
+      c={}
+      c[:on]=case @color
+      when :red;         ANSI_C[:red]
+      when :green;       ANSI_C[:green]
+      when :yellow;      ANSI_C[:yellow]
+      when :blue;        ANSI_C[:blue]
+      when :fuchsia;     ANSI_C[:fuchsia]
+      when :cyan;        ANSI_C[:cyan]
+      when :inv_red;     ANSI_C[:inv_red]
+      when :inv_green;   ANSI_C[:inv_green]
+      when :inv_yellow;  ANSI_C[:inv_yellow]
+      when :inv_blue;    ANSI_C[:inv_blue]
+      when :inv_fuchsia; ANSI_C[:inv_fuchsia]
+      when :inv_cyan;    ANSI_C[:inv_cyan]
+      when :b_red;       ANSI_C[:b_red]
+      when :b_green;     ANSI_C[:b_green]
+      when :b_yellow;    ANSI_C[:b_yellow]
+      when :b_blue;      ANSI_C[:b_blue]
+      when :b_fuchsia;   ANSI_C[:b_fuchsia]
+      when :b_cyan;      ANSI_C[:b_cyan]
+      else               ANSI_C[:red]
+      end
+      c[:off]= ANSI_C[:off]
+      #ansi_color + @line.to_s + ansi_color_off + ' ' + @file.gsub(/([^\/]+$)/,"#{ansi_color}\\1#{ansi_color_off}")
+      c
+    end
+    def set(color=nil)
+      c=ansi(color)
+      file,path=File.basename(@file),File.dirname(@file)
+      c[:on] + @line + c[:off] + ' ' + path + '/' "#{c[:on]}#{file}#{c[:off]}"
+    end
+    def set_(color=nil)
+      c=ansi(color)
+      c[:on] + @line + c[:off] + ' ' +
+        @file.gsub(/([^\/]+$)/,"#{c[:on]}\\1#{c[:off]}")
+    end
+  end
+end
+__END__
+puts SiSU_Debug::Mark.new(__LINE__,__FILE__).set(:red)
+puts SiSU_Debug::Mark.new(__LINE__,__FILE__).set(:green)
+puts SiSU_Debug::Mark.new(__LINE__,__FILE__).set(:inv_red)
+puts SiSU_Debug::Mark.new(__LINE__,__FILE__,:red).set
+puts SiSU_Debug::Mark.new(__LINE__,__FILE__,:green).set
+puts SiSU_Debug::Mark.new(__LINE__,__FILE__,:inv_red).set
diff --git a/lib/sisu/v4/defaults.rb b/lib/sisu/v4/defaults.rb
index aa80c72b..49d4860f 100644
--- a/lib/sisu/v4/defaults.rb
+++ b/lib/sisu/v4/defaults.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/digests.rb b/lib/sisu/v4/digests.rb
index 4bde7511..02bbf6da 100644
--- a/lib/sisu/v4/digests.rb
+++ b/lib/sisu/v4/digests.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/embedded.rb b/lib/sisu/v4/embedded.rb
index 87b37fc0..78ba2d2d 100644
--- a/lib/sisu/v4/embedded.rb
+++ b/lib/sisu/v4/embedded.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/epub.rb b/lib/sisu/v4/epub.rb
index 9ac4b610..d2d5cc6c 100644
--- a/lib/sisu/v4/epub.rb
+++ b/lib/sisu/v4/epub.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -140,7 +140,6 @@ module SiSU_EPUB
       end
       def tuned_file_instructions
         @tell=SiSU_Screen::Ansi.new(@md.opt.cmd)
-        @md.opt.cmd=@md.opt.cmd.gsub(/H/,'h')
         directories
         dal_array=@particulars.dal_array # dal file drawn here
         @tuned_file_array=SiSU_EPUB_Tune::Tune.new(dal_array,@md).songsheet
diff --git a/lib/sisu/v4/epub_concordance.rb b/lib/sisu/v4/epub_concordance.rb
index e75fb1bf..93774d30 100644
--- a/lib/sisu/v4/epub_concordance.rb
+++ b/lib/sisu/v4/epub_concordance.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/epub_format.rb b/lib/sisu/v4/epub_format.rb
index 98fc385d..5a63a6ec 100644
--- a/lib/sisu/v4/epub_format.rb
+++ b/lib/sisu/v4/epub_format.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -64,8 +64,8 @@ module SiSU_EPUB_Format
       vz=SiSU_Viz::Defaults.new
     end
     def ocn_display
-      @make=SiSU_Env::ProcessingSettings.new(@md)
-      if @make.build.ocn?
+      make=SiSU_Env::ProcessingSettings.new(@md)
+      if make.build.ocn?
         ocn_class='ocn'
         if @ocn.to_i==0
           @ocn.gsub(/^(\d+|)$/,
diff --git a/lib/sisu/v4/epub_segments.rb b/lib/sisu/v4/epub_segments.rb
index 1261e228..e2727232 100644
--- a/lib/sisu/v4/epub_segments.rb
+++ b/lib/sisu/v4/epub_segments.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/epub_tune.rb b/lib/sisu/v4/epub_tune.rb
index e99216d5..85bf7a64 100644
--- a/lib/sisu/v4/epub_tune.rb
+++ b/lib/sisu/v4/epub_tune.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/errors.rb b/lib/sisu/v4/errors.rb
index d1ce5170..a2837d9c 100644
--- a/lib/sisu/v4/errors.rb
+++ b/lib/sisu/v4/errors.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/git.rb b/lib/sisu/v4/git.rb
index 50521fba..488357f2 100644
--- a/lib/sisu/v4/git.rb
+++ b/lib/sisu/v4/git.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/harvest.rb b/lib/sisu/v4/harvest.rb
index ea967c37..2c67a6c5 100644
--- a/lib/sisu/v4/harvest.rb
+++ b/lib/sisu/v4/harvest.rb
@@ -10,7 +10,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/harvest_authors.rb b/lib/sisu/v4/harvest_authors.rb
index ef4b89c3..87b1ede7 100644
--- a/lib/sisu/v4/harvest_authors.rb
+++ b/lib/sisu/v4/harvest_authors.rb
@@ -9,7 +9,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/harvest_topics.rb b/lib/sisu/v4/harvest_topics.rb
index ac64c905..0dbb7ff9 100644
--- a/lib/sisu/v4/harvest_topics.rb
+++ b/lib/sisu/v4/harvest_topics.rb
@@ -10,7 +10,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/help.rb b/lib/sisu/v4/help.rb
index 391e722d..df08fb2e 100644
--- a/lib/sisu/v4/help.rb
+++ b/lib/sisu/v4/help.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -63,7 +63,8 @@ module SiSU_Help
      require_relative 'i18n'                             # i18n.rb
     def initialize(request='',color='')
       @request,@color=request,color
-      @cX=(color =~/color_off/) \
+      @cX=((color =~/color_off/) \
+      || (defined? color.act && color.act[:color_state][:set]==:off)) \
       ? (SiSU_Screen::Ansi.new('k').cX)
       : (SiSU_Screen::Ansi.new('yes').cX)
       fns='help_example_dummy_file_name.sst'
@@ -159,7 +160,7 @@ module SiSU_Help
     end
     def summary
       print <<-WOK
-    SiSU, Copyright (C) 1997 - 2012 Ralph Amissah
+    SiSU, Copyright (C) 1997 - 2013 Ralph Amissah
     License GPL version 3 or Later. This program comes with ABSOLUTELY NO WARRANTY;
     This is free software, and you are welcome to redistribute it under the conditions of the GPL3 or later.
     For more license detail type/enter: "sisu --help license"
@@ -900,7 +901,12 @@ If you have problems check permissions (and if in home directory ownership).
       version=SiSU_Env::InfoVersion.instance.get_version
       rb_ver=SiSU_Env::InfoVersion.instance.rbversion
       if version[:version]
-        SiSU_Screen::Ansi.new('-v',version[:project],version[:version],version[:date_stamp],version[:date],rb_ver).version
+        opt_cmd=if defined? @color.cmd \
+        and @color.cmd =~/[ck]/
+          @color.cmd
+        else '-v'
+        end
+        SiSU_Screen::Ansi.new(opt_cmd,version[:project],version[:version],version[:date_stamp],version[:date],rb_ver).version
       else puts 'SiSU version information not available'
       end
     end
@@ -1739,7 +1745,7 @@ preformatted text
 
    SiSU, a framework for document structuring, publishing and search
 
-   Copyright (C) 1997 - 2012 Ralph Amissah
+   Copyright (C) 1997 - 2013 Ralph Amissah
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the Free
@@ -1786,7 +1792,7 @@ preformatted text
    *  Standard SiSU meta-markup syntax, and the
    *  Standard SiSU object citation numbering and system
 
-Copyright (C) Ralph Amissah 1997, current 2012.
+Copyright (C) Ralph Amissah 1997, current 2013.
 All Rights Reserved.
 
 Information on these may be obtained from:
diff --git a/lib/sisu/v4/html.rb b/lib/sisu/v4/html.rb
index f9162192..57ac79c1 100644
--- a/lib/sisu/v4/html.rb
+++ b/lib/sisu/v4/html.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -99,15 +99,15 @@ module SiSU_HTML
           SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"file://#{@md.file.output_path.html_seg.dir}/#{@md.file.base_filename.html_segtoc}").flow if @opt.cmd =~/[MV]/
         end
         data=nil
-        @tuned_file_array=SiSU_HTML::Source::HTML_Environment.new(@particulars).tuned_file_instructions
-        data=@tuned_file_array
+        tuned_file_array=SiSU_HTML::Source::HTML_Environment.new(@particulars).tuned_file_instructions
+        data=tuned_file_array
         scr_endnotes=SiSU_HTML::Source::Endnotes.new(data,@md).scroll
         toc=SiSU_HTML::Source::Toc.new(@md,data).songsheet
         links_guide=SiSU_HTML::Source::LinksGuide.new(data,@md).toc
-        data=@tuned_file_array
+        data=tuned_file_array
         scr_toc=SiSU_HTML::Source::ScrollHeadAndSegToc.new(@md,toc,links_guide).in_common #watch
         SiSU_HTML::Source::Seg.new(@md,data).songsheet
-        data=@tuned_file_array
+        data=tuned_file_array
         scr=SiSU_HTML::Source::Scroll.new(@md,data,scr_endnotes).songsheet
         scroll=SiSU_HTML::Source::ScrollOutput.new(scr_toc,scr[:body],scr[:metadata],scr[:owner_details],scr[:tails],@md).publish
         SiSU_HTML::Source::Output.new(scroll,@md).scroll
@@ -142,12 +142,9 @@ module SiSU_HTML
       end
       def tuned_file_instructions
         @tell=SiSU_Screen::Ansi.new(@md.opt.cmd)
-        @md.opt.cmd=@md.opt.cmd.gsub(/H/,'h')
-        @md.file_type='html' if @md.opt.cmd =~/[hw]/
-        newfilename=%{#{@md.file.output_path.html_scroll.dir}/#{@md.file.base_filename.html_segtoc}} if @md.file_type =~/html/
         dal_array=@particulars.dal_array # dal file drawn here
-        @tuned_file_array=SiSU_HTML_Tune::Tune.new(dal_array,@md).songsheet
-        @tuned_file_array
+        tuned_file_array=SiSU_HTML_Tune::Tune.new(dal_array,@md).songsheet
+        tuned_file_array
       end
     end
     class LinksGuide
diff --git a/lib/sisu/v4/html_format.rb b/lib/sisu/v4/html_format.rb
index cdb0b94a..7a92bd0e 100644
--- a/lib/sisu/v4/html_format.rb
+++ b/lib/sisu/v4/html_format.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/html_minitoc.rb b/lib/sisu/v4/html_minitoc.rb
index 5f562d19..998a71ab 100644
--- a/lib/sisu/v4/html_minitoc.rb
+++ b/lib/sisu/v4/html_minitoc.rb
@@ -9,7 +9,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/html_promo.rb b/lib/sisu/v4/html_promo.rb
index 70e63335..91da0e6c 100644
--- a/lib/sisu/v4/html_promo.rb
+++ b/lib/sisu/v4/html_promo.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/html_scroll.rb b/lib/sisu/v4/html_scroll.rb
index 98f922b2..bccc96ff 100644
--- a/lib/sisu/v4/html_scroll.rb
+++ b/lib/sisu/v4/html_scroll.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/html_segments.rb b/lib/sisu/v4/html_segments.rb
index 97334023..5a110b41 100644
--- a/lib/sisu/v4/html_segments.rb
+++ b/lib/sisu/v4/html_segments.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -211,7 +211,11 @@ module SiSU_HTML_Seg
             m=$1
             if map_nametags[m] \
             and map_nametags[m][:segname]
-              dob.obj.sub!(/href="#{Xx[:segment]}#+(\S+?)"/,%{href="#{map_nametags[m][:segname]}#{Sfx[:html]}#\\1"})
+              inf=SiSU_Env::FileOp.new(@md) if @md
+              lng=(inf.output_dir_structure.by_language_code?) \
+              ? ''
+              : '.' + @md.opt.lng
+              dob.obj.sub!(/href="#{Xx[:segment]}#+(\S+?)"/,%{href="#{map_nametags[m][:segname]}#{lng}#{Sfx[:html]}#\\1"})
             else
               p "NOT FOUND name_tags: #{m}"
               dob.obj.sub!(/href="#{Xx[:segment]}#+(\S+?)"/,%{href="#\\1"}) # not satisfactory
diff --git a/lib/sisu/v4/html_table.rb b/lib/sisu/v4/html_table.rb
index f94199ce..cfc00ce7 100644
--- a/lib/sisu/v4/html_table.rb
+++ b/lib/sisu/v4/html_table.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/html_tune.rb b/lib/sisu/v4/html_tune.rb
index 9ad44443..5196f046 100644
--- a/lib/sisu/v4/html_tune.rb
+++ b/lib/sisu/v4/html_tune.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/hub.rb b/lib/sisu/v4/hub.rb
index 02762d4a..a7b1a05a 100644
--- a/lib/sisu/v4/hub.rb
+++ b/lib/sisu/v4/hub.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -68,6 +68,7 @@ module SiSU
     include SiSU_Viz
   require_relative 'help'                              # help.rb
     include SiSU_Help
+  require_relative 'debug'                             # debug.rb
   require 'uri'
   class HubMaster
     def initialize(argv)
@@ -439,12 +440,6 @@ p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
         end
         SiSU::Operations.new.counter
       end
-      if @opt.cmd =~/k/                                #% -k temporary tests
-        OptionLoopFiles.new(@opt).loop_files_on_given_option do
-          #require_relative 'xml_scaffold'
-          #fix
-        end
-      end
       if @opt.act[:psql][:set]==:on                    #% --pg, -D DB postgresql
         require_relative 'dbi'
         if @opt.files.length > 0 #switch test to actual commands
diff --git a/lib/sisu/v4/i18n.rb b/lib/sisu/v4/i18n.rb
index 206a69ce..14136a18 100644
--- a/lib/sisu/v4/i18n.rb
+++ b/lib/sisu/v4/i18n.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/manifest.rb b/lib/sisu/v4/manifest.rb
index 9c4fceb9..d52d9f43 100644
--- a/lib/sisu/v4/manifest.rb
+++ b/lib/sisu/v4/manifest.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -777,10 +777,11 @@ WOK
       end
       def check_output(data)
         begin
+          make=SiSU_Env::ProcessingSettings.new(@md)
           minitoc=SiSU_HTML_MiniToc::TocMini.new(@md,data).songsheet.join("\n")
           id,file='',''
           vz=SiSU_Viz::Defaults.new
-          search_form=if @f.build.search_form?
+          search_form=if make.build.search_form?
             "<td>#{@env.widget_static.search_form}</td>"
           else ''
           end
@@ -802,7 +803,7 @@ SiSU manifest: #{@md.title.full}
 <body bgcolor="#ffffff" text="#000000" link="#003090" lang="en" xml:lang="en">
 #{format_head_toc.seg_head_navigation_band(:manifest)}
 WOK
-          if @f.build.manifest_minitoc?
+          if make.build.manifest_minitoc?
             if @o_str.dump_or_redirect?
             elsif @f.output_dir_structure.by_language_code? \
             or @f.output_dir_structure.by_filetype?
diff --git a/lib/sisu/v4/manpage.rb b/lib/sisu/v4/manpage.rb
index 34df23cd..48ae874f 100644
--- a/lib/sisu/v4/manpage.rb
+++ b/lib/sisu/v4/manpage.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -73,8 +73,9 @@ module SiSU_Manpage
     def initialize(opt)
       @opt=opt
       if @opt.fns =~/(.+?)\.(?:-|ssm\.)?sst$/
-        @@dostype='unix endnotes'
-      else puts "#{sf} not a processed file type"
+        @@notes=:end
+      else
+        puts "#{sf} not a processed file type"
       end
     end
     def read
@@ -111,7 +112,7 @@ module SiSU_Manpage
         @vz=SiSU_Viz::Defaults.new
         @tab="\t"
         @br="\n"
-        @@dostype='unix endnotes'
+        @@notes=:end
         @manpage={ body: [], open: [], close: [], head: [], metadata: [], tail: [], endnotes: [] }
       end
       def songsheet
@@ -119,13 +120,14 @@ module SiSU_Manpage
         publish(manpage)
       end
       # Used for extraction of endnotes from paragraphs
-      def extract_endnotes(para='')
-        notes=para.scan(/(?:#{Mx[:en_a_o]}|#{Mx[:en_b_o]})([\d*+]+\s+.+?)\s*(?:#{Mx[:en_a_c]}|#{Mx[:en_b_c]})/m)
+      def extract_endnotes(dob='')
+        para=dob.obj.gsub(/#{Mx[:br_line]}/,"\n")
+        notes=para.scan(/(?:#{Mx[:en_a_o]}|#{Mx[:en_b_o]})([\d*+]+(?:\s|\n)+.+?)(?:#{Mx[:en_a_c]}|#{Mx[:en_b_c]})/m)
         @n=[]
         notes.flatten.each do |n| #high cost to deal with <br> appropriately within manpage, consider
           n=n.dup.to_s
-          if n =~/#{Mx[:br_line]}/
-            fix = n.split(/\s*#{Mx[:br_line]}+\s*/) #watch #added
+          if n =~/#{Mx[:br_line]}|#{Mx[:br_nl]}/
+            fix = n.split(/#{Mx[:br_line]}|#{Mx[:br_nl]}/) #watch #added
             fix.each do |x|
               unless x.empty?; @n << x
               end
@@ -141,6 +143,7 @@ module SiSU_Manpage
           wrap=util.line_wrap
           wrap=if wrap =~ /^\s*[\d*+]+\s+.+?\s*\Z/m
             wrap.gsub(/(^|&nbsp;|#{Mx[:nbsp]}|\s|\*)\\\*/,'\1\\\\\*'). #man page requires
+              gsub(/\s(.[BI])\s/,' ').
               gsub(/\s\.(\S+)/,' \\.\1').
               gsub(/^\s*([\d*+]+)\s+(.+?)\s*\Z/m, <<GSUB
 .TP
@@ -155,7 +158,7 @@ GSUB
                       )
           end
           @@endnotes[:para] << wrap
-          @@endnotes[:end] << wrap << "\n.br"
+          @@endnotes[:end] << wrap << "\n.BR"
           @@endnotes
         end
       end
@@ -232,25 +235,23 @@ WOK
           times=wrapped.length
           times=78 if times > 78
           @manpage[:body] << case lv
-          when 1;    '.SH ' << wrapped.upcase << @br << '.br'
-          when 2..3; '.SH ' << wrapped.upcase << @br << '.br'
-          when 4;    '.SH ' << wrapped.upcase << @br << '.br'
-          when 5..6; '.SH ' << wrapped.upcase << @br
+          when 1;    '.SH ' << wrapped.upcase << @br << @br
+          when 2..3; '.SH ' << wrapped.upcase << @br << @br
+          when 4;    '.SH ' << wrapped.upcase << @br << @br
+          when 5..6; '.SH ' << wrapped.upcase << @br << @br
           end
         else
           @manpage[:body] << if  wrapped =~/^\.BI\s/ # main text, contents, body KEEP
-            '.TP' << @br << wrapped.gsub(/^\.BI\s/,'.B ') # sleight ... simpler output (check gsub!)
+            '.TP' << @br << wrapped.gsub(/(^\.B)I\s/,'\1 ') # sleight ... simpler output (check gsub!)
           else
-            '.br' << @br << wrapped
+            @br + '.BR' + @br << wrapped
           end
         end
         if @@endnotes[:para] \
-        and @@dostype =~/footnote/ #edit out to switch off endnotes following paragraph to which they belong
-          @manpage[:body] << @br
+        and @@notes==:foot #edit out to switch off endnotes following paragraph to which they belong
           @@endnotes[:para].each { |e| @manpage[:body] << e << @br }
         elsif @@endnotes[:para] \
-        and @@dostype =~/endnote/
-          @manpage[:body] << @br*2
+        and @@notes==:end
         end
         @@endnotes[:para]=[]
       end
@@ -259,7 +260,7 @@ WOK
         @data_mod,@endnotes,@level,@cont,@copen,@manpage_contents_close=Array.new(6){[]}
         (0..6).each { |x| @cont[x]=@level[x]=false }
         (4..6).each { |x| @manpage_contents_close[x]='' }
-        #manpage_tail #stop call
+        #manpage_tail # stop call
         table_message='[table omitted, see other document formats]'
         fix=[]
         #manpage_metadata
@@ -275,15 +276,22 @@ WOK
             gsub(/#{Mx[:fa_strike_o]}(.+?)#{Mx[:fa_strike_c]}/,'--\1--').
             gsub(/#{Mx[:fa_cite_o]}(.+?)#{Mx[:fa_cite_c]}/,'"\1"').
             gsub(/#{Mx[:fa_monospace_o]}(.+?)#{Mx[:fa_monospace_c]}/,'\1').
-            gsub(/\A\s*#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}#{Mx[:br_line]}([,.:!?](?: |$))?/m,"#{Mx[:br_line]}.I \\1\\2#{Mx[:br_line]}").
-            gsub(/\s*#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}([,.:!?](?: |$))?/m,"#{Mx[:br_line]}.I \\1\\2#{Mx[:br_line]}").
-            gsub(/\A\s*#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}([,.:!?](?: |$))?#{Mx[:br_line]}/m,"#{Mx[:br_line]}.BI \\1\\2#{Mx[:br_line]}").
-            gsub(/\s*#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}([,.:!?](?: |$))?/,"#{Mx[:br_line]}.B \\1\\2#{Mx[:br_line]}").
-            gsub(/\s*#{Mx[:fa_underscore_o]}(.+?)#{Mx[:fa_underscore_c]}([,.:!?](?: |$))?/,"#{Mx[:br_line]}.I \\1\\2#{Mx[:br_line]}")
+            gsub(/\A\s*#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}#{Mx[:br_line]}([,.:!?](?: |$))?/m,
+              "#{Mx[:br_line]}.I \\1\\2#{Mx[:br_line]}").
+            gsub(/\s*#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}([,.:!?](?: |$))?/m,
+              "#{Mx[:br_line]}.I \\1\\2#{Mx[:br_line]}").
+            gsub(/\A\s*#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}([,.:!?](?: |$))?#{Mx[:br_line]}/m,
+              "\n.BI \\1\\2#{Mx[:br_line]}").
+            gsub(/\s*#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}([,.:!?](?: |$))?/m,
+              "#{Mx[:br_line]}.B \\1\\2#{Mx[:br_line]}").
+            gsub(/\s*#{Mx[:fa_underscore_o]}(.+?)#{Mx[:fa_underscore_c]}([,.:!?](?: |$))?/,
+              "\n.I \\1\\2#{Mx[:br_line]}")
           unless dob.is==:code
-            dob.obj=dob.obj.gsub(/(?:^|\s)#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}([,.:!?](?: |$))?/,"\\1 #{@brace_url.txt_open}\\2#{@brace_url.txt_close}\\3").
-              gsub(/(^|#{Mx[:gl_c]}|\s)#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}([,.:!?](?: |$))?/,"\\1#{@brace_url.txt_open}\\2#{@brace_url.txt_close}\\3")
-            @manpage[:endnotes]=extract_endnotes(dob.obj)
+            dob.obj=dob.obj.gsub(/(?:^|\s)#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}([,.:!?](?: |$))?/,
+                "\\1 #{@brace_url.txt_open}\\2#{@brace_url.txt_close}\\3").
+              gsub(/(^|#{Mx[:gl_c]}|\s)#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}([,.:!?](?: |$))?/,
+                "\\1#{@brace_url.txt_open}\\2#{@brace_url.txt_close}\\3")
+            @manpage[:endnotes]=extract_endnotes(dob)
             dob.obj=dob.obj.gsub(/#{Mx[:en_a_o]}([\d*+]+)\s*(?:.+?)#{Mx[:en_a_c]}/m,'[^\1]'). # endnote marker marked up
               gsub(/#{Mx[:en_b_o]}([\d*+]+)\s*(?:.+?)#{Mx[:en_b_c]}/m,'[^\1]'). # endnote marker marked up
               gsub(/#{Mx[:gl_o]}#amp#{Mx[:gl_c]}/,'&'). ##{Mx[:gl_o]}#095#{Mx[:gl_c]}
@@ -300,36 +308,22 @@ WOK
               gsub(/#{Mx[:gl_o]}#169#{Mx[:gl_c]}/,'©')
           else
             dob.obj=dob.obj.gsub(/\\/,'\e').
-              gsub(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})\s*/,"\n\n")                                   # watch
-            #dob.obj.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})+\s*/,"\n")                                   # watch
+              gsub(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})\s*/,"\n")                                   # watch
           end
           dob.obj=dob.obj.gsub(/(^|&nbsp;|#{Mx[:nbsp]}|\s|\*)\\\*/,'\1\\\\\*'). #man page requires
             gsub(/┆/,'|').
-            gsub(/\s\.(\S+)/,' \\.\1').
-            gsub(/(\n\.)(\S\S\S+)/m,'\1\\.\2').
-            gsub(/-/,'\-') #manpages use this
+            gsub(/^(\.\S{3,})/m,' \1') # ^\. used by interpreter, disable when use not intended
           dob.obj=dob.obj.gsub(/&#126;/,'~') if dob.obj #manpages use this
-          if dob.is =~/block|group|verse|alt|code/
-            if dob.is ==:code
-              dob.obj=dob.obj.gsub(/(^|[^}])_([<>])/m,'\1\2'). # _> _<
-                gsub(/(^|[^}])_([<>])/m,'\1\2'). # _<_<
-                gsub(/\A(.+)?\Z/m,".nf\n\n\\1\n\n.fi")
-            end
+          if dob.is ==:code
+            dob.obj=dob.obj.gsub(/(^|[^}])_([<>])/m,'\1\2'). # _> _<
+              gsub(/(^|[^}])_([<>])/m,'\1\2'). # _<_<
+              gsub(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})+(\s*)/m,"\n\\1").                                   # watch
+              gsub(/\A(.+?)\s*\Z/m,".nf\n\\1\n.fi")
           end
-          #dob.obj.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})+\s*/m,"\n.br\n")                                   # watch
           dob.obj=dob.obj.gsub(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})+\s*/m,"\n\n")                                   # watch
           blit=dob.obj.scan(/\[[^\]]+\]|[^\[]+/)
           blit_array=[]
-          blit.each do |x|
-            x=if x =~/^\[/
-              x.gsub(/\s+/,' \ ') #manpages use this
-            else x
-            end
-            blit_array << x
-          end
-          dob.obj=blit_array.join
           dob.obj=dob.obj.gsub(/#{Mx[:gl_o]}:name#\S+?#{Mx[:gl_c]}/mi,''). #added
-          #gsub(/\s\\\s+(#{Mx[:br_line]}|#{Mx[:br_nl]})/,'\1'). #a messy solution
             gsub(/#{Mx[:br_page]}\s*|#{Mx[:br_page_new]}/,'').                                         # remove page breaks
             gsub(/(^|#{Mx[:gl_c]}|\s)#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/,'\1\2').
             gsub(/<a href=".+?">(.+?)<\/a>/m,'\1').
@@ -367,8 +361,7 @@ WOK
               dob.obj=''
             end
             if dob.obj
-              dob.obj=dob.obj.gsub(/\s(\[)/m,' \ \1').
-                gsub(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})\s*/,"\n\n").                                   # watch
+              dob.obj=dob.obj.gsub(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})\s*/,"\n\n").                                   # watch
                 gsub(/#{Mx[:gl_o]}#126#{Mx[:gl_c]}/,'~').
                 gsub(/#{Mx[:gl_o]}#123#{Mx[:gl_c]}/,'{').
                 gsub(/#{Mx[:pa_o]}\S+#{Mx[:pa_c]}/,' ')
@@ -400,7 +393,7 @@ WOK
         content << manpage[:open]
         content << manpage[:head]
         content << manpage[:body]
-        content << @@endnotes[:end] if @@dostype =~/endnotes/
+        content << @@endnotes[:end] if @@notes==:end
         content << manpage[:metadata]
         content << manpage[:tail]
         Output.new(@md,content).manpage
@@ -417,12 +410,21 @@ WOK
         SiSU_Env::FileOp.new(@md).mkdir
         filename_manpage=SiSU_Env::FileOp.new(@md).write_file.manpage
         @sisu=[]
+        emptyline=0
         @content.each do |para|                                                # this is a hack
           if para.is_a?(Array) \
           and para.length > 0
             para.each do |line|
-              line=line.gsub(/\s+$/m,'')
-              filename_manpage.puts line           #unix manpage
+              if line
+                line=line.gsub(/[ \t]+$/m,'').
+                  gsub(/^\A[ ]*\Z/m,'')
+                (line=~/^\A\Z/) \
+                ? (emptyline+=1)
+                : emptyline=0
+                if emptyline < 2                     #remove additional empty lines
+                  filename_manpage.puts line           #unix manpage
+                end
+              end
             end
           else filename_manpage.puts para          #unix manpage # /^([*=-]|\.){5}/
           end
diff --git a/lib/sisu/v4/manpage_format.rb b/lib/sisu/v4/manpage_format.rb
index 57edaeb5..9649911d 100644
--- a/lib/sisu/v4/manpage_format.rb
+++ b/lib/sisu/v4/manpage_format.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/odf.rb b/lib/sisu/v4/odf.rb
index 7e4e807c..5b972048 100644
--- a/lib/sisu/v4/odf.rb
+++ b/lib/sisu/v4/odf.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/odf_format.rb b/lib/sisu/v4/odf_format.rb
index a12c09d0..e0e5b70d 100644
--- a/lib/sisu/v4/odf_format.rb
+++ b/lib/sisu/v4/odf_format.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/options.rb b/lib/sisu/v4/options.rb
index b26bada2..e26fcfc2 100644
--- a/lib/sisu/v4/options.rb
+++ b/lib/sisu/v4/options.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -260,7 +260,7 @@ module SiSU_Commandline
           @cmd=shortcut.cf_0 + 'm'
         end
         if @cmd =~/[vVM]/ \
-        && @cmd !~/-vu?$/
+        && @cmd !~/-[ku]*v[ku]*$/
           SiSU_Screen::Ansi.new(@cmd,"\tsisu " + @cmd +  ' ' + @mod.join(' ') + ' ' + @files.join(' ') + "\n").print_brown
         end
       end
@@ -466,6 +466,7 @@ module SiSU_Commandline
         m.each do |m|
           case m
           when /^--(?:color-toggle)$/;                       c=c+'c'
+          when /^--(?:color-off)$/;                          c=c+'k'
           when /^--(?:configure|init-site)$/;                c=c+'CC'
           when /^--(?:dal?|machine|abstraction|abs)$/;       c=c+'m'
           when /^--(?:txt|text|plaintext)$/;                 c=c+'t'
@@ -501,6 +502,7 @@ module SiSU_Commandline
           when /^--(?:verbose[=-]3)$/;                       c=c+'VM'
           when /^--(?:verbose[=-]2|Verbose|VERBOSE)$/;       c=c+'V'
           when /^--(?:verbose(?:[=-]1)?)$/;                  c=c+'v'
+          when /^--(?:version)$/;                            c=c+'v'
           when /^--(?:verbose[=-]0|quiet|silent)$/;          c=c+'q'
           else mod << m                                     #mod only contains command modifiers; commands converted to character
           end
@@ -609,7 +611,8 @@ module SiSU_Commandline
         : { bool: false, set: :na }
         act[:color_state]=if mod.inspect =~/"--color-on"|"--color"/
           { bool: true, set: :on }
-        elsif mod.inspect =~/"--color-off"/
+        elsif (cmd =~/k/ \
+        || mod.inspect =~/"--color-off"/)
           { bool: false, set: :off }
         else { bool: true, set: :na } #fix default color
         end
@@ -938,6 +941,9 @@ module SiSU_Commandline
     def fns
       @fns
     end
+    def fnl
+      x=@fns.gsub(/(\S+?)((?:\.ssm)?\.sst)/,"\\1.#{lng}\\2")
+    end
     def what
       @what
     end
diff --git a/lib/sisu/v4/param.rb b/lib/sisu/v4/param.rb
index 40f9b983..916d89c1 100644
--- a/lib/sisu/v4/param.rb
+++ b/lib/sisu/v4/param.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -230,6 +230,7 @@ module SiSU_Param
           if x =~/^%\s/ #ignore comment
           elsif x =~/:(\S+?):\s+(.+)/
             a,b=/:(\S+?):\s+(.+)\Z/m.match(x)[1,2]
+            b=b.gsub(/\s*<br(?: \/)?>\s*/,' \\\\\\ ')
             b=if b =~/\n/m
               (b =~/;\n/m) \
               ? (b.split(/;\s*\n\s*/).join(';'))
diff --git a/lib/sisu/v4/param_identify_markup.rb b/lib/sisu/v4/param_identify_markup.rb
index e1d96a62..ca16573d 100644
--- a/lib/sisu/v4/param_identify_markup.rb
+++ b/lib/sisu/v4/param_identify_markup.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/param_make.rb b/lib/sisu/v4/param_make.rb
index a1bda002..ce35307c 100644
--- a/lib/sisu/v4/param_make.rb
+++ b/lib/sisu/v4/param_make.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/particulars.rb b/lib/sisu/v4/particulars.rb
index 97a3da3e..6ccd7896 100644
--- a/lib/sisu/v4/particulars.rb
+++ b/lib/sisu/v4/particulars.rb
@@ -9,7 +9,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -66,169 +66,155 @@ module SiSU_Particulars
   class CombinedSingleton
     include Singleton
     def get_all(opt)
-      @opt=opt
-      set_env
-      set_file
-      set_md
-      set_dal                #needs @md
+      set_env(opt)
+      set_file(opt)
+      set_md(opt)
+      set_dal(opt)                #needs @md
     end
     def get_env(opt)
-      @opt=opt
-      set_env
+      set_env(opt)
     end
     def get_file(opt)
-      @opt=opt
-      set_file
+      set_file(opt)
     end
     def get_md(opt)
-      @opt=opt
-      set_md
+      set_md(opt)
     end
     def get_dal_array(opt)
-      @opt=opt
-      set_dal                #needs @md
+      set_dal(opt)                #needs @md
     end
     def get_env_md(opt)
-      @opt=opt
-      set_env
-      set_md
+      set_env(opt)
+      set_md(opt)
     end
     def get_idx_sst(opt)
-      @opt=opt
-      set_sst_idx
+      set_sst_idx(opt)
     end
     def get_idx_raw(opt)
-      @opt=opt
-      set_raw_idx
+      set_raw_idx(opt)
     end
     def get_idx_html(opt)
-      @opt=opt
-      set_html_idx
+      set_html_idx(opt)
     end
     def get_idx_xhtml(opt)
-      @opt=opt
-      set_xhtml_idx
+      set_xhtml_idx(opt)
     end
     def get_name_tags(opt)
-      @opt=opt
-      set_name_tags
+      set_name_tags(opt)
     end
     def get_maps(opt)
-      @opt=opt
-      set_nametags_map
-      set_ocn_htmlseg_map
+      set_nametags_map(opt)
+      set_ocn_htmlseg_map(opt)
     end
     def get_map_nametags(opt)
-      @opt=opt
-      set_nametags_map
+      set_nametags_map(opt)
     end
     def get_map_ocn_htmlseg(opt)
-      @opt=opt
-      set_ocn_htmlseg_map
+      set_ocn_htmlseg_map(opt)
     end
     attr_accessor :opt,:md,:sst_idx,:raw_idx,:html_idx,:xhtml_idx
-    def set_md
+    def set_md(opt)
       begin
-        @md=SiSU_Param::Parameters.new(@opt).get
+        @md=SiSU_Param::Parameters.new(opt).get
         self
       rescue
-        SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+        SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
           __LINE__.to_s + ':' + __FILE__
         end
       end
     end
     attr_accessor :opt,:env,:file
-    def set_env
+    def set_env(opt)
       begin
-        @env=SiSU_Env::InfoEnv.new(@opt.fns)
+        @env=SiSU_Env::InfoEnv.new(opt.fns)
         self
       rescue
-        SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+        SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
           __LINE__.to_s + ':' + __FILE__
         end
       end
     end
-    def set_file
+    def set_file(opt)
       begin
-        set_md unless @md
+        set_md(opt) unless @md
         @file=SiSU_Env::FileOp.new(@md)
         self
       rescue
-        SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+        SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
           __LINE__.to_s + ':' + __FILE__
         end
       end
     end
     attr_accessor :opt,:dal_array
-    def set_dal
+    def set_dal(opt)
       begin
-        @dal_array=SiSU_DAL::Source.new(@opt).get
+        @dal_array=SiSU_DAL::Source.new(opt).get
         self
       rescue
-        SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+        SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
           __LINE__.to_s + ':' + __FILE__
         end
       end
     end
-    def set_sst_idx
+    def set_sst_idx(opt)
       begin
-        @sst_idx=SiSU_DAL::Source.new(@opt).get_idx_sst
+        @sst_idx=SiSU_DAL::Source.new(opt).get_idx_sst
         self
       rescue
-        SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+        SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
           __LINE__.to_s + ':' + __FILE__
         end
       end
     end
-    def set_raw_idx
+    def set_raw_idx(opt)
       begin
-        @raw_idx=SiSU_DAL::Source.new(@opt).get_idx_raw
+        @raw_idx=SiSU_DAL::Source.new(opt).get_idx_raw
         self
       rescue
-        SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+        SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
           __LINE__.to_s + ':' + __FILE__
         end
       end
     end
-    def set_html_idx
+    def set_html_idx(opt)
       begin
-        @html_idx=SiSU_DAL::Source.new(@opt).get_idx_html
+        @html_idx=SiSU_DAL::Source.new(opt).get_idx_html
         self
       rescue
-        SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+        SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
           __LINE__.to_s + ':' + __FILE__
         end
       end
     end
-    def set_xhtml_idx
+    def set_xhtml_idx(opt)
       begin
-        @xhtml_idx=SiSU_DAL::Source.new(@opt).get_idx_xhtml
+        @xhtml_idx=SiSU_DAL::Source.new(opt).get_idx_xhtml
         self
       rescue
-        SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+        SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
           __LINE__.to_s + ':' + __FILE__
         end
       end
     end
     attr_accessor :nametags_map
-    def set_nametags_map
+    def set_nametags_map(opt)
       begin
-        opt=@md ? @md : @opt
+        opt=@md ? @md : opt
         @nametags_map=SiSU_DAL::Source.new(opt).get_map_nametags
         self
       rescue
-        SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+        SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
           __LINE__.to_s + ':' + __FILE__
         end
       end
     end
     attr_accessor :ocn_htmlseg_map
-    def set_ocn_htmlseg_map
+    def set_ocn_htmlseg_map(opt)
       begin
         @ocn_htmlseg_map=SiSU_DAL::Source.new(@md).get_map_ocn_htmlseg
         self
       rescue
-        SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
+        SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
           __LINE__.to_s + ':' + __FILE__
         end
       end
diff --git a/lib/sisu/v4/plaintext.rb b/lib/sisu/v4/plaintext.rb
index 5ad35447..c6f471d3 100644
--- a/lib/sisu/v4/plaintext.rb
+++ b/lib/sisu/v4/plaintext.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -73,7 +73,7 @@ module SiSU_Plaintext
     def initialize(opt)
       @opt=opt
       unless @opt.fns =~/(.+?)\.(?:-|ssm\.)?sst$/
-       puts "#{sf} not a processed file type"
+        puts "#{sf} not a processed file type"
       end
     end
     def read
@@ -100,7 +100,7 @@ module SiSU_Plaintext
         else 78
         end
         #wrap_width=(defined? md.make.plaintext_wrap) ? md.make.plaintext_wrap : 78
-        SiSU_Plaintext::Source::Scroll.new(dal_array,md,wrap_width).songsheet
+        SiSU_Plaintext::Source::Scroll.new(md,dal_array,wrap_width).songsheet
       rescue
         SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
           __LINE__.to_s + ':' + __FILE__
@@ -112,10 +112,10 @@ module SiSU_Plaintext
     class Scroll <Source
       require_relative 'defaults'                       # defaults.rb
       require_relative 'shared_txt'                     # shared_txt.rb
-      include SiSU_TextUtils
+        include SiSU_TextUtils
       @@endnotes={ para: [], end: [] }
-      def initialize(data,md,wrap_width)
-        @data,@md,@wrap_width=data,md,wrap_width
+      def initialize(md,data,wrap_width)
+        @md,@data,@wrap_width=md,data,wrap_width
         @env=SiSU_Env::InfoEnv.new(@md.fns)
         @brace_url=SiSU_Viz::Defaults.new.url_decoration
         @tab="\t"
@@ -124,11 +124,7 @@ module SiSU_Plaintext
         when /--endnote/; true
         else true
         end
-        @br=case md.opt.mod.inspect
-        when /--dos/; "\r\n"
-        when /--unix/; "\n"
-        else "\n"
-        end
+        @br="\n"
         @plaintext={ body: [], open: [], close: [], head: [], metadata: [], tail: [] }
       end
       def songsheet
@@ -222,8 +218,8 @@ WOK
           n3=lv + 2
         end
         util=nil
-        wrapped=if dob.is ==:para \
-        or dob.is==:heading
+        wrapped=if dob.is==:para \
+        || dob.is==:heading
           if dob.is==:para
             if dob.hang \
             and dob.hang =~/[0-9]/ \
@@ -249,23 +245,21 @@ WOK
           times=wrapped.length
           times=@wrap_width if times > @wrap_width
           @plaintext[:body] << case lv
-          when 1;      wrapped.upcase << @br << Px[:lv1]*times + p_num << @br
-          when 2;      wrapped.upcase << @br << Px[:lv2]*times + p_num << @br
-          when 3;      wrapped.upcase << @br << Px[:lv3]*times + p_num << @br
-          when 4;      wrapped.upcase << @br << Px[:lv4]*times + p_num << @br
-          when 5;      wrapped.upcase << @br << Px[:lv5]*times + p_num << @br
-          when 6;      wrapped.upcase << @br << Px[:lv6]*times + p_num << @br
+          when 1;      wrapped.upcase << @br << Px[:lv1]*times + p_num << @br*2
+          when 2;      wrapped.upcase << @br << Px[:lv2]*times + p_num << @br*2
+          when 3;      wrapped.upcase << @br << Px[:lv3]*times + p_num << @br*2
+          when 4;      wrapped.upcase << @br << Px[:lv4]*times + p_num << @br*2
+          when 5;      wrapped.upcase << @br << Px[:lv5]*times + p_num << @br*2
+          when 6;      wrapped.upcase << @br << Px[:lv6]*times + p_num << @br*2
           end
         else
           @plaintext[:body] << wrapped + p_num << @br # main text, contents, body KEEP
         end
         if @@endnotes[:para] \
         and not @@endnotes_
-          @plaintext[:body] << @br
           @@endnotes[:para].each {|e| @plaintext[:body] << e << @br}
         elsif @@endnotes[:para] \
         and @@endnotes_
-          @plaintext[:body] << @br*2
         end
         @@endnotes[:para]=[]
       end
@@ -324,9 +318,9 @@ WOK
               gsub(/#{Mx[:gl_o]}#092#{Mx[:gl_c]}/,'\\')
           end
           dob.obj=if dob.of==:block                                   # watch
-            dob.obj.gsub(/#{Mx[:gl_o]}●#{Mx[:gl_c]}/,"* ").
-              gsub(/#{Mx[:br_line]}|#{Mx[:br_nl]}/,"\n")
-          else dob.obj.gsub(/#{Mx[:br_line]}|#{Mx[:br_nl]}/,"\n\n")
+            dob.obj.gsub(/#{Mx[:gl_o]}●#{Mx[:gl_c]}/m,"* ").
+              gsub(/\n?#{Mx[:br_line]}\n?|\n?#{Mx[:br_nl]}\n?/m,@br)
+          else dob.obj.gsub(/\n?#{Mx[:br_line]}\n?|\n?#{Mx[:br_nl]}\n?/m,@br*2)
           end
           if dob.is==:code
             dob.obj=dob.obj.gsub(/(^|[^}])_([<>])/m,'\1\2'). # _> _<
@@ -411,14 +405,15 @@ WOK
           and para.length > 0
             para.each do |line|
               if line
-                line.gsub!(/\s+$/m,'')
-                line.gsub!(/^\A[ ]*\Z/m,'')
-                if line=~/^\A[ ]*\Z/m
-                  emptyline+=1
-                else emptyline=0
+                line=line.gsub(/[ \t]+$/m,'').
+                  gsub(/^\A[ ]*\Z/m,'')
+                (line=~/^\A\Z/) \
+                ? (emptyline+=1)
+                : emptyline=0
+                if emptyline < 2                     #remove additional empty lines
+                  file_plaintext.puts line
                 end
-                file_plaintext.puts line if emptyline < 2                     #remove extra line spaces (fix upstream)
-               end
+              end
             end
           else file_plaintext.puts para          #unix plaintext # /^([*=-]|\.){5}/
           end
diff --git a/lib/sisu/v4/plaintext_format.rb b/lib/sisu/v4/plaintext_format.rb
index 745fa715..b1ccc008 100644
--- a/lib/sisu/v4/plaintext_format.rb
+++ b/lib/sisu/v4/plaintext_format.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/po4a.rb b/lib/sisu/v4/po4a.rb
index 8404ae39..b8e21b7a 100644
--- a/lib/sisu/v4/po4a.rb
+++ b/lib/sisu/v4/po4a.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/po4a_set.rb b/lib/sisu/v4/po4a_set.rb
index 020f521c..6ea856dc 100644
--- a/lib/sisu/v4/po4a_set.rb
+++ b/lib/sisu/v4/po4a_set.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/prog_text_translation.rb b/lib/sisu/v4/prog_text_translation.rb
index 03ae97b1..5f2b7742 100644
--- a/lib/sisu/v4/prog_text_translation.rb
+++ b/lib/sisu/v4/prog_text_translation.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/qrcode.rb b/lib/sisu/v4/qrcode.rb
index 13a69ec6..a1591ead 100644
--- a/lib/sisu/v4/qrcode.rb
+++ b/lib/sisu/v4/qrcode.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/relaxng.rb b/lib/sisu/v4/relaxng.rb
index f2ceec58..50a0cee8 100644
--- a/lib/sisu/v4/relaxng.rb
+++ b/lib/sisu/v4/relaxng.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -69,13 +69,13 @@ module SiSU_Relaxng
 
  * Author: Ralph Amissah
 
- * Copyright: (C) 1997 - 2012 Ralph Amissah All Rights Reserved.
+ * Copyright: (C) 1997 - 2013 Ralph Amissah All Rights Reserved.
 
  * License: GPL 3 or later:
 
    SiSU, a framework for document structuring, publishing and search
 
-   Copyright: (C) 1997 - 2012 Ralph Amissah
+   Copyright: (C) 1997 - 2013 Ralph Amissah
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the Free
diff --git a/lib/sisu/v4/remote.rb b/lib/sisu/v4/remote.rb
index d593f44b..e49efba9 100644
--- a/lib/sisu/v4/remote.rb
+++ b/lib/sisu/v4/remote.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/response.rb b/lib/sisu/v4/response.rb
index d660d398..0c490a7e 100644
--- a/lib/sisu/v4/response.rb
+++ b/lib/sisu/v4/response.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/rexml.rb b/lib/sisu/v4/rexml.rb
index 886d7eab..ea68a6ed 100644
--- a/lib/sisu/v4/rexml.rb
+++ b/lib/sisu/v4/rexml.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/screen_text_color.rb b/lib/sisu/v4/screen_text_color.rb
index a9c0b367..661a33a7 100644
--- a/lib/sisu/v4/screen_text_color.rb
+++ b/lib/sisu/v4/screen_text_color.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -68,12 +68,12 @@ module SiSU_Screen
       @cmd,@txt=cmd,txt
       @color_instruct=txt[0]
       flag=SiSU_Env::InfoProcessingFlag.new
-      if @cmd
+      if cmd
         #set default colors on or off -c acts as toggle against this default, if default is off -c turns on, if default is on -c turns off
         @use_color=(flag.color) \
-        ? ((@cmd =~/c/) ? false : true)
-        : ((@cmd =~/c/) ? true : false)
-        if @cmd =~/k/ then @use_color=false # useful color off switch, however, k may be used for something else in future
+        ? ((cmd =~/c/) ? false : true)
+        : ((cmd =~/c/) ? true : false)
+        if cmd =~/k/ then @use_color=false # useful color off switch, however, k may be used for something else in future
         end
       else @use_color=false
       end
diff --git a/lib/sisu/v4/share_src.rb b/lib/sisu/v4/share_src.rb
index 2c446ecb..02b59f3b 100644
--- a/lib/sisu/v4/share_src.rb
+++ b/lib/sisu/v4/share_src.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/share_src_kdissert.rb b/lib/sisu/v4/share_src_kdissert.rb
index 4d0eae9f..0debc475 100644
--- a/lib/sisu/v4/share_src_kdissert.rb
+++ b/lib/sisu/v4/share_src_kdissert.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/shared_html.rb b/lib/sisu/v4/shared_html.rb
index 98966965..fc17ff1d 100644
--- a/lib/sisu/v4/shared_html.rb
+++ b/lib/sisu/v4/shared_html.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/shared_html_lite.rb b/lib/sisu/v4/shared_html_lite.rb
index dfb98ad0..ff9fcb2a 100644
--- a/lib/sisu/v4/shared_html_lite.rb
+++ b/lib/sisu/v4/shared_html_lite.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/shared_images.rb b/lib/sisu/v4/shared_images.rb
index 48fd81a6..6f1b7fee 100644
--- a/lib/sisu/v4/shared_images.rb
+++ b/lib/sisu/v4/shared_images.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/shared_markup_alt.rb b/lib/sisu/v4/shared_markup_alt.rb
index 4efedff1..b3898ea5 100644
--- a/lib/sisu/v4/shared_markup_alt.rb
+++ b/lib/sisu/v4/shared_markup_alt.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/shared_metadata.rb b/lib/sisu/v4/shared_metadata.rb
index 74d76c1e..44c7243e 100644
--- a/lib/sisu/v4/shared_metadata.rb
+++ b/lib/sisu/v4/shared_metadata.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/shared_sem.rb b/lib/sisu/v4/shared_sem.rb
index 1fa919c2..3ef343db 100644
--- a/lib/sisu/v4/shared_sem.rb
+++ b/lib/sisu/v4/shared_sem.rb
@@ -9,7 +9,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/shared_sisupod_source.rb b/lib/sisu/v4/shared_sisupod_source.rb
index 38213858..d1ba5c6d 100644
--- a/lib/sisu/v4/shared_sisupod_source.rb
+++ b/lib/sisu/v4/shared_sisupod_source.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/shared_txt.rb b/lib/sisu/v4/shared_txt.rb
index 6876dabd..8f3d95b8 100644
--- a/lib/sisu/v4/shared_txt.rb
+++ b/lib/sisu/v4/shared_txt.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -69,9 +69,9 @@ module SiSU_TextUtils
       line=0
       out=[]
       out[line]=''
-      @para=@para.gsub(/<br>/,' <br> ').
+      @para=@para.gsub(/<br>/,' \\ ').
         gsub(/#{Mx[:br_nl]}/,"\n\n")
-      words=@para.scan(/\n\n|<br>|\S+/m)
+      words=@para.scan(/\n\n|\s+\\\s+|<br>|\S+/m)
       while words != ''
         word=words.shift
         if not word
diff --git a/lib/sisu/v4/shared_xhtml.rb b/lib/sisu/v4/shared_xhtml.rb
index f78f98fc..831ff15c 100644
--- a/lib/sisu/v4/shared_xhtml.rb
+++ b/lib/sisu/v4/shared_xhtml.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/shared_xml.rb b/lib/sisu/v4/shared_xml.rb
index ba95c805..9202deb1 100644
--- a/lib/sisu/v4/shared_xml.rb
+++ b/lib/sisu/v4/shared_xml.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/sisupod_make.rb b/lib/sisu/v4/sisupod_make.rb
index bea6e775..67e89ae2 100644
--- a/lib/sisu/v4/sisupod_make.rb
+++ b/lib/sisu/v4/sisupod_make.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/sitemaps.rb b/lib/sisu/v4/sitemaps.rb
index d45af899..123b9b32 100644
--- a/lib/sisu/v4/sitemaps.rb
+++ b/lib/sisu/v4/sitemaps.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/spell.rb b/lib/sisu/v4/spell.rb
index e0a8fbc3..b622a0f1 100644
--- a/lib/sisu/v4/spell.rb
+++ b/lib/sisu/v4/spell.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/sst_convert_markup.rb b/lib/sisu/v4/sst_convert_markup.rb
index 20b6d775..e46415f0 100644
--- a/lib/sisu/v4/sst_convert_markup.rb
+++ b/lib/sisu/v4/sst_convert_markup.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/sst_do_inline_footnotes.rb b/lib/sisu/v4/sst_do_inline_footnotes.rb
index b395af55..4a9a6a6f 100644
--- a/lib/sisu/v4/sst_do_inline_footnotes.rb
+++ b/lib/sisu/v4/sst_do_inline_footnotes.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/sst_from_xml.rb b/lib/sisu/v4/sst_from_xml.rb
index ab55f0de..cf5745d5 100644
--- a/lib/sisu/v4/sst_from_xml.rb
+++ b/lib/sisu/v4/sst_from_xml.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -144,15 +144,18 @@ module SiSU_sstFromXML
             end
           end
           if xml =~/\.sxs\.xml$/
-            unless @opt.cmd =~/q/; tell(xml,'sax')
+            unless @opt.cmd =~/q/
+              tell(xml,'sax')
             end
             sax
           elsif xml =~/\.sxd\.xml$/
-            unless @opt.cmd =~/q/; tell(xml,'dom')
+            unless @opt.cmd =~/q/
+              tell(xml,'dom')
             end
             dom
           elsif xml =~/\.sxn\.xml$/
-            unless @opt.cmd =~/q/; tell(xml,'node')
+            unless @opt.cmd =~/q/
+              tell(xml,'node')
             end
             node
           else puts "filename not recognised: << #{xml} >>"
diff --git a/lib/sisu/v4/sst_identify_markup.rb b/lib/sisu/v4/sst_identify_markup.rb
index 012475be..54fbee54 100644
--- a/lib/sisu/v4/sst_identify_markup.rb
+++ b/lib/sisu/v4/sst_identify_markup.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/sst_to_s_xml_sax.rb b/lib/sisu/v4/sst_to_s_xml_sax.rb
index 18ad3955..64479fe8 100644
--- a/lib/sisu/v4/sst_to_s_xml_sax.rb
+++ b/lib/sisu/v4/sst_to_s_xml_sax.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb
index f1dfdb16..f54b3f26 100644
--- a/lib/sisu/v4/sysenv.rb
+++ b/lib/sisu/v4/sysenv.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -284,10 +284,10 @@ module SiSU_Env
     end
     def rc_path_options
       @rc_path=[
-        "#{$sisu_document_markup_directory}/.sisu/#{SiSU_version_dir}",
-        "#{$sisu_document_markup_directory}/.sisu",
-        "#{$sisu_document_markup_directory}/_sisu/#{SiSU_version_dir}",
-        "#{$sisu_document_markup_directory}/_sisu",
+        "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_version_dir}",
+        "#{$sisu_document_markup_directory_base_fixed_path}/.sisu",
+        "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_version_dir}",
+        "#{$sisu_document_markup_directory_base_fixed_path}/_sisu",
         "#{@@home}/.sisu/#{SiSU_version_dir}",
         "#{@@home}/.sisu",
         "#{@@sisu_etc}/#{SiSU_version_dir}",
@@ -361,10 +361,10 @@ module SiSU_Env
       tell_no_yaml='WARNING - YAML loading switched off, to enable delete the file:'
       if @markup_dir_changed_
         @ad_path=[
-          "#{$sisu_document_markup_directory}/.sisu/#{SiSU_version_dir}/skin/yml",
-          "#{$sisu_document_markup_directory}/.sisu/skin/yml",
-          "#{$sisu_document_markup_directory}/_sisu/#{SiSU_version_dir}/skin/yml",
-          "#{$sisu_document_markup_directory}/_sisu/skin/yml",
+          "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_version_dir}/skin/yml",
+          "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/skin/yml",
+          "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_version_dir}/skin/yml",
+          "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/skin/yml",
           "#{@@home}/.sisu/#{SiSU_version_dir}/skin/yml",
           "#{@@home}/.sisu/skin/yml",
           "#{@@sisu_etc}/#{SiSU_version_dir}/skin/yml",
@@ -3584,7 +3584,9 @@ WOK
       @env_rc ||=SiSU_Env::InfoEnv.new(@md.fns)
     end
     def doc_rc #document rc, make instructions
-      @md.make
+      (defined? @md.make) \
+      ? @md.make
+      : nil
     end
     def cmd_rc_act #command-line rc
       @cmd_rc_act=@md.opt.opt_act
@@ -3595,8 +3597,9 @@ WOK
           true
         elsif cmd_rc_act[:ocn][:set]==:off
           false
-        elsif defined? @md.make.ocn? \
-        and @md.make.ocn? ==:off
+        elsif doc_rc.is_a?(Method) \
+        and defined? doc_rc.ocn? \
+        and doc_rc.toc? ==:off
           false
         elsif env_rc.build.ocn? ==:off
           false
@@ -3609,8 +3612,9 @@ WOK
           true
         elsif cmd_rc_act[:toc][:set]==:off
           false
-        elsif defined? @md.make.toc? \
-        and @md.make.toc? ==:off
+        elsif doc_rc.is_a?(Method) \
+        and defined? doc_rc.toc? \
+        and doc_rc.toc? ==:off
           false
         elsif env_rc.build.toc? ==:off
           false
@@ -3623,8 +3627,9 @@ WOK
           true
         elsif cmd_rc_act[:manifest][:set]==:off
           false
-        elsif defined? @md.make.manifest? \
-        and @md.make.manifest? ==:off
+        elsif doc_rc.is_a?(Method) \
+        and defined? doc_rc.manifest? \
+        and doc_rc.manifest? ==:off
           false
         elsif env_rc.build.manifest? ==:off
           false
@@ -3637,8 +3642,9 @@ WOK
           true
         elsif cmd_rc_act[:links_to_manifest][:set]==:off
           false
-        elsif defined? @md.make.links_to_manifest? \
-        and @md.make.links_to_manifest? ==:off
+        elsif doc_rc.is_a?(Method) \
+        and defined? doc_rc.links_to_manifest? \
+        and doc_rc.links_to_manifest? ==:off
           false
         elsif env_rc.build.links_to_manifest? ==:off
           false
@@ -3651,8 +3657,9 @@ WOK
           true
         elsif cmd_rc_act[:metadata][:set]==:off
           false
-        elsif defined? @md.make.metadata? \
-        and @md.make.metadata? ==:off
+        elsif doc_rc.is_a?(Method) \
+        and defined? doc_rc.metadata? \
+        and doc_rc.metadata? ==:off
           false
         elsif env_rc.build.metadata? ==:off
           false
@@ -3667,8 +3674,9 @@ WOK
           true
         elsif cmd_rc_act[:minitoc][:set]==:off
           false
-        elsif defined? @md.make.minitoc? \
-        and @md.make.minitoc? ==:off
+        elsif doc_rc.is_a?(Method) \
+        and defined? doc_rc.minitoc? \
+        and doc_rc.minitoc? ==:off
           false
         elsif env_rc.build.minitoc? ==:off
           false
@@ -3685,9 +3693,10 @@ WOK
         elsif cmd_rc_act[:manifest_minitoc][:set]==:off \
         || cmd_rc_act[:minitoc][:set]==:off
           false
-        elsif defined? @md.make.manifest_minitoc? \
-        and (@md.make.manifest_minitoc? ==:off \
-        || @md.make.minitoc? ==:off)
+        elsif doc_rc.is_a?(Method) \
+        and defined? doc_rc.manifest_minitoc? \
+        and (doc_rc.manifest_minitoc? ==:off \
+        || doc_rc.minitoc? ==:off)
           false
         elsif env_rc.build.manifest_minitoc? ==:off \
         || env_rc.build.minitoc? ==:off
@@ -3707,9 +3716,10 @@ WOK
         elsif cmd_rc_act[:html_minitoc][:set]==:off \
         || cmd_rc_act[:minitoc][:set]==:off
           false
-        elsif defined? @md.make.html_minitoc? \
-        and (@md.make.html_minitoc? ==:off \
-        || @md.make.minitoc? ==:off)
+        elsif doc_rc.is_a?(Method) \
+        and defined? doc_rc.html_minitoc? \
+        and (doc_rc.html_minitoc? ==:off \
+        || doc_rc.minitoc? ==:off)
           false
         elsif env_rc.build.html_minitoc? ==:off \
         || env_rc.build.minitoc? ==:off
@@ -3725,8 +3735,9 @@ WOK
           true
         elsif cmd_rc_act[:html_top_band][:set]==:off
           false
-        elsif defined? @md.make.html_top_band? \
-        and @md.make.html_top_band? ==:off
+        elsif doc_rc.is_a?(Method) \
+        and defined? doc_rc.html_top_band? \
+        and doc_rc.html_top_band? ==:off
           false
         elsif env_rc.build.html_top_band? ==:off
           false
@@ -3739,8 +3750,9 @@ WOK
           true
         elsif cmd_rc_act[:html_navigation][:set]==:off
           false
-        elsif defined? @md.make.html_navigation? \
-        and @md.make.html_navigation? ==:off
+        elsif doc_rc.is_a?(Method) \
+        and defined? doc_rc.html_navigation? \
+        and doc_rc.html_navigation? ==:off
           false
         elsif env_rc.build.html_navigation? ==:off
           false
@@ -3753,8 +3765,9 @@ WOK
           true
         elsif cmd_rc_act[:html_navigation_bar][:set]==:off
           false
-        elsif defined? @md.make.html_navigation_bar? \
-        and @md.make.html_navigation_bar? ==:off
+        elsif doc_rc.is_a?(Method) \
+        and defined? doc_rc.html_navigation_bar? \
+        and doc_rc.html_navigation_bar? ==:off
           false
         elsif env_rc.build.html_navigation_bar? ==:off
           false
@@ -3767,8 +3780,9 @@ WOK
           true
         elsif cmd_rc_act[:search_form][:set]==:off
           false
-        elsif defined? @md.make.html_search_form? \
-        and @md.make.search_form? ==:off
+        elsif doc_rc.is_a?(Method) \
+        and defined? doc_rc.html_search_form? \
+        and doc_rc.search_form? ==:off
           false
         elsif env_rc.build.search_form? ==:off
           false
@@ -3783,9 +3797,10 @@ WOK
         elsif cmd_rc_act[:html_search_form][:set]==:off \
         || cmd_rc_act[:search_form][:set]==:off
           false
-        elsif defined? @md.make.html_search_form? \
-        and (@md.make.html_search_form? ==:off \
-        || @md.make.search_form? ==:off)
+        elsif doc_rc.is_a?(Method) \
+        and defined? doc_rc.html_search_form? \
+        and (doc_rc.html_search_form? ==:off \
+        || doc_rc.search_form? ==:off)
           false
         elsif env_rc.build.html_search_form? ==:off \
         || env_rc.build.search_form? ==:off
@@ -3801,8 +3816,9 @@ WOK
           true
         elsif cmd_rc_act[:html_right_pane][:set]==:off
           false
-        elsif defined? @md.make.html_right_pane? \
-        and @md.make.html_right_pane? ==:off
+        elsif doc_rc.is_a?(Method) \
+        and defined? doc_rc.html_right_pane? \
+        and doc_rc.html_right_pane? ==:off
           false
         elsif env_rc.build.html_right_pane? ==:off
           false
@@ -3815,8 +3831,9 @@ WOK
           true
         elsif cmd_rc_act[:segsubtoc][:set]==:off
           false
-        elsif defined? @md.make.segsubtoc? \
-        and @md.make.segsubtoc? ==:off
+        elsif doc_rc.is_a?(Method) \
+        and defined? doc_rc.segsubtoc? \
+        and doc_rc.segsubtoc? ==:off
           false
         elsif env_rc.build.segsubtoc? ==:off
           false
diff --git a/lib/sisu/v4/termsheet.rb b/lib/sisu/v4/termsheet.rb
index c376871c..505baed4 100644
--- a/lib/sisu/v4/termsheet.rb
+++ b/lib/sisu/v4/termsheet.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/texinfo.rb b/lib/sisu/v4/texinfo.rb
index ef622025..a550bec1 100644
--- a/lib/sisu/v4/texinfo.rb
+++ b/lib/sisu/v4/texinfo.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/texinfo_format.rb b/lib/sisu/v4/texinfo_format.rb
index 0c6b99f2..0d4e22fd 100644
--- a/lib/sisu/v4/texinfo_format.rb
+++ b/lib/sisu/v4/texinfo_format.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/texpdf.rb b/lib/sisu/v4/texpdf.rb
index f5c90cf5..aa1f9444 100644
--- a/lib/sisu/v4/texpdf.rb
+++ b/lib/sisu/v4/texpdf.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/texpdf_format.rb b/lib/sisu/v4/texpdf_format.rb
index 223633de..fb569fca 100644
--- a/lib/sisu/v4/texpdf_format.rb
+++ b/lib/sisu/v4/texpdf_format.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/update.rb b/lib/sisu/v4/update.rb
index 4630d640..12f54d84 100644
--- a/lib/sisu/v4/update.rb
+++ b/lib/sisu/v4/update.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/urls.rb b/lib/sisu/v4/urls.rb
index 0aba1d89..a9a27bff 100644
--- a/lib/sisu/v4/urls.rb
+++ b/lib/sisu/v4/urls.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/webrick.rb b/lib/sisu/v4/webrick.rb
index 96280d0c..2e32cd5e 100644
--- a/lib/sisu/v4/webrick.rb
+++ b/lib/sisu/v4/webrick.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/wikispeak.rb b/lib/sisu/v4/wikispeak.rb
index e67213f0..f35624c5 100644
--- a/lib/sisu/v4/wikispeak.rb
+++ b/lib/sisu/v4/wikispeak.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/xhtml.rb b/lib/sisu/v4/xhtml.rb
index df3f18a6..1af8bb00 100644
--- a/lib/sisu/v4/xhtml.rb
+++ b/lib/sisu/v4/xhtml.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/xhtml_table.rb b/lib/sisu/v4/xhtml_table.rb
index 991359fa..6ae6ad85 100644
--- a/lib/sisu/v4/xhtml_table.rb
+++ b/lib/sisu/v4/xhtml_table.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/xml.rb b/lib/sisu/v4/xml.rb
index beccb393..27c3a895 100644
--- a/lib/sisu/v4/xml.rb
+++ b/lib/sisu/v4/xml.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/xml_dom.rb b/lib/sisu/v4/xml_dom.rb
index d0d39dbe..78e5c642 100644
--- a/lib/sisu/v4/xml_dom.rb
+++ b/lib/sisu/v4/xml_dom.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/xml_fictionbook.rb b/lib/sisu/v4/xml_fictionbook.rb
index abb903e9..95a5fe07 100644
--- a/lib/sisu/v4/xml_fictionbook.rb
+++ b/lib/sisu/v4/xml_fictionbook.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/xml_format.rb b/lib/sisu/v4/xml_format.rb
index 212a2866..5c5593fe 100644
--- a/lib/sisu/v4/xml_format.rb
+++ b/lib/sisu/v4/xml_format.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/xml_md_oai_pmh_dc.rb b/lib/sisu/v4/xml_md_oai_pmh_dc.rb
index 56e19e0e..f4cc3a5c 100644
--- a/lib/sisu/v4/xml_md_oai_pmh_dc.rb
+++ b/lib/sisu/v4/xml_md_oai_pmh_dc.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/xml_scaffold.rb b/lib/sisu/v4/xml_scaffold.rb
index 2b7ae055..0a442065 100644
--- a/lib/sisu/v4/xml_scaffold.rb
+++ b/lib/sisu/v4/xml_scaffold.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/xml_tables.rb b/lib/sisu/v4/xml_tables.rb
index 8f95024d..19f28976 100644
--- a/lib/sisu/v4/xml_tables.rb
+++ b/lib/sisu/v4/xml_tables.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
diff --git a/lib/sisu/v4/zap.rb b/lib/sisu/v4/zap.rb
index 5e338da2..344b9367 100644
--- a/lib/sisu/v4/zap.rb
+++ b/lib/sisu/v4/zap.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later: