v3dv: SiSU_DAL_ for module names in dal, & module Metadata is SiSU_Metadatasisu_3.1.11

* v3dv: modify.rb script (& its artifact) removed (after use) from lib/sisu
  modify.rb script remains available (in generic form) under:
  data/sisu/v3/conf/convert/modify.rb
  data/sisu/v3dv/conf/convert/modify.rb

17 files changed, 25 insertions, 522 deletions

diff --git a/lib/sisu/v3dv/epub_segments.rb b/lib/sisu/v3dv/epub_segments.rb
index 0280f951..5545dc23 100644
--- a/lib/sisu/v3dv/epub_segments.rb
+++ b/lib/sisu/v3dv/epub_segments.rb
@@ -85,7 +85,7 @@ module SiSU_EPUB_Seg
           @seg[:headings] << format_seg.title_heading1
           filename_seg << @seg[:heading_idx] << @seg[:headings] << %{\n<div class="content">\n} << @seg[:idx] << '</div>'
         elsif @type=='metadata'
-          metadata=Metadata::Summary.new(@md).xhtml_display.metadata
+          metadata=SiSU_Metadata::Summary.new(@md).xhtml_display.metadata
           @seg[:headings]=[]
           format_head_seg=SiSU_EPUB_Format::HeadSeg.new(@md)
           @seg[:headings] << format_head_seg.title_banner(@md.title.main,@md.title.sub,@author)
diff --git a/lib/sisu/v3dv/html_format.rb b/lib/sisu/v3dv/html_format.rb
index 968d9747..4267a2da 100644
--- a/lib/sisu/v3dv/html_format.rb
+++ b/lib/sisu/v3dv/html_format.rb
@@ -960,7 +960,7 @@ WOK
         @lnk_url        =t_o[:lnk_url]        || nil
         @lnk_txt        =t_o[:lnk_txt]        || nil
         @format         =t_o[:format]         || nil
-      elsif t_o.class.inspect =~/^(?:#<)?SiSU_DocumentStructure/
+      elsif t_o.class.inspect =~/^(?:#<)?SiSU_DAL_DocumentStructure/
         @dob=t_o if defined? t_o.is
         @named=nametags_seg(@dob)
         @txt=((defined? t_o.obj) ? t_o.obj : nil)
diff --git a/lib/sisu/v3dv/html_scroll.rb b/lib/sisu/v3dv/html_scroll.rb
index b14d841f..ac57b585 100644
--- a/lib/sisu/v3dv/html_scroll.rb
+++ b/lib/sisu/v3dv/html_scroll.rb
@@ -146,7 +146,7 @@ module SiSU_HTML_Scroll
             #and dob.obj=~/Meta/
             #p __LINE__
             ##and dob.obj=='Metadata'
-            #metadata=Metadata::Summary.new(@md).xhtml.metadata
+            #metadata=SiSU_Metadata::Summary.new(@md).xhtml.metadata
             elsif dob.ln==5
               sto.heading_body5
             elsif dob.ln==6
diff --git a/lib/sisu/v3dv/html_segments.rb b/lib/sisu/v3dv/html_segments.rb
index 69388229..75c9b90f 100644
--- a/lib/sisu/v3dv/html_segments.rb
+++ b/lib/sisu/v3dv/html_segments.rb
@@ -92,7 +92,7 @@ module SiSU_HTML_Seg
           @seg[:headings] << format_seg.title_heading1
           filename_seg << @seg[:heading_idx] << @minitoc << @seg[:headings] << %{\n<div class="content">\n} << @seg[:idx] << '</div>' # << '</div>'
         elsif @type=='metadata'
-          metadata=Metadata::Summary.new(@md).xhtml_display.metadata
+          metadata=SiSU_Metadata::Summary.new(@md).xhtml_display.metadata
           @seg[:headings]=[]
           format_head_seg=SiSU_HTML_Format::HeadSeg.new(@md)
           if @title_banner_
diff --git a/lib/sisu/v3dv/manpage.rb b/lib/sisu/v3dv/manpage.rb
index 07f97c95..90c31a3b 100644
--- a/lib/sisu/v3dv/manpage.rb
+++ b/lib/sisu/v3dv/manpage.rb
@@ -159,7 +159,7 @@ GSUB
         end
       end
       def manpage_metadata
-        @manpage[:metadata]=Metadata::Summary.new(@md).manpage.metadata
+        @manpage[:metadata]=SiSU_Metadata::Summary.new(@md).manpage.metadata
       end
       def manpage_tail
         SiSU_Env::InfoSkin.new(@md).select
diff --git a/lib/sisu/v3dv/modify.rb b/lib/sisu/v3dv/modify.rb
deleted file mode 100644
index dad713d8..00000000
--- a/lib/sisu/v3dv/modify.rb
+++ /dev/null
@@ -1,376 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-=begin
-
- * Name: modify.rb
-
- * Description: A conversion script for canned substitutions,
-   a fairly generic simple tool that can be used to store other canned conversions,
-   (used here for altering SiSU markup or the SiSU program)
-
- * Author: Ralph Amissah
-
- * Copyright: (C) 1997 - 2012, Ralph Amissah, All Rights Reserved.
-
- * License: GPL 3 or later:
-
- * Packaged with: SiSU a framework for document structuring, publishing & search
-
-   Copyright (C) Ralph Amissah
-
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the Free
-   Software Foundation, either version 3 of the License, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-   more details.
-
-   You should have received a copy of the GNU General Public License along with
-   this program. If not, see <http://www.gnu.org/licenses/>.
-
-   If you have Internet connection, the latest version of the GPL should be
-   available at these locations:
-   <http://www.fsf.org/licensing/licenses/gpl.html>
-   <http://www.gnu.org/licenses/gpl.html>
-
-   <http://www.jus.uio.no/sisu/gpl.fsf/toc.html>
-   <http://www.jus.uio.no/sisu/gpl.fsf/doc.html>
-   <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt>
-
- * Hompages:
-   <http://www.jus.uio.no/sisu>
-   <http://www.sisudoc.org>
-
- * Download:
-   <http://www.jus.uio.no/sisu/SiSU/download.html>
-
- * Ralph Amissah
-   <ralph@amissah.com>
-   <ralph.amissah@gmail.com>
-
-=end
-module SiSU_Modify
-  class Operations
-    def initialize(cf,files)
-      @cf,@files=cf,files
-      @description="This is a script that contains canned text conversions for reuse"
-      pwd=Dir.pwd
-      @mod_inst='modify_instructions.rb'
-      @modify_instructions_script="#{pwd}/#{@mod_inst}"
-      if FileTest.file?(@modify_instructions_script) ==true
-        puts <<-WOK
-  autoload script: "#{@modify_instructions_script}"
-  used by "ruby  #{__FILE__} --convert" if
-  "Extracted.new.modify.modules_and_classes" is used
-  (see "matches_and_replaces")
-  EDIT this file manually
-  [to rebuild run: "ruby #{__FILE__} --build-gsub"]
-
-           WOK
-      else
-        puts <<-WOK
-  autoload script does not exist: "#{@modify_instructions_script}"
-  needed for "ruby  #{__FILE__} --convert" if
-  "Extracted.new.modify.modules_and_classes" is used
-  (see "matches_and_replaces")
-  try run: "ruby #{__FILE__} --build-gsub"
-
-           WOK
-      end
-      autoload :Extracted, "./#{@mod_inst}"
-    end
-    def matches_and_replaces #edit manually
-      [
-       #Extracted.new.modify.modules_and_classes,
-        Extracted.new.modify.modules,
-       #Extracted.new.modify.classes,
-       #modify.dates,
-       #modify.modules,
-       #modify.classes,
-       #modify.misc,
-      ]
-    end
-    def message(text)
-      response=''
-      while response !~/yes/
-        print %{
-    #{text}
-    To continue type "yes" [to exit type "no" or "quit"]: }
-        response=File.new('/dev/tty').gets.strip
-        exit if response =~/^(?:quit|no)$/
-      end
-    end
-    def help
-    print <<WOK
-
-#{@description}
-
-note converting twice in a single direction will result
-in markup inconsistency
-
-modify.rb --convert
-  performs the current conversion that is set in method "matches_and_replaces",
-  this needs to be edited manually, as do the substitutions to be made on the
-  files matched in the settings [handle with care]
-
-modify.rb --report
-  reports on the names of modules and classes in each file requested
-  (the defalt is all)
-
-modify.rb --build-gsub
-  creates modify_instructions.rb methods for substitutions of methods and
-  classes for editing
-
-WOK
-      exit
-    end
-    #%% substitutions to be made
-    #   [//,                                                                   ''],
-    #def rename_default
-    #  message(%q{rename SiSU modules, classes, date})
-    #  [
-    #    [/1997\s+-\s+2012/,                                                    '1997 - 2012'],
-    #  ]
-    #end
-    def modify
-      def misc
-        [
-          #[//,                                                                  ''],
-        ]
-      end
-      def dates
-        [
-          [/1997\s+-\s+2011/,                                                    '1997 - 2012'],
-        ]
-      end
-      def modules
-        [
-         #[//,                                                                   ''],
-        ]
-      end
-      def classes
-        [
-         #[//,                                                                   ''],
-        ]
-      end
-      self
-    end
-    def convert
-      message("WARNING, proceed at your own risk,\npermanent changes requested for the above named files\n  best that you check (manually) what this file is set to do\n  conversions set are at the top of the file")
-      if matches_and_replaces.length > 0
-        @files.each do |i|
-          @new,@matched,@empty1,@empty2=true,false,false,false
-          file=File.open(i,'r')
-          cont=file.readlines
-          file.close
-          @file=File.new(i,'w')
-          cont.each do |t|
-            matches_and_replaces.each do |match_and_replace|
-              match_and_replace.each do |m,r|
-                if t =~m
-                  p m.to_s + ' -> ' + r
-                  puts "in:  #{t}"
-                  t.gsub!(m,r) if m and r
-                  puts "out: #{t}"
-                end
-              end
-            end
-            if t=~/^\s*$/; @empty1=true
-            else           @empty1=false
-            end
-            @file.puts t unless (@empty1==true and @empty2==true)
-            if t=~/^\s*$/; @empty2=true
-            else           @empty2=false
-            end
-          end
-          @file.close
-        end
-      end
-    end
-    def report_modules_and_classes
-      @f=nil
-      @structure={}
-      @arr={mod: [], cl: []}
-      @files.each do |f|
-        @new,@matched,@empty1,@empty2=true,false,false,false
-        file=File.open(f,'r')
-        cont=file.readlines
-        file.close
-        cont.each do |t|
-          if f != @f
-            @f=f
-            @mod=nil
-            #puts "---\n#{@f}"
-            @structure[@f]={}
-          end
-          if t =~/^\s*module\s+\S+/
-            @mod=t.match(/^\s*module\s+(\S+)/)[1]
-            #puts '  ' +   @mod
-            @arr[:mod] << @mod
-            @structure[@f].store(@mod,[])
-            #@structure[@f] = {@mod => []}
-          end
-          if t =~/^\s*class\s+\S+/
-            cl=t.match(/^\s*class\s+(\S+)/)[1]
-            #puts '    ' + cl
-            @arr[:cl] << cl
-            @structure[@f][@mod] << cl
-          end
-        end
-      end
-      @structure.sort.each do |fl,modules|
-         puts "---\n" + fl
-         modules.sort.each do |mod,classes|
-           puts '  ' + mod
-           classes.sort.each do |cl|
-             puts '    ' + cl
-           end
-         end
-      end
-      puts '---'
-      puts 'number of modules: ' + @arr[:mod].length.to_s + ', unique: ' + @arr[:mod].uniq.length.to_s
-      puts 'number of classes: ' + @arr[:cl].length.to_s + ', unique: ' + @arr[:cl].uniq.length.to_s
-    end
-    def build_search_and_replace_method_for_modules_and_classes
-      @f=nil
-      @structure={}
-      @arr={mod: [], cl: []}
-      @files.each do |f|
-        @new,@matched,@empty1,@empty2=true,false,false,false
-        file=File.open(f,'r')
-        cont=file.readlines
-        file.close
-        cont.each do |t|
-          if f != @f
-            @f=f
-            @mod=nil
-            #puts "---\n#{@f}"
-            @structure[@f]={}
-          end
-          if t =~/^\s*module\s+\S+/
-            @mod=t.match(/^\s*module\s+(\S+)/)[1]
-            #puts '  ' +   @mod
-            @arr[:mod] << @mod
-            @structure[@f].store(@mod,[])
-            #@structure[@f] = {@mod => []}
-          end
-          if t =~/^\s*class\s+\S+/
-            cl=t.match(/^\s*class\s+(\S+)/)[1]
-            #puts '    ' + cl
-            @arr[:cl] << cl
-            @structure[@f][@mod] << cl
-          end
-        end
-      end
-      puts 'number of modules: ' + @arr[:mod].length.to_s + ', unique: ' + @arr[:mod].uniq.length.to_s
-      puts 'number of classes: ' + @arr[:cl].length.to_s + ', unique: ' + @arr[:cl].uniq.length.to_s
-      method_modules_and_classes=[]
-      method_modules_and_classes <<<<-WOK
-#module SiSU_MC
-  class Extracted
-    def modify
-      WOK
-      #% modules_and_classes
-      method_modules_and_classes <<<<-WOK
-      def modules_and_classes
-        [
-      WOK
-      @structure.sort.each do |fl,modules|
-         method_modules_and_classes << ' '*8 +  "##% -- " + fl
-         modules.sort.each do |mod,classes|
-           method_modules_and_classes << ' '*8 + '# ' + "[/#{mod}/," + ' '*(67 - mod.length) + "'#{mod}'],"
-           classes.uniq.sort.each do |cl|
-             method_modules_and_classes << ' '*8 + '#   ' + "[/#{cl}/," + ' '*(65 - cl.length) + "'#{cl}'],"
-           end
-         end
-      end
-      method_modules_and_classes <<<<-WOK
-        ]
-      end
-      WOK
-      #% modules
-      method_modules_and_classes <<<<-WOK
-      def modules
-        [
-      WOK
-      method_modules_and_classes << ' '*8 + '# ' + 'number of modules: ' + @arr[:mod].length.to_s +
-        ', unique: ' + @arr[:mod].uniq.length.to_s
-      @arr[:mod].uniq.sort.each do |mod|
-        method_modules_and_classes << ' '*8 + '# ' + "[/#{mod}/," + ' '*(67 - mod.length) + "'#{mod}'],"
-      end
-      method_modules_and_classes <<<<-WOK
-        ]
-      end
-      WOK
-      #% classes
-      method_modules_and_classes <<<<-WOK
-      def classes
-        [
-      WOK
-      method_modules_and_classes << ' '*8 + '# ' + 'number of classes: ' + @arr[:cl].length.to_s +
-        ', unique: ' + @arr[:cl].uniq.length.to_s
-      @arr[:cl].uniq.sort.each do |cl|
-        method_modules_and_classes << ' '*8 + '# ' + "[/#{cl}/," + ' '*(67 - cl.length) + "'#{cl}'],"
-      end
-      method_modules_and_classes <<<<-WOK
-        ]
-      end
-      WOK
-      method_modules_and_classes <<<<-WOK
-      self
-    end
-  end
-#end
-      WOK
-      #method_modules_and_classes.each{|x| puts x}
-      if FileTest.file?(@modify_instructions_script) ==true
-        message("WARNING << #{@mod_inst} >> exists (and may have been edited). The existing << #{@mod_inst} >> will be overwritten if you proceed.")
-      end
-      instructs=File.new(@modify_instructions_script,'w')
-      method_modules_and_classes.each do |x|
-        puts x
-        instructs.puts x
-      end
-      instructs.close
-    end
-    def action
-      if @files and @files.length > 0
-        p @files
-        mr=nil
-        #%% changes to make m match, r replace      -------------------------->
-        if @cf =~/--help/; help
-        else
-          case @cf
-          when /--convert/;    convert
-          when /--report/;     report_modules_and_classes
-          when /--build-gsub/; build_search_and_replace_method_for_modules_and_classes
-          else help
-          end
-          #act
-        end
-      else puts "this routine makes permanent changes to the contents of the files matched, as instructed within [no matches]"
-      end
-    end
-  end
-end
-#% files to match for this conversion set  ------------------------->
-f=$* #; p $*
-cf=f[0].to_s
-f.shift
-match_and_replace=Array.new
-unless f.length > 0
-  f=if cf == '--report' \
-  or cf == '--build-gsub'
-    Dir.glob("[a-zA-Z]*.rb")  #restrict to ruby files
-  else
-    Dir.glob("[a-zA-Z]*")
-  end
-  f=f.sort.delete_if { |x| x == __FILE__ or x == 'modify_instructions.rb' }
-end
-SiSU_Modify::Operations.new(cf,f).action
-__END__
-#f=Dir.glob("{bin,conf,data,lib}/**/*.rb")     #sisu development
-#f=Dir.glob("[^_]/**/*")                       #all files subdirectories beneath pwd except those starting with _
diff --git a/lib/sisu/v3dv/modify_instructions.rb b/lib/sisu/v3dv/modify_instructions.rb
deleted file mode 100644
index 48ae92c6..00000000
--- a/lib/sisu/v3dv/modify_instructions.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-#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
diff --git a/lib/sisu/v3dv/odf.rb b/lib/sisu/v3dv/odf.rb
index 2f0cf38e..4b90c543 100644
--- a/lib/sisu/v3dv/odf.rb
+++ b/lib/sisu/v3dv/odf.rb
@@ -143,7 +143,7 @@ module SiSU_ODF
         end
       end
       def odf_metadata
-        @@odf[:metadata]=Metadata::Summary.new(@md).odf.metadata
+        @@odf[:metadata]=SiSU_Metadata::Summary.new(@md).odf.metadata
       end
       def odf_tail
         generator="Generated by: #{@md.sisu_version[:project]} #{@md.sisu_version[:version]} of #{@md.sisu_version[:date_stamp]} (#{@md.sisu_version[:date]})"  if @md.sisu_version[:version]
diff --git a/lib/sisu/v3dv/plaintext.rb b/lib/sisu/v3dv/plaintext.rb
index e4b9b398..9bef2c09 100644
--- a/lib/sisu/v3dv/plaintext.rb
+++ b/lib/sisu/v3dv/plaintext.rb
@@ -172,7 +172,7 @@ GSUB
         @@endnotes
       end
       def plaintext_metadata
-        array=Metadata::Summary.new(@md).plaintext.metadata
+        array=SiSU_Metadata::Summary.new(@md).plaintext.metadata
         array.each do |meta|
           tag,inf=meta.scan(/^.+?:\s|.+/)
           if tag and inf
diff --git a/lib/sisu/v3dv/po4a.rb b/lib/sisu/v3dv/po4a.rb
index 2aa4e21d..a622aac9 100644
--- a/lib/sisu/v3dv/po4a.rb
+++ b/lib/sisu/v3dv/po4a.rb
@@ -239,7 +239,7 @@ GSUB
       end
       def pot_metadata_src
         @po4a_identify_type='type: SiSU doc' #'type: Plain text'
-        meta_src=Metadata::Summary.new(@md_src)
+        meta_src=SiSU_Metadata::Summary.new(@md_src)
         w=[]
         w << [
           "#. #{@po4a_identify_type} - metadata: title",
@@ -344,8 +344,8 @@ GSUB
       def pot_metadata_src_trn
         @po4a_identify_type='type: SiSU doc'
         #@po4a_identify_type='type: Plain text'
-        meta_src=Metadata::Summary.new(@md_src)
-        meta_trn=Metadata::Summary.new(@md_trn)
+        meta_src=SiSU_Metadata::Summary.new(@md_src)
+        meta_trn=SiSU_Metadata::Summary.new(@md_trn)
         w=[]
         w << [
           "#. #{@po4a_identify_type} - metadata: title",
diff --git a/lib/sisu/v3dv/shared_metadata.rb b/lib/sisu/v3dv/shared_metadata.rb
index 1f02ce1f..f3834059 100644
--- a/lib/sisu/v3dv/shared_metadata.rb
+++ b/lib/sisu/v3dv/shared_metadata.rb
@@ -56,7 +56,7 @@
  ** Description: system environment, resource control and configuration details
 
 =end
-module Metadata
+module SiSU_Metadata
   class Summary
     attr_accessor :tag,:inf,:class,:attrib
     def initialize(md,display_heading=false)
@@ -855,7 +855,7 @@ module Metadata
 WOK
       end
       def metadata
-        Metadata::Summary.new(@md).metadata_base
+        SiSU_Metadata::Summary.new(@md).metadata_base
       end
       self
     end
@@ -872,7 +872,7 @@ WOK
 WOK
       end
       def metadata
-        Metadata::Summary.new(@md).metadata_base
+        SiSU_Metadata::Summary.new(@md).metadata_base
       end
       self
     end
@@ -890,7 +890,7 @@ WOK
 WOK
       end
       def metadata
-        Metadata::Summary.new(@md).metadata_base
+        SiSU_Metadata::Summary.new(@md).metadata_base
       end
       self
     end
@@ -902,7 +902,7 @@ WOK
 </p>}
       end
       def metadata
-        Metadata::Summary.new(@md,true).metadata_base
+        SiSU_Metadata::Summary.new(@md,true).metadata_base
       end
       self
     end
@@ -943,7 +943,7 @@ WOK
 WOK
       end
       def metadata
-        Metadata::Summary.new(@md).metadata_base
+        SiSU_Metadata::Summary.new(@md).metadata_base
       end
       self
     end
@@ -955,7 +955,7 @@ WOK
 WOK
       end
       def metadata
-        Metadata::Summary.new(@md).metadata_base
+        SiSU_Metadata::Summary.new(@md).metadata_base
       end
       self
     end
@@ -969,7 +969,7 @@ WOK
 WOK
       end
       def metadata
-        Metadata::Summary.new(@md).metadata_base
+        SiSU_Metadata::Summary.new(@md).metadata_base
       end
       self
     end
diff --git a/lib/sisu/v3dv/sst_do_inline_footnotes.rb b/lib/sisu/v3dv/sst_do_inline_footnotes.rb
index 73b49087..d1e1bef6 100644
--- a/lib/sisu/v3dv/sst_do_inline_footnotes.rb
+++ b/lib/sisu/v3dv/sst_do_inline_footnotes.rb
@@ -65,7 +65,7 @@ module SiSU_ConvertFootnotes
   require_relative 'param'                              # param.rb
     include SiSU_Param
   require_relative 'dal_syntax'                         # dal_syntax.rb
-    include SiSU_Syntax
+    include SiSU_DAL_Syntax
   require_relative 'i18n'                               # i18n.rb
   class Instantiate < SiSU_Param::Parameters::Instructions
      @@flag={} #Beware!!
diff --git a/lib/sisu/v3dv/sst_to_s_xml_sax.rb b/lib/sisu/v3dv/sst_to_s_xml_sax.rb
index c96eabfe..e3e219e0 100644
--- a/lib/sisu/v3dv/sst_to_s_xml_sax.rb
+++ b/lib/sisu/v3dv/sst_to_s_xml_sax.rb
@@ -269,7 +269,7 @@ WOK
         (0..6).each { |x| @cont[x]=@level[x]=false }
         (4..6).each { |x| @xml_contents_close[x]='' }
         @data.each do |para|
-          data << SiSU_DocumentStructureExtract::Structure.new(@md,para).structure #takes on Mx marks
+          data << SiSU_DAL_DocumentStructureExtract::Structure.new(@md,para).structure #takes on Mx marks
         end
         data.each do |para|
           if para !~/^\s*(?:%+ |<:code>)/
diff --git a/lib/sisu/v3dv/texpdf.rb b/lib/sisu/v3dv/texpdf.rb
index f4a18f0d..ee623cec 100644
--- a/lib/sisu/v3dv/texpdf.rb
+++ b/lib/sisu/v3dv/texpdf.rb
@@ -551,7 +551,7 @@ module SiSU_TeX
             elsif dob.ln==4 \
             and dob.obj=~/Metadata\b/
               h=tst.level4
-              metadata=Metadata::TeX_Metadata.new(@md).metadata_tex
+              metadata=SiSU_Metadata::TeX_Metadata.new(@md).metadata_tex
               dob.tmp=h.tmp + ' ' + '\begin{scriptsize}' + metadata.join(br) + '\end{scriptsize}'
             else dob.tmp='' # dob.tmp={ l: '', p: '' }
             end
@@ -919,7 +919,7 @@ WOK
                 file[:portrait].puts morph,"\n"
                 file[:landscape].puts morph,"\n"
               end
-            elsif morph.class.inspect =~ /SiSU_DocumentStructure/ \
+            elsif morph.class.inspect =~ /SiSU_DAL_DocumentStructure/ \
             and morph.tmp \
             and morph.tmp.class==String
               if morph.is !='code' \
diff --git a/lib/sisu/v3dv/xhtml.rb b/lib/sisu/v3dv/xhtml.rb
index 353309d4..f444323a 100644
--- a/lib/sisu/v3dv/xhtml.rb
+++ b/lib/sisu/v3dv/xhtml.rb
@@ -177,7 +177,7 @@ WOK
         end
       end
       def xml_head
-        metadata=Metadata::Summary.new(@md).xhtml_scroll.metadata
+        metadata=SiSU_Metadata::Summary.new(@md).xhtml_scroll.metadata
         @@xml[:head] << metadata
       end
       def name_tags(dob)
diff --git a/lib/sisu/v3dv/xml.rb b/lib/sisu/v3dv/xml.rb
index 095a1fe2..a0755375 100644
--- a/lib/sisu/v3dv/xml.rb
+++ b/lib/sisu/v3dv/xml.rb
@@ -178,7 +178,7 @@ WOK
         end
       end
       def xml_head
-        metadata=Metadata::Summary.new(@md).xml_sax.metadata
+        metadata=SiSU_Metadata::Summary.new(@md).xml_sax.metadata
         @@xml[:head] << metadata
       end
       def xml_sc(md='')
diff --git a/lib/sisu/v3dv/xml_dom.rb b/lib/sisu/v3dv/xml_dom.rb
index 63a7814a..dd4dcd44 100644
--- a/lib/sisu/v3dv/xml_dom.rb
+++ b/lib/sisu/v3dv/xml_dom.rb
@@ -138,7 +138,7 @@ module SiSU_XML_DOM
           '<endnote><symbol>\1</symbol><note>\2</note></endnote> ')
       end
       def xml_head
-        metadata=Metadata::Summary.new(@md).xml_dom.metadata
+        metadata=SiSU_Metadata::Summary.new(@md).xml_dom.metadata
         @@xml[:head] << metadata
       end
       def xml_sc(md='')