v3dv: dal, remove sisu_manifest from document structure & toc

* html & epub coding affected

4 files changed, 11 insertions, 13 deletions

diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 314da884..bfbb5340 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -44,6 +44,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.14.orig.tar.xz
 * v3dv: -j copy images associated with file (images used by html & xmls)
   * automatically invoked by --dump & redirect
 
+* v3dv: dal, remove sisu_manifest from document structure & toc (metadata
+  retained (provide link to sisu_manifest)), html & epub coding affected
+
 * v3 v3dv: document --redirect, --dump, -j update sisu_commands.sst
   [documents not generated until v3.2.0 (when v3dv branch is merged into v3)]
 
diff --git a/lib/sisu/v3dv/dal_doc_str.rb b/lib/sisu/v3dv/dal_doc_str.rb
index a3c697e0..b4a98edd 100644
--- a/lib/sisu/v3dv/dal_doc_str.rb
+++ b/lib/sisu/v3dv/dal_doc_str.rb
@@ -502,11 +502,6 @@ module SiSU_DAL_DocumentStructureExtract
       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_DAL_DocumentStructure::ObjectHeading.new.heading_insert(h)
-      tuned_file << @pb
-      h={ ln: 2, obj: 'Manifest', autonum_: false, ocn_: false }
-      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_DAL_DocumentStructure::ObjectHeading.new.heading_insert(h)
       tuned_file
       h={ obj: 'eof' }
       meta=SiSU_DAL_DocumentStructure::ObjectMetadata.new.metadata(@metadata)
diff --git a/lib/sisu/v3dv/epub_segments.rb b/lib/sisu/v3dv/epub_segments.rb
index 55c6c1f9..96abfdc0 100644
--- a/lib/sisu/v3dv/epub_segments.rb
+++ b/lib/sisu/v3dv/epub_segments.rb
@@ -247,10 +247,10 @@ WOK
                 SiSU_EPUB_Seg::Seg.new.reinitialise
                 heading_art(dob)
                 head(dob)
-                if @@seg_name_xhtml[tracking]=='sisu_manifest' # this is for manifest, includes navigation bug
+                if @@seg_name_xhtml[tracking] =='metadata'
                   segfilename="#{dir_epub_cont}/#{@@seg_name_xhtml[tracking]}#{Sfx[:epub_xhtml]}"
                   output_epub_cont_seg=File.new(segfilename,'w')
-                  SiSU_EPUB_Seg::Output.new(@md,output_epub_cont_seg,@@seg,@minitoc,'sisu_manifest').output
+                  SiSU_EPUB_Seg::Output.new(@md,output_epub_cont_seg,@@seg,@minitoc,'metadata').output
                   SiSU_EPUB_Seg::Seg.new.reinitialise #BUG navigation bug with items following metadata, and occurring before manifest, this becomes a bug ... work area for book index, FIX
                 end
                #@output_epub_cont_seg.close                                         #%(((( EOF )))) -->
diff --git a/lib/sisu/v3dv/html_segments.rb b/lib/sisu/v3dv/html_segments.rb
index eca87b12..05f30cc4 100644
--- a/lib/sisu/v3dv/html_segments.rb
+++ b/lib/sisu/v3dv/html_segments.rb
@@ -266,12 +266,12 @@ module SiSU_HTML_Seg
                 heading_art(dob)
                 head(dob)
                #keep use for last segment, eg if metadata is last segment
-               #if @@seg_name_html[tracking] =~/metadata/ # this is for metadata
-               #  segfilename="#{@md.dir_out}/#{@md.fnl[:pre]}#{@@seg_name_html[tracking]}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}"
-               #  output_seg_file=File.new(segfilename,'w')
-               #  SiSU_HTML_Seg::Output.new(@md,output_seg_file,@@seg,minitoc,'metadata').output
-               #  Seg.new.reinitialise
-               #end
+               if @@seg_name_html[tracking] =='metadata' # this is for metadata
+                 segfilename="#{@file.output_path.html_seg.dir}/#{@@seg_name_html[tracking]}#{@md.lang_code_insert}#{Sfx[:html]}"
+                 output_seg_file=File.new(segfilename,'w')
+                 SiSU_HTML_Seg::Output.new(@md,output_seg_file,@@seg,minitoc,'metadata').output
+                 Seg.new.reinitialise
+               end
               end
               if tracking==0
                 heading_art(dob)