v5: xml, scaffold, re-activated, split into sisu structure & collapsed structuresisu_4.2.11

* --xml-scaffold-sisu (--xml-scaffold)
* --xml-scaffold-collapse
* output currently to terminal only

11 files changed, 492 insertions, 88 deletions

diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index c3849d56..dcf40f63 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -30,6 +30,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.11.orig.tar.xz
   sisu_4.2.11.orig.tar.xz
   sisu_4.2.11-1.dsc
 
+[5.0.24 changes only]
+
 %% 4.2.10.orig.tar.xz (2013-11-02:43/6)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.10
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.10-1
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 00955fb6..56ca73be 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -30,6 +30,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.24.orig.tar.xz
   sisu_5.0.24.orig.tar.xz
   sisu_5.0.24-1.dsc
 
+* xml, scaffold, re-activated, split into sisu structure & collapsed structure
+
 %% 5.0.23.orig.tar.xz (2013-11-02:43/6)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.23
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.23-1
diff --git a/lib/sisu/v5/constants.rb b/lib/sisu/v5/constants.rb
index 26130506..a21f01b7 100644
--- a/lib/sisu/v5/constants.rb
+++ b/lib/sisu/v5/constants.rb
@@ -63,20 +63,23 @@
 #Ax,Xx,Mx,Rx,Hx,Dx,Px,Ep,Db,Gt,Tex=Array.new(11){{}}
 YEAR='2013'
 Sfx={
-  txt:        '.txt',
-  html:       '.html',
-  xhtml:      '.xhtml',
-  xml:        '.xml',
-  xml_sax:    '.sax.xml',
-  xml_dom:    '.dom.xml',
-  epub:       '.epub',
-  epub_xhtml: '.xhtml',
-  odt:        '.odt',
-  pdf:        '.pdf',
-  manpage:    '.1',
-  info:       '.info',
-  texinfo:    '.texinfo',
-  sql:        '.sql.db',
+  txt:                       '.txt',
+  html:                      '.html',
+  xhtml:                     '.xhtml',
+  xml:                       '.xml',
+  xml_sax:                   '.sax.xml',
+  xml_dom:                   '.dom.xml',
+  xml_scaffold:              '.scaffold.xml',
+  xml_scaffold_structure_sisu:     '.scaffold.sisu.xml',
+  xml_scaffold_structure_collapse: '.scaffold.collapse.xml',
+  epub:                      '.epub',
+  epub_xhtml:                '.xhtml',
+  odt:                       '.odt',
+  pdf:                       '.pdf',
+  manpage:                   '.1',
+  info:                      '.info',
+  texinfo:                   '.texinfo',
+  sql:                       '.sql.db',
 }
 Ax={
   tab:                       "\t",
diff --git a/lib/sisu/v5/dal_doc_str.rb b/lib/sisu/v5/dal_doc_str.rb
index 409c28ab..203bc988 100644
--- a/lib/sisu/v5/dal_doc_str.rb
+++ b/lib/sisu/v5/dal_doc_str.rb
@@ -690,24 +690,24 @@ module SiSU_DAL_DocumentStructureExtract
       end
       if @md.flag_endnotes
         tuned_file << @pb
-        h={ ln: 2, obj: 'Endnotes', autonum_: false }
+        h={ ln: 2, lc: 2, obj: 'Endnotes', autonum_: false }
         tuned_file << SiSU_DAL_DocumentStructure::ObjectHeading.new.heading_insert(h)
-        h={ ln: 4, obj: 'Endnotes', name: 'endnotes', autonum_: false }
+        h={ ln: 4, lc: 3, obj: 'Endnotes', name: 'endnotes', autonum_: false }
         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 }
+        h={ ln: 2, lc: 2, obj: 'Index', autonum_: false }
         tuned_file << SiSU_DAL_DocumentStructure::ObjectHeading.new.heading_insert(h)
-        h={ ln: 4, obj: 'Index', name: 'book_index', autonum_: false }
+        h={ ln: 4, lc: 3, obj: 'Index', name: 'book_index', autonum_: false }
         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 }
+      h={ ln: 2, lc: 2, obj: 'Metadata', autonum_: false, ocn_: false }
       tuned_file << SiSU_DAL_DocumentStructure::ObjectHeading.new.heading_insert(h)
-      h={ ln: 4, obj: 'SiSU Metadata, document information', name: 'metadata', autonum_: false, ocn_: false }
+      h={ ln: 4, lc: 3, obj: 'SiSU Metadata, document information', name: 'metadata', autonum_: false, ocn_: false }
       tuned_file << SiSU_DAL_DocumentStructure::ObjectHeading.new.heading_insert(h)
       h={ obj: 'eof' }
       meta=SiSU_DAL_DocumentStructure::ObjectMetadata.new.metadata(@metadata)
diff --git a/lib/sisu/v5/hub.rb b/lib/sisu/v5/hub.rb
index 6893e2ad..2e9092ff 100644
--- a/lib/sisu/v5/hub.rb
+++ b/lib/sisu/v5/hub.rb
@@ -331,6 +331,14 @@ module SiSU
           require_relative 'xhtml'                     #  xhtml.rb
           SiSU_XHTML::Source.new(@opt).read
         end
+        if @opt.act[:xml_scaffold_structure_sisu][:set]==:on #% --xml-scaffold --xml-scaffold-sisu
+          require_relative 'xml_scaffold_structure_sisu' #  xml_scaffold_structure_sisu.rb
+          SiSU_XML_Scaffold_Structure_Sisu::Source.new(@opt).read
+        end
+        if @opt.act[:xml_scaffold_structure_collapse][:set]==:on #% --xml-scaffold-collapse
+          require_relative 'xml_scaffold_structure_collapsed' # xml_scaffold_structure_collapsed.rb
+          SiSU_XML_Scaffold_Structure_Collapse::Source.new(@opt).read
+        end
         if @opt.act[:xml_sax][:set]==:on               #% --xml-sax, -x xml sax type
           require_relative 'xml'                       #  xml.rb
           SiSU_XML_SAX::Source.new(@opt).read
@@ -633,6 +641,8 @@ module SiSU
         || @opt.act[:odt][:set]==:on \
         || @opt.act[:xml_sax][:set]==:on \
         || @opt.act[:xml_dom][:set]==:on \
+        || @opt.act[:xml_scaffold_structure_sisu][:set]==:on \
+        || @opt.act[:xml_scaffold_structure_collapse][:set]==:on \
         || @opt.act[:pdf][:set]==:on \
         || @opt.act[:pdf_p][:set]==:on \
         || @opt.act[:pdf_l][:set]==:on \
diff --git a/lib/sisu/v5/manifest.rb b/lib/sisu/v5/manifest.rb
index 3d6a5835..fc4bd5b9 100644
--- a/lib/sisu/v5/manifest.rb
+++ b/lib/sisu/v5/manifest.rb
@@ -396,6 +396,20 @@ module SiSU_Manifest
           id,file='XML DOM',@f.base_filename.xml_dom
           summarize(id,file,pth,rel,url)
         end
+        if FileTest.file?(@f.place_file.xml_scaffold_structure_sisu.dir)==true
+          pth=@f.output_path.xml_scaffold_structure_sisu.dir
+          rel=@f.output_path.xml_scaffold_structure_sisu.rel_sm
+          url=@f.output_path.xml_scaffold_structure_sisu.url
+          id,file='XML Scaffold sisu structure',@f.base_filename.xml_scaffold_structure_sisu
+          summarize(id,file,pth,rel,url)
+        end
+        if FileTest.file?(@f.place_file.xml_scaffold_structure_collapse.dir)==true
+          pth=@f.output_path.xml_scaffold_structure_collapse.dir
+          rel=@f.output_path.xml_scaffold_structure_collapse.rel_sm
+          url=@f.output_path.xml_scaffold_structure_collapse.url
+          id,file='XML Scaffold collapsed structure',@f.base_filename.xml_scaffold_structure_collapse
+          summarize(id,file,pth,rel,url)
+        end
         if FileTest.file?(@f.place_file.info.dir)==true
           pth=@f.output_path.texinfo.dir
           rel=@f.output_path.texinfo.rel_sm
diff --git a/lib/sisu/v5/options.rb b/lib/sisu/v5/options.rb
index 5bf851e3..7203f8b2 100644
--- a/lib/sisu/v5/options.rb
+++ b/lib/sisu/v5/options.rb
@@ -861,6 +861,12 @@ module SiSU_Commandline
         || mod.inspect =~/"--xml-dom"/) \
         ? { bool: true, set: :on }
         : { bool: false, set: :na }
+        act[:xml_scaffold_structure_sisu]=mod.inspect =~/"--xml-scaffold"|"--xml-scaffold-sisu"/ \
+        ? { bool: true, set: :on }
+        : { bool: false, set: :na }
+        act[:xml_scaffold_structure_collapse]=mod.inspect =~/"--xml-scaffold-collapse"/ \
+        ? { bool: true, set: :on }
+        : { bool: false, set: :na }
         act[:xhtml]=(cmd =~/b/ \
         || mod.inspect =~/"--xhtml"/) \
         ? { bool: true, set: :on }
@@ -979,7 +985,9 @@ module SiSU_Commandline
         || act[:sisupod][:set]==:on \
         || act[:concordance][:set]==:on \
         || act[:xml_dom][:set]==:on \
-        || act[:xml_sax][:set]==:on )
+        || act[:xml_sax][:set]==:on \
+        || act[:xml_scaffold_structure_sisu][:set]==:on \
+        || act[:xml_scaffold_structure_collapse][:set]==:on )
           { bool: true, set: :on }
           #if cmd !~/[mn]/
           #  extra+=if cmd =~/[abegHhIiLNOoPpQTtwXxyz]/ \
@@ -1021,7 +1029,9 @@ module SiSU_Commandline
         || act[:sisupod][:set]==:on \
         || act[:concordance][:set]==:on \
         || act[:xml_dom][:set]==:on \
-        || act[:xml_sax][:set]==:on )
+        || act[:xml_sax][:set]==:on \
+        || act[:xml_scaffold_structure_sisu][:set]==:on \
+        || act[:xml_scaffold_structure_collapse][:set]==:on )
           { bool: true, set: :on }
           ##      if cmd !~/y/
           ##        extra+=if cmd =~/[abeHhIiNopQSstwXxz]/ \
diff --git a/lib/sisu/v5/sysenv.rb b/lib/sisu/v5/sysenv.rb
index f1076c68..d4079f8c 100644
--- a/lib/sisu/v5/sysenv.rb
+++ b/lib/sisu/v5/sysenv.rb