Merge tag 'sisu_5.3.5' into debian/sid

SiSU 5.3.5

8 files changed, 48 insertions, 167 deletions

diff --git a/lib/sisu/v5/ao_syntax.rb b/lib/sisu/v5/ao_syntax.rb
index cdcb3883..8ff90ae0 100644
--- a/lib/sisu/v5/ao_syntax.rb
+++ b/lib/sisu/v5/ao_syntax.rb
@@ -333,7 +333,7 @@ module SiSU_AO_Syntax
       dob
     end
     def fontface(dob)
-      leader=/^|#{Mx[:gl_c]}|\s+|['"]|[#{Mx[:nbsp]}#{Mx[:fa_o_c]}#{Mx[:fa_c]}#{Mx[:lnk_o]}#{Mx[:br_nl]}#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:tc_c]}#{Mx[:tc_p]}]|[\(\[\{]|[、。]|\>/
+      leader=/^|#{Mx[:gl_c]}|\s+|['"]|[#{Mx[:nbsp]}#{Mx[:fa_o_c]}#{Mx[:fa_c]}#{Mx[:lnk_o]}#{Mx[:br_nl]}#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:tc_c]}#{Mx[:tc_p]}]|[\(\[\{]|[、。「」]|\>/
       dob=fontface_lines(dob,leader)
       dob.obj=dob.obj.gsub(/(#{leader})\*\{(.+?)\}\*/m,
           "\\1#{@emph[:o]}\\2#{@emph[:c]}").                                                                                                                             #emphasis
diff --git a/lib/sisu/v5/composite.rb b/lib/sisu/v5/composite.rb
index 9e7ccb5c..adc88e52 100644
--- a/lib/sisu/v5/composite.rb
+++ b/lib/sisu/v5/composite.rb
@@ -132,7 +132,7 @@ module SiSU_Assemble
     def insertion(fni,insert_array)
       file={ prepared: [], images: [] }
       rgx_image=/(?:^|[^_\\])\{\s*(\S+?\.(?:png|jpg|gif))/
-      file[:prepared] << "\n% |#{fni}|@|^|>>ok\n"
+      file[:prepared] << "\n% |#{fni}|@|^|>>ok\n\n"
       @code_flag=false
       insert_array.each do |i|
         @code_flag=if i =~/^code\{/ then true
@@ -141,11 +141,11 @@ module SiSU_Assemble
         end
         if not @code_flag \
         and i !~/^%+\s/
-          i=i.gsub(/^([123]|:?[ABC])~\? /,'% [conditional heading:] \1~ ')            #off conditional heading (consider syntax)
+          i=i.gsub(/^([123]|:?[ABCD])~\? /,'% [conditional heading:] \1~ ')    #off conditional heading (consider syntax)
           if i =~/^@\S+?:/
             i=i.gsub(/\n/m,"\n%  ").
               gsub(/\n%\s+$/m,'').
-              gsub(/^@\S+?:/m,"\n% [imported header:] ")                          #off imported headers
+              gsub(/^@\S+?:/m,"\n% [imported header:] ")                       #off imported headers
           end
         end
         file[:prepared] << i
@@ -171,6 +171,7 @@ module SiSU_Assemble
         or para =~/^(?:<<\s*)\|(\S+?)\|@\|.+?\|(?:req(?:quire)?\b|\s*\})?/ \
         or para =~/^r\{(.+?)\}/ #depreciated
           loadfile=$1.strip
+          src_ssm=@opt.fns.sub(/\.ssm\.sst/,'.ssm')
           if (@opt.act[:verbose][:set]==:on \
           || @opt.act[:verbose_plus][:set]==:on \
           || @opt.act[:maintenance][:set]==:on)
@@ -200,7 +201,7 @@ module SiSU_Assemble
             file[:prepared]
           else
             cX=SiSU_Screen::Ansi.new(@opt.act[:color_state][:set]).cX
-            STDERR.puts "\t  #{cX.fuchsia}ERROR#{cX.off} #{cX.brown}#{@opt.fns}#{cX.off} #{cX.fuchsia}requires invalid or non-existent file:#{cX.off} #{cX.brown}#{loadfile}#{cX.off}"
+            STDERR.puts "\t  #{cX.fuchsia}ERROR#{cX.off} #{cX.brown}#{@opt.fns}#{cX.off} #{cX.fuchsia}requires an invalid or non-existent file:#{cX.off} #{cX.brown}#{loadfile}#{cX.off}"
             para
           end
         else tuned_file << para
@@ -255,7 +256,7 @@ module SiSU_Assemble
             @ssm << loadfile
           else
             cX=SiSU_Screen::Ansi.new(@opt.act[:color_state][:set]).cX
-            STDERR.puts "\t  #{cX.fuchsia}ERROR#{cX.off} #{cX.brown}#{@opt.fns}#{cX.off} #{cX.fuchsia}requires invalid or non-existent file:#{cX.off} #{cX.brown}#{loadfile}#{cX.off}"
+            STDERR.puts "\t  #{cX.fuchsia}ERROR#{cX.off} #{cX.brown}#{@opt.fns}#{cX.off} #{cX.fuchsia}requires an invalid or non-existent file:#{cX.off} #{cX.brown}#{loadfile}#{cX.off}"
             para
           end
         end
diff --git a/lib/sisu/v5/constants.rb b/lib/sisu/v5/constants.rb
index a9be54f0..748051b6 100644
--- a/lib/sisu/v5/constants.rb
+++ b/lib/sisu/v5/constants.rb
@@ -260,8 +260,8 @@ else
   }
 end
 Db={
-  name_prefix:               "SiSU#{SiSU_is[:version_dir]}a_",
-  name_prefix_db:            "sisu_#{SiSU_is[:version_dir]}a_",
+  name_prefix:               "SiSU#{SiSU_is[:version_dir]}b_",
+  name_prefix_db:            "sisu_#{SiSU_is[:version_dir]}b_",
   col_title:                  800,
   col_title_part:             400,
   col_title_edition:           10,
@@ -276,7 +276,7 @@ Db={
   col_library:                 30,
   col_small:                   16,
   col_filename:               256,
-  col_digest:                  64,
+  col_digest:                 128,
   col_filesize:                10,
   col_info_note:             2500,
 }
@@ -353,7 +353,7 @@ check:
  ♩ ♭   ✠   ▭  ▬  ▪
 【】〖〗◢ ◣ ◀ ▶ ◘ ◙
 《》「」
- ‹ › ∗ 
+ ‹ › ∗  ∴ ∷
 '〔lv1〕','〔lv2〕','〔lv3〕','〔lv4〕','〔lv5〕','〔lv6〕','〔lv7〕','〔lv8〕','〔lv9〕'
 '〔 Ѳ1〕','〔 Ѳ2〕','〔 Ѳ3〕','〔 Ѳ4〕','〔 Ѳ5〕','〔Ѳ6〕','〔Ѳ7〕','〔Ѳ8〕','〔Ѳ9〕'
 ◁▷
diff --git a/lib/sisu/v5/digests.rb b/lib/sisu/v5/digests.rb
index 7099b646..b3dd40bd 100644
--- a/lib/sisu/v5/digests.rb
+++ b/lib/sisu/v5/digests.rb
@@ -71,7 +71,7 @@ module SiSU_DigestView
       @fnb=@opt.fnb
       @@endnotes_para=[]
       @@dg=nil
-      @dg=@@dg ||=SiSU_Env::InfoEnv.new.digest.type
+      @dg=@@dg ||=SiSU_Env::InfoEnv.new.digest(opt).type
       @particulars=SiSU_Particulars::CombinedSingleton.instance.get_all(opt)
     end
     def read
@@ -91,13 +91,13 @@ module SiSU_DigestView
           if @opt.act[:verbose_plus][:set]==:on \
           or @opt.act[:maintenance][:set]==:on
             SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],@opt.fns,"file://#{@md.file.output_path.hash_digest.dir}/#{@md.file.base_filename.hash_digest}").flow
-            end
-          end
-          if SiSU_Env::SystemCall.new.openssl
-            SiSU_DigestView::Source::Scroll.new(@particulars).songsheet
-          else
-            SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('*EXITED* hash digests will not run without openssl')
           end
+        end
+        if SiSU_Env::SystemCall.new.openssl
+          SiSU_DigestView::Source::Scroll.new(@particulars).songsheet
+        else
+          SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('*EXITED* hash digests will not run without openssl')
+        end
       rescue
         SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
@@ -114,8 +114,8 @@ module SiSU_DigestView
         @particulars=particulars
         @data,@env,@md=@particulars.ao_array,@particulars.env,@particulars.md
         SiSU_Env::FileOp.new(@md).mkdir
-        @@dg ||=@env.digest.type
-        @@dl ||=@env.digest.length
+        @@dg ||=@env.digest(@md.opt).type
+        @@dl ||=@env.digest(@md.opt).length
         @dg,@dl=@@dg,@@dl
         l=SiSU_Env::StandardiseLanguage.new(@md.opt.lng).language
         @language=l[:n]
@@ -158,135 +158,6 @@ module SiSU_DigestView
         txt=txt.gsub(/([()])/,"\\\\\\1")
       end
       def message_digest
-        data=@data
-        sys=SiSU_Env::SystemCall.new
-        @p=[]
-        @g,@v,@r='','',''
-        data.each do |para|
-          x=nil
-          y,para_endnotes=[],[]
-          if para =~/#{Mx[:id_o]}~(\d+);(?:(?:\w|[0-6]:)\d+);(?:\w\d+)#{Mx[:id_c]}#{Mx[:id_o]}([0-9a-f]{#{@dl}}):([0-9a-f]{#{@dl}})#{Mx[:id_c]}/
-            ocn,d_clean,d_all=$1,$2,$3
-            @ocn=ocn unless ocn.to_i==0
-            para=para.gsub(/#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}/,'<b>\1</b>').
-              gsub(/#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}/,'<i>\1</i>').
-              gsub(/#{Mx[:fa_underscore_o]}(.+?)#{Mx[:fa_underscore_c]}/,'<u>\1</u>')
-            if para=~/#{Mx[:en_a_o]}[\d*+]+.+?#{Mx[:id_o]}[0-9a-f]{#{@dl}}#{Mx[:id_c]}#{Mx[:en_a_c]}/
-              para_endnotes << para.scan(/(?:#{Mx[:en_a_o]}|#{Mx[:en_b_o]})([\d*+]+).+?#{Mx[:id_o]}([0-9a-f]{#{@dl}})#{Mx[:id_c]}(?:#{Mx[:en_a_c]}|#{Mx[:en_b_c]})/)
-            end
-            images=[]
-            if para !~/^%+\s/ \
-            and para =~/(?:^|[^_\\])#{Mx[:lnk_o]}(\S+\.(png|jpg|gif))\s.+?#{Mx[:lnk_c]}(?:#{Mx[:url_o]}\S+?#{Mx[:url_c]}|image)/
-              images=para.scan(/(?:^|[^_\\])#{Mx[:lnk_o]}(\S+\.(?:png|jpg|gif))\s.+?#{Mx[:lnk_c]}(?:#{Mx[:url_o]}\S+?#{Mx[:url_c]}|image)/).flatten
-            else nil
-            end
-            x=case para
-            when /^#{Mx[:meta_o]}title#{Mx[:meta_c]}/
-              "\n" << '  '*0 << '@' << '  '*9
-            when /^#{Mx[:meta_o]}subtitle#{Mx[:meta_c]}/
-              "\n" << '  '*1 << '@' << '  '*8
-            when /^#{Mx[:lv_o]}1:/ #fix Mx[:lv_o]
-              "\n" << '  '*2 << ':A ' << '  '*6 << '- ' << ocn << ' '*(10-ocn.length) << d_clean << ' ' << d_all
-            when /^#{Mx[:lv_o]}2:/ #fix Mx[:lv_o]
-              "\n" << '  '*3 << ':B ' << '  '*5 << '- ' << ocn << ' '*(10-ocn.length) << d_clean << ' ' << d_all
-            when /^#{Mx[:lv_o]}3:/ #fix Mx[:lv_o]
-              "\n" << '  '*4 << ':C ' << '  '*4 << '- ' << ocn << ' '*(10-ocn.length) << d_clean << ' ' << d_all
-            when /^#{Mx[:lv_o]}4:/ #fix Mx[:lv_o]
-              "\n" << '  '*5 << '1' << '  '*4 << '- ' << ocn << ' '*(10-ocn.length) << d_clean << ' ' << d_all
-            when /^#{Mx[:lv_o]}5:/ #fix Mx[:lv_o]
-              "\n" << '  '*6 << '2' << '  '*3 << '- ' << ocn << ' '*(10-ocn.length) << d_clean << ' ' << d_all
-            when /^#{Mx[:lv_o]}6:/ #fix Mx[:lv_o]
-              "\n" << '  '*7 << '3' << '  '*2 << '- ' << ocn << ' '*(10-ocn.length) << d_clean << ' ' << d_all
-            else
-              if para =~/MD5\(\S+?\.sst\)=\s*<u>([0-9a-f]{#{@dl}})<\/u>/                                        #watch
-                @n,@s=/MD5\((\S+?\.sst)\)=\s*<u>([0-9a-f]{#{@dl}})<\/u>/.match(para)[1,2]
-              end
-              x=unless ocn =~ /^0$/
-                if images \
-                and images.length > 0 # then get path of image & produce digest
-                  @image_name,@image_dgst,@img=[],[],[]
-                  images.each do |i|
-                    image_source=if FileTest.file?("#{@env.path.image_source_include_local}/#{i}")
-                      @env.path.image_source_include_local
-                    elsif FileTest.file?("#{@env.path.image_source_include_remote}/#{i}")
-                      @env.path.image_source_include_remote
-                    elsif FileTest.file?("#{@env.path.image_source_include}/#{i}")
-                      @env.path.image_source_include
-                    else
-                      SiSU_Screen::Ansi.new(@md.opt.act[:color_state][:set],"ERROR - image:", %{"#{i}" missing}, "search locations: #{@env.path.image_source_include_local}, #{@env.path.image_source_include_remote} and #{@env.path.image_source_include}").error2 unless @md.opt.act[:quiet][:set]==:on
-                      nil
-                    end
-                    @img << /\S+\.(png|jpg|gif)/.match(i)[1]
-                    not_found_msg='image not found'
-                    if image_source
-                      para_image = image_source + '/' + i
-                      @image_name << i
-                      @image_dgst << (@dg =~/^sha(?:2|256)$/) \
-                      ? sys.sha256(para_image)
-                      : sys.md5(para_image)
-                    else
-                      @image_name << '  '*16 + i + ' [image missing]'
-                      @image_dgst << ''
-                      @image_dgst[1]=not_found_msg + ' '*(32-not_found_msg.length)
-                    end
-                  end
-                  line= "\n" + '  '*9 + ' - ' + ocn + ' '*(10-ocn.length) + d_clean + ' ' + d_all + "\n"
-                  line_image=[]
-                  c=0
-                  @image_name.each do |ok|
-                    line_image << %{                     #{@img[c]}       #{@image_dgst[c][1]}                                  #{@image_name[c]}}
-                    c +=1
-                  end
-                  line=line + line_image.join("\n")
-                else "\n" + '  '*9 + ' - ' + ocn + ' '*(10-ocn.length) + d_clean + ' ' + d_all
-                end
-              else
-                prefix=''
-                metad=[@tr.full_title,@tr.author,@tr.translator,@tr.illustrator,@tr.prepared_by,@tr.digitized_by,@tr.description,@tr.subject,@tr.abstract,@tr.publisher,@tr.contributor,@tr.date_created,@tr.date_issued,@tr.date_available,@tr.date_modified,@tr.date_valid,@tr.date,@tr.type,@tr.format,@tr.rights,@tr.identifier,@tr.source,@tr.language,@tr.language_original,@tr.relation,@tr.coverage,@tr.keywords,@tr.comments,@tr.cls_loc,@tr.cls_dewey,@tr.cls_gutenberg,@tr.cls_isbn,@tr.prefix_a,@tr.prefix_b,@tr.sourcefile,@tr.sourcefile_digest,@tr.last_generated,@tr.sisu_version,@tr.ruby_version,@tr.sc_number,@tr.sc_date,'Generated by: ','Ruby version: ']
-                metad.each do |n|
-                  m=rgx_txt(n)
-                  if m=~/\S+/ \
-                  and para=~/^#{m}:/
-                    x,o=0,18
-                    while x < 2; o = o + 2
-                      x=o - n.length
-                    end
-                    space=' '*x
-                    prefix="#{n.downcase}#{space}"
-                    break
-                  else prefix='  '*9
-                  end
-                end
-                m_title=rgx_txt(@tr.full_title)
-                m_author=rgx_txt(@tr.author)
-                m_sourcefile_digest=rgx_txt(@tr.sourcefile_digest)
-                m_sisu_version=rgx_txt(@tr.sisu_version)
-                m_last_generated=rgx_txt(@tr.last_generated)
-                m_ruby_version=rgx_txt(@tr.ruby_version)
-                case para
-                when /#{m_title}: /
-                  @t=/#{m_title}: (.+?)#{Mx[:id_o]}~\d;(?:\w|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}[0-9a-f]{#{@dl}}:[0-9a-f]{#{@dl}}#{Mx[:id_c]}/.match(para)[1].gsub(/<\/?u>/,'').strip
-                when /#{m_author}: /
-                  @c=/#{m_author}: (.+?)#{Mx[:id_o]}~\d;(?:\w|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}[0-9a-f]{#{@dl}}:[0-9a-f]{#{@dl}}#{Mx[:id_c]}/.match(para)[1].gsub(/<\/?u>/,'').strip
-                when /#{m_sourcefile_digest}.+?<u>/                                        #watch
-                  dgst_extra="\n" << ' '*21 << 'source' << ' '*4 << @md.dgst[1] << ' '*34 << @md.fns
-                when /#{m_sisu_version}: /
-                  @v=/#{m_sisu_version}: (.+?)#{Mx[:id_o]}~\d;(?:\w|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}[0-9a-f]{#{@dl}}:[0-9a-f]{#{@dl}}#{Mx[:id_c]}/.match(para)[1].gsub(/<\/?u>/,'').strip
-                when /#{m_last_generated}: /
-                  @g=/#{m_last_generated}: (.+?)#{Mx[:id_o]}~\d;(?:\w|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}[0-9a-f]{#{@dl}}:[0-9a-f]{#{@dl}}#{Mx[:id_c]}/.match(para)[1].gsub(/<\/?u>/,'').strip
-                when /#{m_ruby_version}: /
-                  @r=/#{m_ruby_version}: (.+?)#{Mx[:id_o]}~\d;(?:\w|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}[0-9a-f]{#{@dl}}:[0-9a-f]{#{@dl}}#{Mx[:id_c]}/.match(para)[1].gsub(/<\/?u>/,'').strip
-                end
-                dgst_extra ||=''
-                "\n" << prefix << ' - ' << ocn << ' '*(10-ocn.length) << d_clean << ' ' << d_all << dgst_extra << "\n"
-              end
-            end
-            para_endnotes[0].each { |e| y << "\n" + ' '*(28-e[0].length) + "[#{e[0].to_s}] #{e[1].to_s}" } if para_endnotes[0]
-            if y; digests(x,y)
-            else  digests(x)
-            end
-          end
-        end
         manifest="#{@env.url.root}/#{@md.fnb}/sisu_manifest.html"
         a=%{ocn      digest clean (no markup/notes),#{@sp*33}digest all (includes markup & endnotes)\n}
         description("#{@md.title.full}\n")
@@ -340,18 +211,20 @@ module SiSU_DigestView
         data.each do |t_o|
           if t_o.is==:heading
             x=case t_o.ln
-            when 1 then l[1] +=1 #fix Mx[:lv_o]
+            when 1 then l[0] +=1 #fix Mx[:lv_o]
               '  '*0 << ':A'
-            when 2 then l[2] +=1 #fix Mx[:lv_o]
+            when 1 then l[1] +=1 #fix Mx[:lv_o]
               '  '*1 << ':B'
-            when 3 then l[3] +=1 #fix Mx[:lv_o]
+            when 2 then l[2] +=1 #fix Mx[:lv_o]
               '  '*2 << ':C'
+            when 3 then l[3] +=1 #fix Mx[:lv_o]
+              '  '*3 << ':D'
             when 4 then l[4] +=1 #fix Mx[:lv_o]
-              '  '*3 << '1'
+              '  '*4 << '1'
             when 5 then l[5] +=1 #fix Mx[:lv_o]
-              '  '*4 << '2'
+              '  '*5 << '2'
             when 6 then l[6] +=1 #fix Mx[:lv_o]
-              '  '*5 << '3'
+              '  '*6 << '3'
             else nil
             end
           end
@@ -363,9 +236,10 @@ module SiSU_DigestView
         ao_structure_summary("document structure[*]\n")
         [0,1,2,3,4,5,6].each do |y|
           v=case y
-          when 1 then ':A'
-          when 2 then ':B'
-          when 3 then ':C'
+          when 0 then ':A'
+          when 1 then ':B'
+          when 2 then ':C'
+          when 3 then ':D'
           when 4 then '1 '
           when 5 then '2 '
           when 6 then '3 '
@@ -374,7 +248,7 @@ module SiSU_DigestView
         end
         ao_structure_summary("objects (ocn) = #{ocn}\n")
         ao_structure_summary("endnotes      = #{endnotes}\n")
-        ao_structure_summary("  [*] number of headers (@) and of each heading level (:A to :C and 1 to 3)\n")
+        ao_structure_summary("  [*] number of headers (@) and of each heading level (:A to :D and 1 to 3)\n")
       end
       def supplementary
         if defined? @md.sc_number \
diff --git a/lib/sisu/v5/html_format.rb b/lib/sisu/v5/html_format.rb
index e244bbb8..058a8f34 100644
--- a/lib/sisu/v5/html_format.rb
+++ b/lib/sisu/v5/html_format.rb
@@ -217,7 +217,7 @@ module SiSU_HTML_Format
       @env=SiSU_Env::InfoEnv.new(md.fns)
       @file=SiSU_Env::FileOp.new(md)
       @o_str ||=SiSU_Env::ProcessingSettings.new(md).output_dir_structure
-      @make=SiSU_Env::ProcessingSettings.new(@md)
+      @make=SiSU_Env::ProcessingSettings.new(md)
     end
     def home
       %{<td align="center" bgcolor=#{@vz.color_band2}>
diff --git a/lib/sisu/v5/html_minitoc.rb b/lib/sisu/v5/html_minitoc.rb
index 5366b127..8b802a81 100644
--- a/lib/sisu/v5/html_minitoc.rb
+++ b/lib/sisu/v5/html_minitoc.rb
@@ -143,7 +143,8 @@
         end
         txt_obj={ txt: title }
         format_toc=SiSU_HTML_Format::FormatToc.new(@md,txt_obj)
-        toc_mini=if txt.name =~/^meta/ and txt.obj=~/Document Information/
+        toc_mini=if txt.name =~/^meta/ \
+        and txt.obj=~/Document Information/
           format_toc.mini_tail
         else format_toc.mini_lev1
         end
diff --git a/lib/sisu/v5/param.rb b/lib/sisu/v5/param.rb
index ba75bfb0..adc9350f 100644
--- a/lib/sisu/v5/param.rb
+++ b/lib/sisu/v5/param.rb
@@ -568,7 +568,7 @@ module SiSU_Param
             and copyright.text \
             and not copyright.text.empty?
               v=sep(copyright.text)
-              s +=copyright.text + v
+              s +='Copyright: ' + copyright.text + v
             end
             if defined? copyright.translation \
             and copyright.translation \
@@ -1311,7 +1311,7 @@ module SiSU_Param
         if @en[:note] > 0 \
         and @en[:sum] > 0
           if @en[:sum] > 0
-          else SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'*WARN* both endnote styles used',"~{ #{@en[:sum]} }~ and ^~ #{@en[:mark]}").warn unless @opt.act[:unless][:set]==:on
+          else SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'*WARN* both endnote styles used',"~{ #{@en[:sum]} }~ and ^~ #{@en[:mark]}").warn unless @opt.act[:quiet][:set]==:on
           end
         end
         if @en[:mark] != @en[:note] \
@@ -1328,7 +1328,7 @@ module SiSU_Param
           and  @opt.inspect =~/P/
             #@title=Md.new('Text Insert',@opt,@env).title
           else
-            SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'WARNING: Document Title missing','please provide @title:').warn unless @opt.act[:unless][:set]==:on
+            SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'WARNING: Document Title missing','please provide @title:').warn unless @opt.act[:quiet][:set]==:on
           end
         end
         if @author !~/[\S]/
@@ -1336,7 +1336,7 @@ module SiSU_Param
           and  @opt.inspect =~/P/
             #@creator=SiSU_Param::Md.new('Text Insert',@opt,@env).creator
           else
-            SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'WARNING: Document Author missing','please provide @creator: :author:').warn unless @opt.act[:unless][:set]==:on
+            SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'WARNING: Document Author missing','please provide @creator: :author:').warn unless @opt.act[:quiet][:set]==:on
           end
         end
         @struct={}
diff --git a/lib/sisu/v5/shared_metadata.rb b/lib/sisu/v5/shared_metadata.rb
index b7ba2f1f..da396040 100644
--- a/lib/sisu/v5/shared_metadata.rb
+++ b/lib/sisu/v5/shared_metadata.rb
@@ -886,6 +886,8 @@ WOK
     def initialize(md)
       @md=md
       @br="\\\\\n"
+      @make=SiSU_Env::ProcessingSettings.new(md)
+      @o_str ||=SiSU_Env::ProcessingSettings.new(md).output_dir_structure
     end
     def meta_para(tag,inf,sc=true)
       inf=((inf.is_a?(String) && sc) ? spec_char(inf) : inf)
@@ -906,9 +908,12 @@ WOK
       l=SiSU_Env::StandardiseLanguage.new(@md.opt.lng).language
       language=l[:n]
       tr=SiSU_Translate::Source.new(@md,language)
-      tag="Document Manifest @"
-      inf="#{@br}#{@md.file.output_path.manifest.url}/#{@md.file.base_filename.manifest}"
-      meta << meta_para(tag,inf)
+      if @make.build.links_to_manifest? \
+      and not @o_str.dump_or_redirect?
+        tag="Document Manifest @"
+        inf="#{@br}#{@md.file.output_path.manifest.url}/#{@md.file.base_filename.manifest}"
+        meta << meta_para(tag,inf)
+      end
       if defined? @md.title.full \
       and @md.title.full=~/\S+/
         tag,inf=tr.full_title,@md.title.full