Merge tag 'sisu_5.5.6' into debian/sid

SiSU 5.5.6

89 files changed, 668 insertions, 665 deletions

diff --git a/lib/sisu/v5/air.rb b/lib/sisu/v5/air.rb
index 12ec9ed6..aaa4340f 100644
--- a/lib/sisu/v5/air.rb
+++ b/lib/sisu/v5/air.rb
@@ -61,7 +61,7 @@
 
 =end
 module SiSU_Air
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
   class Source
     @@ao_array=[]
     @@fns=nil
diff --git a/lib/sisu/v5/ao.rb b/lib/sisu/v5/ao.rb
index ee99805d..d7b418f5 100644
--- a/lib/sisu/v5/ao.rb
+++ b/lib/sisu/v5/ao.rb
@@ -64,9 +64,9 @@
 module SiSU_AO
   require_relative 'defaults'                           # defaults.rb
     include SiSU_Viz
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
-  require_relative 'param'                              # param.rb
+  require_relative 'dp'                                 # dp.rb
     include SiSU_Param
   require_relative 'ao_doc_objects'                     # ao.rb
   require_relative 'ao_syntax'                          # ao_syntax.rb
diff --git a/lib/sisu/v5/ao_composite.rb b/lib/sisu/v5/ao_composite.rb
index 0d5905bc..af194db7 100644
--- a/lib/sisu/v5/ao_composite.rb
+++ b/lib/sisu/v5/ao_composite.rb
@@ -62,7 +62,7 @@
 
 =end
 module SiSU_Assemble
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
   class RemoteImage
     def initialize
       @env=SiSU_Env::InfoEnv.new
diff --git a/lib/sisu/v5/cgi.rb b/lib/sisu/v5/cgi.rb
index cd0175b5..efea863c 100644
--- a/lib/sisu/v5/cgi.rb
+++ b/lib/sisu/v5/cgi.rb
@@ -62,7 +62,7 @@
 
 =end
 module  SiSU_CGI                                                                 #% database building documents
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
   require_relative 'cgi_pgsql'                          # cgi_pgsql.rb
   require_relative 'cgi_sqlite'                         # cgi_sqlite.rb
   class SearchSQL
diff --git a/lib/sisu/v5/cgi_pgsql.rb b/lib/sisu/v5/cgi_pgsql.rb
index a65b8a97..633e20fc 100644
--- a/lib/sisu/v5/cgi_pgsql.rb
+++ b/lib/sisu/v5/cgi_pgsql.rb
@@ -61,7 +61,7 @@
 
 =end
 module  SiSU_CGI_PgSQL                                                            #% database building documents
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
   require_relative 'cgi_sql_common'                     # cgi_sql_common.rb
     include SiSU_CGI_SQL
   class SearchPgSQL < CGI_Common
diff --git a/lib/sisu/v5/cgi_sqlite.rb b/lib/sisu/v5/cgi_sqlite.rb
index fc665074..531071c4 100644
--- a/lib/sisu/v5/cgi_sqlite.rb
+++ b/lib/sisu/v5/cgi_sqlite.rb
@@ -61,7 +61,7 @@
 
 =end
 module  SiSU_CGI_SQLite                                                            #% database building documents
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
   require_relative 'cgi_sql_common'                     # cgi_sql_common.rb
     include SiSU_CGI_SQL
   class SearchSQLite < CGI_Common
diff --git a/lib/sisu/v5/conf.rb b/lib/sisu/v5/conf.rb
index 04ac5cfa..820d0941 100644
--- a/lib/sisu/v5/conf.rb
+++ b/lib/sisu/v5/conf.rb
@@ -61,7 +61,7 @@
 
 =end
 module SiSU_Initialize
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
     include SiSU_Screen
   require_relative 'relaxng'                            # relaxng.rb
@@ -82,7 +82,7 @@ module SiSU_Initialize
     end
   end
   class ConfigSite #config files such as css are not updated if they already exist unless forced using the --init=site modifier
-    require_relative 'sysenv'                           # sysenv.rb
+    require_relative 'se'                               # se.rb
     def initialize(opt)
       @opt=opt
       @env=SiSU_Env::InfoEnv.new(@opt.fns)
diff --git a/lib/sisu/v5/css.rb b/lib/sisu/v5/css.rb
index d9b2aa8c..b99359aa 100644
--- a/lib/sisu/v5/css.rb
+++ b/lib/sisu/v5/css.rb
@@ -61,7 +61,7 @@
 
 =end
 module SiSU_Style
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
   require_relative 'defaults'                           # defaults.rb
   class CSS_HeadInfo
     def initialize(md,ft='html')
diff --git a/lib/sisu/v5/db_columns.rb b/lib/sisu/v5/db_columns.rb
index 04be289d..189e8acb 100644
--- a/lib/sisu/v5/db_columns.rb
+++ b/lib/sisu/v5/db_columns.rb
@@ -62,7 +62,7 @@
 
 =end
 module SiSU_DbColumns
-  require_relative 'sysenv'                            # sysenv.rb
+  require_relative 'se'                                # se.rb
   require_relative 'db_sqltxt'                         # db_sqltxt.rb
   class Columns < SiSU_DbText::Prepare
     def initialize(md=nil)
diff --git a/lib/sisu/v5/db_create.rb b/lib/sisu/v5/db_create.rb
index 142318f5..35b15ada 100644
--- a/lib/sisu/v5/db_create.rb
+++ b/lib/sisu/v5/db_create.rb
@@ -64,7 +64,7 @@
 module SiSU_DbCreate
   require_relative 'db_columns'                         # db_columns.rb
   class Create < SiSU_DbColumns::Columns
-    require_relative 'sysenv'                           # sysenv.rb
+    require_relative 'se'                               # se.rb
     @@dl=nil
     def initialize(opt,conn,file,sql_type=:pg)
       @opt,@conn,@file,@sql_type=opt,conn,file,sql_type
diff --git a/lib/sisu/v5/db_drop.rb b/lib/sisu/v5/db_drop.rb
index ba7b57cd..2106fe8f 100644
--- a/lib/sisu/v5/db_drop.rb
+++ b/lib/sisu/v5/db_drop.rb
@@ -63,7 +63,7 @@
 =end
 module SiSU_DbDrop
   class Drop
-    require_relative 'response'                          # response.rb
+    require_relative 'utils_response'                   # utils_response.rb
     def initialize(opt,conn,db_info,sql_type)
       @opt,@conn,@db_info,@sql_type=opt,conn,db_info,sql_type
       @ans=SiSU_Response::Response.new
diff --git a/lib/sisu/v5/db_load_tuple.rb b/lib/sisu/v5/db_load_tuple.rb
index 750a47f0..98310bfd 100644
--- a/lib/sisu/v5/db_load_tuple.rb
+++ b/lib/sisu/v5/db_load_tuple.rb
@@ -64,7 +64,7 @@
 module SiSU_DbTuple
   require_relative 'db_columns'                         # db_columns.rb
   class LoadDocuments
-    require_relative 'param'                            # param.rb
+    require_relative 'dp'                               # dp.rb
       include SiSU_Param
     def initialize(conn,col,opt,file_maint)
       @conn,@col,@opt,@file_maint=conn,col,opt,file_maint
diff --git a/lib/sisu/v5/dbi.rb b/lib/sisu/v5/dbi.rb
index 83021b20..75b07372 100644
--- a/lib/sisu/v5/dbi.rb
+++ b/lib/sisu/v5/dbi.rb
@@ -61,9 +61,9 @@
 
 =end
 module  SiSU_DBI                                                                 #% database building
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env; include SiSU_Screen
-  require_relative 'param'                              # param.rb
+  require_relative 'dp'                                 # dp.rb
     include SiSU_Param
   require_relative 'db_dbi'                             # db_dbi.rb
     include SiSU_DbDBI
diff --git a/lib/sisu/v5/dbi_discrete.rb b/lib/sisu/v5/dbi_discrete.rb
index 9c4726c9..73976756 100644
--- a/lib/sisu/v5/dbi_discrete.rb
+++ b/lib/sisu/v5/dbi_discrete.rb
@@ -61,9 +61,9 @@
 
 =end
 module  SiSU_DBI_Discrete                               #% database building
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env; include SiSU_Screen
-  require_relative 'param'                              # param.rb
+  require_relative 'dp'                                 # dp.rb
     include SiSU_Param
   require_relative 'db_dbi'                             # db_dbi.rb
     include SiSU_DbDBI
diff --git a/lib/sisu/v5/defaults.rb b/lib/sisu/v5/defaults.rb
index 25dd270a..c2f0f19c 100644
--- a/lib/sisu/v5/defaults.rb
+++ b/lib/sisu/v5/defaults.rb
@@ -67,7 +67,7 @@ module SiSU_Viz
   rescue LoadError
     SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('uri NOT FOUND (LoadError)')
   end
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   require_relative 'css'                                # css.rb
     include SiSU_Style
diff --git a/lib/sisu/v5/digests.rb b/lib/sisu/v5/digests.rb
index 662fa23d..83f26714 100644
--- a/lib/sisu/v5/digests.rb
+++ b/lib/sisu/v5/digests.rb
@@ -61,7 +61,7 @@
 
 =end
 module SiSU_DigestView
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
   require_relative 'prog_text_translation'              # prog_text_translation.rb
   require_relative 'shared_markup_alt.rb'               # shared_markup_alt.rb
   class Source
diff --git a/lib/sisu/v5/param.rb b/lib/sisu/v5/dp.rb
index 4621f460..0dde14b8 100644
--- a/lib/sisu/v5/param.rb
+++ b/lib/sisu/v5/dp.rb
@@ -51,13 +51,13 @@
 
  * Git
    <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/param.rb;hb=HEAD>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dp.rb;hb=HEAD>
 
  * Ralph Amissah
    <ralph@amissah.com>
    <ralph.amissah@gmail.com>
 
- ** Description: parameters extracted from input file(s) for program use
+ ** Description: document parameters extracted from input files for program use
 
 =end
 module SiSU_Param
@@ -68,10 +68,10 @@ module SiSU_Param
     SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
       error('uri or pstore NOT FOUND (LoadError)')
   end
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
-  require_relative 'param_make'                         # param_make.rb
-  require_relative 'param_identify_markup'              # param_identify_markup.rb
+  require_relative 'dp_make'                            # dp_make.rb
+  require_relative 'dp_identify_markup'                 # dp_identify_markup.rb
   @@date=SiSU_Env::InfoDate.new
   @@proc=
     @@filename_txt=
@@ -926,563 +926,566 @@ module SiSU_Param
       end
       #protected
       def extract
-        @user,@home,@hostname,@pwd=ENV['USER'],ENV['HOME'],ENV['HOSTNAME'],ENV['PWD']
-        @programs,@wc,@language,@language_original={},{},{},{}
-        @en={ sum: 0, mark: 0, note: 0, mismatch: 0 }
-        @prog=SiSU_Env::InfoSettings.new
-        @sys=SiSU_Env::SystemCall.new
-        @env=SiSU_Env::InfoEnv.new(@fns) #watch
-        if (@opt.act[:verbose_plus][:set]==:on \
-        || @opt.act[:maintenance][:set]==:on)
-          puts 'system locale: ' + @sys.locale
-        end
-        if @prog.wc \
-        and @sys.wc
-          wc=%x{wc #{fns}}
-          wca=wc.scan(/\d+/)
-          @wc_lines,@wc_words,@wc_bytes=wca[0].to_i,wca[1].to_i,wca[2].to_i
-        else
-          fns_a=@data.dup
-          tmp=fns_a.join
-          fns_a=tmp.scan(/\S+/)
-          @wc_words=fns_a.length
-          fns_a=tmp=nil
-        end
-        @concord_make=(@wc_words > @env.concord_max) ? false : true
-        @locale=@sys.locale
-        @file_encoding=@sys.file_encoding(fns,@opt.cmd)
-        # programs set here for things that affect output appearance only
-        @programs[:pdf]=SiSU_Env::SystemCall.new.program_found?('pdflatex')
-        if @opt.cmd =~/P/ #if @env.multilingual?
-          m=/((.+?)(?:\~\w\w(?:_\w\w)?)?)\.((?:-|ssm\.)?sst|ssm|ssi)$/ #watch added match for sss
-          @fnn,@fnb,@fnt=@fns[m,1],@fns[m,2],@fns[m,3]
-          @flv=@env.document_language_versions_found[:f]
-        else
-          m=/((.+?)(?:\~\w\w(?:_\w\w)?)?)\.((?:-|ssm\.)?sst|ssm)$/ #watch added match for sss
-          @fnn,@fnb,@fnt=@fns[m,1],@fns[m,2],@fns[m,3]
-          @flv=@env.document_language_versions_found[:f]
-          @fnz=(@fns =~/\.(?:ssm\.sst|ssm)$/) ? (@fnn + '.ssm.txz') : (@fnn + '.sst.txz')
-        end
-        @papersize=@env.papersize #'A4' #default size #get first from SiSU_Env:: # @env is probably no longer most appropriate name! as default info is more general
-        @sfx_src=@fns[m,2]
-        if @fns =~ /(?:-|ssm\.)?sst$/ \
-        and not @opt.cmd =~/P/ #watch
-          @env_out_root=@env.path.output
-          @dir_out="#{@env.path.output}/#{@fnb}"
-          @dir_tex=@env.processing_path.tex
-          @dir_lout=@env.processing_path.lout
-          @@publisher='SiSU http://www.jus.uio.no/sisu'
-        end
-        @txt_path=@txt_path ||= @env.path.output
-        @stmp=%{#{@fns}}[/^(.+?)\..*/m,1]
-        @fnstex=@fns.gsub(/_/,'\_\-').gsub(/\./,'.\-')
-        @flag_endnotes,@flag_auto_endnotes,@flag_separate_endnotes=false,false,false
-        @flag_separate_endnotes_make=true
-        ver=SiSU_Env::InfoVersion.instance
-        @sisu_version=ver.get_version
-        @ruby_version=ver.rbversion
-        @generated=Time.now
-        fns_array=@data.dup
-        skip unless fns_array                                                    # consider
-        @code_flag=false
-        fns_array.each do |para|                                               #% scan document
-          if para !~/^%+\s/ \
-          and para =~/<![abcdeghijklmnopqrstuvwxyz]/i # <!f not included
-            raise "Old markup style in file #{@fns}, current version #{@sisu_version[:project]} #{@sisu_version[:version]} #{@sisu_version[:date_stamp]} #{@sisu_version[:date]}:\n\t\t#{para}\n\n"
+        begin
+          @user,@home,@hostname,@pwd=ENV['USER'],ENV['HOME'],ENV['HOSTNAME'],ENV['PWD']
+          @programs,@wc,@language,@language_original={},{},{},{}
+          @en={ sum: 0, mark: 0, note: 0, mismatch: 0 }
+          @prog=SiSU_Env::InfoSettings.new
+          @sys=SiSU_Env::SystemCall.new
+          @env=SiSU_Env::InfoEnv.new(@fns) #watch
+          if (@opt.act[:verbose_plus][:set]==:on \
+          || @opt.act[:maintenance][:set]==:on)
+            puts 'system locale: ' + @sys.locale
           end
-          @code_flag=case para
-          when /^code\{\s*$/ then true
-          when /^\}code\s*$/ then false
-          else                    @code_flag
+          if @prog.wc \
+          and @sys.wc
+            wc=%x{wc #{fns}}
+            wca=wc.scan(/\d+/)
+            @wc_lines,@wc_words,@wc_bytes=wca[0].to_i,wca[1].to_i,wca[2].to_i
+          else
+            fns_a=@data.dup
+            tmp=fns_a.join
+            fns_a=tmp.scan(/\S+/)
+            @wc_words=fns_a.length
+            fns_a=tmp=nil
           end
-          regx_header=/^@\S+?:[+-]?\s/
-          if para =~regx_header \
-          and not @code_flag #or para=~/^(?:1|:?A)~/
-            case para
-            when /^@title:(.+)/m                                               #% * header metadata - title
-              @title=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).title
-            when /^@creator:(.+)/m                                             #% * header metadata - creator
-              @creator=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).creator
-              @authorship=@author=@creator.author
-              @authors=@creator.author_detail
-            when /^@date:(.+)/m                                                #% * header metadata - date
-              @date=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).date
-            when /^@publisher:\s+(.+)/m                                        #% * header metadata - publisher
-              @publisher=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).current_publisher
-              @current_publisher=@publisher
-            when /^@rights:(.+)/m                                              #% * header metadata - rights
-              @rights=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).rights
-            when /^@classify:(.+)/m                                            #% * header metadata - classify
-              @classify=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).classify
-            when /^@identifier:(.+)/m                                          #% * header metadata - identifier
-              @identifier=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).identifier
-            when /^@original:(.+)/m                                            #% * header metadata - original (document)
-              @original=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).original
-              @source=@original.source
-            when /^@notes?:\s(.+)\Z/m                                          #% * header metadata - notes
-              @notes=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).notes
-            when /^@links:\s+(.+?)\Z/m                                         #% * header metadata - links
-              links=SiSU_Param::Parameters::MdMake.new($1.strip,@opt,@env).make_links.links
-              @lnk=@links=if @header_make_links_append == :yes
-                (links) \
-                  ? (links + @links)
-                  : @links
-              else
-                (links) \
-                  ? (links)
-                  : @links
-              end
-            when /^@make:(.+)/m                                                #% * header processing - make
-              @make=SiSU_Param::Parameters::MdMake.new($1.strip,@opt,@env).make
-              makes=SiSU_Param_Make::MakeHead.new(@make).make_instruct
-              @pagenew=(makes[:pagenew]) \
-                ? (makes[:pagenew]) \
-                : @pagenew
-              @pagebreak=(makes[:pagebreak]) \
-                ? (makes[:pagebreak]) \
-                : @pagebreak
-              @pageline=(makes[:pageline]) \
-                ? (makes[:pageline]) \
-                : @pageline
-              @toc=(makes[:toc]) ? (makes[:toc]) : @toc
-              @lv0=(makes[:lv0]) ? (makes[:lv0]) : @lv0
-              @lv1=(makes[:lv1]) ? (makes[:lv1]) : @lv1
-              @lv2=(makes[:lv2]) ? (makes[:lv2]) : @lv2
-              @lv3=(makes[:lv3]) ? (makes[:lv3]) : @lv3
-              @lv4=(makes[:lv4]) ? (makes[:lv4]) : @lv4
-              @lv5=(makes[:lv5]) ? (makes[:lv5]) : @lv5
-              @lv6=(makes[:lv6]) ? (makes[:lv6]) : @lv6
-              @num_top=
-                (makes[:num_top]) \
-                ? (makes[:num_top]) \
-                : @num_top
-              @substitution_match_list=
-                (makes[:substitution_match_list]) \
-                ? (makes[:substitution_match_list]) \
-                : @substitution_match_list
-              @bold_match_list=
-                (makes[:bold_match_list]) \
-                ? (makes[:bold_match_list]) \
-                : @bold_match_list
-              @italics_match_list=
-                (makes[:italics_match_list]) \
-                ? (makes[:italics_match_list]) \
-                : @italics_match_list
-              @emphasis_set_to=
-                (makes[:emphasis_set_to]) \
-                ? (makes[:emphasis_set_to]) \
-                : @emphasis_set_to
-              @i18n=
-                (makes[:i18n]) \
-                ? (makes[:i18n]) \
-                : @i18n
-              @man_section=
-                (makes[:man_section]) \
-                ? (makes[:man_section]) \
-                : @man_section
-              @footer_links=
-                (makes[:footer_links]) \
-                ? (makes[:footer_links]) \
-                : @footer_links
-              @home_button_links=
-                (makes[:home_button_links]) \
-                ? (makes[:home_button_links]) \
-                : @home_button_links
-              @home_button_image=
-                (makes[:home_button_image]) \
-                ? (makes[:home_button_image]) \
-                : @home_button_image
-              @cover_image=
-                (makes[:cover_image]) \
-                ? (makes[:cover_image]) \
-                : @cover_image
+          @concord_make=(@wc_words > @env.concord_max) ? false : true
+          @locale=@sys.locale
+          @file_encoding=@sys.file_encoding(fns,@opt.cmd)
+          # programs set here for things that affect output appearance only
+          @programs[:pdf]=SiSU_Env::SystemCall.new.program_found?('pdflatex')
+          if @opt.cmd =~/P/ #if @env.multilingual?
+            m=/((.+?)(?:\~\w\w(?:_\w\w)?)?)\.((?:-|ssm\.)?sst|ssm|ssi)$/ #watch added match for sss
+            @fnn,@fnb,@fnt=@fns[m,1],@fns[m,2],@fns[m,3]
+            @flv=@env.document_language_versions_found[:f]
+          else
+            m=/((.+?)(?:\~\w\w(?:_\w\w)?)?)\.((?:-|ssm\.)?sst|ssm)$/ #watch added match for sss
+            @fnn,@fnb,@fnt=@fns[m,1],@fns[m,2],@fns[m,3]
+            @flv=@env.document_language_versions_found[:f]
+            @fnz=(@fns =~/\.(?:ssm\.sst|ssm)$/) ? (@fnn + '.ssm.txz') : (@fnn + '.sst.txz')
+          end
+          @papersize=@env.papersize #'A4' #default size #get first from SiSU_Env:: # @env is probably no longer most appropriate name! as default info is more general
+          @sfx_src=@fns[m,2]
+          if @fns =~ /(?:-|ssm\.)?sst$/ \
+          and not @opt.cmd =~/P/ #watch
+            @env_out_root=@env.path.output
+            @dir_out="#{@env.path.output}/#{@fnb}"
+            @dir_tex=@env.processing_path.tex
+            @dir_lout=@env.processing_path.lout
+            @@publisher='SiSU http://www.jus.uio.no/sisu'
+          end
+          @txt_path=@txt_path ||= @env.path.output
+          @stmp=%{#{@fns}}[/^(.+?)\..*/m,1]
+          @fnstex=@fns.gsub(/_/,'\_\-').gsub(/\./,'.\-')
+          @flag_endnotes,@flag_auto_endnotes,@flag_separate_endnotes=false,false,false
+          @flag_separate_endnotes_make=true
+          ver=SiSU_Env::InfoVersion.instance
+          @sisu_version=ver.get_version
+          @ruby_version=ver.rbversion
+          @generated=Time.now
+          fns_array=@data.dup
+          skip unless fns_array                                                    # consider
+          @code_flag=false
+          fns_array.each do |para|                                               #% scan document
+            if para !~/^%+\s/ \
+            and para =~/<![abcdeghijklmnopqrstuvwxyz]/i # <!f not included
+              raise "Old markup style in file #{@fns}, current version #{@sisu_version[:project]} #{@sisu_version[:version]} #{@sisu_version[:date_stamp]} #{@sisu_version[:date]}:\n\t\t#{para}\n\n"
+            end
+            @code_flag=case para
+            when /^code\{\s*$/ then true
+            when /^\}code\s*$/ then false
+            else                    @code_flag
             end
-            @lv0 ||=/^0~/
-            @lv1 ||=/^1~/
-            @lv2 ||=/^2~/
-            @lv3 ||=/^3~/
-            @lv4 ||=/^4~/
-            @lv5 ||=/^5~/
-            @lv6 ||=/^6~/
-          else                                                                 #% *
-            l_0=l_1=l_2=l_3=l_4=l_5=''
-            if defined? @make.headings[0]
-              l_0=if defined? @make.headings[0][0] \
-              and @make.headings[0][0] =~/\S+/
-                "|^#{@make.headings[0][0]}"
+            regx_header=/^@\S+?:[+-]?\s/
+            if para =~regx_header \
+            and not @code_flag #or para=~/^(?:1|:?A)~/
+              case para
+              when /^@title:(.+)/m                                               #% * header metadata - title
+                @title=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).title
+              when /^@creator:(.+)/m                                             #% * header metadata - creator
+                @creator=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).creator
+                @authorship=@author=@creator.author
+                @authors=@creator.author_detail
+              when /^@date:(.+)/m                                                #% * header metadata - date
+                @date=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).date
+              when /^@publisher:\s+(.+)/m                                        #% * header metadata - publisher
+                @publisher=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).current_publisher
+                @current_publisher=@publisher
+              when /^@rights:(.+)/m                                              #% * header metadata - rights
+                @rights=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).rights
+              when /^@classify:(.+)/m                                            #% * header metadata - classify
+                @classify=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).classify
+              when /^@identifier:(.+)/m                                          #% * header metadata - identifier
+                @identifier=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).identifier
+              when /^@original:(.+)/m                                            #% * header metadata - original (document)
+                @original=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).original
+                @source=@original.source
+              when /^@notes?:\s(.+)\Z/m                                          #% * header metadata - notes
+                @notes=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).notes
+              when /^@links:\s+(.+?)\Z/m                                         #% * header metadata - links
+                links=SiSU_Param::Parameters::MdMake.new($1.strip,@opt,@env).make_links.links
+                @lnk=@links=if @header_make_links_append == :yes
+                  (links) \
+                    ? (links + @links)
+                    : @links
+                else
+                  (links) \
+                    ? (links)
+                    : @links
+                end
+              when /^@make:(.+)/m                                                #% * header processing - make
+                @make=SiSU_Param::Parameters::MdMake.new($1.strip,@opt,@env).make
+                makes=SiSU_Param_Make::MakeHead.new(@make).make_instruct
+                @pagenew=(makes[:pagenew]) \
+                  ? (makes[:pagenew]) \
+                  : @pagenew
+                @pagebreak=(makes[:pagebreak]) \
+                  ? (makes[:pagebreak]) \
+                  : @pagebreak
+                @pageline=(makes[:pageline]) \
+                  ? (makes[:pageline]) \
+                  : @pageline
+                @toc=(makes[:toc]) ? (makes[:toc]) : @toc
+                @lv0=(makes[:lv0]) ? (makes[:lv0]) : @lv0
+                @lv1=(makes[:lv1]) ? (makes[:lv1]) : @lv1
+                @lv2=(makes[:lv2]) ? (makes[:lv2]) : @lv2
+                @lv3=(makes[:lv3]) ? (makes[:lv3]) : @lv3
+                @lv4=(makes[:lv4]) ? (makes[:lv4]) : @lv4
+                @lv5=(makes[:lv5]) ? (makes[:lv5]) : @lv5
+                @lv6=(makes[:lv6]) ? (makes[:lv6]) : @lv6
+                @num_top=
+                  (makes[:num_top]) \
+                  ? (makes[:num_top]) \
+                  : @num_top
+                @substitution_match_list=
+                  (makes[:substitution_match_list]) \
+                  ? (makes[:substitution_match_list]) \
+                  : @substitution_match_list
+                @bold_match_list=
+                  (makes[:bold_match_list]) \
+                  ? (makes[:bold_match_list]) \
+                  : @bold_match_list
+                @italics_match_list=
+                  (makes[:italics_match_list]) \
+                  ? (makes[:italics_match_list]) \
+                  : @italics_match_list
+                @emphasis_set_to=
+                  (makes[:emphasis_set_to]) \
+                  ? (makes[:emphasis_set_to]) \
+                  : @emphasis_set_to
+                @i18n=
+                  (makes[:i18n]) \
+                  ? (makes[:i18n]) \
+                  : @i18n
+                @man_section=
+                  (makes[:man_section]) \
+                  ? (makes[:man_section]) \
+                  : @man_section
+                @footer_links=
+                  (makes[:footer_links]) \
+                  ? (makes[:footer_links]) \
+                  : @footer_links
+                @home_button_links=
+                  (makes[:home_button_links]) \
+                  ? (makes[:home_button_links]) \
+                  : @home_button_links
+                @home_button_image=
+                  (makes[:home_button_image]) \
+                  ? (makes[:home_button_image]) \
+                  : @home_button_image
+                @cover_image=
+                  (makes[:cover_image]) \
+                  ? (makes[:cover_image]) \
+                  : @cover_image
               end
-              l_1=if defined? @make.headings[0][1] \
-              and @make.headings[0][1] =~/\S+/
-                "|^#{@make.headings[0][1]}"
+              @lv0 ||=/^0~/
+              @lv1 ||=/^1~/
+              @lv2 ||=/^2~/
+              @lv3 ||=/^3~/
+              @lv4 ||=/^4~/
+              @lv5 ||=/^5~/
+              @lv6 ||=/^6~/
+            else                                                                 #% *
+              l_0=l_1=l_2=l_3=l_4=l_5=''
+              if defined? @make.headings[0]
+                l_0=if defined? @make.headings[0][0] \
+                and @make.headings[0][0] =~/\S+/
+                  "|^#{@make.headings[0][0]}"
+                end
+                l_1=if defined? @make.headings[0][1] \
+                and @make.headings[0][1] =~/\S+/
+                  "|^#{@make.headings[0][1]}"
+                end
+                l_2=if defined? @make.headings[0][2] \
+                and @make.headings[0][2] =~/\S+/
+                  "|^#{@make.headings[0][2]}"
+                end
+                l_3=if defined? @make.headings[0][3] \
+                and @make.headings[0][3] =~/\S+/
+                  "|^#{@make.headings[0][3]}"
+                end
+                l_4=if defined? @make.headings[0][4] \
+                and @make.headings[0][4] =~/\S+/
+                  "|^#{@make.headings[0][4]}"
+                end
+                l_5=if defined? @make.headings[0][5] \
+                and @make.headings[0][5] =~/\S+/
+                  "|^#{@make.headings[0][5]}"
+                end
               end
-              l_2=if defined? @make.headings[0][2] \
-              and @make.headings[0][2] =~/\S+/
-                "|^#{@make.headings[0][2]}"
+              case para
+              #when /^:?A~/
+              when /^:?B~#{l_0}/
+                @lvs[1]=1
+              when /^:?C~#{l_1}/
+                @lvs[2]=1
+              when /^:?D~#{l_2}/
+                @lvs[3]=1
+              when /^1~#{l_3}/
+                @lvs[4]=1
+              when /^2~#{l_4}/
+                @lvs[5]=1
+              when /^3~#{l_5}/
+                @lvs[6]=1
               end
-              l_3=if defined? @make.headings[0][3] \
-              and @make.headings[0][3] =~/\S+/
-                "|^#{@make.headings[0][3]}"
+              if para =~ /^:?A~/                                                  #% processing
+                if not defined? @title.full.nil?
+                  tf=para[/^:A~\S*(.+)$/m,1]
+                  tf="@title: #{tf}"
+                  @title=SiSU_Param::Parameters::Md.new(tf.strip,@opt,@env).title
+                end
+                creator=(@creator.is_a?(SiSU_Param::Parameters::Md) \
+                && defined? @creator.author \
+                && @creator.author.is_a?(String)) \
+                ? " #{@creator.author}"
+                : ''
+                title=@title.full.gsub(/\s*(?:<p>|<p \/>|<br>|<br \/>)\s*/,' ').
+                  gsub(/~\{.+?\}~/,'')
+                SiSU_Screen::Ansi.new(
+                  @opt.act[:color_state][:set],
+                  'Document Parameters',
+                  %{#{title}#{creator}}
+                ).txt_grey if @opt.act[:verbose][:set]==:on
               end
-              l_4=if defined? @make.headings[0][4] \
-              and @make.headings[0][4] =~/\S+/
-                "|^#{@make.headings[0][4]}"
+              if not @book_idx \
+              and para =~/^=\{(.+?)\}[\s`]*\Z/m
+                @book_idx=true
               end
-              l_5=if defined? @make.headings[0][5] \
-              and @make.headings[0][5] =~/\S+/
-                "|^#{@make.headings[0][5]}"
+              unless @code_flag
+                case para
+                when /~\{\s+.+?\}~/m                                             #% processing
+                  en=para.scan(/~\{.+?\}~/m)
+                  en.each { |e| @en[:sum] +=1 }
+                when /~\^(?:\s|$)/m                                              #% processing
+                  mk=para.scan(/~\^(?:\s|$)/)
+                  mk.each { |e| @en[:mark] +=1 }
+                when /^\^~\s+\S/ then @en[:note] +=1                             #% processing
+                end
               end
-            end
-            case para
-            #when /^:?A~/
-            when /^:?B~#{l_0}/
-              @lvs[1]=1
-            when /^:?C~#{l_1}/
-              @lvs[2]=1
-            when /^:?D~#{l_2}/
-              @lvs[3]=1
-            when /^1~#{l_3}/
-              @lvs[4]=1
-            when /^2~#{l_4}/
-              @lvs[5]=1
-            when /^3~#{l_5}/
-              @lvs[6]=1
-            end
-            if para =~ /^:?A~/                                                  #% processing
-              if not defined? @title.full.nil?
-                tf=para[/^:A~\S*(.+)$/m,1]
-                tf="@title: #{tf}"
-                @title=SiSU_Param::Parameters::Md.new(tf.strip,@opt,@env).title
+              if para =~/~\{|\^~ |~\^|\{.+?\[[1-6]\]\}\S+?\.ss[tm]/m
+                @flag_auto_endnotes,@flag_endnotes=true,true
               end
-              creator=(@creator.is_a?(SiSU_Param::Parameters::Md) \
-              && defined? @creator.author \
-              && @creator.author.is_a?(String)) \
-              ? " #{@creator.author}"
-              : ''
-              title=@title.full.gsub(/\s*(?:<p>|<p \/>|<br>|<br \/>)\s*/,' ').
-                gsub(/~\{.+?\}~/,'')
-              SiSU_Screen::Ansi.new(
-                @opt.act[:color_state][:set],
-                'Parameters',
-                %{#{title}#{creator}}
-              ).txt_grey if @opt.act[:verbose][:set]==:on
-            end
-            if not @book_idx \
-            and para =~/^=\{(.+?)\}[\s`]*\Z/m
-              @book_idx=true
-            end
-            unless @code_flag
-              case para
-              when /~\{\s+.+?\}~/m                                             #% processing
-                en=para.scan(/~\{.+?\}~/m)
-                en.each { |e| @en[:sum] +=1 }
-              when /~\^(?:\s|$)/m                                              #% processing
-                mk=para.scan(/~\^(?:\s|$)/)
-                mk.each { |e| @en[:mark] +=1 }
-              when /^\^~\s+\S/ then @en[:note] +=1                             #% processing
+              if para =~/^(?:table\{|\{table)/i
+                @flag_tables=true
               end
             end
-            if para =~/~\{|\^~ |~\^|\{.+?\[[1-6]\]\}\S+?\.ss[tm]/m
-              @flag_auto_endnotes,@flag_endnotes=true,true
+            if para =~/^:?A~/
+              @set_heading_top=true
             end
-            if para =~/^(?:table\{|\{table)/i
-              @flag_tables=true
+            if para =~/^1~/
+              m=nil
+              if para =~/^1~(\S+)\s+(.+)$/
+                m,t=$1,$2
+              elsif para =~/^1~\s+(.+)$/
+                t=$1
+              end
+              unless @heading_seg_first_flag                                     # extract first segment name
+                @heading_seg_first=t
+                @heading_seg_first_flag=true
+              end
+              if m                                                               # list all segment names
+                @seg_names << m
+                @set_heading_seg=true
+                if m=~/^\d{1,3}/ \
+                and m !~/^0/
+                  @seg_autoname_safe=false
+                end
+              end
             end
-          end
-          if para =~/^:?A~/
-            @set_heading_top=true
-          end
-          if para =~/^1~/
-            m=nil
-            if para =~/^1~(\S+)\s+(.+)$/
-              m,t=$1,$2
-            elsif para =~/^1~\s+(.+)$/
-              t=$1
+            para=para.gsub(/<:=(\S+?)>/,'{ c_\1.png 14x14 }image')               # embedded symbol (image)
+            if para !~/^%+\s/ \
+            and para =~@rgx_image
+              @ec[:image] << para.scan(@rgx_image).uniq
             end
-            unless @heading_seg_first_flag                                     # extract first segment name
-              @heading_seg_first=t
-              @heading_seg_first_flag=true
+            @ec[:audio] << para.scan(@rgx_audio).uniq if para =~@rgx_audio #embedded content
+            @ec[:multimedia] << para.scan(@rgx_mm).uniq if para =~@rgx_mm #embedded content
+            unless @sem_tag
+              @sem_tag=true if para=~/[:;]\{.+?\}[:;][a-z+]/ #refix later
             end
-            if m                                                               # list all segment names
-              @seg_names << m
-              @set_heading_seg=true
-              if m=~/^\d{1,3}/ \
-              and m !~/^0/
-                @seg_autoname_safe=false
-              end
+          end                                                                    #% here endeth the document loop
+          unless @make
+            if (@opt.act[:verbose_plus][:set]==:on \
+            || @opt.act[:maintenance][:set]==:on)
+              SiSU_Screen::Ansi.new(
+                @opt.act[:color_state][:set],
+                '@make:',
+                'header absent'
+              ).warn
             end
+            @make=SiSU_Param::Parameters::MdMake.new('@make: ',@opt,@env).make
           end
-          para=para.gsub(/<:=(\S+?)>/,'{ c_\1.png 14x14 }image')               # embedded symbol (image)
-          if para !~/^%+\s/ \
-          and para =~@rgx_image
-            @ec[:image] << para.scan(@rgx_image).uniq
+          if @cover_image \
+          and @cover_image.is_a?(Hash) \
+          and (@cover_image[:cover] =~@rgx_image \
+            or @cover_image[:cover] =~/\S+?.(?:jpg|png|gif)/)
+            @ec[:image] << @cover_image[:cover]
           end
-          @ec[:audio] << para.scan(@rgx_audio).uniq if para =~@rgx_audio #embedded content
-          @ec[:multimedia] << para.scan(@rgx_mm).uniq if para =~@rgx_mm #embedded content
-          unless @sem_tag
-            @sem_tag=true if para=~/[:;]\{.+?\}[:;][a-z+]/ #refix later
+          if @home_button_image \
+          and @home_button_image.is_a?(Hash) \
+          and (@home_button_image =~@rgx_image \
+            or @home_button_image =~/\S+?\.(?:jpg|png|gif)/)
+            @ec[:image] << @home_button_image
           end
-        end                                                                    #% here endeth the document loop
-        unless @make
-          if (@opt.act[:verbose_plus][:set]==:on \
-          || @opt.act[:maintenance][:set]==:on)
-            SiSU_Screen::Ansi.new(
-              @opt.act[:color_state][:set],
-              '@make:',
-              'header absent'
-            ).warn
+          if @ec[:image].length > 0
+            @ec[:image]=@ec[:image].flatten.uniq
+            @ec[:image].delete_if {|x| x =~/https?:\/\// }
+            @ec[:image]=@ec[:image].sort
           end
-          @make=SiSU_Param::Parameters::MdMake.new('@make: ',@opt,@env).make
-        end
-        if @cover_image \
-        and @cover_image.is_a?(Hash) \
-        and (@cover_image[:cover] =~@rgx_image \
-          or @cover_image[:cover] =~/\S+?.(?:jpg|png|gif)/)
-          @ec[:image] << @cover_image[:cover]
-        end
-        if @home_button_image \
-        and @home_button_image.is_a?(Hash) \
-        and (@home_button_image =~@rgx_image \
-          or @home_button_image =~/\S+?\.(?:jpg|png|gif)/)
-          @ec[:image] << @home_button_image
-        end
-        if @ec[:image].length > 0
-          @ec[:image]=@ec[:image].flatten.uniq
-          @ec[:image].delete_if {|x| x =~/https?:\/\// }
-          @ec[:image]=@ec[:image].sort
-        end
-        @ec[:audio]=@ec[:audio].uniq.flatten.sort
-        @ec[:multimedia]=@ec[:multimedia].uniq.flatten.sort
-        unless @rights
-          if defined? @creator.author \
-          and @creator.author.is_a?(String) \
-          and defined? @date.published \
-          and @date.published.is_a?(String)
-            @rights=SiSU_Param::Parameters::MdDefault.new.rights(@creator.author,@date.published)
-          elsif defined? @creator.author \
-          and @creator.author.is_a?(String)
-            @rights=SiSU_Param::Parameters::MdDefault.new.rights("[#{@creator.author}]",'')
+          @ec[:audio]=@ec[:audio].uniq.flatten.sort
+          @ec[:multimedia]=@ec[:multimedia].uniq.flatten.sort
+          unless @rights
+            if defined? @creator.author \
+            and @creator.author.is_a?(String) \
+            and defined? @date.published \
+            and @date.published.is_a?(String)
+              @rights=SiSU_Param::Parameters::MdDefault.new.rights(@creator.author,@date.published)
+            elsif defined? @creator.author \
+            and @creator.author.is_a?(String)
+              @rights=SiSU_Param::Parameters::MdDefault.new.rights("[#{@creator.author}]",'')
+            end
           end
-        end
-        if defined? @classify.topic_register \
-        and @classify.topic_register.is_a?(String) \
-        and @classify.topic_register.length >3
-           topic_register=@classify.topic_register
-           u=topic_register.scan(/[^;]+/m).sort
-           v=[]
-           u.each do |l|
-             v << l.scan(/[^:]+/m)
-           end
-           v.each do |s|
-             s[-1]=s[-1].scan(/[^|]+/m) if s[-1] =~/[|]/m
-             @topic_register_array << s
-           end
-           @topic_register_array
-        end
-        if @i18n
-          @i18n=@i18n.uniq
-          @i18n << 'en' unless @i18n.find_index("en")
-        else
-          @i18n=[ 'en' ]
-        end
-        translated=[]
-        translate_list=[@pagenew,@pagebreak,@pageline,@num_top,@toc_lev_limit]
-        translate_list.each do |t|
-          translate=t.to_s if t
-          translated << if translate
-            translate.gsub!(/3/,'6')
-            translate.gsub!(/2/,'5')
-            translate.gsub!(/1/,'4')
-            translate.gsub!(/:?C/,'3')
-            translate.gsub!(/:?B/,'2')
-            translate.gsub!(/:?A/,'1')
-            # looks like an ok substituion for the above but is not, causes problems, check why
-            #translate=translate.gsub(/3/,'6').
-            #  gsub(/2/,'5').
-            #  gsub(/1/,'4').
-            #  gsub(/:?C/,'3').
-            #  gsub(/:?B/,'2').
-            #  gsub(/:?A/,'1')
-            translate=(translate =~/^\d+$/) \
-            ? translate.to_i
-            : translate
-          else nil
+          if defined? @classify.topic_register \
+          and @classify.topic_register.is_a?(String) \
+          and @classify.topic_register.length >3
+             topic_register=@classify.topic_register
+             u=topic_register.scan(/[^;]+/m).sort
+             v=[]
+             u.each do |l|
+               v << l.scan(/[^:]+/m)
+             end
+             v.each do |s|
+               s[-1]=s[-1].scan(/[^|]+/m) if s[-1] =~/[|]/m
+               @topic_register_array << s
+             end
+             @topic_register_array
           end
-        end
-        @pagenew,@pagebreak,@pageline,@num_top,@toc_lev_limit=translated
-        @markup=@markup.gsub(/page_new\s*=\s*([\dA-C])/,"page_new=#{@pagenew}").
-          gsub(/page_break\s*=\s*([\dA-C])/,"page_break=#{@pagebreak}").
-          gsub(/page_line\s*=\s*([\dA-C])/,"page_line=#{@pageline}").
-          gsub(/num_top\s*=\s*([\dA-C])/,"num_top=#{@num_top}").
-          gsub(/toc_lev_limit\s*=\s*([\dA-C])/,"toc_lev_limit=#{@toc_lev_limit}")
-        papersize_array_rc=@papersize.downcase.scan(/(?:a4|letter|legal|book|a5|b5)/)
-        papersize_array_opt=[
-          ((@opt.act[:pdf_a4][:set]==:on)     ? 'a4'     : ''),
-          ((@opt.act[:pdf_a5][:set]==:on)     ? 'a5'     : ''),
-          ((@opt.act[:pdf_b5][:set]==:on)     ? 'b5'     : ''),
-          ((@opt.act[:pdf_letter][:set]==:on) ? 'letter' : ''),
-          ((@opt.act[:pdf_legal][:set]==:on)  ? 'legal'  : ''),
-        ] - [""]
-        @papersize_array=(papersize_array_opt.length > 0) \
-        ? papersize_array_opt
-        : papersize_array_rc
-        fn=@opt.fno #decide what to do a filesize on .ssm tells very little about actual document size
-        @filesize=(File.size(fn)).to_s
-        if @sys.openssl !=false \
-        and FileTest.file?(@env.source_file_with_path)
-          @dgst=[]
-          case @env.digest(@opt).type
-          when :sha512
-            dgst=@sys.sha512(@env.source_file_with_path)
-            @dgst=dgst[1].length==128 ? dgst : nil
-            puts 'check document (sha512) digest' if not @dgst
-          when :sha256
-            dgst=@sys.sha256(@env.source_file_with_path)
-            @dgst=dgst[1].length==64 ? dgst : nil
-            puts 'check document (sha256) digest' if not @dgst
-          when :md5
-            dgst=@sys.md5(@env.source_file_with_path)
-            @dgst=dgst[1].length==32 ? dgst : nil
-            puts 'check document (md5) digest' if not @dgst
+          if @i18n
+            @i18n=@i18n.uniq
+            @i18n << 'en' unless @i18n.find_index("en")
           else
-            dgst=@sys.sha256(@env.source_file_with_path)
-            @dgst=dgst[1].length==64 ? dgst : nil
-            puts 'check document (sha256) digest' if not @dgst
+            @i18n=[ 'en' ]
           end
-        elsif not FileTest.file?(@env.source_file_with_path)
-          #puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:fuchsia)
-        end
-        @publisher ||= "#{@@publisher} (this copy)"
-        fn_set_lang=SiSU_Env::StandardiseLanguage.new(@opt.lng).language
-        unless @language[:code] \
-        and @language[:name]
-          lang=@env.i18n.language #default language settings for directory by name, or in sysrc.yml
-          @language[:code] ||= lang.code
-          @language[:name] ||= lang.title
-        end
-        unless fn_set_lang[:d]==true #decide, naming convention overrides other settings, within document, etc.
-          @language[:code]=fn_set_lang[:c]
-          @language[:name]=fn_set_lang[:n]
-        end
-        @fnl=@env.i18n.lang_filename(fn_set_lang[:c])
-        @lang=@lang.uniq
-        @fn=SiSU_Env::EnvCall.new(@fns).lang(fn_set_lang[:c])
-        if @en[:note] > 0 \
-        and @en[:sum] > 0
-          if @en[:sum] > 0
-          else
-            SiSU_Screen::Ansi.new(
-              @opt.act[:color_state][:set],
-              '*WARN* both endnote styles used',
-              "~{ #{@en[:sum]} }~ and ^~ #{@en[:mark]}"
-            ).warn unless @opt.act[:quiet][:set]==:on
+          translated=[]
+          translate_list=[@pagenew,@pagebreak,@pageline,@num_top,@toc_lev_limit]
+          translate_list.each do |t|
+            translate=t.to_s if t
+            translated << if translate
+              translate.gsub!(/3/,'6')
+              translate.gsub!(/2/,'5')
+              translate.gsub!(/1/,'4')
+              translate.gsub!(/:?C/,'3')
+              translate.gsub!(/:?B/,'2')
+              translate.gsub!(/:?A/,'1')
+              # looks like an ok substituion for the above but is not, causes problems, check why
+              #translate=translate.gsub(/3/,'6').
+              #  gsub(/2/,'5').
+              #  gsub(/1/,'4').
+              #  gsub(/:?C/,'3').
+              #  gsub(/:?B/,'2').
+              #  gsub(/:?A/,'1')
+              translate=(translate =~/^\d+$/) \
+              ? translate.to_i
+              : translate
+            else nil
+            end
           end
-        end
-        if @en[:mark] != @en[:note] \
-        and @en[:note] > 0
-          @en[:mismatch]=@en[:note] - @en[:mark]
-          SiSU_Screen::Ansi.new(
-            @opt.act[:color_state][:set],
-            '*WARN* endnote number mismatch',
-            "endnotes: #{@en[:note]} != endnote reference marks: #{@en[:mark]} (difference = #{@en[:mismatch]})"
-          ).warn unless @opt.act[:quiet][:set]==:on
-          footnote_conversion_errors=File.new("#{Dir.pwd}/footnote_conversion_errors.txt",'a')
-          footnote_conversion_errors <<
-            "#{@fns}:\n\tendnotes: #{@en[:note]} != endnote reference marks: #{@en[:mark]} (difference = #{@en[:mismatch]})\n"
-        end
-        if not @title \
-        or not defined? @title.main \
-        or @title.main !~/[\S]/
-          if @fns =~/\.ssm$/ \
-          and  @opt.inspect =~/P/
-            #@title=Md.new('Text Insert',@opt,@env).title
-          else
-            SiSU_Screen::Ansi.new(
-              @opt.act[:color_state][:set],
-              'WARNING: Document Title missing',
-              'please provide @title:'
-            ).warn unless @opt.act[:quiet][:set]==:on
+          @pagenew,@pagebreak,@pageline,@num_top,@toc_lev_limit=translated
+          @markup=@markup.gsub(/page_new\s*=\s*([\dA-C])/,"page_new=#{@pagenew}").
+            gsub(/page_break\s*=\s*([\dA-C])/,"page_break=#{@pagebreak}").
+            gsub(/page_line\s*=\s*([\dA-C])/,"page_line=#{@pageline}").
+            gsub(/num_top\s*=\s*([\dA-C])/,"num_top=#{@num_top}").
+            gsub(/toc_lev_limit\s*=\s*([\dA-C])/,"toc_lev_limit=#{@toc_lev_limit}")
+          papersize_array_rc=@papersize.downcase.scan(/(?:a4|letter|legal|book|a5|b5)/)
+          papersize_array_opt=[
+            ((@opt.act[:pdf_a4][:set]==:on)     ? 'a4'     : ''),
+            ((@opt.act[:pdf_a5][:set]==:on)     ? 'a5'     : ''),
+            ((@opt.act[:pdf_b5][:set]==:on)     ? 'b5'     : ''),
+            ((@opt.act[:pdf_letter][:set]==:on) ? 'letter' : ''),
+            ((@opt.act[:pdf_legal][:set]==:on)  ? 'legal'  : ''),
+          ] - [""]
+          @papersize_array=(papersize_array_opt.length > 0) \
+          ? papersize_array_opt
+          : papersize_array_rc
+          fn=@opt.fno #decide what to do a filesize on .ssm tells very little about actual document size
+          @filesize=(File.size(fn)).to_s
+          if @sys.openssl !=false \
+          and FileTest.file?(@env.source_file_with_path)
+            @dgst=[]
+            case @env.digest(@opt).type
+            when :sha512
+              dgst=@sys.sha512(@env.source_file_with_path)
+              @dgst=dgst[1].length==128 ? dgst : nil
+              puts 'check document (sha512) digest' if not @dgst
+            when :sha256
+              dgst=@sys.sha256(@env.source_file_with_path)
+              @dgst=dgst[1].length==64 ? dgst : nil
+              puts 'check document (sha256) digest' if not @dgst
+            when :md5
+              dgst=@sys.md5(@env.source_file_with_path)
+              @dgst=dgst[1].length==32 ? dgst : nil
+              puts 'check document (md5) digest' if not @dgst
+            else
+              dgst=@sys.sha256(@env.source_file_with_path)
+              @dgst=dgst[1].length==64 ? dgst : nil
+              puts 'check document (sha256) digest' if not @dgst
+            end
+          elsif not FileTest.file?(@env.source_file_with_path)
+            #puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:fuchsia)
           end
-        end
-        if @author !~/[\S]/
-          if @fns =~/\.ssm$/ \
-          and  @opt.inspect =~/P/
-            #@creator=SiSU_Param::Md.new('Text Insert',@opt,@env).creator
-          else
+          @publisher ||= "#{@@publisher} (this copy)"
+          fn_set_lang=SiSU_Env::StandardiseLanguage.new(@opt.lng).language
+          unless @language[:code] \
+          and @language[:name]
+            lang=@env.i18n.language #default language settings for directory by name, or in sysrc.yml
+            @language[:code] ||= lang.code
+            @language[:name] ||= lang.title
+          end
+          unless fn_set_lang[:d]==true #decide, naming convention overrides other settings, within document, etc.
+            @language[:code]=fn_set_lang[:c]
+            @language[:name]=fn_set_lang[:n]
+          end
+          @fnl=@env.i18n.lang_filename(fn_set_lang[:c])
+          @lang=@lang.uniq
+          @fn=SiSU_Env::EnvCall.new(@fns).lang(fn_set_lang[:c])
+          if @en[:note] > 0 \
+          and @en[:sum] > 0
+            if @en[:sum] > 0
+            else
+              SiSU_Screen::Ansi.new(
+                @opt.act[:color_state][:set],
+                '*WARN* both endnote styles used',
+                "~{ #{@en[:sum]} }~ and ^~ #{@en[:mark]}"
+              ).warn unless @opt.act[:quiet][:set]==:on
+            end
+          end
+          if @en[:mark] != @en[:note] \
+          and @en[:note] > 0
+            @en[:mismatch]=@en[:note] - @en[:mark]
             SiSU_Screen::Ansi.new(
               @opt.act[:color_state][:set],
-              'WARNING: Document Author missing',
-              'please provide @creator: :author:'
+              '*WARN* endnote number mismatch',
+              "endnotes: #{@en[:note]} != endnote reference marks: #{@en[:mark]} (difference = #{@en[:mismatch]})"
             ).warn unless @opt.act[:quiet][:set]==:on
+            footnote_conversion_errors=File.new("#{Dir.pwd}/footnote_conversion_errors.txt",'a')
+            footnote_conversion_errors <<
+              "#{@fns}:\n\tendnotes: #{@en[:note]} != endnote reference marks: #{@en[:mark]} (difference = #{@en[:mismatch]})\n"
           end
-        end
-        @struct={}
-        doc_struct=Hash.new(0)
-        if @lv1.nil?
-          fns_array.each do |para|
-            if para =~/^(Part|Chapter|Section|Article)\b/i
-              case para
-              when /^(Part|PART)\b/
-                @struct[:part]=doc_struct[:part]
-                doc_struct[:part]=doc_struct[:part] + 1
-              when /^(Chapter|CHAPTER)\b/
-                @struct[:chapter]=doc_struct[:chapter]
-                doc_struct[:chapter]=doc_struct[:chapter] + 1
-              when /^(Section|SECTION)\b/
-                @struct[:section]=doc_struct[:section]
-                doc_struct[:section]=doc_struct[:section] + 1
-              when /^(Article|ARTICLE)\b/
-                @struct[:article]=doc_struct[:article]
-                doc_struct[:article]=doc_struct[:article] + 1
-              when /^(Clause|CLAUSE)\b/
-                @struct[:clause]=doc_struct[:clause]
-                doc_struct[:clause]=doc_struct[:clause] + 1
-              when /^\d\..*[^\.]$/
-                @struct[:number]=doc_struct[:number]
-                doc_struct[:number]=doc_struct[:number] + 1
-              end
+          if not @title \
+          or not defined? @title.main \
+          or @title.main !~/[\S]/
+            if @fns =~/\.ssm$/ \
+            and  @opt.inspect =~/P/
+              #@title=Md.new('Text Insert',@opt,@env).title
+            else
+              SiSU_Screen::Ansi.new(
+                @opt.act[:color_state][:set],
+                'WARNING: Document Title missing',
+                'please provide @title:'
+              ).warn unless @opt.act[:quiet][:set]==:on
             end
           end
-          if doc_struct[:article] > 2                                            #%~level 4
-            @lv4=/^(?:Article|ARTICLE)\b/
-          elsif doc_struct[:chapter] > 2 \
-          and doc_struct[:article] \
-          and doc_struct[:article] < 3
-            @lv4=/^(?:Chapter|CHAPTER)\b/
-          elsif doc_struct[:clause] > 2
-            @lv4=/^(?:Clause|CLAUSE)\b/
-          elsif doc_struct[:number] > 2
-            @lv4="^\d\..*[^\.]$"
-          end
-          if doc_struct[:section] > 2                                           #%~level 3
-            @lv3=/^(?:Section|SECTION)\b/
-          end
-          if doc_struct[:chapter] > 2 \
-          and doc_struct[:article] \
-          and doc_struct[:article] > 2
-            @lv2=/^(?:Chapter|CHAPTER)\b/
-          end
-          if doc_struct[:part] > 2 \
-          and @lv[2].nil?
-            @lv2=/^(?:Part|PART)\b/
+          if @author !~/[\S]/
+            if @fns =~/\.ssm$/ \
+            and  @opt.inspect =~/P/
+              #@creator=SiSU_Param::Md.new('Text Insert',@opt,@env).creator
+            else
+              SiSU_Screen::Ansi.new(
+                @opt.act[:color_state][:set],
+                'WARNING: Document Author missing',
+                'please provide @creator: :author:'
+              ).warn unless @opt.act[:quiet][:set]==:on
+            end
           end
-          if doc_struct[:part] > 2 \
-          and @lv[2].inspect !~/Part/ \
-          and @lv[1].nil?
-            @lv1=/^(Part|PART)\b/
+          @struct={}
+          doc_struct=Hash.new(0)
+          if @lv1.nil?
+            fns_array.each do |para|
+              if para =~/^(Part|Chapter|Section|Article)\b/i
+                case para
+                when /^(Part|PART)\b/
+                  @struct[:part]=doc_struct[:part]
+                  doc_struct[:part]=doc_struct[:part] + 1
+                when /^(Chapter|CHAPTER)\b/
+                  @struct[:chapter]=doc_struct[:chapter]
+                  doc_struct[:chapter]=doc_struct[:chapter] + 1
+                when /^(Section|SECTION)\b/
+                  @struct[:section]=doc_struct[:section]
+                  doc_struct[:section]=doc_struct[:section] + 1
+                when /^(Article|ARTICLE)\b/
+                  @struct[:article]=doc_struct[:article]
+                  doc_struct[:article]=doc_struct[:article] + 1
+                when /^(Clause|CLAUSE)\b/
+                  @struct[:clause]=doc_struct[:clause]
+                  doc_struct[:clause]=doc_struct[:clause] + 1
+                when /^\d\..*[^\.]$/
+                  @struct[:number]=doc_struct[:number]
+                  doc_struct[:number]=doc_struct[:number] + 1
+                end
+              end
+            end
+            if doc_struct[:article] > 2                                            #%~level 4
+              @lv4=/^(?:Article|ARTICLE)\b/
+            elsif doc_struct[:chapter] > 2 \
+            and doc_struct[:article] \
+            and doc_struct[:article] < 3
+              @lv4=/^(?:Chapter|CHAPTER)\b/
+            elsif doc_struct[:clause] > 2
+              @lv4=/^(?:Clause|CLAUSE)\b/
+            elsif doc_struct[:number] > 2
+              @lv4="^\d\..*[^\.]$"
+            end
+            if doc_struct[:section] > 2                                           #%~level 3
+              @lv3=/^(?:Section|SECTION)\b/
+            end
+            if doc_struct[:chapter] > 2 \
+            and doc_struct[:article] \
+            and doc_struct[:article] > 2
+              @lv2=/^(?:Chapter|CHAPTER)\b/
+            end
+            if doc_struct[:part] > 2 \
+            and @lv[2].nil?
+              @lv2=/^(?:Part|PART)\b/
+            end
+            if doc_struct[:part] > 2 \
+            and @lv[2].inspect !~/Part/ \
+            and @lv[1].nil?
+              @lv1=/^(Part|PART)\b/
+            end
           end
+          @lnk=@lnk.compact if @lnk
+          @lv0 ||=/^0~/
+          @lv1 ||=/^1~/
+          @lv2 ||=/^2~/
+          @lv3 ||=/^3~/
+          @lv4 ||=/^4~/
+          @lv5 ||=/^5~/
+          @lv6 ||=/^6~/
+          @data=nil #else whole file's contents are stored in md pstore & is not required to be... big waste actually
+          @file=SiSU_Env::FileOp.new(self) #watch
+          Store.new(self,@env).store                                             #% pstore
+          self
+        rescue
         end
-        @lnk=@lnk.compact if @lnk
-        @lv0 ||=/^0~/
-        @lv1 ||=/^1~/
-        @lv2 ||=/^2~/
-        @lv3 ||=/^3~/
-        @lv4 ||=/^4~/
-        @lv5 ||=/^5~/
-        @lv6 ||=/^6~/
-        @data=nil #else whole file's contents are stored in md pstore & is not required to be... big waste actually
-        @file=SiSU_Env::FileOp.new(self) #watch
-        Store.new(self,@env).store                                             #% pstore
-        self
       end
       private
       class Store
diff --git a/lib/sisu/v5/param_identify_markup.rb b/lib/sisu/v5/dp_identify_markup.rb
index f6884c7d..f6884c7d 100644
--- a/lib/sisu/v5/param_identify_markup.rb
+++ b/lib/sisu/v5/dp_identify_markup.rb
diff --git a/lib/sisu/v5/param_make.rb b/lib/sisu/v5/dp_make.rb
index 578e4fb9..05b5cbdf 100644
--- a/lib/sisu/v5/param_make.rb
+++ b/lib/sisu/v5/dp_make.rb
@@ -57,7 +57,7 @@
    <ralph@amissah.com>
    <ralph.amissah@gmail.com>
 
- ** Description: make parameters extracted for program use
+ ** Description: document parameters make extracted for program use
 
 =end
 
diff --git a/lib/sisu/v5/embedded.rb b/lib/sisu/v5/embedded.rb
index c013806b..b46975fd 100644
--- a/lib/sisu/v5/embedded.rb
+++ b/lib/sisu/v5/embedded.rb
@@ -61,9 +61,9 @@
 
 =end
 module SiSU_Embedded
-  require_relative 'param'                              # param.rb
+  require_relative 'dp'                                 # dp.rb
     include SiSU_Param
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   class Source
     def initialize(opt)
diff --git a/lib/sisu/v5/errors.rb b/lib/sisu/v5/errors.rb
index f4e05091..c3468043 100644
--- a/lib/sisu/v5/errors.rb
+++ b/lib/sisu/v5/errors.rb
@@ -61,7 +61,7 @@
 
 =end
 module SiSU_Errors
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env; include SiSU_Screen
   class Rescued <CreateFile
     def initialize(error,errorlist,cmd,fns='')
diff --git a/lib/sisu/v5/git.rb b/lib/sisu/v5/git.rb
index e7d2fcc1..5d3ffb8e 100644
--- a/lib/sisu/v5/git.rb
+++ b/lib/sisu/v5/git.rb
@@ -61,8 +61,8 @@
 
 =end
 module SiSU_Git
-  require_relative 'param'                              # param.rb
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'dp'                                 # dp.rb
+  require_relative 'se'                                 # se.rb
   require_relative 'ao'                                 # ao.rb
   class Source
     def initialize(opt)
diff --git a/lib/sisu/v5/harvest.rb b/lib/sisu/v5/harvest.rb
index 053df905..cc12b08e 100644
--- a/lib/sisu/v5/harvest.rb
+++ b/lib/sisu/v5/harvest.rb
@@ -65,10 +65,10 @@
 module SiSU_Harvest
   @@the_idx_topics,@@the_idx_authors={},{}
   class Source
-    require_relative 'options'                              # options.rb
+    require_relative 'hub_options'                          # hub_options.rb
     require_relative 'harvest_topics'                       # harvest_topics.rb
     require_relative 'harvest_authors'                      # harvest_authors.rb
-    require_relative 'sysenv'                               # sysenv.rb
+    require_relative 'se'                                   # se.rb
       include SiSU_Env
     def initialize(opt)
       @opt=opt
diff --git a/lib/sisu/v5/author_format.rb b/lib/sisu/v5/harvest_author_format.rb
index 3bda7904..42238924 100644
--- a/lib/sisu/v5/author_format.rb
+++ b/lib/sisu/v5/harvest_author_format.rb
@@ -51,7 +51,7 @@
 
  * Git
    <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/author_format.rb;hb=HEAD>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/harvest_author_format.rb;hb=HEAD>
 
  * Ralph Amissah
    <ralph@amissah.com>
diff --git a/lib/sisu/v5/harvest_authors.rb b/lib/sisu/v5/harvest_authors.rb
index 361b9a8f..7904ab15 100644
--- a/lib/sisu/v5/harvest_authors.rb
+++ b/lib/sisu/v5/harvest_authors.rb
@@ -62,7 +62,7 @@
 
 =end
 module SiSU_HarvestAuthors
-  require_relative 'author_format'                      # author_format.rb
+  require_relative 'harvest_author_format'              # harvest_author_format.rb
   class Songsheet
     @@the_idx_authors={}
     def initialize(opt,env)
diff --git a/lib/sisu/v5/harvest_topics.rb b/lib/sisu/v5/harvest_topics.rb
index c68293b0..cd507f63 100644
--- a/lib/sisu/v5/harvest_topics.rb
+++ b/lib/sisu/v5/harvest_topics.rb
@@ -63,7 +63,7 @@
 
 =end
 module SiSU_HarvestTopics
-  require_relative 'author_format'                      # author_format.rb
+  require_relative 'harvest_author_format'              # harvest_author_format.rb
   include SiSU_Viz
   class Songsheet
     @@the_idx_topics={}
diff --git a/lib/sisu/v5/html.rb b/lib/sisu/v5/html.rb
index 526b41c6..a613f56f 100644
--- a/lib/sisu/v5/html.rb
+++ b/lib/sisu/v5/html.rb
@@ -66,7 +66,7 @@ module SiSU_HTML
   rescue LoadError
     SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('pstore NOT FOUND (LoadError)')
   end
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
   require_relative 'defaults'                           # defaults.rb
     include SiSU_Viz
diff --git a/lib/sisu/v5/html_concordance.rb b/lib/sisu/v5/html_concordance.rb
index 7bbb1a4c..dbaf83cf 100644
--- a/lib/sisu/v5/html_concordance.rb
+++ b/lib/sisu/v5/html_concordance.rb
@@ -62,9 +62,9 @@
 
 =end
 module SiSU_Concordance
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   require_relative 'defaults'                           # defaults.rb
     include SiSU_Viz
@@ -212,7 +212,7 @@ WOK
         include SiSU_Viz
       require_relative 'html_format'                    # html_format.rb
         include SiSU_HTML_Format
-      require_relative 'sysenv'                         # sysenv.rb
+      require_relative 'se'                             # se.rb
         include SiSU_Screen
       @@dp=nil
       def initialize(particulars)
diff --git a/lib/sisu/v5/html_lite_shared.rb b/lib/sisu/v5/html_lite_shared.rb
index 3ce59049..e9497698 100644
--- a/lib/sisu/v5/html_lite_shared.rb
+++ b/lib/sisu/v5/html_lite_shared.rb
@@ -66,7 +66,7 @@ module SiSU_FormatShared
     include SiSU_Viz
   class CSS_Format
     require_relative 'defaults'                         # defaults.rb
-    require_relative 'particulars'                      # particulars.rb
+    require_relative 'se_hub_particulars'               # se_hub_particulars.rb
     @@fns=nil
     def initialize(md,t_o)
       @md,@t_o=md,t_o
diff --git a/lib/sisu/v5/html_promo.rb b/lib/sisu/v5/html_promo.rb
index f10bdb51..87f9bb31 100644
--- a/lib/sisu/v5/html_promo.rb
+++ b/lib/sisu/v5/html_promo.rb
@@ -61,7 +61,7 @@
 
 =end
 module SiSU_HTML_Promo
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   class Ad
     def initialize(md)
diff --git a/lib/sisu/v5/html_tune.rb b/lib/sisu/v5/html_tune.rb
index 39cbb708..1a2c9dee 100644
--- a/lib/sisu/v5/html_tune.rb
+++ b/lib/sisu/v5/html_tune.rb
@@ -60,9 +60,9 @@
  ** Description: html generation, html pre-processing
 
 =end
-require_relative 'param'
+require_relative 'dp'                                   # dp.rb
 module SiSU_HTML_Tune
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env; include SiSU_Screen
   require_relative 'html_format'                        # html_format.rb #watch
   @@line_mode=''
diff --git a/lib/sisu/v5/hub.rb b/lib/sisu/v5/hub.rb
index 510e2092..785da84d 100644
--- a/lib/sisu/v5/hub.rb
+++ b/lib/sisu/v5/hub.rb
@@ -63,11 +63,11 @@
 =end
 module SiSU
   require_relative 'constants'                         # constants.rb
-  require_relative 'sysenv'                            # sysenv.rb
+  require_relative 'se'                                # se.rb
     include SiSU_Env
     include SiSU_Screen
-  require_relative 'options'                           # options.rb
-  require_relative 'param'                             # param.rb
+  require_relative 'hub_options'                       # hub_options.rb
+  require_relative 'dp'                                # dp.rb
     include SiSU_Param
   require_relative 'defaults'                          # defaults.rb
     include SiSU_Viz
@@ -599,10 +599,10 @@ module SiSU
       else
       end
       if @opt.act[:urls_selected][:set]==:on           #% --sitemap, -Y
-       require_relative 'urls'
-       OptionLoopFiles.new(@opt).loop_files_on_given_option do
-         SiSU_Urls::Source.new(@opt).read              #% -u -v -V -M
-       end
+        require_relative 'urls'
+        OptionLoopFiles.new(@opt).loop_files_on_given_option do
+          SiSU_Urls::Source.new(@opt).read              #% -u -v -V -M
+        end
       end
     end
     def do_initialization
diff --git a/lib/sisu/v5/options.rb b/lib/sisu/v5/hub_options.rb
index eede713a..f851b985 100644
--- a/lib/sisu/v5/options.rb
+++ b/lib/sisu/v5/hub_options.rb
@@ -51,7 +51,7 @@
 
  * Git
    <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/options.rb;hb=HEAD>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/hub_options.rb;hb=HEAD>
 
  * Ralph Amissah
    <ralph@amissah.com>
@@ -67,8 +67,8 @@ module SiSU_Commandline
   rescue LoadError
     SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('pathname NOT FOUND (LoadError)')
   end
-  require_relative 'sysenv'                             # sysenv.rb
-  require_relative 'param_make'                         # param_make.rb
+  require_relative 'se'                                 # se.rb
+  require_relative 'dp_make'                            # dp_make.rb
   class HeaderCommon
     def sisu_document_make_instructions(make_instruct_array=:nil)
       @pagenew=
@@ -1394,6 +1394,6 @@ module SiSU_Commandline
   end
 end
 __END__
-note usually named @opt is carried in Param (usually as @md.opt), @opt is a
+note usually named @opt is carried in dp document parameters (usually as @md.opt), @opt is a
 subset of @md where @md is passed, contents of @opt are available as @md.opt
 passing @opt as well is duplication check for fns & fnb
diff --git a/lib/sisu/v5/manifest.rb b/lib/sisu/v5/manifest.rb
index 1afe1deb..f2a9e748 100644
--- a/lib/sisu/v5/manifest.rb
+++ b/lib/sisu/v5/manifest.rb
@@ -61,15 +61,15 @@
 
 =end
 module SiSU_Manifest
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   require_relative 'prog_text_translation'              # prog_text_translation.rb
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
   require_relative 'html_minitoc'                       # html_minitoc.rb
   require_relative 'html'                               # html.rb
     include SiSU_HTML_Format
-  require_relative 'param'                              # param.rb
+  require_relative 'dp'                                 # dp.rb
     include SiSU_Param
   require_relative 'i18n'                               # i18n.rb
   include SiSU_Viz
diff --git a/lib/sisu/v5/manpage.rb b/lib/sisu/v5/manpage.rb
index a59ba835..0bcf1799 100644
--- a/lib/sisu/v5/manpage.rb
+++ b/lib/sisu/v5/manpage.rb
@@ -63,7 +63,7 @@
 =end
 module SiSU_Manpage
   require_relative 'ao'                                 # ao.rb
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   include SiSU_Param
   include SiSU_Viz
diff --git a/lib/sisu/v5/manpage_format.rb b/lib/sisu/v5/manpage_format.rb
index 7a9ea98b..c46a3c7b 100644
--- a/lib/sisu/v5/manpage_format.rb
+++ b/lib/sisu/v5/manpage_format.rb
@@ -61,7 +61,7 @@
 
 =end
 module SiSU_ManpageFormat
-  require_relative 'param'                              # param.rb
+  require_relative 'dp'                                 # dp.rb
     include SiSU_Param
   include SiSU_Viz
   class ParagraphNumber
diff --git a/lib/sisu/v5/po4a.rb b/lib/sisu/v5/po4a.rb
index 3b800e83..b5086eb7 100644
--- a/lib/sisu/v5/po4a.rb
+++ b/lib/sisu/v5/po4a.rb
@@ -63,7 +63,7 @@
 =end
 module SiSU_Po4a
   require_relative 'ao'                                 # ao.rb
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   require_relative 'ao_composite'                       # ao_composite.rb
   require_relative 'shared_metadata'                    # shared_metadata.rb
diff --git a/lib/sisu/v5/prog_text_translation.rb b/lib/sisu/v5/prog_text_translation.rb
index 98319960..9a7db086 100644
--- a/lib/sisu/v5/prog_text_translation.rb
+++ b/lib/sisu/v5/prog_text_translation.rb
@@ -61,7 +61,7 @@
 
 =end
 module SiSU_Translate
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env; include SiSU_Param
   class Source
     def initialize(md,doc_lang,trans_str='')
diff --git a/lib/sisu/v5/qrcode.rb b/lib/sisu/v5/qrcode.rb
index f6fd78bf..19d310c1 100644
--- a/lib/sisu/v5/qrcode.rb
+++ b/lib/sisu/v5/qrcode.rb
@@ -61,13 +61,13 @@
 
 =end
 module SiSU_QRcode
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   require_relative 'prog_text_translation'              # prog_text_translation.rb
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
   require_relative 'html'                               # html.rb
-  require_relative 'param'                              # param.rb
+  require_relative 'dp'                                 # dp.rb
     include SiSU_Param
   require_relative 'i18n'                               # i18n.rb
   include SiSU_Viz
diff --git a/lib/sisu/v5/relaxng.rb b/lib/sisu/v5/relaxng.rb
index f6e86470..ebef4a31 100644
--- a/lib/sisu/v5/relaxng.rb
+++ b/lib/sisu/v5/relaxng.rb
@@ -61,7 +61,7 @@
 
 =end
 module SiSU_Relaxng
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
   class RelaxNG
     def gpl3_or_later
       @gpl3_or_later =<<RELAXNG
diff --git a/lib/sisu/v5/remote.rb b/lib/sisu/v5/remote.rb
index 672eff9e..1a1a9f0a 100644
--- a/lib/sisu/v5/remote.rb
+++ b/lib/sisu/v5/remote.rb
@@ -61,7 +61,7 @@
 
 =end
 module SiSU_Remote
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   class Put
     def initialize(opt)
diff --git a/lib/sisu/v5/rexml.rb b/lib/sisu/v5/rexml.rb
index f7a2c968..c4512872 100644
--- a/lib/sisu/v5/rexml.rb
+++ b/lib/sisu/v5/rexml.rb
@@ -67,9 +67,9 @@ module SiSU_Rexml
   rescue LoadError
     SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('rexml/document NOT FOUND (LoadError)')
   end
-  require_relative 'param'                              # param.rb
+  require_relative 'dp'                                 # dp.rb
     include SiSU_Param
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   include SiSU_Viz
   class Rexml
diff --git a/lib/sisu/v5/sysenv.rb b/lib/sisu/v5/se.rb
index 0d67733f..cefd45d5 100644
--- a/lib/sisu/v5/sysenv.rb
+++ b/lib/sisu/v5/se.rb
@@ -51,7 +51,7 @@
 
  * Git
    <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/sysenv.rb;hb=HEAD>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se.rb;hb=HEAD>
 
  * Ralph Amissah
    <ralph@amissah.com>
@@ -156,7 +156,7 @@ module SiSU_Env
   end
 end
 module SiSU_Screen
-  require_relative 'screen_text_color'                  # screen_text_color.rb
+  require_relative 'utils_screen_text_color'               # utils_screen_text_color.rb
 end
 module SiSU_Errors
   require_relative 'errors'                             # errors.rb
diff --git a/lib/sisu/v5/se_createsite.rb b/lib/sisu/v5/se_createsite.rb
index 42d86aad..33e334ce 100644
--- a/lib/sisu/v5/se_createsite.rb
+++ b/lib/sisu/v5/se_createsite.rb
@@ -63,7 +63,7 @@
 module SiSU_Create_Site
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
-  require_relative 'screen_text_color'                     # screen_text_color.rb
+  require_relative 'utils_screen_text_color'               # utils_screen_text_color.rb
   require_relative 'se_info_env'                           # se_info_env.rb
   begin
     require 'fileutils'
diff --git a/lib/sisu/v5/se_filemap.rb b/lib/sisu/v5/se_filemap.rb
index 99de4a0c..0c4c84c0 100644
--- a/lib/sisu/v5/se_filemap.rb
+++ b/lib/sisu/v5/se_filemap.rb
@@ -145,7 +145,7 @@ module SiSU_File_Map
             ft << @md.fn[:xml_scaffold_structure_collapse]
           end
           @fnb=@md.fnb
-        else   # still needed where/when param is not parsed
+        else   # still needed where/when dp document param is not parsed
           if @opt.act[:html][:set]==:on                    #% --html, -h -H
             ft << '.html' << '.html.??'
           end
diff --git a/lib/sisu/v5/particulars.rb b/lib/sisu/v5/se_hub_particulars.rb
index 6efbc94c..4372ac72 100644
--- a/lib/sisu/v5/particulars.rb
+++ b/lib/sisu/v5/se_hub_particulars.rb
@@ -52,7 +52,7 @@
 
  * Git
    <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/particulars.rb;hb=HEAD>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_hub_particulars.rb;hb=HEAD>
 
  * Ralph Amissah
    <ralph@amissah.com>
@@ -67,9 +67,9 @@ module SiSU_Particulars
   rescue LoadError
     SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('singleton NOT FOUND (LoadError)')
   end
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
-  require_relative 'param'                              # param.rb
+  require_relative 'dp'                                 # dp.rb
     include SiSU_Param
   require_relative 'ao'                                 # ao.rb
   class CombinedSingleton
diff --git a/lib/sisu/v5/shared_images.rb b/lib/sisu/v5/shared_images.rb
index e307eba3..c1e9abdc 100644
--- a/lib/sisu/v5/shared_images.rb
+++ b/lib/sisu/v5/shared_images.rb
@@ -60,7 +60,7 @@
  ** Description: common file for xml generation
 =end
 module SiSU_Images
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
   class Source
     def initialize(opt)
       @particulars=SiSU_Particulars::CombinedSingleton.instance.get_all(opt)
diff --git a/lib/sisu/v5/shared_sem.rb b/lib/sisu/v5/shared_sem.rb
index 860457bb..6ddc3f45 100644
--- a/lib/sisu/v5/shared_sem.rb
+++ b/lib/sisu/v5/shared_sem.rb
@@ -62,7 +62,7 @@
 
 =end
 module SiSU_Sem
-  require_relative 'param'                              # param.rb
+  require_relative 'dp'                                 # dp.rb
   class Tags
     def initialize(para,md)
       @para,@md=para,md
diff --git a/lib/sisu/v5/sitemaps.rb b/lib/sisu/v5/sitemaps.rb
index b76d2d60..2d157096 100644
--- a/lib/sisu/v5/sitemaps.rb
+++ b/lib/sisu/v5/sitemaps.rb
@@ -57,13 +57,13 @@
    <ralph@amissah.com>
    <ralph.amissah@gmail.com>
 
- ** Description: sitemap created from parameters extracted from input file(s)
+ ** Description: sitemap created from document parameters
 
 =end
 module SiSU_Sitemaps
-  require_relative 'param'                              # param.rb
+  require_relative 'dp'                                 # dp.rb
     include SiSU_Param
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   require_relative 'xml_shared'                         # xml_shared.rb
     include SiSU_XML_Munge
diff --git a/lib/sisu/v5/src_kdissert_share.rb b/lib/sisu/v5/src_kdissert_share.rb
index abf2f2d1..e67d4249 100644
--- a/lib/sisu/v5/src_kdissert_share.rb
+++ b/lib/sisu/v5/src_kdissert_share.rb
@@ -61,7 +61,7 @@
 
 =end
 module SiSU_KdiSource
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   class Source
     begin
diff --git a/lib/sisu/v5/src_share.rb b/lib/sisu/v5/src_share.rb
index f78b922f..be789e00 100644
--- a/lib/sisu/v5/src_share.rb
+++ b/lib/sisu/v5/src_share.rb
@@ -63,7 +63,7 @@
 module SiSU_Markup
   require_relative 'src_shared'                         # src_shared.rb
     include SiSU_Source
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   class Source < SiSU_Source::SiSUpodSource
     def initialize(opt,build=nil,place=nil)
diff --git a/lib/sisu/v5/src_shared.rb b/lib/sisu/v5/src_shared.rb
index 068120f5..2f6f8305 100644
--- a/lib/sisu/v5/src_shared.rb
+++ b/lib/sisu/v5/src_shared.rb
@@ -63,8 +63,8 @@
 module SiSU_Source
   include SiSU_Env
   class SiSUpodSource
-    require_relative 'sysenv'                           # sysenv.rb
-    require_relative 'particulars'                      # particulars.rb
+    require_relative 'se'                               # se.rb
+    require_relative 'se_hub_particulars'               # se_hub_particulars.rb
     def initialize(opt,build=nil,place=nil)
       @opt=opt
       @date=SiSU_Env::InfoDate.new.dt
diff --git a/lib/sisu/v5/src_sisupod_make.rb b/lib/sisu/v5/src_sisupod_make.rb
index 5dd8f038..fa5b6560 100644
--- a/lib/sisu/v5/src_sisupod_make.rb
+++ b/lib/sisu/v5/src_sisupod_make.rb
@@ -63,10 +63,10 @@
 module SiSU_Doc
   require_relative 'src_shared'                         # scr_shared.rb
     include SiSU_Source
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   class Source < SiSU_Source::SiSUpodSource
-    require_relative 'response'                         # response.rb
+    require_relative 'utils_response'                   # utils_response.rb
     def initialize(opt,build=nil,place=nil)
       super(opt,build,place)
       @zipfile=@opt.fno.gsub(/(?:\~\S{2,3})?(\.ss[tm])$/,'\1')
diff --git a/lib/sisu/v5/sst_convert_markup.rb b/lib/sisu/v5/sst_convert_markup.rb
index cdceba7c..6002e2fc 100644
--- a/lib/sisu/v5/sst_convert_markup.rb
+++ b/lib/sisu/v5/sst_convert_markup.rb
@@ -65,7 +65,7 @@
 module SiSU_Modify
   require_relative 'sst_identify_markup'                # sst_identify_markup.rb
   require_relative 'sst_from_xml'                       # sst_from_xml.rb
-  require_relative 'response'                           # response.rb
+  require_relative 'utils_response'                     # utils_response.rb
   class ConvertMarkup
     def initialize(opt)
       @opt=opt
@@ -311,7 +311,7 @@ WOK
   end
 end
 #%% files to match for this conversion set  ------------------------->
-require_relative 'options'                              # options.rb
+require_relative 'hub_options'                          # hub_options.rb
 argv=$*
 base_path=Dir.pwd
 @opt=SiSU_Commandline::Options.new(argv,base_path)
diff --git a/lib/sisu/v5/sst_do_inline_footnotes.rb b/lib/sisu/v5/sst_do_inline_footnotes.rb
index ac4c63d5..c3340fbd 100644
--- a/lib/sisu/v5/sst_do_inline_footnotes.rb
+++ b/lib/sisu/v5/sst_do_inline_footnotes.rb
@@ -64,9 +64,9 @@
 module SiSU_ConvertFootnotes
   require_relative 'defaults'                           # defaults.rb
     include SiSU_Viz
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
-  require_relative 'param'                              # param.rb
+  require_relative 'dp'                                 # dp.rb
     include SiSU_Param
   require_relative 'ao_syntax'                          # ao_syntax.rb
     include SiSU_AO_Syntax
@@ -277,7 +277,7 @@ module SiSU_ConvertFootnotes
       data=@data
       tuned_file=[]
       data.each do |para|
-        if @md.markup =~/0\.16|0\.37/                                    #parameters not extracted/available
+        if @md.markup =~/0\.16|0\.37/                   #parameters not extracted/available
           para.gsub!(/^0~\S+\s+/,'@\1: ')
           para.gsub!(/^1~/,':A~')
           para.gsub!(/^2~/,':B~')
diff --git a/lib/sisu/v5/sst_from_xml.rb b/lib/sisu/v5/sst_from_xml.rb
index 7ae4b446..b6fccd92 100644
--- a/lib/sisu/v5/sst_from_xml.rb
+++ b/lib/sisu/v5/sst_from_xml.rb
@@ -62,7 +62,7 @@
 
 =end
 module SiSU_sstFromXML
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
   class Convert
     begin
       require 'rexml/document'
diff --git a/lib/sisu/v5/sst_to_s_xml_sax.rb b/lib/sisu/v5/sst_to_s_xml_sax.rb
index acb3ac40..fe685983 100644
--- a/lib/sisu/v5/sst_to_s_xml_sax.rb
+++ b/lib/sisu/v5/sst_to_s_xml_sax.rb
@@ -61,13 +61,13 @@
 
 =end
 module SiSU_SimpleXML_ModelSax
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
   require_relative 'defaults'                           # defaults.rb
     include SiSU_Viz
-  require_relative 'param'                              # param.rb
+  require_relative 'dp'                                 # dp.rb
     include SiSU_Param
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   require_relative 'ao_doc_str'                         # ao_doc_str.rb
   require_relative 'xml_shared'                         # xml_shared.rb
diff --git a/lib/sisu/v5/termsheet.rb b/lib/sisu/v5/termsheet.rb
index 7e8a2a30..a3fe308d 100644
--- a/lib/sisu/v5/termsheet.rb
+++ b/lib/sisu/v5/termsheet.rb
@@ -62,8 +62,8 @@
       sample files must be provided - (saved till later as may confuse)
 
 =end
-require_relative 'sysenv'                               # sysenv.rb
-require_relative 'param'                                # param.rb
+require_relative 'se'                                   # se.rb
+require_relative 'dp'                                   # dp.rb
   include SiSU_Param
 @do,@done,@used,@html_output,@txt_input,@txt_output,@@report=Array.new(7){[]}
 @@info=nil
@@ -123,7 +123,7 @@ WOK
   @@report << @done << @used << "\n"
   @done,@used=[],[]
 end
-require_relative 'param'                                # param.rb
+require_relative 'dp'                                   # dp.rb
 @argv=$*
 @proc="#{@argv[0].to_s}"
 if @proc =~  /^-?[wft]/
diff --git a/lib/sisu/v5/texinfo.rb b/lib/sisu/v5/texinfo.rb
index 4c25c1ed..e792a989 100644
--- a/lib/sisu/v5/texinfo.rb
+++ b/lib/sisu/v5/texinfo.rb
@@ -62,7 +62,7 @@
 =end
 module SiSU_TexInfo
   require_relative 'html'                               # html.rb
-  require_relative 'param'                              # param.rb
+  require_relative 'dp'                                 # dp.rb
     include SiSU_Param
   include SiSU_Viz
   #include Stamp ... needed removed arbitrarily 2005w05/1 (warnings about undefined flags)
diff --git a/lib/sisu/v5/texinfo_format.rb b/lib/sisu/v5/texinfo_format.rb
index 4286f50b..5bc41442 100644
--- a/lib/sisu/v5/texinfo_format.rb
+++ b/lib/sisu/v5/texinfo_format.rb
@@ -62,7 +62,7 @@
 =end
 module SiSU_TexInfoFormat
   @@table_pg_break_counter=1
-  require_relative 'param'                              # param.rb
+  require_relative 'dp'                                 # dp.rb
     include SiSU_Param
   include SiSU_Viz
   class Texinfo
diff --git a/lib/sisu/v5/texpdf.rb b/lib/sisu/v5/texpdf.rb
index 8d6a01c5..b5d36602 100644
--- a/lib/sisu/v5/texpdf.rb
+++ b/lib/sisu/v5/texpdf.rb
@@ -68,7 +68,7 @@ module SiSU_TeX
   end
   require_relative 'defaults'                           # defaults.rb
     include SiSU_Viz
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
   require_relative 'texpdf_format'                      # texpdf_format.rb
     include SiSU_TeX_Pdf
@@ -87,7 +87,7 @@ module SiSU_TeX
     rescue LoadError
       SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('pstore NOT FOUND (LoadError)')
     end
-    require_relative 'sysenv'                           # sysenv.rb
+    require_relative 'se'                               # se.rb
       include SiSU_Env
     include SiSU_Viz
     require_relative 'ao'                               # ao.rb
diff --git a/lib/sisu/v5/txt_asciidoc.rb b/lib/sisu/v5/txt_asciidoc.rb
index 7ca3cc85..43e49f7b 100644
--- a/lib/sisu/v5/txt_asciidoc.rb
+++ b/lib/sisu/v5/txt_asciidoc.rb
@@ -62,7 +62,7 @@
 =end
 module SiSU_Txt_AsciiDoc
   require_relative 'ao'                                 # ao.rb
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   require_relative 'shared_metadata'                    # shared_metadata.rb
   require_relative 'txt_shared'                         # txt_shared.rb
diff --git a/lib/sisu/v5/txt_markdown.rb b/lib/sisu/v5/txt_markdown.rb
index 69bedbc5..1e4326a3 100644
--- a/lib/sisu/v5/txt_markdown.rb
+++ b/lib/sisu/v5/txt_markdown.rb
@@ -62,7 +62,7 @@
 =end
 module SiSU_Txt_Markdown
   require_relative 'ao'                                 # ao.rb
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   require_relative 'shared_metadata'                    # shared_metadata.rb
   require_relative 'txt_shared'                         # txt_shared.rb
diff --git a/lib/sisu/v5/txt_plain.rb b/lib/sisu/v5/txt_plain.rb
index 824d29c8..2f3cc134 100644
--- a/lib/sisu/v5/txt_plain.rb
+++ b/lib/sisu/v5/txt_plain.rb
@@ -63,7 +63,7 @@
 =end
 module SiSU_Txt_Plain
   require_relative 'ao'                                 # ao.rb
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   require_relative 'shared_metadata'                    # shared_metadata.rb
   require_relative 'txt_shared'                         # txt_shared.rb
diff --git a/lib/sisu/v5/txt_rst.rb b/lib/sisu/v5/txt_rst.rb
index c3978b06..f00c9e9c 100644
--- a/lib/sisu/v5/txt_rst.rb
+++ b/lib/sisu/v5/txt_rst.rb
@@ -62,7 +62,7 @@
 =end
 module SiSU_Txt_rST
   require_relative 'ao'                                 # ao.rb
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   require_relative 'shared_metadata'                    # shared_metadata.rb
   require_relative 'txt_shared'                         # txt_shared.rb
diff --git a/lib/sisu/v5/txt_textile.rb b/lib/sisu/v5/txt_textile.rb
index f5962b80..65c102fc 100644
--- a/lib/sisu/v5/txt_textile.rb
+++ b/lib/sisu/v5/txt_textile.rb
@@ -62,7 +62,7 @@
 =end
 module SiSU_Txt_Textile
   require_relative 'ao'                                 # ao.rb
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   require_relative 'shared_metadata'                    # shared_metadata.rb
   require_relative 'txt_shared'                         # txt_shared.rb
diff --git a/lib/sisu/v5/update.rb b/lib/sisu/v5/update.rb
index a4b6b2b3..2301990a 100644
--- a/lib/sisu/v5/update.rb
+++ b/lib/sisu/v5/update.rb
@@ -61,7 +61,7 @@
 
 =end
 module SiSU_UpdateControlFlag
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   include SiSU_Param
   class Check
diff --git a/lib/sisu/v5/urls.rb b/lib/sisu/v5/urls.rb
index cef51ab5..815fe65a 100644
--- a/lib/sisu/v5/urls.rb
+++ b/lib/sisu/v5/urls.rb
@@ -61,9 +61,9 @@
 
 =end
 module SiSU_Urls
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env; include SiSU_Screen
   class Source
     attr_reader :opt
diff --git a/lib/sisu/v5/response.rb b/lib/sisu/v5/utils_response.rb
index 969da001..88209b2c 100644
--- a/lib/sisu/v5/response.rb
+++ b/lib/sisu/v5/utils_response.rb
@@ -51,7 +51,7 @@
 
  * Git
    <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/response.rb;hb=HEAD>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/utils_response.rb;hb=HEAD>
 
  * Ralph Amissah
    <ralph@amissah.com>
diff --git a/lib/sisu/v5/screen_text_color.rb b/lib/sisu/v5/utils_screen_text_color.rb
index 42b0c698..42b0c698 100644
--- a/lib/sisu/v5/screen_text_color.rb
+++ b/lib/sisu/v5/utils_screen_text_color.rb
diff --git a/lib/sisu/v5/spell.rb b/lib/sisu/v5/utils_spell.rb
index 69b6da7e..886f6f7f 100644
--- a/lib/sisu/v5/spell.rb
+++ b/lib/sisu/v5/utils_spell.rb
@@ -51,7 +51,7 @@
 
  * Git
    <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/spell.rb;hb=HEAD>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/utils_spell.rb;hb=HEAD>
 
  * Ralph Amissah
    <ralph@amissah.com>
diff --git a/lib/sisu/v5/webrick.rb b/lib/sisu/v5/webrick.rb
index e43d8cd1..f6ff970b 100644
--- a/lib/sisu/v5/webrick.rb
+++ b/lib/sisu/v5/webrick.rb
@@ -70,7 +70,7 @@ module SiSU_Webserv
     rescue LoadError
       SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('time or webrick NOT FOUND (LoadError)')
     end
-    require_relative 'sysenv'                             # sysenv.rb
+    require_relative 'se'                                 # se.rb
       include SiSU_Env
       include SiSU_Screen
     def initialize
@@ -159,7 +159,7 @@ WOK
       get=Dir.pwd
       brick(@port,get)
     rescue
-      require_relative 'sysenv'                             # sysenv.rb
+      require_relative 'se'                                 # se.rb
       SiSU_Errors::Rescued.new($!,$@,'-W',nil).location do #fix
         __LINE__.to_s + ':' + __FILE__
       end
diff --git a/lib/sisu/v5/wikispeak.rb b/lib/sisu/v5/wikispeak.rb
index e54b8edd..a0fba849 100644
--- a/lib/sisu/v5/wikispeak.rb
+++ b/lib/sisu/v5/wikispeak.rb
@@ -62,7 +62,7 @@
 =end
 module SiSU_Wikispeak
   require_relative 'ao'                                 # ao.rb
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   include SiSU_Param
   include SiSU_Viz
diff --git a/lib/sisu/v5/xhtml.rb b/lib/sisu/v5/xhtml.rb
index e1efeeaf..4253e8eb 100644
--- a/lib/sisu/v5/xhtml.rb
+++ b/lib/sisu/v5/xhtml.rb
@@ -63,9 +63,9 @@
 module SiSU_XHTML
   require_relative 'defaults'                           # defaults.rb
     include SiSU_Viz
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   require_relative 'xml_shared'                         # xml_shared.rb
     include SiSU_XML_Munge
diff --git a/lib/sisu/v5/xhtml_epub2.rb b/lib/sisu/v5/xhtml_epub2.rb
index d0b4a7dc..9b110497 100644
--- a/lib/sisu/v5/xhtml_epub2.rb
+++ b/lib/sisu/v5/xhtml_epub2.rb
@@ -66,7 +66,7 @@ module SiSU_XHTML_EPUB2
   rescue LoadError
     SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('pstore NOT FOUND (LoadError)')
   end
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
   require_relative 'defaults'                           # defaults.rb
     include SiSU_Viz
diff --git a/lib/sisu/v5/xhtml_epub2_concordance.rb b/lib/sisu/v5/xhtml_epub2_concordance.rb
index cb498d0f..447dd72e 100644
--- a/lib/sisu/v5/xhtml_epub2_concordance.rb
+++ b/lib/sisu/v5/xhtml_epub2_concordance.rb
@@ -62,9 +62,9 @@
 
 =end
 module SiSU_XHTML_EPUB2_Concordance
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   require_relative 'defaults'                           # defaults.rb
     include SiSU_Viz
@@ -157,7 +157,7 @@ WOK
         include SiSU_Viz
       require_relative 'xhtml_epub2_format'             # xhtml_epub2_format.rb
         include SiSU_XHTML_EPUB2_Format
-      require_relative 'sysenv'                         # sysenv.rb
+      require_relative 'se'                             # se.rb
         include SiSU_Screen
       def initialize(particulars)
         @particulars=particulars
diff --git a/lib/sisu/v5/xhtml_epub2_tune.rb b/lib/sisu/v5/xhtml_epub2_tune.rb
index db234a19..aa748cf6 100644
--- a/lib/sisu/v5/xhtml_epub2_tune.rb
+++ b/lib/sisu/v5/xhtml_epub2_tune.rb
@@ -60,9 +60,9 @@
  ** Description: epub generation, epub pre-processing
 
 =end
-require_relative 'param'
+require_relative 'dp'                                   # dp.rb
 module SiSU_XHTML_EPUB2_Tune
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env; include SiSU_Screen
   require_relative 'xhtml_epub2_format'                 # xhtml_epub2_format.rb #watch
   @@line_mode=''
diff --git a/lib/sisu/v5/xml_docbook5.rb b/lib/sisu/v5/xml_docbook5.rb
index 0870c06e..8132a356 100644
--- a/lib/sisu/v5/xml_docbook5.rb
+++ b/lib/sisu/v5/xml_docbook5.rb
@@ -61,10 +61,10 @@
 
 =end
 module SiSU_XML_Docbook_Book
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
   require_relative 'ao'                                 # ao.rb
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   require_relative 'txt_shared'                         # txt_shared.rb
     include SiSU_TextUtils
diff --git a/lib/sisu/v5/xml_dom.rb b/lib/sisu/v5/xml_dom.rb
index b51a317a..a602eee3 100644
--- a/lib/sisu/v5/xml_dom.rb
+++ b/lib/sisu/v5/xml_dom.rb
@@ -63,9 +63,9 @@
 module SiSU_XML_DOM
   require_relative 'defaults'                           # defaults.rb
     include SiSU_Viz
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   require_relative 'ao'                                 # ao.rb
   require_relative 'xml_shared'                         # xml_shared.rb
diff --git a/lib/sisu/v5/xml_fictionbook2.rb b/lib/sisu/v5/xml_fictionbook2.rb
index 997f0b0a..74afc6ad 100644
--- a/lib/sisu/v5/xml_fictionbook2.rb
+++ b/lib/sisu/v5/xml_fictionbook2.rb
@@ -61,10 +61,10 @@
 
 =end
 module SiSU_XML_Fictionbook
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
   require_relative 'ao'                                 # ao.rb
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   require_relative 'txt_shared'                         # txt_shared.rb
     include SiSU_TextUtils
diff --git a/lib/sisu/v5/xml_format.rb b/lib/sisu/v5/xml_format.rb
index 7694f56b..871ec487 100644
--- a/lib/sisu/v5/xml_format.rb
+++ b/lib/sisu/v5/xml_format.rb
@@ -62,7 +62,7 @@
 
 =end
 module SiSU_XML_Format
-  require_relative 'param'                              # param.rb
+  require_relative 'dp'                                 # dp.rb
     include SiSU_Param
   include SiSU_Viz
   class ParagraphNumber
diff --git a/lib/sisu/v5/xml_md_oai_pmh_dc.rb b/lib/sisu/v5/xml_md_oai_pmh_dc.rb
index 7ec83ff2..9279ba11 100644
--- a/lib/sisu/v5/xml_md_oai_pmh_dc.rb
+++ b/lib/sisu/v5/xml_md_oai_pmh_dc.rb
@@ -61,9 +61,9 @@
 
 =end
 module SiSU_XML_Metadata
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
-  require_relative 'param'                              # param.rb
+  require_relative 'dp'                                 # dp.rb
     include SiSU_Param
   class OAI_PMH
     def initialize(opt)
diff --git a/lib/sisu/v5/xml_odf_odt.rb b/lib/sisu/v5/xml_odf_odt.rb
index df71ce81..55c8d7ed 100644
--- a/lib/sisu/v5/xml_odf_odt.rb
+++ b/lib/sisu/v5/xml_odf_odt.rb
@@ -61,10 +61,10 @@
 
 =end
 module SiSU_XML_ODF_ODT
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
   require_relative 'ao'                                 # ao.rb
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   include SiSU_Viz
   require_relative 'xml_odf_odt_format'                 # xml_odf_odt_format.rb
diff --git a/lib/sisu/v5/xml_odf_odt_format.rb b/lib/sisu/v5/xml_odf_odt_format.rb
index b56e4284..bfbd075c 100644
--- a/lib/sisu/v5/xml_odf_odt_format.rb
+++ b/lib/sisu/v5/xml_odf_odt_format.rb
@@ -61,7 +61,7 @@
 
 =end
 module SiSU_XML_ODF_ODT_Format
-  require_relative 'param'                              # param.rb
+  require_relative 'dp'                                 # dp.rb
     include SiSU_Param
   include SiSU_Viz
   class ParagraphNumber
diff --git a/lib/sisu/v5/xml_sax.rb b/lib/sisu/v5/xml_sax.rb
index ac2b6d47..58719798 100644
--- a/lib/sisu/v5/xml_sax.rb
+++ b/lib/sisu/v5/xml_sax.rb
@@ -63,9 +63,9 @@
 module SiSU_XML_SAX
   require_relative 'defaults'                           # defaults.rb
     include SiSU_Viz
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   require_relative 'xml_shared'                         # xml_shared.rb
     include SiSU_XML_Munge
diff --git a/lib/sisu/v5/xml_scaffold_structure_collapsed.rb b/lib/sisu/v5/xml_scaffold_structure_collapsed.rb
index 0395d090..f36c937f 100644
--- a/lib/sisu/v5/xml_scaffold_structure_collapsed.rb
+++ b/lib/sisu/v5/xml_scaffold_structure_collapsed.rb
@@ -61,10 +61,10 @@
 
 =end
 module SiSU_XML_Scaffold_Structure_Collapse
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
   require_relative 'ao'                                 # ao.rb
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   class Source
     def initialize(opt)
diff --git a/lib/sisu/v5/xml_scaffold_structure_sisu.rb b/lib/sisu/v5/xml_scaffold_structure_sisu.rb
index 39ca1e6a..44344328 100644
--- a/lib/sisu/v5/xml_scaffold_structure_sisu.rb
+++ b/lib/sisu/v5/xml_scaffold_structure_sisu.rb
@@ -61,10 +61,10 @@
 
 =end
 module SiSU_XML_Scaffold_Structure_Sisu
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
   require_relative 'ao'                                 # ao.rb
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   class Source
     def initialize(opt)
diff --git a/lib/sisu/v5/xml_shared.rb b/lib/sisu/v5/xml_shared.rb
index 77df1a30..bd0e383b 100644
--- a/lib/sisu/v5/xml_shared.rb
+++ b/lib/sisu/v5/xml_shared.rb
@@ -567,7 +567,7 @@ module SiSU_XML_Munge
   end
 end
 module SiSU_XML_Tags #Format
-  require_relative 'param'                              # param.rb
+  require_relative 'dp'                                 # dp.rb
     include SiSU_Param
   include SiSU_Viz
   class RDF
diff --git a/lib/sisu/v5/zap.rb b/lib/sisu/v5/zap.rb
index 94a9e196..75707247 100644
--- a/lib/sisu/v5/zap.rb
+++ b/lib/sisu/v5/zap.rb
@@ -61,7 +61,7 @@
 
 =end
 module SiSU_Zap
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   class Source
     def initialize(opt)