v3dv: make further changes to module names & test

15 files changed, 219 insertions, 275 deletions

diff --git a/lib/sisu/v3dv/dal.rb b/lib/sisu/v3dv/dal.rb
index a8527e6d..21d6eebd 100644
--- a/lib/sisu/v3dv/dal.rb
+++ b/lib/sisu/v3dv/dal.rb
@@ -66,7 +66,7 @@ module SiSU_DAL
     include SiSU_Param
   require_relative 'dal_doc_objects'                    # dal_doc_objects.rb
   require_relative 'dal_syntax'                         # dal_syntax.rb
-    include SiSU_Syntax
+    include SiSU_DAL_Syntax
   require_relative 'dal_doc_str'                        # dal_doc_str.rb
   require_relative 'dal_idx'                            # dal_idx.rb
   require_relative 'dal_numbering'                      # dal_numbering.rb
@@ -475,15 +475,15 @@ module SiSU_DAL
       reset
       data=@data
       data=data.join.split("\n\n")
-      data=SiSU_Insertions::Insertions.new(@md,data).expand_insertions?                                                # dal_expand_insertions.rb
-      data=SiSU_SubstituteAndInsert::SI.new(@md,data).substitutions_and_insertions?                                  # dal_substitutions_and_insertions.rb
-      data,metadata=SiSU_DocumentStructureExtract::Build.new(@md,data).identify_parts                                # dal_doc_str.rb
-      data=SiSU_Syntax::Markup.new(@md,data).songsheet                                                                 # dal_syntax.rb
-      data,endnote_array=SiSU_CharacterCheck::Check.new(data).character_check_and_oldstyle_endnote_array              # dal_character_check.rb
-      data=SiSU_Images::Images.new(@md,data).images                                                                    # dal_images.rb
-      data,tags_map,ocn_html_seg_map=SiSU_Numbering::Numbering.new(@md,data).numbering_song                            # dal_numbering.rb
-      data,book_index_rel,book_index_rel_html_seg,html_idx,xhtml_idx=SiSU_BookIndex::BookIndex.new(@md,data,@env).indexing_song if @md.book_idx  # dal_idx.rb
-      data=SiSU_Endnotes::Endnotes.new(@md,data,endnote_array).endnotes                                                # dal_endnotes.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,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
       outputdata=data
       if @md.opt.cmd =~/[mM]/
         SiSU_DAL::Output.new(@fn,@md,outputdata).hard_output
diff --git a/lib/sisu/v3dv/dal_character_check.rb b/lib/sisu/v3dv/dal_character_check.rb
index a498db46..2857cb98 100644
--- a/lib/sisu/v3dv/dal_character_check.rb
+++ b/lib/sisu/v3dv/dal_character_check.rb
@@ -56,7 +56,7 @@
  ** Description: system environment, resource control and configuration details
 
 =end
-module SiSU_CharacterCheck
+module SiSU_DAL_CharacterCheck
   class Check
     def initialize(data)
       @data=data
diff --git a/lib/sisu/v3dv/dal_doc_objects.rb b/lib/sisu/v3dv/dal_doc_objects.rb
index 11ccb0d0..c476b0ce 100644
--- a/lib/sisu/v3dv/dal_doc_objects.rb
+++ b/lib/sisu/v3dv/dal_doc_objects.rb
@@ -56,7 +56,7 @@
  ** Description: document abstraction
 
 =end
-module SiSU_DocumentStructure
+module SiSU_DAL_DocumentStructure
   class Extract
     def extract(h,o)
       obj=h ? h : o
diff --git a/lib/sisu/v3dv/dal_doc_str.rb b/lib/sisu/v3dv/dal_doc_str.rb
index e51320cb..5ab3553f 100644
--- a/lib/sisu/v3dv/dal_doc_str.rb
+++ b/lib/sisu/v3dv/dal_doc_str.rb
@@ -56,7 +56,7 @@
  ** Description: document abstraction
 
 =end
-module SiSU_DocumentStructureExtract
+module SiSU_DAL_DocumentStructureExtract
   class Instantiate < SiSU_Param::Parameters::Instructions
     @@flag={} #Beware!!
     def initialize
@@ -70,8 +70,8 @@ module SiSU_DocumentStructureExtract
     def initialize(md,data)
       @md,@data=md,data
       Instantiate.new
-      @pb=SiSU_DocumentStructure::ObjectLayout.new.break(Hx[:br_page])
-      @pbn=SiSU_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_new])
+      @pb=SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page])
+      @pbn=SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_new])
     end
     def ln_get(lv)
       ln=case lv
@@ -173,7 +173,7 @@ module SiSU_DocumentStructureExtract
           when /^%+\s/                                     #comment
             t_o=if t_o=~/^%+\s+(.+)/
               h={obj: $1}
-              SiSU_DocumentStructure::ObjectComment.new.comment(h)
+              SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h)
             else nil
             end
           when /^:?([A-C1-6])\~/                           #heading / lv
@@ -184,19 +184,19 @@ module SiSU_DocumentStructureExtract
               note=endnote_test?(obj)
               obj,tags=extract_tags(obj)
               h={ lv: lv, ln: ln, obj: obj, idx: idx, tags: tags }
-              SiSU_DocumentStructure::ObjectHeading.new.heading(h)
+              SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h)
             elsif t_o=~/^:?[A-C1-6]\~(\S+?)-\s+(.+)/m
               name,obj=$1,$2
               note=endnote_test?(obj)
               obj,tags=extract_tags(obj)
               h={ lv: lv, name: name, obj: obj, idx: idx, autonum_: false, tags: tags}
-              SiSU_DocumentStructure::ObjectHeading.new.heading(h)
+              SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h)
             elsif t_o=~/^:?[A-C1-6]\~(\S+)\s+(.+)/m
               name,obj=$1,$2
               note=endnote_test?(obj)
               obj,tags=extract_tags(obj,name)
               h={ lv: lv, name: name, obj: obj, idx: idx, tags: tags }
-              SiSU_DocumentStructure::ObjectHeading.new.heading(h)
+              SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h)
             else nil
             end
           when /^_(?:[1-9]!?|[1-9]?\*)\s+/                  #indented and/or bullet paragraph
@@ -213,7 +213,7 @@ module SiSU_DocumentStructureExtract
               obj,tags=extract_tags(obj)
               unless obj=~/\A\s*\Z/m
                 h={ bullet_: bullet, hang: hang, indent: indent, obj: obj, idx: idx, note_: note, image_: image, tags: tags }
-                SiSU_DocumentStructure::ObjectPara.new.paragraph(h)
+                SiSU_DAL_DocumentStructure::ObjectPara.new.paragraph(h)
               end
             else nil
             end
@@ -230,23 +230,23 @@ module SiSU_DocumentStructureExtract
               obj,tags=extract_tags(obj)
               unless obj=~/\A\s*\Z/m
                 h={ hang: hang, indent: indent, obj: obj, idx: idx, note_: note, image_: image, tags: tags }
-                SiSU_DocumentStructure::ObjectPara.new.paragraph(h)
+                SiSU_DAL_DocumentStructure::ObjectPara.new.paragraph(h)
               end
             else nil
             end
           when /^[<\[](?:br)?:(?:pa?r|o(?:bj|---)?)[>\]]\s*$/                  #[br:par] #[br:obj]
-            SiSU_DocumentStructure::ObjectLayout.new.break(Hx[:br_obj])
+            SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_obj])
           when /^(?:[<\[](?:br)?:pg[>\]]|<?:pb>?)\s*$/                         #[br:pg]
-            SiSU_DocumentStructure::ObjectLayout.new.break(Hx[:br_page])
+            SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page])
           when /^[<\[](?:br)?:pg?n[>\]]\s*$/                                   #[br:pgn]
-            SiSU_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_new])
+            SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_new])
           else                                             #paragraph
             image=image_test(t_o)
             note=endnote_test?(t_o)
             obj,tags=extract_tags(t_o)
             unless obj=~/\A\s*\Z/m
               h={ bullet_: false, indent: 0, hang: 0, obj: obj, idx: idx, note_: note, image_: image, tags: tags }
-              SiSU_DocumentStructure::ObjectPara.new.paragraph(h)
+              SiSU_DAL_DocumentStructure::ObjectPara.new.paragraph(h)
             end
           end
         elsif not @@flag['code']
@@ -255,30 +255,30 @@ module SiSU_DocumentStructureExtract
             @@counter=1
             @codeblock_numbered=(t_o =~/^code\{#/) ? true : false
             h={ obj: 'code block start' }                   #introduce a counter
-            t_o=SiSU_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DocumentStructure::ObjectLayout.new.insert(h)
+            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DAL_DocumentStructure::ObjectLayout.new.insert(h)
           elsif t_o =~/^poem\{/
             @@flag['poem']=true
             h={ obj: 'poem start' }                         #introduce a counter
-            t_o=SiSU_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DocumentStructure::ObjectLayout.new.insert(h)
+            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DAL_DocumentStructure::ObjectLayout.new.insert(h)
             tuned_file << t_o
           elsif t_o =~/^group\{/
             @@flag['group']=true
             h={ obj: 'group text start' }                   #introduce a counter
-            t_o=SiSU_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DocumentStructure::ObjectLayout.new.insert(h)
+            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DAL_DocumentStructure::ObjectLayout.new.insert(h)
             tuned_file << t_o
           elsif t_o =~/^block\{/
             @@flag['block']=true
             h={ obj: 'block text start' }                   #introduce a counter
-            t_o=SiSU_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DocumentStructure::ObjectLayout.new.insert(h)
+            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DAL_DocumentStructure::ObjectLayout.new.insert(h)
             tuned_file << t_o
           elsif t_o =~/^alt\{/
             @@flag['alt']=true
             h={ obj: 'alt text start' }                     #introduce a counter
-            t_o=SiSU_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DocumentStructure::ObjectLayout.new.insert(h)
+            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DAL_DocumentStructure::ObjectLayout.new.insert(h)
             tuned_file << t_o
           elsif t_o =~/^(?:table\{|\{table)[ ~]/
             h={ obj: 'table start' }                        #introduce a counter
-            ins=SiSU_DocumentStructure::ObjectComment.new.comment(h) #ins=SiSU_DocumentStructure::ObjectLayout.new.insert(h)
+            ins=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h) #ins=SiSU_DAL_DocumentStructure::ObjectLayout.new.insert(h)
             tuned_file << ins
             if t_o=~/^table\{(?:~h)?\s+/
               @@flag['table']=true
@@ -318,10 +318,10 @@ module SiSU_DocumentStructureExtract
                 cols.times { col << width }
               end
               h={ head_: hd, cols: cols, widths: col, obj: rows, idx: idx, tags: tags }
-              t_o=SiSU_DocumentStructure::ObjectTable.new.table(h) unless h.nil?
+              t_o=SiSU_DAL_DocumentStructure::ObjectTable.new.table(h) unless h.nil?
               tuned_file << t_o
               h={ obj: 'table end' }                        #introduce a counter
-              t_o=SiSU_DocumentStructure::ObjectComment.new.comment(h)
+              t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h)
               t_o
             elsif t_o=~/^\{table(?:~h)?\s+/
               m1,m2,hd=nil,nil,nil
@@ -341,10 +341,10 @@ module SiSU_DocumentStructureExtract
                 rows += r + Mx[:tc_c]
               end
               h={ head_: hd, cols: col.length, widths: col, obj: rows, idx: idx, tags: tags }
-              t_o=SiSU_DocumentStructure::ObjectTable.new.table(h) unless h.nil?
+              t_o=SiSU_DAL_DocumentStructure::ObjectTable.new.table(h) unless h.nil?
               tuned_file << t_o
               h={ obj: 'table end' }                        #introduce a counter
-              t_o=SiSU_DocumentStructure::ObjectComment.new.comment(h)
+              t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h)
               t_o
             end
           end
@@ -356,12 +356,12 @@ module SiSU_DocumentStructureExtract
             @@flag['table']=false
             headings,columns,widths,idx=@h[:head_],@h[:cols],@h[:widths],@h[:idx]
             @h={ head_: headings, cols: columns, widths: widths, idx: idx, obj: @rows }
-            t_o=SiSU_DocumentStructure::ObjectTable.new.table(@h)
+            t_o=SiSU_DAL_DocumentStructure::ObjectTable.new.table(@h)
             tuned_file << t_o
             @h,@rows=nil,''
             t_o
             h={ obj: 'table end' }                          #introduce a counter
-            t_o=SiSU_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DocumentStructure::ObjectLayout.new.insert(h)
+            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DAL_DocumentStructure::ObjectLayout.new.insert(h)
             t_o
           else
             if t_o !~/^table\{/ \
@@ -379,11 +379,11 @@ module SiSU_DocumentStructureExtract
             obj=@tuned_code.join("\n")
             tags=[]
             h={ obj: obj, tags: tags, number_: @codeblock_numbered }
-            t_o=SiSU_DocumentStructure::ObjectBlockTxt.new.code(h)
+            t_o=SiSU_DAL_DocumentStructure::ObjectBlockTxt.new.code(h)
             @tuned_code=[]
             tuned_file << t_o
             h={ obj: 'code block end' }                     #introduce a counter
-            t_o=SiSU_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DocumentStructure::ObjectLayout.new.insert(h)
+            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DAL_DocumentStructure::ObjectLayout.new.insert(h)
           end
           if @@flag['code'] \
           and t_o.class==String \
@@ -392,7 +392,7 @@ module SiSU_DocumentStructureExtract
             @line_mode=sub_array.scan(/.+/)
             @line_mode=[]
             sub_array.scan(/.+/) {|w| @line_mode << w if w =~/[\S]+/}
-            t_o=SiSU_DocumentStructureExtract::Build.new(@md,@line_mode).build_lines('code').join
+            t_o=SiSU_DAL_DocumentStructureExtract::Build.new(@md,@line_mode).build_lines('code').join
             @tuned_code << t_o
             t_o=nil
           end
@@ -404,37 +404,37 @@ module SiSU_DocumentStructureExtract
           and t_o =~/^\}poem/
             @@flag['poem']=false
             h={ obj: 'poem end' }                           #introduce a counter
-            t_o=SiSU_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DocumentStructure::ObjectLayout.new.insert(h)
+            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DAL_DocumentStructure::ObjectLayout.new.insert(h)
           elsif ( @@flag['group'] \
           and t_o =~/^\}group/ )
             @@flag['group']=false
             obj,tags=extract_tags(@tuned_block.join("\n"))
             h={ obj: obj, tags: tags }
             @tuned_block=[]
-            t_o=SiSU_DocumentStructure::ObjectBlockTxt.new.group(h)
+            t_o=SiSU_DAL_DocumentStructure::ObjectBlockTxt.new.group(h)
             tuned_file << t_o
             h={ obj: 'group text end' }                     #introduce a counter
-            t_o=SiSU_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DocumentStructure::ObjectLayout.new.insert(h)
+            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DAL_DocumentStructure::ObjectLayout.new.insert(h)
           elsif ( @@flag['block'] \
           and t_o =~/^\}block/ )
             @@flag['block']=false
             obj,tags=extract_tags(@tuned_block.join("\n"))
             h={ obj: obj, tags: tags }
             @tuned_block=[]
-            t_o=SiSU_DocumentStructure::ObjectBlockTxt.new.block(h)
+            t_o=SiSU_DAL_DocumentStructure::ObjectBlockTxt.new.block(h)
             tuned_file << t_o
             h={ obj: 'block text end' }                     #introduce a counter
-            t_o=SiSU_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DocumentStructure::ObjectLayout.new.insert(h)
+            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DAL_DocumentStructure::ObjectLayout.new.insert(h)
           elsif ( @@flag['alt'] \
           and t_o =~/^\}alt/ )
             @@flag['alt']=false
             obj,tags=extract_tags(@tuned_block.join("\n"))
             h={ obj: obj, tags: tags }
-            t_o=SiSU_DocumentStructure::ObjectBlockTxt.new.alt(h)
+            t_o=SiSU_DAL_DocumentStructure::ObjectBlockTxt.new.alt(h)
             @tuned_block=[]
             tuned_file << t_o
             h={ obj: 'alt text end' }                       #introduce a counter
-            t_o=SiSU_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DocumentStructure::ObjectLayout.new.insert(h)
+            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h) #t_o=SiSU_DAL_DocumentStructure::ObjectLayout.new.insert(h)
           end
           if @@flag['poem'] \
           or @@flag['group'] \
@@ -444,13 +444,13 @@ module SiSU_DocumentStructureExtract
             sub_array=t_o.dup
             @line_mode=sub_array.scan(/.+/)
             type=if @@flag['poem']; 'poem'
-            t_o=SiSU_DocumentStructureExtract::Build.new(@md,@line_mode).build_lines(type).join
+            t_o=SiSU_DAL_DocumentStructureExtract::Build.new(@md,@line_mode).build_lines(type).join
             poem=t_o.split(/\n\n/)
             poem.each do |v|
               v.gsub!(/\n/m,"#{Mx[:br_nl]}\n")
               obj,tags=extract_tags(v)
               h={ obj: obj, tags: tags }
-              t_o=SiSU_DocumentStructure::ObjectBlockTxt.new.verse(h)
+              t_o=SiSU_DAL_DocumentStructure::ObjectBlockTxt.new.verse(h)
               tuned_file << t_o
             end
             else 'group'
@@ -484,32 +484,32 @@ module SiSU_DocumentStructureExtract
       if @md.flag_endnotes
         tuned_file << @pb
         h={ ln: 2, obj: 'Endnotes', autonum_: false }
-        tuned_file << SiSU_DocumentStructure::ObjectHeading.new.heading_insert(h)
+        tuned_file << SiSU_DAL_DocumentStructure::ObjectHeading.new.heading_insert(h)
         h={ ln: 4, obj: 'Endnotes', name: 'endnotes', autonum_: false }
-        tuned_file << SiSU_DocumentStructure::ObjectHeading.new.heading_insert(h)
+        tuned_file << SiSU_DAL_DocumentStructure::ObjectHeading.new.heading_insert(h)
         h={ obj: 'Endnotes' }
       end
       if @md.book_idx
         tuned_file << @pb
         h={ ln: 2, obj: 'Index', autonum_: false }
-        tuned_file << SiSU_DocumentStructure::ObjectHeading.new.heading_insert(h)
+        tuned_file << SiSU_DAL_DocumentStructure::ObjectHeading.new.heading_insert(h)
         h={ ln: 4, obj: 'Index', name: 'book_index', autonum_: false }
-        tuned_file << SiSU_DocumentStructure::ObjectHeading.new.heading_insert(h)
+        tuned_file << SiSU_DAL_DocumentStructure::ObjectHeading.new.heading_insert(h)
         h={ obj: 'Index' }
       end
       tuned_file << @pb
       h={ ln: 2, obj: 'Metadata', autonum_: false, ocn_: false }
-      tuned_file << SiSU_DocumentStructure::ObjectHeading.new.heading_insert(h)
+      tuned_file << SiSU_DAL_DocumentStructure::ObjectHeading.new.heading_insert(h)
       h={ ln: 4, obj: 'SiSU Metadata, document information', name: 'metadata', autonum_: false, ocn_: false }
-      tuned_file << SiSU_DocumentStructure::ObjectHeading.new.heading_insert(h)
+      tuned_file << SiSU_DAL_DocumentStructure::ObjectHeading.new.heading_insert(h)
       tuned_file << @pb
       h={ ln: 2, obj: 'Manifest', autonum_: false, ocn_: false }
-      tuned_file << SiSU_DocumentStructure::ObjectHeading.new.heading_insert(h)
+      tuned_file << SiSU_DAL_DocumentStructure::ObjectHeading.new.heading_insert(h)
       h={ ln: 4, obj: 'SiSU Manifest, alternative outputs etc.', name: 'sisu_manifest', autonum_: false, ocn_: false }
-      tuned_file << SiSU_DocumentStructure::ObjectHeading.new.heading_insert(h)
+      tuned_file << SiSU_DAL_DocumentStructure::ObjectHeading.new.heading_insert(h)
       tuned_file
       h={ obj: 'eof' }
-      meta=SiSU_DocumentStructure::ObjectMetadata.new.metadata(@metadata)
+      meta=SiSU_DAL_DocumentStructure::ObjectMetadata.new.metadata(@metadata)
       [tuned_file,meta]
     end
     def table_rows_and_columns_array(table_str)
@@ -522,11 +522,11 @@ module SiSU_DocumentStructureExtract
     end
     def meta_heading(h)
       h={ lv: h[:lv], ln: h[:ln], name: h[:name], obj: h[:obj], ocn: '0' }
-      SiSU_DocumentStructure::ObjectHeading.new.heading(h)
+      SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h)
     end
     def meta_para(str)
       h={ obj: str, ocn_: false }
-      SiSU_DocumentStructure::ObjectPara.new.paragraph(h)
+      SiSU_DAL_DocumentStructure::ObjectPara.new.paragraph(h)
     end
     def metadata
       meta=[]
@@ -537,9 +537,9 @@ module SiSU_DocumentStructureExtract
       tr=SiSU_Translate::Source.new(@md,language)
       meta << @pb
       h={ ln: 2, obj: 'Metadata', ocn_: false }
-      meta << SiSU_DocumentStructure::ObjectHeading.new.heading(h)
+      meta << SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h)
       h={ ln: 4, name: 'metadata', obj: 'Metadata', autonum_: false, ocn_: false }
-      meta << SiSU_DocumentStructure::ObjectHeading.new.heading(h) #add ocnm
+      meta << SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h) #add ocnm
       s="Document Manifest @\n #{base_html}/#{@md.fn[:manifest]}"
       meta << meta_para(s)
       s="#{Mx[:fa_bold_o]}Dublin Core#{Mx[:fa_bold_c]} (DC)" #add ocnm
@@ -781,22 +781,22 @@ module SiSU_DocumentStructureExtract
         @dob=case @dob.obj
         when /^#{@md.lv1}/
           h={ lv: 'A', ln: 1 }
-          SiSU_DocumentStructure::ObjectHeading.new.heading(h,@dob)
+          SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h,@dob)
         when /^#{@md.lv2}/
           h={ lv: 'B', ln: 2 }
-          SiSU_DocumentStructure::ObjectHeading.new.heading(h,@dob)
+          SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h,@dob)
         when /^#{@md.lv3}/
           h={ lv: 'C', ln: 3 }
-          SiSU_DocumentStructure::ObjectHeading.new.heading(h,@dob)
+          SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h,@dob)
         when /^#{@md.lv4}/
           h={ lv: '1', ln: 4 }
-          SiSU_DocumentStructure::ObjectHeading.new.heading(h,@dob)
+          SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h,@dob)
         when /^#{@md.lv5}/
           h={ lv: '2', ln: 5 }
-          SiSU_DocumentStructure::ObjectHeading.new.heading(h,@dob)
+          SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h,@dob)
         when /^#{@md.lv6}/
           h={ lv: '3', ln: 6 }
-          SiSU_DocumentStructure::ObjectHeading.new.heading(h,@dob)
+          SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h,@dob)
         else @dob
         end
       else @dob
@@ -954,19 +954,19 @@ module SiSU_DocumentStructureExtract
           dob.obj.gsub!(/#{Mx[:pa_non_object_no_heading]}/,'')
           if dob.is=='para'
             h={ obj: dob.obj, ocn_: false, ocn: nil }
-            dob=SiSU_DocumentStructure::ObjectPara.new.paragraph(h,dob)
+            dob=SiSU_DAL_DocumentStructure::ObjectPara.new.paragraph(h,dob)
           elsif dob.is=='heading'
             h={ obj: dob.obj, ocn_: false, ocn: nil, toc_: true }
-            dob=SiSU_DocumentStructure::ObjectHeading.new.heading(h,dob)
+            dob=SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h,dob)
           end
         elsif dob.obj=~/#{Mx[:pa_non_object_dummy_heading]}/
           dob.obj.gsub!(/#{Mx[:pa_non_object_dummy_heading]}/,'')
           if dob.is=='para'
             h={ obj: dob.obj, ocn_: false, ocn: nil }
-            dob=SiSU_DocumentStructure::ObjectPara.new.paragraph(h,dob)
+            dob=SiSU_DAL_DocumentStructure::ObjectPara.new.paragraph(h,dob)
           elsif dob.is=='heading'
             h={ obj: dob.obj, ocn_: false, ocn: nil, toc_: false }
-            dob=SiSU_DocumentStructure::ObjectHeading.new.heading(h,dob)
+            dob=SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h,dob)
           end
         else dob
         end
@@ -1080,7 +1080,7 @@ module SiSU_DocumentStructureExtract
       when '6'; 9
       end
       h={ tag: tag, node: o[:node], lv: o[:lv], ln: ln, status: o[:status] }
-      SiSU_DocumentStructure::ObjectStructure.new.xml_dom(h) #downstream code utilise else ignore like comments
+      SiSU_DAL_DocumentStructure::ObjectStructure.new.xml_dom(h) #downstream code utilise else ignore like comments
     end
     def tag_open(o,tag)
       t={ lv: tag[o.ln], node: o.node, status: 'open' }
diff --git a/lib/sisu/v3dv/dal_endnotes.rb b/lib/sisu/v3dv/dal_endnotes.rb
index f8651a9e..bb327f39 100644
--- a/lib/sisu/v3dv/dal_endnotes.rb
+++ b/lib/sisu/v3dv/dal_endnotes.rb
@@ -56,7 +56,7 @@
  ** Description: system environment, resource control and configuration details
 
 =end
-module SiSU_Endnotes
+module SiSU_DAL_Endnotes
   class Endnotes
     def initialize(md,data,endnote_array=nil)
       @md,@data,@endnote_array=md,data,endnote_array
diff --git a/lib/sisu/v3dv/dal_expand_insertions.rb b/lib/sisu/v3dv/dal_expand_insertions.rb
index cbcc3876..f821769e 100644
--- a/lib/sisu/v3dv/dal_expand_insertions.rb
+++ b/lib/sisu/v3dv/dal_expand_insertions.rb
@@ -56,7 +56,7 @@
  ** Description: system environment, resource control and configuration details
 
 =end
-module SiSU_Insertions
+module SiSU_DAL_Insertions
   class Insertions
     def initialize(md,data)
       @md,@data=md,data
diff --git a/lib/sisu/v3dv/dal_hash_digest.rb b/lib/sisu/v3dv/dal_hash_digest.rb
index 941d5cf9..8353b5a0 100644
--- a/lib/sisu/v3dv/dal_hash_digest.rb
+++ b/lib/sisu/v3dv/dal_hash_digest.rb
@@ -56,7 +56,7 @@
  ** Description: system environment, resource control and configuration details
 
 =end
-module SiSU_Hash
+module SiSU_DAL_Hash
   require_relative 'shared_markup_alt.rb'               #shared_markup_alt.rb
   class ObjectDigest
     def initialize(md,data,env=nil)
diff --git a/lib/sisu/v3dv/dal_idx.rb b/lib/sisu/v3dv/dal_idx.rb
index 63c6c846..8ba2f2b5 100644
--- a/lib/sisu/v3dv/dal_idx.rb
+++ b/lib/sisu/v3dv/dal_idx.rb
@@ -56,7 +56,7 @@
  ** Description: system environment, resource control and configuration details
 
 =end
-module SiSU_BookIndex
+module SiSU_DAL_BookIndex
   class BookIndex
     def initialize(md,data,env=nil)
       @md,@data,@env=md,data,env
@@ -164,15 +164,15 @@ module SiSU_BookIndex
       idx={}
       idx[:sst_rel_html_seg],idx[:sst_rel],idx[:html],idx[:xhtml]=[],[],[],[]
       h={obj: Mx[:br_page]}
-      o=SiSU_DocumentStructure::ObjectLayout.new.break(h)
+      o=SiSU_DAL_DocumentStructure::ObjectLayout.new.break(h)
       idx[:sst_rel_html_seg] << o
       idx[:sst_rel] << o
       h={lv: '2', name: 'index', obj: "Index"}
-      o=SiSU_DocumentStructure::ObjectHeading.new.heading(h)
+      o=SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h)
       idx[:sst_rel_html_seg] << o
       idx[:sst_rel] << o
       h={lv: '4', name: 'idx', obj: " [Index] #{Mx[:pa_non_object_dummy_heading]}"}
-      o=SiSU_DocumentStructure::ObjectHeading.new.heading(h)
+      o=SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h)
       idx[:sst_rel_html_seg] << o
       idx[:sst_rel] << o
       alph=%W[9 A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
diff --git a/lib/sisu/v3dv/dal_images.rb b/lib/sisu/v3dv/dal_images.rb
index 87a6f756..fd058c72 100644
--- a/lib/sisu/v3dv/dal_images.rb
+++ b/lib/sisu/v3dv/dal_images.rb
@@ -56,7 +56,7 @@
  ** Description: system environment, resource control and configuration details
 
 =end
-module SiSU_Images
+module SiSU_DAL_Images
   class Images
     #require 'RMagick'
     #include Magick
diff --git a/lib/sisu/v3dv/dal_metadata.rb b/lib/sisu/v3dv/dal_metadata.rb
index 2c6d133e..f7dc9579 100644
--- a/lib/sisu/v3dv/dal_metadata.rb
+++ b/lib/sisu/v3dv/dal_metadata.rb
@@ -56,7 +56,7 @@
  ** Description: system environment, resource control and configuration details
 
 =end
-module SiSU_Metadata
+module SiSU_DAL_Metadata
   class Metadata
     def initialize(md,metad)
       @md,@metadata=md,metad
@@ -66,11 +66,11 @@ module SiSU_Metadata
     end
     def make_para(obj,ocn)
       h={ obj: obj, ocn: 0 }
-      SiSU_DocumentStructure::ObjectPara.new.paragraph(h)
+      SiSU_DAL_DocumentStructure::ObjectPara.new.paragraph(h)
     end
     def make_heading(obj,ocn,name,lv,ln)
       h={ lv: lv, ln: ln, name: name, obj: obj, ocn: 0 }
-      SiSU_DocumentStructure::ObjectHeading.new.heading(h)
+      SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h)
     end
     def metadata
     end
diff --git a/lib/sisu/v3dv/dal_numbering.rb b/lib/sisu/v3dv/dal_numbering.rb
index cd543450..cf7d861a 100644
--- a/lib/sisu/v3dv/dal_numbering.rb
+++ b/lib/sisu/v3dv/dal_numbering.rb
@@ -56,7 +56,7 @@
  ** Description: system environment, resource control and configuration details
 
 =end
-module SiSU_Numbering
+module SiSU_DAL_Numbering
   class Numbering
     attr_accessor :obj,:osp,:ocn,:lv,:name,:index,:comment
     def initialize(md,data)
@@ -139,7 +139,7 @@ module SiSU_Numbering
       chapter_number_counter=0
       data.each do |dob| #@md.seg_names << [additions to segment names]
         title_no=nil
-        dob=SiSU_DocumentStructureExtract::Structure.new(@md,dob).structure_markup #must happen earlier, node info etc. require
+        dob=SiSU_DAL_DocumentStructureExtract::Structure.new(@md,dob).structure_markup #must happen earlier, node info etc. require
         if dob.is =='heading' \
         and dob.autonum_ \
         and defined? @md.make.num_top \
@@ -229,11 +229,11 @@ module SiSU_Numbering
       @tuned_file=@tuned_file.flatten
     end
     def ocn(data)                                                                      #and auto segment numbering increment
-      @tuned_file=SiSU_DocumentStructureExtract::OCN.new(@md,data).ocn
+      @tuned_file=SiSU_DAL_DocumentStructureExtract::OCN.new(@md,data).ocn
       @tuned_file
     end
     def xml(data)
-      @tuned_file=SiSU_DocumentStructureExtract::XML.new(@md,data).dom
+      @tuned_file=SiSU_DAL_DocumentStructureExtract::XML.new(@md,data).dom
       @tuned_file
     end
     def minor_numbering(data)                                                          #and auto segment numbering increment
@@ -343,9 +343,9 @@ module SiSU_Numbering
           m=dob.ln.to_s
           dob_tmp=[]
           if @md.pagenew.inspect =~/#{m}/
-            dob_tmp << SiSU_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_new]) << dob
+            dob_tmp << SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_new]) << dob
           elsif @md.pagebreak.inspect =~/#{m}/
-            dob_tmp << SiSU_DocumentStructure::ObjectLayout.new.break(Hx[:br_page]) << dob
+            dob_tmp << SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page]) << dob
           end
           para_result=unless dob_tmp.length > 0; dob
           else                                   dob_tmp
diff --git a/lib/sisu/v3dv/dal_substitutions_and_insertions.rb b/lib/sisu/v3dv/dal_substitutions_and_insertions.rb
index a16ada75..b81a91e2 100644
--- a/lib/sisu/v3dv/dal_substitutions_and_insertions.rb
+++ b/lib/sisu/v3dv/dal_substitutions_and_insertions.rb
@@ -56,7 +56,7 @@
  ** Description: system environment, resource control and configuration details
 
 =end
-module SiSU_SubstituteAndInsert
+module SiSU_DAL_SubstituteAndInsert
   class SI
     def initialize(md,data)
       @md,@data=md,data
@@ -137,9 +137,9 @@ module SiSU_SubstituteAndInsert
       end
       data_expand.each do |para|
         para=if @md.markup_version.determined >= 0.38
-          SiSU_DocumentStructureExtract::Structure.new(@md,para).structure_markup_normalize
+          SiSU_DAL_DocumentStructureExtract::Structure.new(@md,para).structure_markup_normalize
         else
-          SiSU_DocumentStructureExtract::Structure.new(@md,para).structure_marks
+          SiSU_DAL_DocumentStructureExtract::Structure.new(@md,para).structure_marks
         end
         para.gsub!(/^(:?A~)\s*$/,'\1~ @title @author')                                    #conditional header
         para.gsub!(/^((?:[1-9]|:?[A-C])~\S*)\s*$/,'\1~ [Note: heading marker::required title missing]~#')    #conditional header for incorporated document 2004w12
diff --git a/lib/sisu/v3dv/dal_syntax.rb b/lib/sisu/v3dv/dal_syntax.rb
index 39a4c689..6d923467 100644
--- a/lib/sisu/v3dv/dal_syntax.rb
+++ b/lib/sisu/v3dv/dal_syntax.rb
@@ -56,7 +56,7 @@
  ** Description: Syntax for markup, input markup syntaxes, determined here
 
 =end
-module SiSU_Syntax
+module SiSU_DAL_Syntax
   class Words
     def initialize(line,md,mkp)
       @line,@md,@mkp=line,md,mkp
diff --git a/lib/sisu/v3dv/modify.rb b/lib/sisu/v3dv/modify.rb
index 743c9ccc..dad713d8 100644
--- a/lib/sisu/v3dv/modify.rb
+++ b/lib/sisu/v3dv/modify.rb
@@ -85,11 +85,11 @@ module SiSU_Modify
     def matches_and_replaces #edit manually
       [
        #Extracted.new.modify.modules_and_classes,
-       #Extracted.new.modify.modules,
+        Extracted.new.modify.modules,
        #Extracted.new.modify.classes,
        #modify.dates,
        #modify.modules,
-        modify.classes,
+       #modify.classes,
        #modify.misc,
       ]
     end
@@ -148,189 +148,12 @@ WOK
       end
       def modules
         [
-         #[/Metadata/,                                                         'SiSU_Metadata'],
-          [/FORMAT/,                                                           'SiSU_FormatAuthor'],
-          [/HARVEST_authors/,                                                  'SiSU_Harvest_Authors'],
-          [/HARVEST_topics/,                                                   'SiSU_Harvest_Topics'],
-          [/Utility/,                                                          'SiSU_SpellUtility'],
-          [/SiSU_book_index/,                                                  'SiSU_BookIndex'],
-          [/SiSU_CGI_sqlite/,                                                  'SiSU_CGI_SQLite'],
-          [/SiSU_CGI_pgsql/,                                                   'SiSU_CGI_PgSQL'],
-          [/SiSU_CGI_sql/,                                                     'SiSU_CGI_SQL'],
-          [/SiSU_character_check/,                                             'SiSU_CharacterCheck'],
-          [/SiSU_character_encode/,                                            'SiSU_CharacterEncode'],
-          [/SiSU_commandline/,                                                 'SiSU_Commandline'],
-          [/SiSU_Convert_footnotes/,                                           'SiSU_ConvertFootnotes'],
-          [/SiSU_DB_columns/,                                                  'SiSU_DbColumns'],
-          [/SiSU_DB_create/,                                                   'SiSU_DbCreate'],
-          [/SiSU_DB_DBI/,                                                      'SiSU_DbDBI'],
-          [/SiSU_DB_drop/,                                                     'SiSU_DbDrop'],
-          [/SiSU_DB_import/,                                                   'SiSU_DbImport'],
-          [/SiSU_DB_index/,                                                    'SiSU_DbIndex'],
-          [/SiSU_DB_remove/,                                                   'SiSU_DbRemove'],
-          [/SiSU_DB_select/,                                                   'SiSU_DbSelect'],
-          [/SiSU_DB_tests/,                                                    'SiSU_DbTests'],
-          [/SiSU_DB_text/,                                                     'SiSU_DbText'],
-          [/SiSU_DB_tuple/,                                                    'SiSU_DbTuple'],
-          [/SiSU_Digest_view/,                                                 'SiSU_DigestView'],
-          [/SiSU_document_structure_extract/,                                  'SiSU_DocumentStructureExtract'],
-          [/SiSU_document_structure/,                                          'SiSU_DocumentStructure'],
-          [/SiSU_endnotes/,                                                    'SiSU_Endnotes'],
-          [/SiSU_EPUB_seg/,                                                    'SiSU_EPUB_Seg'],
-          [/SiSU_Format_Shared/,                                               'SiSU_FormatShared'],
-          [/SiSU_hash/,                                                        'SiSU_Hash'],
-          [/SiSU_HTML_minitoc/,                                                'SiSU_HTML_MiniToc'],
-          [/SiSU_HTML_promo/,                                                  'SiSU_HTML_Promo'],
-          [/SiSU_HTML_scroll/,                                                 'SiSU_HTML_Scroll'],
-          [/SiSU_HTML_seg/,                                                    'SiSU_HTML_Seg'],
-          [/SiSU_HTML_shared/,                                                 'SiSU_HTML_Shared'],
-          [/SiSU_HTML_table/,                                                  'SiSU_HTML_Table'],
-          [/SiSU_images/,                                                      'SiSU_Images'],
-          [/SiSU_insertions/,                                                  'SiSU_Insertions'],
-          [/SiSU_Kdi_source/,                                                  'SiSU_KdiSource'],
-          [/SiSU_Manpage_format/,                                              'SiSU_ManpageFormat'],
-          [/SiSU_Markup_type/,                                                 'SiSU_MarkupType'],
-          [/SiSU_numbering/,                                                   'SiSU_Numbering'],
-          [/SiSU_ODF_format/,                                                  'SiSU_ODF_Format'],
-          [/SiSU_Plaintext_format/,                                            'SiSU_PlaintextFormat'],
-          [/SiSU_po4a_utils/,                                                  'SiSU_Po4aUtils'],
-          [/SiSU_po4a/,                                                        'SiSU_Po4a'],
-          [/SiSU_relaxng/,                                                     'SiSU_Relaxng'],
-          [/SiSU_sem/,                                                         'SiSU_Sem'],
-          [/SiSU_simple_xml_model_sax/,                                        'SiSU_SimpleXML_ModelSax'],
-          [/SiSU_sst_from_xml/,                                                'SiSU_sstFromXML'],
-          [/SiSU_substitute_and_insert/,                                       'SiSU_SubstituteAndInsert'],
-          [/SiSU_Texinfo_format/,                                              'SiSU_TexInfoFormat'],
-          [/SiSU_text_representation/,                                         'SiSU_TextRepresentation'],
-          [/SiSU_text_translation/,                                            'SiSU_TextTranslation'],
-          [/SiSU_text_utils/,                                                  'SiSU_TextUtils'],
-          [/SiSU_Update_control_flag/,                                         'SiSU_UpdateControlFlag'],
-          [/SiSU_urls/,                                                        'SiSU_Urls'],
-          [/SiSU_metadata/,                                                    'SiSU_Metadata'],
-          [/SiSU_XHTML_shared/,                                                'SiSU_XHTML_Shared'],
-          [/SiSU_XHTML_table/,                                                 'SiSU_XHTML_Table'],
-          [/SiSU_XML_format/,                                                  'SiSU_XML_Format'],
-          [/SiSU_XML_metadata/,                                                'SiSU_XML_Metadata'],
-          [/SiSU_XML_munge/,                                                   'SiSU_XML_Munge'],
-          [/SiSU_XML_scaffold/,                                                'SiSU_XML_Scaffold'],
-          [/SiSU_XML_tags/,                                                    'SiSU_XML_Tags'],
+         #[//,                                                                   ''],
         ]
       end
       def classes
         [
-# classes incorrectly named
-#         [/SiSU_CGI_common/,                                                  'CGI_Common'],
-#         [/SiSU_Config/,                                                      'ConfigSite'],
-#         [/SiSU_file/,                                                        'FileOp'],
-#         [/SiSU_search_pgsql/,                                                'SearchPgSQL'],
-#         [/SiSU_search_sqlite/,                                               'SearchSQLite'],
-#         [/SiSU_search/,                                                      'SearchSQL'],
-#         [/SiSU_SQL/,                                                         'SQL'],
-# classes
-          [/Bare_urls/,                                                        'BareUrls'],
-          [/Book_index/,                                                       'BookIndex'],
-          [/Character_encoding/,                                               'CharacterEncoding'],
-          [/Clean_html/,                                                       'CleanHTML'],
-          [/Clean_output/,                                                     'CleanOutput'],
-          [/Clean_xhtml/,                                                      'CleanXHTML'],
-          [/Column_size/,                                                      'ColumnSize'],
-          [/Combined_singleton/,                                               'CombinedSingleton'],
-          [/Composite_file_list/,                                              'CompositeFileList'],
-          [/Convert_markup/,                                                   'ConvertMarkup'],
-          [/Create_file/,                                                      'CreateFile'],
-          [/Create_site/,                                                      'CreateSite'],
-          [/Create_system_link/,                                               'CreateSystemLink'],
-          [/CSS_default/,                                                      'CSS_Default'],
-          [/CSS_Format_generic/,                                               'CSS_FormatGeneric'],
-          [/CSS_select/,                                                       'CSS_Select'],
-          [/CSS_stylesheet/,                                                   'CSS_Stylesheet'],
-          [/Css/,                                                              'CSS'],
-          [/Dbi_search_statement/,                                             'DBI_SearchStatement'],
-          [/Dbi_search_string/,                                                'DBI_SearchString'],
-          [/Doc_title/,                                                        'DocTitle'],
-          [/Env_call/,                                                         'EnvCall'],
-          [/Epub_output/,                                                      'EPUB_Output'],
-          [/File_map/,                                                         'FileMap'],
-          [/Format_head/,                                                      'FormatHead'],
-          [/Format_seg/,                                                       'FormatSeg'],
-          [/Format_obj_break/,                                                 'FormatObjBreak'],
-          [/Format_scroll/,                                                    'FormatScroll'],
-          [/Format_seg/,                                                       'FormatSeg'],
-          [/Format_str/,                                                       'FormatStr'],
-          [/Format_text_object/,                                               'FormatTextObject'],
-          [/Format_toc/,                                                       'FormatToc'],
-          [/Get_init/,                                                         'GetInit'],
-          [/Head_information/,                                                 'HeadInformation'],
-          [/Header_scan/,                                                      'HeaderScan'],
-          [/Character_encoding/,                                               'CharacterEncoding'],
-          [/Head_scroll/,                                                      'HeadScroll'],
-          [/Head_seg/,                                                         'HeadSeg'],
-          [/Head_toc/,                                                         'HeadToc'],
-          [/Html_environment/,                                                 'HTML_Environment'],
-          [/Info_date/,                                                        'InfoDate'],
-          [/Info_db/,                                                          'InfoDb'],
-          [/Info_env/  ,                                                       'InfoEnv'],
-          [/Info_error/,                                                       'InfoError'],
-          [/Info_file/,                                                        'InfoFile'],
-          [/Info_port/,                                                        'InfoPort'],
-          [/Info_processing_flag/,                                             'InfoProcessingFlag'],
-          [/Info_program/,                                                     'InfoProgram'],
-          [/Info_remote_host/,                                                 'InfoRemoteHost'],
-          [/Info_remote/,                                                      'InfoRemote'],
-          [/Info_settings/,                                                    'InfoSettings'],
-          [/Info_skin/,                                                        'InfoSkin'],
-          [/Info_system/,                                                      'InfoSystem'],
-          [/Info_version/,                                                     'InfoVersion'],
-          [/LaTeX_to_pdf/,                                                     'LaTeXtoPdf'],
-          [/LaTeX_create/,                                                     'LaTeXcreate'],
-          [/Links_guide/,                                                      'LinksGuide'],
-          [/Load_documents/,                                                   'LoadDocuments'],
-          [/Load_endnotes/,                                                    'LoadEndnotes'],
-          [/Load_metadata/,                                                    'LoadMetadata'],
-          [/Load_urls/,                                                        'LoadUrls'],
-          [/Markup_identify/,                                                  'MarkupIdentify'],
-          [/Markup_inform/,                                                    'MarkupInform'],
-          [/Markup_history/,                                                   'MarkupHistory'],
-          [/Md_default/,                                                       'MdDefault'],
-          [/Modified_text_plus_Hash_digest/,                                   'ModifiedTextPlusHashDigest'],
-          [/Object_block_txt/,                                                 'ObjectBlockTxt'],
-          [/Object_comment/,                                                   'ObjectComment'],
-          [/Object_digest/,                                                    'ObjectDigest'],
-          [/Object_heading/,                                                   'ObjectHeading'],
-          [/Object_image/,                                                     'ObjectImage'],
-          [/Object_layout/,                                                    'ObjectLayout'],
-          [/Object_metadata/,                                                  'ObjectMetadata'],
-          [/Object_meta/,                                                      'ObjectMeta'],
-          [/Object_para/,                                                      'ObjectPara'],
-          [/Object_structure/,                                                 'ObjectStructure'],
-          [/Object_table/,                                                     'ObjectTable'],
-          [/ODT_head_1_2/,                                                     'ODT_Head_1_2'],
-          [/Output_index/,                                                     'OutputIndex'],
-          [/Output_Info/,                                                      'OutputInfo'],
-          [/Output_urls/,                                                      'OutputUrls'],
-          [/Paragraph_number/,                                                 'ParagraphNumber'],
-          [/Pot_number/,                                                       'PotNumber'],
-          [/Remote_download/,                                                  'RemoteDownload'],
-          [/Remote_image/,                                                     'RemoteImage'],
-          [/Scroll_head_and_segtoc/,                                           'ScrollHeadAndSegToc'],
-          [/Scroll_output/,                                                    'ScrollOutput'],
-          [/Search_request/,                                                   'SearchRequest'],
-          [/Seg_output/,                                                       'SegOutput'],
-          [/Set_CF/,                                                           'SetCF'],
-          [/Special_characters/,                                               'SpecialCharacters'],
-          [/Split_text_object/,                                                'SplitTextObject'],
-          [/Standardise_language/,                                             'StandardiseLanguage'],
-          [/System_call/,                                                      'SystemCall'],
-          [/Table_html/,                                                       'TableHTML'],
-          [/Table_xhtml/,                                                      'TableXHTML'],
-          [/Table_xml_exp/,                                                    'TableXMLexp'],
-          [/Table_xml/,                                                        'TableXML'],
-          [/TeX_metadata/,                                                     'TeX_Metadata'],
-          [/Texinfo_make/,                                                     'TeXinfoMake'],
-          [/Texinfo_txt/,                                                      'TeXinfoTxt'],
-          [/Toc_mini/,                                                         'TocMini'],
-          [/Use_TeX/,                                                          'UseTeX'],
-          [/XHtml_environment/,                                                'XHTML_Environment'],
+         #[//,                                                                   ''],
         ]
       end
       self
diff --git a/lib/sisu/v3dv/modify_instructions.rb b/lib/sisu/v3dv/modify_instructions.rb
new file mode 100644
index 00000000..48ae92c6
--- /dev/null
+++ b/lib/sisu/v3dv/modify_instructions.rb
@@ -0,0 +1,121 @@
+#module SiSU_MC
+  class Extracted
+    def modify
+      def modules_and_classes
+        [
+        ##% -- dal.rb
+        # [/SiSU_DAL/,                                                           'SiSU_DAL'],
+        #   [/Instantiate/,                                                      'Instantiate'],
+        #   [/Make/,                                                             'Make'],
+        #   [/Output/,                                                           'Output'],
+        #   [/Source/,                                                           'Source'],
+        ##% -- dal_character_check.rb
+        # [/SiSU_CharacterCheck/,                                                'SiSU_CharacterCheck'],
+        #   [/Check/,                                                            'Check'],
+        ##% -- dal_doc_objects.rb
+        # [/SiSU_DocumentStructure/,                                             'SiSU_DocumentStructure'],
+        #   [/Extract/,                                                          'Extract'],
+        #   [/ObjectBlockTxt/,                                                   'ObjectBlockTxt'],
+        #   [/ObjectComment/,                                                    'ObjectComment'],
+        #   [/ObjectHeading/,                                                    'ObjectHeading'],
+        #   [/ObjectImage/,                                                      'ObjectImage'],
+        #   [/ObjectLayout/,                                                     'ObjectLayout'],
+        #   [/ObjectMeta/,                                                       'ObjectMeta'],
+        #   [/ObjectMetadata/,                                                   'ObjectMetadata'],
+        #   [/ObjectPara/,                                                       'ObjectPara'],
+        #   [/ObjectStructure/,                                                  'ObjectStructure'],
+        #   [/ObjectTable/,                                                      'ObjectTable'],
+        ##% -- dal_doc_str.rb
+        # [/SiSU_DocumentStructureExtract/,                                      'SiSU_DocumentStructureExtract'],
+        #   [/Build/,                                                            'Build'],
+        #   [/Instantiate/,                                                      'Instantiate'],
+        #   [/OCN/,                                                              'OCN'],
+        #   [/Structure/,                                                        'Structure'],
+        #   [/XML/,                                                              'XML'],
+        ##% -- dal_endnotes.rb
+        # [/SiSU_Endnotes/,                                                      'SiSU_Endnotes'],
+        #   [/Endnotes/,                                                         'Endnotes'],
+        ##% -- dal_expand_insertions.rb
+        # [/SiSU_Insertions/,                                                    'SiSU_Insertions'],
+        #   [/Insertions/,                                                       'Insertions'],
+        ##% -- dal_hash_digest.rb
+        # [/SiSU_Hash/,                                                          'SiSU_Hash'],
+        #   [/ObjectDigest/,                                                     'ObjectDigest'],
+        ##% -- dal_idx.rb
+        # [/SiSU_BookIndex/,                                                     'SiSU_BookIndex'],
+        #   [/BookIndex/,                                                        'BookIndex'],
+        ##% -- dal_images.rb
+        # [/SiSU_Images/,                                                        'SiSU_Images'],
+        #   [/Images/,                                                           'Images'],
+        ##% -- dal_metadata.rb
+        # [/SiSU_Metadata/,                                                      'SiSU_Metadata'],
+        #   [/Metadata/,                                                         'Metadata'],
+        ##% -- dal_numbering.rb
+        # [/SiSU_Numbering/,                                                     'SiSU_Numbering'],
+        #   [/Numbering/,                                                        'Numbering'],
+        ##% -- dal_substitutions_and_insertions.rb
+        # [/SiSU_SubstituteAndInsert/,                                           'SiSU_SubstituteAndInsert'],
+        #   [/SI/,                                                               'SI'],
+        ##% -- dal_syntax.rb
+        # [/SiSU_Syntax/,                                                        'SiSU_Syntax'],
+        #   [/Markup/,                                                           'Markup'],
+        #   [/Words/,                                                            'Words'],
+        ]
+      end
+      def modules
+        [
+        # number of modules: 13, unique: 13
+          [/SiSU_BookIndex/,                                                     'SiSU_DAL_BookIndex'],
+          [/SiSU_CharacterCheck/,                                                'SiSU_DAL_CharacterCheck'],
+        # [/SiSU_DAL/,                                                           'SiSU_DAL'],
+          [/SiSU_DocumentStructure/,                                             'SiSU_DAL_DocumentStructure'],
+          [/SiSU_DocumentStructureExtract/,                                      'SiSU_DAL_DocumentStructureExtract'],
+          [/SiSU_Endnotes/,                                                      'SiSU_DAL_Endnotes'],
+          [/SiSU_Hash/,                                                          'SiSU_DAL_Hash'],
+          [/SiSU_Images/,                                                        'SiSU_DAL_Images'],
+          [/SiSU_Insertions/,                                                    'SiSU_DAL_Insertions'],
+          [/SiSU_Metadata/,                                                      'SiSU_DAL_Metadata'],
+          [/SiSU_Numbering/,                                                     'SiSU_DAL_Numbering'],
+          [/SiSU_SubstituteAndInsert/,                                           'SiSU_DAL_SubstituteAndInsert'],
+          [/SiSU_Syntax/,                                                        'SiSU_DAL_Syntax'],
+        ]
+      end
+      def classes
+        [
+        # number of classes: 31, unique: 30
+        # [/BookIndex/,                                                          'BookIndex'],
+        # [/Build/,                                                              'Build'],
+        # [/Check/,                                                              'Check'],
+        # [/Endnotes/,                                                           'Endnotes'],
+        # [/Extract/,                                                            'Extract'],
+        # [/Images/,                                                             'Images'],
+        # [/Insertions/,                                                         'Insertions'],
+        # [/Instantiate/,                                                        'Instantiate'],
+        # [/Make/,                                                               'Make'],
+        # [/Markup/,                                                             'Markup'],
+        # [/Metadata/,                                                           'Metadata'],
+        # [/Numbering/,                                                          'Numbering'],
+        # [/OCN/,                                                                'OCN'],
+        # [/ObjectBlockTxt/,                                                     'ObjectBlockTxt'],
+        # [/ObjectComment/,                                                      'ObjectComment'],
+        # [/ObjectDigest/,                                                       'ObjectDigest'],
+        # [/ObjectHeading/,                                                      'ObjectHeading'],
+        # [/ObjectImage/,                                                        'ObjectImage'],
+        # [/ObjectLayout/,                                                       'ObjectLayout'],
+        # [/ObjectMeta/,                                                         'ObjectMeta'],
+        # [/ObjectMetadata/,                                                     'ObjectMetadata'],
+        # [/ObjectPara/,                                                         'ObjectPara'],
+        # [/ObjectStructure/,                                                    'ObjectStructure'],
+        # [/ObjectTable/,                                                        'ObjectTable'],
+        # [/Output/,                                                             'Output'],
+        # [/SI/,                                                                 'SI'],
+        # [/Source/,                                                             'Source'],
+        # [/Structure/,                                                          'Structure'],
+        # [/Words/,                                                              'Words'],
+        # [/XML/,                                                                'XML'],
+        ]
+      end
+      self
+    end
+  end
+#end