v3dv: call most methods by full name (include associated module & class names)

* messing with code, merge back now likely to become v3.2

18 files changed, 152 insertions, 190 deletions

diff --git a/lib/sisu/v3dv/dal.rb b/lib/sisu/v3dv/dal.rb
index 21d6eebd..d5a4a948 100644
--- a/lib/sisu/v3dv/dal.rb
+++ b/lib/sisu/v3dv/dal.rb
@@ -119,7 +119,7 @@ module SiSU_DAL
         create_dal
       rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@@fns).error
       ensure
-        Instantiate.new
+        SiSU_DAL::Instantiate.new
       end
     end
     def get                                                                    #reads dal, unless does not exist then creates first
@@ -135,7 +135,7 @@ module SiSU_DAL
         dal=(@@dal_array.empty?) ? read_fnc : @@dal_array.dup
       rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
       ensure
-        Instantiate.new
+        SiSU_DAL::Instantiate.new
       end
     end
     def get_idx_sst                                                            #reads dal idx.sst, #unless does not exist then creates first
@@ -151,7 +151,7 @@ module SiSU_DAL
         dal=(@@idx_arr[:sst].empty?) ? read_idx_sst : @@idx_arr[:sst].dup #check
       rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
       ensure
-        Instantiate.new
+        SiSU_DAL::Instantiate.new
       end
     end
     def get_idx_tex                                                            #reads dal idx.tex, #unless does not exist then creates first
@@ -167,7 +167,7 @@ module SiSU_DAL
         dal=(@@idx_arr[:tex].empty?) ? read_idx_tex : @@idx_arr[:tex].dup #check
       rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
       ensure
-        Instantiate.new
+        SiSU_DAL::Instantiate.new
       end
     end
     def get_idx_html                                                           #reads dal idx.html, #unless does not exist then creates first
@@ -183,7 +183,7 @@ module SiSU_DAL
         dal=(@@idx_arr[:html].empty?) ? read_idx_html : @@idx_arr[:html].dup
       rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
       ensure
-        Instantiate.new
+        SiSU_DAL::Instantiate.new
       end
     end
     def get_idx_xhtml                                                          #reads dal idx.xhtml, #unless does not exist then creates first
@@ -199,7 +199,7 @@ module SiSU_DAL
         dal=(@@idx_arr[:xhtml].empty?) ? read_idx_xhtml : @@idx_arr[:xhtml].dup
       rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
       ensure
-        Instantiate.new
+        SiSU_DAL::Instantiate.new
       end
     end
     def get_map_nametags                                                       #reads dal map.nametags, #unless does not exist then creates first
@@ -215,7 +215,7 @@ module SiSU_DAL
         dal=(@@map_arr[:nametags].empty?) ? read_map_nametags : @@map_arr[:nametags].dup
       rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
       ensure
-        Instantiate.new
+        SiSU_DAL::Instantiate.new
       end
     end
     def get_map_ocn_htmlseg                                                    #reads dal map.ocn_htmlseg, #unless does not exist then creates first
@@ -231,7 +231,7 @@ module SiSU_DAL
         dal=(@@map_arr[:ocn_htmlseg].empty?) ? read_map_ocn_htmlseg : @@map_arr[:ocn_htmlseg].dup
       rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
       ensure
-        Instantiate.new
+        SiSU_DAL::Instantiate.new
       end
     end
   protected
@@ -475,15 +475,15 @@ module SiSU_DAL
       reset
       data=@data
       data=data.join.split("\n\n")
-      data=SiSU_DAL_Insertions::Insertions.new(@md,data).expand_insertions?                                                # dal_expand_insertions.rb
+      data=SiSU_DAL_Insertions::Insertions.new(@md,data).expand_insertions?                                              # dal_expand_insertions.rb
       data=SiSU_DAL_SubstituteAndInsert::SI.new(@md,data).substitutions_and_insertions?                                  # dal_substitutions_and_insertions.rb
       data,metadata=SiSU_DAL_DocumentStructureExtract::Build.new(@md,data).identify_parts                                # dal_doc_str.rb
-      data=SiSU_DAL_Syntax::Markup.new(@md,data).songsheet                                                                 # dal_syntax.rb
-      data,endnote_array=SiSU_DAL_CharacterCheck::Check.new(data).character_check_and_oldstyle_endnote_array              # dal_character_check.rb
-      data=SiSU_DAL_Images::Images.new(@md,data).images                                                                    # dal_images.rb
-      data,tags_map,ocn_html_seg_map=SiSU_DAL_Numbering::Numbering.new(@md,data).numbering_song                            # dal_numbering.rb
+      data=SiSU_DAL_Syntax::Markup.new(@md,data).songsheet                                                               # dal_syntax.rb
+      data,endnote_array=SiSU_DAL_CharacterCheck::Check.new(data).character_check_and_oldstyle_endnote_array             # dal_character_check.rb
+      data=SiSU_DAL_Images::Images.new(@md,data).images                                                                  # dal_images.rb
+      data,tags_map,ocn_html_seg_map=SiSU_DAL_Numbering::Numbering.new(@md,data).numbering_song                          # dal_numbering.rb
       data,book_index_rel,book_index_rel_html_seg,html_idx,xhtml_idx=SiSU_DAL_BookIndex::BookIndex.new(@md,data,@env).indexing_song if @md.book_idx  # dal_idx.rb
-      data=SiSU_DAL_Endnotes::Endnotes.new(@md,data,endnote_array).endnotes                                                # dal_endnotes.rb
+      data=SiSU_DAL_Endnotes::Endnotes.new(@md,data,endnote_array).endnotes                                              # dal_endnotes.rb
       outputdata=data
       if @md.opt.cmd =~/[mM]/
         SiSU_DAL::Output.new(@fn,@md,outputdata).hard_output
diff --git a/lib/sisu/v3dv/dal_doc_str.rb b/lib/sisu/v3dv/dal_doc_str.rb
index 5ab3553f..dbf4f066 100644
--- a/lib/sisu/v3dv/dal_doc_str.rb
+++ b/lib/sisu/v3dv/dal_doc_str.rb
@@ -69,7 +69,7 @@ module SiSU_DAL_DocumentStructureExtract
     @@flag={} #Beware!!
     def initialize(md,data)
       @md,@data=md,data
-      Instantiate.new
+      SiSU_DAL_DocumentStructureExtract::Instantiate.new
       @pb=SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page])
       @pbn=SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_new])
     end
diff --git a/lib/sisu/v3dv/db_create.rb b/lib/sisu/v3dv/db_create.rb
index 47d22915..6420c3ec 100644
--- a/lib/sisu/v3dv/db_create.rb
+++ b/lib/sisu/v3dv/db_create.rb
@@ -66,7 +66,7 @@ module SiSU_DbCreate
       @opt,@conn,@file,@sql_type=opt,conn,file,sql_type
       @cX=SiSU_Screen::Ansi.new(@opt.cmd).cX
       @comment=(@sql_type=='pg') \
-      ? (Comment.new(@conn,@sql_type))
+      ? (SiSU_DbCreate::Comment.new(@conn,@sql_type))
       : nil
       @@dl ||=SiSU_Env::InfoEnv.new.digest.length
     end
diff --git a/lib/sisu/v3dv/epub.rb b/lib/sisu/v3dv/epub.rb
index 250b428f..259cdbe0 100644
--- a/lib/sisu/v3dv/epub.rb
+++ b/lib/sisu/v3dv/epub.rb
@@ -106,7 +106,7 @@ module SiSU_EPUB
         data=@tuned_file_array
         scr_toc=SiSU_EPUB::Source::ScrollHeadAndSegToc.new(@md,toc).in_common #watch
         SiSU_EPUB::Source::Seg.new(@md,data).songsheet
-        SiSU_EPUB::Source::EPUB_Output.new(@md).songsheet
+        SiSU_EPUB::Source::Output.new(@md).songsheet
       rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
       ensure
         unless @opt.cmd =~/[MV]/ #check maintenance flag
@@ -242,7 +242,7 @@ module SiSU_EPUB
               md_opf_a_content << @epub.metadata_opf.manifest_content(dob_toc,name_s_a)
               md_opf_a_spine << @epub.metadata_opf.spine(dob_toc,name_s_a)
               md_opf_a_guide << @epub.metadata_opf.guide(dob_toc,name_s_a)
-              Toc.new(@md,dob_toc).level_1
+              SiSU_EPUB::Source::Toc.new(@md,dob_toc).level_1
             when 2
               @s_b_no +=1
               name_s_b='section_b' + @s_b_no.to_s
@@ -257,7 +257,7 @@ module SiSU_EPUB
               md_opf_a_content << @epub.metadata_opf.manifest_content(dob_toc,name_s_b)
               md_opf_a_spine << @epub.metadata_opf.spine(dob_toc,name_s_b)
               md_opf_a_guide << @epub.metadata_opf.guide(dob_toc,name_s_b)
-              Toc.new(@md,dob_toc).level_2
+              SiSU_EPUB::Source::Toc.new(@md,dob_toc).level_2
             when 3
               @s_c_no +=1
               name_s_c='section_c' + @s_c_no.to_s
@@ -271,7 +271,7 @@ module SiSU_EPUB
               md_opf_a_content << @epub.metadata_opf.manifest_content(dob_toc,name_s_c)
               md_opf_a_spine << @epub.metadata_opf.spine(dob_toc,name_s_c)
               md_opf_a_guide << @epub.metadata_opf.guide(dob_toc,name_s_c)
-              Toc.new(@md,dob_toc).level_3
+              SiSU_EPUB::Source::Toc.new(@md,dob_toc).level_3
             when 4
               @ncx_cls=[]
               @nav_no+=1
@@ -281,9 +281,9 @@ module SiSU_EPUB
               md_opf_a_content << @epub.metadata_opf.manifest_content(dob_toc)
               md_opf_a_spine << @epub.metadata_opf.spine(dob_toc)
               md_opf_a_guide << @epub.metadata_opf.guide(dob_toc)
-              Toc.new(@md,dob_toc).level_4
-            when 5; Toc.new(@md,dob_toc).level_5
-            when 6; Toc.new(@md,dob_toc).level_6
+              SiSU_EPUB::Source::Toc.new(@md,dob_toc).level_4
+            when 5; SiSU_EPUB::Source::Toc.new(@md,dob_toc).level_5
+            when 6; SiSU_EPUB::Source::Toc.new(@md,dob_toc).level_6
             else nil
             end
             toc.each do |k,d|
@@ -318,8 +318,8 @@ module SiSU_EPUB
         @@toc[:opf] << @epub.metadata_opf.guide_open << md_opf_a_guide << @epub.metadata_opf.guide_close
         @@toc[:opf] << @epub.metadata_opf.package_close
         @@toc[:opf]=@@toc[:opf].flatten
-        EPUB_Output.new(@md,@@toc[:opf]).epub_metadata_opf
-        EPUB_Output.new(@md,@@toc[:ncx]).epub_toc_ncx
+        SiSU_EPUB::Source::Output.new(@md,@@toc[:opf]).epub_metadata_opf
+        SiSU_EPUB::Source::Output.new(@md,@@toc[:ncx]).epub_toc_ncx
         @md.firstseg=@@firstseg
         @@toc
       end
@@ -486,29 +486,6 @@ module SiSU_EPUB
         end
         toc
       end
-      def level_crosslink
-        dob=@data
-        if dob !~/^4~!/
-          dob.gsub!(/^4~!\s+(\S+)\s+(.+)/,
-            %{<table><tr><td width =\"80\"></td>
-  <td><a href="http://\\1">
-    #{@png.crosslink_ext}
-      &nbsp;&nbsp;\\2
-    <\/a>
-  </td></tr></table>
-})
-        else
-          dob.gsub!(/^4~!\s+(\S+)\s+(.+)/,
-            %{<table><tr><td width ="80">
-  </td><td>
-    <a href="\\1">
-      #{@png.crosslink}
-        &nbsp;&nbsp;\\2
-    <\/a>
-  </td></tr></table>
-})
-        end
-      end
     end
     class ScrollHeadAndSegToc < Toc
       def initialize(md='',toc='',links_guide_toc='')
@@ -590,7 +567,7 @@ module SiSU_EPUB
         segtoc << seg_toc_band_bottom
         segtoc << format_head_toc.xhtml_close
         segtoc.flatten!.compact!
-        EPUB_Output.new(@md,segtoc).segtoc
+        SiSU_EPUB::Source::Output.new(@md,segtoc).segtoc
         segtoc=[]
         @toc[:scr],@toc[:seg]=[],[]
         toc_shared
@@ -600,7 +577,7 @@ module SiSU_EPUB
     end
     class Seg < SiSU_EPUB_Seg::Seg
     end
-    class EPUB_Output
+    class Output
       def initialize(md,output='')
         @md,@output=md,output
         @epub_doc="#{@md.fnb}.epub"
diff --git a/lib/sisu/v3dv/epub_format.rb b/lib/sisu/v3dv/epub_format.rb
index 46c9d4be..3f7ea4d5 100644
--- a/lib/sisu/v3dv/epub_format.rb
+++ b/lib/sisu/v3dv/epub_format.rb
@@ -1791,7 +1791,7 @@ WOK
     end
     def make_concordance
       manifest=scroll=seg=''
-      wgt=Widget.new(@md)
+      wgt=SiSU_EPUB_Format::Widget.new(@md)
       %{<table summary="toc scroll and segment with pdf" border="0" cellpadding="3" cellspacing="0">
 <tr>
   #{wgt.seg(@vz.nav_txt_toc_link)}#{wgt.scroll(@vz.nav_txt_doc_link)}#{wgt.pdf}#{wgt.odf}
@@ -1987,7 +1987,7 @@ WOK
     end
     def doc_types #used in seg_nav_band ###
       scroll=seg=''
-      wgt=Widget.new(@md)
+      wgt=SiSU_EPUB_Format::Widget.new(@md)
       x=if @md.concord_make
         %{
 <table summary="segment navigation available documents types: toc,doc,pdf,concordance" border="0" cellpadding="3" cellspacing="0">
diff --git a/lib/sisu/v3dv/epub_segments.rb b/lib/sisu/v3dv/epub_segments.rb
index 5545dc23..e8bc3f20 100644
--- a/lib/sisu/v3dv/epub_segments.rb
+++ b/lib/sisu/v3dv/epub_segments.rb
@@ -60,7 +60,7 @@ module SiSU_EPUB_Seg
   require_relative 'shared_xhtml'                       # shared_xhtml.rb
   require_relative 'epub'                               # epub.rb
   require_relative 'shared_metadata'                    # shared_metadata.rb
-  class SegOutput
+  class Output
     def initialize(md,outputfile,seg,minitoc,type='')
       @md,@output_epub_cont_seg,@seg,@minitoc,@type=md,outputfile,seg,minitoc,type
     end
@@ -149,7 +149,7 @@ WOK
         @minitoc=SiSU_EPUB::Source::Toc.new(@md,@data).minitoc
         data=get_subtoc_endnotes(@data)
         data=articles(data)
-        Seg.new.cleanup # (((( added ))))
+        SiSU_EPUB_Seg::Seg.new.cleanup # (((( added ))))
         #### (((( END )))) ####
       rescue; SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error
       ensure
@@ -237,32 +237,32 @@ WOK
             || dob.is=='heading_insert') \
             and dob.ln==4
               if tracking != 0
-                Seg.new(@md).tail
+                SiSU_EPUB_Seg::Seg.new(@md).tail
                 segfilename="#{dir_epub_cont}/#{@@seg_name_xhtml[tracking-1]}#{Sfx[:epub_xhtml]}"
                 output_epub_cont_seg=File.new(segfilename,'w') if @@seg_name_xhtml[tracking-1]
                 if dob.is=='heading' \
                 or @@seg_name_xhtml[tracking-1] !~/endnotes|book_index|metadata/
-                  SegOutput.new(@md,output_epub_cont_seg,@@seg,@minitoc).output
+                  SiSU_EPUB_Seg::Output.new(@md,output_epub_cont_seg,@@seg,@minitoc).output
                 elsif dob.is=='heading_insert'
                   if @@seg_name_xhtml[tracking-1]=='endnotes'
-                    SegOutput.new(@md,output_epub_cont_seg,@@seg,@minitoc,'endnotes').output
+                    SiSU_EPUB_Seg::Output.new(@md,output_epub_cont_seg,@@seg,@minitoc,'endnotes').output
                   elsif @@seg_name_xhtml[tracking-1]=='book_index'
-                    SegOutput.new(@md,output_epub_cont_seg,@@seg,@minitoc,'idx').output
+                    SiSU_EPUB_Seg::Output.new(@md,output_epub_cont_seg,@@seg,@minitoc,'idx').output
                     @@seg[:idx]=[]
                   elsif @@seg_name_xhtml[tracking-1]=='metadata' # navigation bug FIX
-                    SegOutput.new(@md,output_epub_cont_seg,@@seg,@minitoc,'metadata').output
+                    SiSU_EPUB_Seg::Output.new(@md,output_epub_cont_seg,@@seg,@minitoc,'metadata').output
                   else puts "#{__FILE__}::#{__LINE__}"
                   end
                 else puts "#{__FILE__}::#{__LINE__}"
                 end
-                Seg.new.reinitialise
+                SiSU_EPUB_Seg::Seg.new.reinitialise
                 heading_art(dob)
                 head(dob)
                 if @@seg_name_xhtml[tracking]=='sisu_manifest' # this is for manifest, includes navigation bug
                   segfilename="#{dir_epub_cont}/#{@@seg_name_xhtml[tracking]}#{Sfx[:epub_xhtml]}"
                   output_epub_cont_seg=File.new(segfilename,'w')
-                  SegOutput.new(@md,output_epub_cont_seg,@@seg,@minitoc,'sisu_manifest').output
-                  Seg.new.reinitialise #BUG navigation bug with items following metadata, and occurring before manifest, this becomes a bug ... work area for book index, FIX
+                  SiSU_EPUB_Seg::Output.new(@md,output_epub_cont_seg,@@seg,@minitoc,'sisu_manifest').output
+                  SiSU_EPUB_Seg::Seg.new.reinitialise #BUG navigation bug with items following metadata, and occurring before manifest, this becomes a bug ... work area for book index, FIX
                 end
                #@output_epub_cont_seg.close                                         #%(((( EOF )))) -->
               end
diff --git a/lib/sisu/v3dv/epub_tune.rb b/lib/sisu/v3dv/epub_tune.rb
index 2f150006..62bcc4e0 100644
--- a/lib/sisu/v3dv/epub_tune.rb
+++ b/lib/sisu/v3dv/epub_tune.rb
@@ -208,27 +208,19 @@ module SiSU_EPUB_Tune
       begin
         @cX=SiSU_Screen::Ansi.new(@md.opt.cmd).cX
         SiSU_Screen::Ansi.new(@md.opt.cmd,'Tune').txt_grey if @md.opt.cmd =~/[MVv]/
-        data=Tune.new(@data,@md).amp_html
-        data=Tune.new(data,@md).endnotes_html
-        data=Tune.new(data,@md).url_markup
-        data=Tune.new(data,@md).markup
+        data=SiSU_EPUB_Tune::Tune.new(@data,@md).amp_html
+        data=SiSU_EPUB_Tune::Tune.new(data,@md).endnotes_html
+        data=SiSU_EPUB_Tune::Tune.new(data,@md).url_markup
+        data=SiSU_EPUB_Tune::Tune.new(data,@md).markup
         if @md.opt.cmd =~/M/  #Hard Output Tune Optional on/off here
-          data=Output.new(data,@md).hard_output
-          Output.new(data,@md).marshal
+          data=SiSU_EPUB_Tune::Output.new(data,@md).hard_output
+          SiSU_EPUB_Tune::Output.new(data,@md).marshal
         end
-        tuned=Tune.new(@data,@md).output
+        tuned=SiSU_EPUB_Tune::Tune.new(@data,@md).output
       rescue; SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error
       ensure
       end
     end
-    def para_numbers
-      data=@data
-      @tuned_file=[]
-      data.each do |dob|
-        dob.gsub!(/#{Mx[:lv_o]}\d:(\S?)#{Mx[:lv_c]}/,'\0#\1.&nbsp;') #fix Mx[:lv_o]
-        @tuned_file << dob
-      end
-    end
     def markup
       @tuned_file=[]
       @data.each do |dob|
diff --git a/lib/sisu/v3dv/html.rb b/lib/sisu/v3dv/html.rb
index 6306975f..3006ff95 100644
--- a/lib/sisu/v3dv/html.rb
+++ b/lib/sisu/v3dv/html.rb
@@ -239,12 +239,12 @@ module SiSU_HTML
             toc=if dob_toc.is =='heading' \
             or dob.is=='heading_insert'
               toc=case dob_toc.ln
-              when 1; Toc.new(@md,dob_toc).level_1
-              when 2; Toc.new(@md,dob_toc).level_2
-              when 3; Toc.new(@md,dob_toc).level_3
-              when 4; Toc.new(@md,dob_toc).level_4
-              when 5; Toc.new(@md,dob_toc).level_5
-              when 6; Toc.new(@md,dob_toc).level_6
+              when 1; SiSU_HTML::Source::Toc.new(@md,dob_toc).level_1
+              when 2; SiSU_HTML::Source::Toc.new(@md,dob_toc).level_2
+              when 3; SiSU_HTML::Source::Toc.new(@md,dob_toc).level_3
+              when 4; SiSU_HTML::Source::Toc.new(@md,dob_toc).level_4
+              when 5; SiSU_HTML::Source::Toc.new(@md,dob_toc).level_5
+              when 6; SiSU_HTML::Source::Toc.new(@md,dob_toc).level_6
               else nil
               end
             end
@@ -585,7 +585,7 @@ WOK
         ads=SiSU_HTML_Promo::Ad.new(@md)
         @segtoc << format_head_toc.seg_navigation_tail << ads.div.close << ads.display << format_head_toc.html_close
         @segtoc.flatten!.compact!
-        Output.new(@segtoc,@md).segtoc
+        SiSU_HTML::Source::Output.new(@segtoc,@md).segtoc
         @segtoc=[]
         @toc[:scr],@toc[:seg]=[],[]
         toc_shared
diff --git a/lib/sisu/v3dv/html_format.rb b/lib/sisu/v3dv/html_format.rb
index 4267a2da..be4427ac 100644
--- a/lib/sisu/v3dv/html_format.rb
+++ b/lib/sisu/v3dv/html_format.rb
@@ -112,7 +112,7 @@ module SiSU_HTML_Format
     end
     def doc_types #used in toc & seg_nav_band
       scroll=seg=''
-      wgt=Widget.new(@md)
+      wgt=SiSU_HTML_Format::Widget.new(@md)
       %{
 <table summary="segment navigation available documents types: toc,doc,pdf,concordance" border="0" cellpadding="3" cellspacing="0">
 <tr>
@@ -350,7 +350,7 @@ WOK
       end
     end
     def make_seg_scroll_pdf
-      wgt=Widget.new(@md)
+      wgt=SiSU_HTML_Format::Widget.new(@md)
       scroll=%{<td align="center" bgcolor=#{@vz.color_band2}>
   #{@vz.nav_txt_doc_link}
 </td>
@@ -363,7 +363,7 @@ WOK
     end
     def make_scroll_seg_pdf
       manifest=scroll=seg=''
-      wgt=Widget.new(@md)
+      wgt=SiSU_HTML_Format::Widget.new(@md)
       seg=%{<td align="center" bgcolor=#{@vz.color_band2}>
   #{@vz.nav_txt_toc_link}
 </td>
@@ -377,7 +377,7 @@ WOK
     end
     def make_concordance
       manifest=scroll=seg=''
-      wgt=Widget.new(@md)
+      wgt=SiSU_HTML_Format::Widget.new(@md)
       %{<table summary="toc scroll and segment with pdf" border="0" cellpadding="3" cellspacing="0">
 <tr>
 <td align="center" bgcolor=#{@vz.color_band2}>
diff --git a/lib/sisu/v3dv/html_minitoc.rb b/lib/sisu/v3dv/html_minitoc.rb
index 7f891a2e..96ef5d75 100644
--- a/lib/sisu/v3dv/html_minitoc.rb
+++ b/lib/sisu/v3dv/html_minitoc.rb
@@ -80,12 +80,12 @@
             txt.obj.gsub!(@pat_strip_heading_name,'\1')
             txt.obj.gsub(/(.*?)<a name="(\d+)"><\/a>(.*)/,'\1') #2002w42 altered gsub! - problematic? - suspect
             toc=case txt.ln
-            when 1; TocMini.new(@md,txt).level_1
-            when 2; TocMini.new(@md,txt).level_2
-            when 3; TocMini.new(@md,txt).level_3
-            when 4; TocMini.new(@md,txt).level_4
-            when 5; TocMini.new(@md,txt).level_5
-            when 6; TocMini.new(@md,txt).level_6
+            when 1; SiSU_HTML_MiniToc::TocMini.new(@md,txt).level_1
+            when 2; SiSU_HTML_MiniToc::TocMini.new(@md,txt).level_2
+            when 3; SiSU_HTML_MiniToc::TocMini.new(@md,txt).level_3
+            when 4; SiSU_HTML_MiniToc::TocMini.new(@md,txt).level_4
+            when 5; SiSU_HTML_MiniToc::TocMini.new(@md,txt).level_5
+            when 6; SiSU_HTML_MiniToc::TocMini.new(@md,txt).level_6
             else
             end
             @toc << toc
diff --git a/lib/sisu/v3dv/html_scroll.rb b/lib/sisu/v3dv/html_scroll.rb
index ac57b585..f540b104 100644
--- a/lib/sisu/v3dv/html_scroll.rb
+++ b/lib/sisu/v3dv/html_scroll.rb
@@ -68,8 +68,8 @@ module SiSU_HTML_Scroll
     end
     def songsheet
       begin
-        scr=Scroll.new(@md,@data,@endnotes).markup
-        scr[:tails]=Scroll.new(@md).tails
+        scr=SiSU_HTML_Scroll::Scroll.new(@md,@data,@endnotes).markup
+        scr[:tails]=SiSU_HTML_Scroll::Scroll.new(@md).tails
         scr
       rescue; SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error
       ensure
diff --git a/lib/sisu/v3dv/html_segments.rb b/lib/sisu/v3dv/html_segments.rb
index 75c9b90f..20ab0726 100644
--- a/lib/sisu/v3dv/html_segments.rb
+++ b/lib/sisu/v3dv/html_segments.rb
@@ -61,7 +61,7 @@ module SiSU_HTML_Seg
   require_relative 'html'                               # html.rb
   require_relative 'html_promo'                         # html_promo.rb
   require_relative 'shared_metadata'                    # shared_metadata.rb
-  class SegOutput
+  class Output
     def initialize(md,outputfile,seg,minitoc,type='')
       @md,@output_seg_file,@seg,@minitoc,@type=md,outputfile,seg,minitoc,type
       @title_banner_=SiSU_Env::CreateSite.new(@md.opt.cmd).html_seg_title_banner?
@@ -147,7 +147,7 @@ module SiSU_HTML_Seg
         @minitoc=SiSU_HTML::Source::Toc.new(@md,@data).minitoc
         data=get_subtoc_endnotes(@data)
         data=articles(data)
-        Seg.new.cleanup # (((( added ))))
+        SiSU_HTML_Seg::Seg.new.cleanup # (((( added ))))
         #### (((( END )))) ####
       rescue; SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error
       ensure
@@ -234,7 +234,7 @@ module SiSU_HTML_Seg
                 unless FileTest.directory?(@file.output_path.html_seg.dir)
                   FileUtils::mkdir_p(@file.output_path.html_seg.dir) if File.writable?("#{@file.output_path.base.dir}/.")
                 end
-                Seg.new(@md).tail
+                SiSU_HTML_Seg::Seg.new(@md).tail
                 segfilename="#{@file.output_path.html_seg.dir}/#{@@seg_name_html[tracking-1]}#{@md.lang_code_insert}#{Sfx[:html]}"
                 output_seg_file=File.new(segfilename,'w') if @@seg_name_html[tracking-1]
                 minitoc=(@env.html_minitoc?) \
@@ -242,27 +242,27 @@ module SiSU_HTML_Seg
                 : ''
                 if dob.is=='heading' \
                 or @@seg_name_html[tracking-1] !~/endnotes|book_index|metadata/
-                  SegOutput.new(@md,output_seg_file,@@seg,minitoc).output
+                  SiSU_HTML_Seg::Output.new(@md,output_seg_file,@@seg,minitoc).output
                 elsif dob.is=='heading_insert'
                   if @@seg_name_html[tracking-1]=='endnotes'
-                    SegOutput.new(@md,output_seg_file,@@seg,minitoc,'endnotes').output
+                    SiSU_HTML_Seg::Output.new(@md,output_seg_file,@@seg,minitoc,'endnotes').output
                   elsif @@seg_name_html[tracking-1]=='book_index'
-                    SegOutput.new(@md,output_seg_file,@@seg,minitoc,'idx').output
+                    SiSU_HTML_Seg::Output.new(@md,output_seg_file,@@seg,minitoc,'idx').output
                     @@seg[:idx]=[]
                   elsif @@seg_name_html[tracking-1]=='metadata'
-                    SegOutput.new(@md,output_seg_file,@@seg,minitoc,'metadata').output
+                    SiSU_HTML_Seg::Output.new(@md,output_seg_file,@@seg,minitoc,'metadata').output
                   else puts "#{__FILE__}::#{__LINE__}"
                   end
                 else puts "#{__FILE__}::#{__LINE__}"
                 end
-                Seg.new.reinitialise
+                SiSU_HTML_Seg::Seg.new.reinitialise
                 heading_art(dob)
                 head(dob)
                #keep use for last segment, eg if metadata is last segment
                #if @@seg_name_html[tracking] =~/metadata/ # this is for metadata
                #  segfilename="#{@md.dir_out}/#{@md.fnl[:pre]}#{@@seg_name_html[tracking]}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}"
                #  output_seg_file=File.new(segfilename,'w')
-               #  SegOutput.new(@md,output_seg_file,@@seg,minitoc,'metadata').output
+               #  SiSU_HTML_Seg::Output.new(@md,output_seg_file,@@seg,minitoc,'metadata').output
                #  Seg.new.reinitialise
                #end
               end
diff --git a/lib/sisu/v3dv/html_tune.rb b/lib/sisu/v3dv/html_tune.rb
index 0161d5df..1b5cca4d 100644
--- a/lib/sisu/v3dv/html_tune.rb
+++ b/lib/sisu/v3dv/html_tune.rb
@@ -212,10 +212,10 @@ module SiSU_HTML_Tune
         songsheet_array(@data)
         #data=songsheet_array(@data)
         if @md.opt.cmd =~/M/  #Hard Output Tune Optional on/off here
-          data=Output.new(@data,@md).hard_output
-          Output.new(@data,@md).marshal
+          data=SiSU_HTML_Tune::Output.new(@data,@md).hard_output
+          SiSU_HTML_Tune::Output.new(@data,@md).marshal
         end
-        tuned=Tune.new(@data,@md).output
+        tuned=SiSU_HTML_Tune::Tune.new(@data,@md).output
       rescue; SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error
       ensure
       end
@@ -321,14 +321,6 @@ module SiSU_HTML_Tune
       end
       dob
     end
-    def para_numbers
-      data=@data
-      @tuned_file=[]
-      data.each do |dob|
-        dob.gsub!(/#{Mx[:lv_o]}\d:(\S?)#{Mx[:lv_c]}/,'\0<a name="H#\1">#\1.</a>&nbsp;') #fix Mx[:lv_o]
-        @tuned_file << dob
-      end
-    end
     def angle_brackets(dob)
       dob.obj.gsub!(/<([a-z:\/]+)>/,"#{Dx[:lt_xml]}\\1#{Dx[:gt_xml]}")
       dob
diff --git a/lib/sisu/v3dv/hub.rb b/lib/sisu/v3dv/hub.rb
index dbcf3c8e..c2477267 100644
--- a/lib/sisu/v3dv/hub.rb
+++ b/lib/sisu/v3dv/hub.rb
@@ -233,7 +233,7 @@ module SiSU
               else
                if @req !~/^conf$/ \
                and @opt.fns !~/http:\/\//
-                  Operations.new(@opt).not_found
+                  SiSU::Operations.new(@opt).not_found
                 end
               end
             elsif FileTest.file?(put)
@@ -250,14 +250,14 @@ module SiSU
                 @n_do=@n_do+1
                 SiSU_Screen::Ansi.new(@opt.cmd,@n_do,"#{@req.upcase} processed").files_processed if @opt.cmd =~/[MVv]/
               end
-            else Operations.new(@opt).not_found
+            else SiSU::Operations.new(@opt).not_found
             end
           end
         end
       elsif @req =~/^dbi$/;            SiSU_DBI::SQL.new(@opt).connect    # -D -d
       elsif @req=~/^sisupod_make$/;    SiSU_Doc::Source.new(@opt).read         # -S
       end
-      Operations.new.counter
+      SiSU::Operations.new.counter
     end
   end
   class Operations
@@ -346,7 +346,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
       @tell=lambda { SiSU_Screen::Ansi.new(@opt.cmd,@msg,"#{@msgs.inspect if @msgs}") }
     end
     def op(req,msg)
-      Op.new(@opt,req,msg).select if req and msg
+      SiSU::Op.new(@opt,req,msg).select if req and msg
     end
     def actions
       if @opt.cmd =~/E/ # re-assign character
@@ -407,22 +407,22 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
           if @opt.cmd =~/R/
             if @opt.mod.inspect =~/--init(?:ialize)?=site/ \
             and @opt.cmd =~/RZ/
-              Operations.new(@opt).remote_put_base_site_rsync_match
-            else Operations.new(@opt).remote_put_base_site_rsync
+              SiSU::Operations.new(@opt).remote_put_base_site_rsync_match
+            else SiSU::Operations.new(@opt).remote_put_base_site_rsync
             end
           elsif @opt.cmd =~/r/
             if @opt.mod.inspect =~/--init(?:ialize)?=site/ \
             and @opt.cmd =~/CCr/
-              Operations.new(@opt).remote_put_base_site_all
-            else Operations.new(@opt).remote_put_base_site
+              SiSU::Operations.new(@opt).remote_put_base_site_all
+            else SiSU::Operations.new(@opt).remote_put_base_site
             end
           end
         end
         if @opt.act[:sample_search_form][:bool]                                #% --sample-search-form, -F cgi sample search form
-          Operations.new(@opt).cgi
+          SiSU::Operations.new(@opt).cgi
         end
         if @opt.act[:webrick][:bool]                                           #% --webrick, -W webrick
-          Operations.new(@opt).webrick
+          SiSU::Operations.new(@opt).webrick
         end
         if @opt.cmd =~/Z/                                                      #% -Z wipe previous output clean
           op('zap','Zap, deletions')
@@ -463,7 +463,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
             if @get_s.length > 0                                               #% remote markup file .sst
               require_relative 'remote'                                        # remote.rb
               SiSU_Remote::Get.new(@opt,@get_s).fns
-              Operations.new.counter
+              SiSU::Operations.new.counter
             end
             if @get_p.length > 0                                               #% remote sisupod
               require_relative 'remote'                                        # remote.rb
@@ -536,13 +536,14 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
             if FileTest.file?(fns)
               @opt.fns=fns
               case @opt.fns
-              when /\.(termsheet.rb)$/;            Operations.new(@opt).termsheet
+              when /\.(termsheet.rb)$/
+                SiSU::Operations.new(@opt).termsheet
               else                                 #print "not processed --> ", fns, "\n"
               end
-            else Operations.new(@opt).not_found
+            else SiSU::Operations.new(@opt).not_found
             end
           end
-          Operations.new.counter
+          SiSU::Operations.new.counter
         end
         if @opt.cmd =~/k/                                                      #% -T temporary tests
           op('xml_scaffold','XML scaffold')
@@ -632,7 +633,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
             and @opt.mod.inspect =~/--(?:(?:convert(?:-from)?|from)[=-])?(?:xml2sst|sxml)/
             elsif @opt.fns=~/\.ssi$/ \
             and @opt.mod.inspect =~/--identify/
-            else Operations.new(@opt).not_recognised
+            else SiSU::Operations.new(@opt).not_recognised
             end
           end
           if @opt.fns =~/\.ssm\.sst$/ \
@@ -641,7 +642,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
             @tell.call.warn unless @opt.cmd =~/V/
             File.unlink(@opt.fns) if File.exist?(@opt.fns) #CONSIDER
           end
-        else                          #Operations.new(fns,'html').not_found
+        else                          #SiSU::Operations.new(fns,'html').not_found
         end
       end
     end
@@ -665,7 +666,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
     home=ENV['HOME']
     argv=$*
     @opt=SiSU_Commandline::Options.new(argv)
-    Processing.new(@opt).actions
+    SiSU::Processing.new(@opt).actions
   rescue; STDERR.puts SiSU_Screen::Ansi.new(@opt,$!,$@,nil).rescue #fix
   ensure
     Dir.chdir(@@pwd_the)
diff --git a/lib/sisu/v3dv/manifest.rb b/lib/sisu/v3dv/manifest.rb
index 30e645b4..253b01d9 100644
--- a/lib/sisu/v3dv/manifest.rb
+++ b/lib/sisu/v3dv/manifest.rb
@@ -92,13 +92,13 @@ module SiSU_Manifest
           SiSU_Screen::Ansi.new(@opt.cmd,"#{browser} #{url_html}").grey_tab if @opt.cmd =~/v/i
         end
         data=SiSU_HTML::Source::HTML_Environment.new(@particulars).tuned_file_instructions
-        OutputInfo.new(@md).check_output(data)
+        SiSU_Manifest::Source::Output.new(@md).check_output(data)
       rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
       ensure
       end
     end
     private
-    class OutputInfo <Source
+    class Output <Source
       def initialize(md)
         @manifest={ txt: [], html: [] }
         @md,@fns=md,md.fns
diff --git a/lib/sisu/v3dv/odf.rb b/lib/sisu/v3dv/odf.rb
index 4b90c543..8f1f60b4 100644
--- a/lib/sisu/v3dv/odf.rb
+++ b/lib/sisu/v3dv/odf.rb
@@ -675,7 +675,7 @@ WOK
         content << @@odf[:body]
         content << @@odf[:metadata]
         content << @@odf[:tail]
-        Output.new(content,@md,@env).odf
+        SiSU_ODF::Source::Output.new(content,@md,@env).odf
         @@odf[:head],@@odf[:body],@@odf[:tail],@@odf[:metadata]=[],[],[],[]
       end
     end
diff --git a/lib/sisu/v3dv/param.rb b/lib/sisu/v3dv/param.rb
index d8c65e8c..4d439535 100644
--- a/lib/sisu/v3dv/param.rb
+++ b/lib/sisu/v3dv/param.rb
@@ -82,7 +82,7 @@ module SiSU_Param
         opt.fns
       else opt.fns.gsub(/\.ssm$/,'.ssm.sst')
       end
-      Instantiate.new.param_instantiate
+      SiSU_Param::Instantiate.new.param_instantiate
       @env=SiSU_Env::InfoEnv.new(@fns)
       @pstorefile="#{@env.processing_path.dal}/#{@fns}.pstore"
     end
@@ -113,8 +113,8 @@ module SiSU_Param
         else
           param_msg='Parameters extracted'
           fns_array=@env.read_source_file(@opt.fns)
-          md=Instructions.new(fns_array,@opt)
-          @md=Instructions.new(fns_array,@opt).extract
+          md=SiSU_Param::Parameters::Instructions.new(fns_array,@opt)
+          @md=SiSU_Param::Parameters::Instructions.new(fns_array,@opt).extract
           @md
         end
         if defined? @md.title.main # on removal check problems with -U
@@ -1096,27 +1096,27 @@ module SiSU_Param
           and not @code_flag #or para=~/^(?:1|:?A)~/
             case para
             when /^@title:(.+)/m                                               #% * header metadata - title
-              @title=Md.new($1.strip,@opt,@env).title
+              @title=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).title
             when /^@creator:(.+)/m                                             #% * header metadata - creator
-              @creator=Md.new($1.strip,@opt,@env).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=Md.new($1.strip,@opt,@env).date
+              @date=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).date
             when /^@publisher:\s+(.+)/m                                        #% * header metadata - publisher
-              @publisher=Md.new($1.strip,@opt,@env).current_publisher
+              @publisher=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).current_publisher
               @current_publisher=@publisher
             when /^@rights:(.+)/m;                                             #% * header metadata - rights
-              @rights=Md.new($1.strip,@opt,@env).rights
+              @rights=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).rights
             when /^@classify:(.+)/m; classify=$1                               #% * header metadata - classify
-              @classify=Md.new($1.strip,@opt,@env).classify
+              @classify=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).classify
             when /^@original:(.+)/m                                            #% * header metadata - original (document)
-              @original=Md.new($1.strip,@opt,@env).original
+              @original=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).original
               @source=@original.source
             when /^@notes?:\s(.+)\Z/m                                          #% * header metadata - notes
-              @notes=Md.new($1.strip,@opt,@env).notes
+              @notes=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).notes
             when /^@links:\s+(.+?)\Z/m                                         #% * header metadata - links
-              doc_links=Md.new($1.strip,@opt,@env).links
+              doc_links=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).links
               count=1
               @links=[]
               doc_links.each do |doc_link|
@@ -1128,7 +1128,7 @@ module SiSU_Param
               end
               @lnk=@links
             when /^@make:(.+)/m                                                #% * header processing - make
-              @make=Md.new($1.strip,@opt,@env).make
+              @make=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).make
               if defined? @make.breaks \
               and @make.breaks[:page_new]                  #clearpage
                 @pagenew=@make.breaks[:page_new]
@@ -1223,7 +1223,7 @@ module SiSU_Param
               if not defined? @title.full.nil?
                 tf=para[/^:A~\S*(.+)$/m,1]
                 tf="@title: #{tf}"
-                @title=Md.new(tf.strip,@opt,@env).title
+                @title=SiSU_Param::Parameters::Md.new(tf.strip,@opt,@env).title
               end
               @html_title=@title.full.gsub(/(<p>|<p \/>|<br>|<br \/>)/,'')
               SiSU_Screen::Ansi.new(@opt.cmd,'Parameters',@html_title).txt_grey if @opt.cmd =~/v/
@@ -1296,10 +1296,10 @@ module SiSU_Param
           and @creator.author \
           and defined? @date.published \
           and @date.published
-            @rights=MdDefault.new.rights(@creator.author,@date.published)
+            @rights=SiSU_Param::Parameters::MdDefault.new.rights(@creator.author,@date.published)
           elsif defined? @creator.author \
           and @creator.author
-            @rights=MdDefault.new.rights("[#{@creator.author}]",'')
+            @rights=SiSU_Param::Parameters::MdDefault.new.rights("[#{@creator.author}]",'')
           end
         end
         if defined? @classify.topic_register \
@@ -1423,7 +1423,7 @@ module SiSU_Param
         if @author !~/[\S]/
           if @fns =~/\.ssm$/ \
           and  @opt.inspect =~/P/
-            #@creator=Md.new('Text Insert',@opt,@env).creator
+            #@creator=SiSU_Param::Md.new('Text Insert',@opt,@env).creator
           else
             SiSU_Screen::Ansi.new(@opt.cmd,'Warning Document Author missing','please provide @creator: :author:').warn unless @opt.cmd =~/q/
           end
diff --git a/lib/sisu/v3dv/sysenv.rb b/lib/sisu/v3dv/sysenv.rb
index 4e0e12a7..dea32c98 100644
--- a/lib/sisu/v3dv/sysenv.rb
+++ b/lib/sisu/v3dv/sysenv.rb
@@ -472,7 +472,7 @@ module SiSU_Env
           @fn[:t]=filename[m,2]
         end
       end
-      lng_base=InfoEnv.new.language_default_set
+      lng_base=SiSU_Env::InfoEnv.new.language_default_set
       lang=SiSU_Env::StandardiseLanguage.new
       langs=lang.codes
       x=[]
@@ -623,7 +623,7 @@ module SiSU_Env
     end
     def file_encoding(filename,cmd='')                                         #file encoding
       program='file'
-      fnsp=InfoEnv.new(filename).source_file_with_path
+      fnsp=SiSU_Env::InfoEnv.new(filename).source_file_with_path
       if program_found?(program)
         encoding=%x{file -L #{fnsp}}.strip
         encoding.gsub!(/#{fnsp}:(\s+|$)/,'')
@@ -850,7 +850,7 @@ module SiSU_Env
     require_relative 'i18n'                  # i18n.rb
     def initialize(l='')
       @language=(l.nil? || l.empty?) \
-      ? InfoEnv.new.language_default_set
+      ? SiSU_Env::InfoEnv.new.language_default_set
       : l
       @r=%{(?:#{Px[:lng_lst].join('|')})}
       @lang_info=SiSU_i18n::Languages.new
@@ -972,7 +972,7 @@ module SiSU_Env
     def initialize(fns='',md=nil)
       super() #you may not want to re-execute this static info so frequently!
       @fns,@md=fns,md
-      @env=EnvCall.new(fns) if fns
+      @env=SiSU_Env::EnvCall.new(fns) if fns
       fnb=if @md \
       and defined? @md.fnb
         @md.fnb
@@ -1116,7 +1116,7 @@ module SiSU_Env
         FileUtils::rm_rf(spp)
       end
       paths=[]
-      flv=EnvCall.new(opt.fns).document_language_versions_found
+      flv=SiSU_Env::EnvCall.new(opt.fns).document_language_versions_found
       flv[:f].each {|l| lng_dirs << l[:l] }
       lng_dirs.uniq!
       lng_dirs.each do |lng|
@@ -2740,7 +2740,7 @@ WOK
       include FileUtils::Verbose
     def initialize(opt)
       @opt=opt
-      z=FileMap.new(@opt)
+      z=SiSU_Env::FileMap.new(@opt)
       @zap=z.local_sisu_source
       if @opt.cmd =~ /[hH]/
         @zap=Dir.glob(@zap).join(' ')
@@ -2901,15 +2901,15 @@ WOK
           and remote_gen !~/\/\//) \
           and @@flag_remote==true \
           and @opt.cmd !~/U/
-            SystemCall.new(local_gen,remote_gen).scp
+            SiSU_Env::SystemCall.new(local_gen,remote_gen).scp
             if FileTest.file?("#{local_src}/#{src_txt}")
-              SystemCall.new("#{local_src}/#{src_txt}",remote_src).scp
+              SiSU_Env::SystemCall.new("#{local_src}/#{src_txt}",remote_src).scp
             end
             if FileTest.file?("#{local_pod}/#{src_pod}")
-              SystemCall.new("#{local_src}/#{src_pod}",remote_pod).scp
+              SiSU_Env::SystemCall.new("#{local_src}/#{src_pod}",remote_pod).scp
             end
             if FileTest.file?("#{local_epub}/#{@opt.fnb}.epub")
-              SystemCall.new("#{local_epub}/#{@opt.fnb}.epub",remote_epub,@opt.cmd).scp
+              SiSU_Env::SystemCall.new("#{local_epub}/#{@opt.fnb}.epub",remote_epub,@opt.cmd).scp
             end
           elsif  @opt.cmd =~/U/
             puts "#{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
@@ -2936,7 +2936,7 @@ WOK
           and @@flag_remote==true \
           and @opt.cmd !~/U/
             puts "begin scp_base: #{local} -> #{remote}"
-            SystemCall.new("#{local}/#{@env.path.style}/",remote).scp
+            SiSU_Env::SystemCall.new("#{local}/#{@env.path.style}/",remote).scp
           elsif @opt.cmd =~/U/
             puts "#{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
             puts "begin scp_base: #{local} -> #{remote}"
@@ -2954,9 +2954,9 @@ WOK
           and @@flag_remote==true \
           and @opt.cmd !~/U/
             puts "begin scp_base_all: #{local} -> #{remote}"
-            SystemCall.new("#{local}/_sisu/image_sys/",remote).scp
-            SystemCall.new("#{local}/_sisu/image/",remote).scp
-            SystemCall.new("#{local}/#{@env.path.style}/",remote).scp
+            SiSU_Env::SystemCall.new("#{local}/_sisu/image_sys/",remote).scp
+            SiSU_Env::SystemCall.new("#{local}/_sisu/image/",remote).scp
+            SiSU_Env::SystemCall.new("#{local}/#{@env.path.style}/",remote).scp
           elsif @opt.cmd =~/U/
             puts "#{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
             puts "scp_base_all: #{local} -> #{remote}"
@@ -2970,7 +2970,7 @@ WOK
       self
     end
     def images_from_skin
-      skin=InfoSkin.new(@md).select
+      skin=SiSU_Env::InfoSkin.new(@md).select
       skin_array=nil
       skin_images_array=[]
       if skin
@@ -3001,7 +3001,7 @@ WOK
           and remote_gen !~/\/\//) \
           and @@flag_remote==true \
           and @opt.cmd !~/U/
-#           SystemCall.new("#{local_src}/#{src_txt}",remote_src,@opt.cmd).rsync
+#           SiSU_Env::SystemCall.new("#{local_src}/#{src_txt}",remote_src,@opt.cmd).rsync
             delete_extra_files='--delete' # '--delete-after'
             inp=[]
             if (@opt.cmd =~/h/ \
@@ -3108,13 +3108,13 @@ WOK
               ##create file structure without copying files?:
               ##rsync -av -f"+ */" -f"- *" @f.output_path.base.dir remote:./path/.
               #local_dirs=%{-f"+ */" -f"- *" #{@f.output_path.base.dir}/*}
-              #SystemCall.new(local_dirs,remote_gen,@opt.cmd).rsync
+              #SiSU_Env::SystemCall.new(local_dirs,remote_gen,@opt.cmd).rsync
               local=local_gen + ' ' + images + ' ' + images_skin + ' ' + images_system + ' ' + local_css
-              SystemCall.new(local,remote_rel,@opt.cmd).rsync('--relative',@f.output_path.base.dir)
+              SiSU_Env::SystemCall.new(local,remote_rel,@opt.cmd).rsync('--relative',@f.output_path.base.dir)
             rescue
               p __LINE__.to_s + ':' + __FILE__
               local_dirs=%{--include='*/' --exclude='*' #{@f.output_path.base.dir}}
-              SystemCall.new(local_dirs,remote_gen,@opt.cmd).rsync
+              SiSU_Env::SystemCall.new(local_dirs,remote_gen,@opt.cmd).rsync
             end
           elsif @opt.cmd =~/U/
             puts "#{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
@@ -3141,9 +3141,9 @@ WOK
           and @rc['permission_set']['remote_base_site'] \
           and @@flag_remote==true \
           and @opt.cmd !~/U/
-            SystemCall.new("#{image_sys}","#{remote_conf}").rsync
-            SystemCall.new("#{images}","#{remote_conf}").rsync
-            SystemCall.new("#{ldest}","#{remote}").rsync
+            SiSU_Env::SystemCall.new("#{image_sys}","#{remote_conf}").rsync
+            SiSU_Env::SystemCall.new("#{images}","#{remote_conf}").rsync
+            SiSU_Env::SystemCall.new("#{ldest}","#{remote}").rsync
           elsif @opt.cmd =~/U/
             puts "#{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
             puts "rsync_base: #{local} -> #{remote}"
@@ -3164,9 +3164,9 @@ WOK
           and @opt.cmd !~/U/
             delete_extra_files='--delete' # '--delete-after'
             puts "begin rsync_base_sync: #{local} -> #{remote}"
-            SystemCall.new("#{local}/_sisu/image_sys/",remote).rsync(delete_extra_files)
-            SystemCall.new("#{local}/_sisu/image/",remote).rsync(delete_extra_files)
-            SystemCall.new("#{local}/#{@env.path.style}/",remote).rsync(delete_extra_files)
+            SiSU_Env::SystemCall.new("#{local}/_sisu/image_sys/",remote).rsync(delete_extra_files)
+            SiSU_Env::SystemCall.new("#{local}/_sisu/image/",remote).rsync(delete_extra_files)
+            SiSU_Env::SystemCall.new("#{local}/#{@env.path.style}/",remote).rsync(delete_extra_files)
           elsif @opt.cmd =~/U/
             puts "#{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
             puts "rsync_base_sync: #{local} -> #{remote}"
@@ -3185,7 +3185,7 @@ WOK
         remote="#{remote_conn[:name]}/#{@env.path.stub_pwd}/."
         if @@flag_remote
           delete_extra_files='--delete' # '--delete-after'
-          SystemCall.new(local,remote).rsync(delete_extra_files)
+          SiSU_Env::SystemCall.new(local,remote).rsync(delete_extra_files)
         elsif @opt.cmd =~/U/
           puts "#{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
           puts "rsync_sitemaps: #{local} -> #{remote}"
@@ -3199,7 +3199,7 @@ WOK
         remote="#{remote_conn[:name]}/#{@env.path.stub_pwd}/."
         if @@flag_remote
           delete_extra_files='--delete' # '--delete-after'
-          SystemCall.new(local,remote).rsync(delete_extra_files)
+          SiSU_Env::SystemCall.new(local,remote).rsync(delete_extra_files)
         elsif @opt.cmd =~/U/
           puts "#{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
           puts "rsync_sitemaps: #{local} -> #{remote}"
@@ -4838,7 +4838,7 @@ WOK
     end
     def param_instantiate
       @cX||=SiSU_Screen::Ansi.new(@cmd)
-      @@date=InfoDate.new
+      @@date=SiSU_Env::InfoDate.new
       @@proc=@@filename_txt=@@filename_texinfo=@@filename_lout_portrait=@@filename_lout_landscape=@@filename_html_scroll=@@filename_html_index=@@filename_html_segtoc=@@filename_semantic=@@filename_rss=@@newfile=@@drr=@@yaml=@@yamladdr=nil
       @@publisher='SiSU scribe'
     end
@@ -4856,7 +4856,7 @@ WOK
       u=/.+?\/([^\/]+)(?:\/(?:#{r})$|$)/
       @pwd_stub=pt.realpath.to_s[u,1]
       @rc=@@rc ||=GetInit.instance.sisu_yaml.rc
-      @defaults=InfoEnv.new.defaults
+      @defaults=SiSU_Env::InfoEnv.new.defaults
     end
     def share_source?
       ((defined? @rc['db']['share_source']) \
@@ -5053,7 +5053,7 @@ WOK
         "#{@md.doc_css}_html.css"
       elsif FileTest.file?("#{@env.path.output}/#{@env.path.style}/#{@env.path.stub_pwd}_html.css")
         "#{@env.path.stub_pwd}_html.css"
-      else CSS_Default.new.html
+      else SiSU_Env::CSS_Default.new.html
       end
     end
     def html_tables
@@ -5062,7 +5062,7 @@ WOK
         "#{@md.doc_css}_html_tables.css"
       elsif FileTest.file?("#{@env.path.output}/#{@env.path.style}/#{@env.path.stub_pwd}_html_tables.css")
         "#{@env.path.stub_pwd}_html_tables.css"
-      else CSS_Default.new.html_tables
+      else SiSU_Env::CSS_Default.new.html_tables
       end
     end
     def xhtml
@@ -5071,7 +5071,7 @@ WOK
         "#{@md.doc_css}_xhtml.css"
       elsif FileTest.file?("#{@env.path.output}/#{@env.path.style}/#{@env.path.stub_pwd}_xhtml.css")
         "#{@env.path.stub_pwd}_xhtml.css"
-      else CSS_Default.new.xhtml
+      else SiSU_Env::CSS_Default.new.xhtml
       end
     end
     def xml_sax
@@ -5080,7 +5080,7 @@ WOK
         "#{@md.doc_css}_xml_sax.css"
       elsif FileTest.file?("#{@env.path.output}/#{@env.path.style}/#{@env.path.stub_pwd}_xml_sax.css")
         "#{@env.path.stub_pwd}_xml_sax.css"
-      else CSS_Default.new.xml_sax
+      else SiSU_Env::CSS_Default.new.xml_sax
       end
     end
     def xml_dom
@@ -5089,7 +5089,7 @@ WOK
         "#{@md.doc_css}_xml_dom.css"
       elsif FileTest.file?("#{@env.path.output}/#{@env.path.style}/#{@env.path.stub_pwd}_xml_dom.css")
         "#{@env.path.stub_pwd}_xml_dom.css"
-      else CSS_Default.new.xml_dom
+      else SiSU_Env::CSS_Default.new.xml_dom
       end
     end
     def docbook_xml
@@ -5098,7 +5098,7 @@ WOK
         "#{@md.doc_css}_xml_dom.css"
       elsif FileTest.file?("#{@env.path.output}/#{@env.path.style}/#{@env.path.stub_pwd}_docbook.css")
         "#{@env.path.stub_pwd}_docbook.css"
-      else CSS_Default.new.docbook_xml
+      else SiSU_Env::CSS_Default.new.docbook_xml
       end
     end
     def homepage
@@ -5107,14 +5107,14 @@ WOK
         "#{@md.doc_css}_homepage.css"
       elsif FileTest.file?("#{@env.path.output}/#{@env.path.style}/#{@env.path.stub_pwd}_homepage.css")
         "#{@env.path.stub_pwd}_homepage.css"
-      else CSS_Default.new.homepage
+      else SiSU_Env::CSS_Default.new.homepage
       end
     end
   end
   class CSS_Stylesheet
     def initialize(md)
       @md=md
-      @css=CSS_Select.new(@md)
+      @css=SiSU_Env::CSS_Select.new(@md)
       @env=SiSU_Env::InfoEnv.new
       @file=SiSU_Env::FileOp.new(@md)
     end