v5 v6: metadata, pdf, remove link to manifest page where --no-manifest is used

* (Closes: #744378)

5 files changed, 27 insertions, 7 deletions

diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 0b357d41..c25d71ee 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -46,6 +46,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.5.orig.tar.xz
 * composite (inserts), missing includes doesn't give an error, fix
   (Closes: #744379) see sisu.org for comment
 
+* metadata, pdf, remove link to manifest page where --no-manifest is used
+  (Closes: #744378)
+
 * added sisu.org emacs:evil:org mode notes related to sisu development
 
 %% 5.3.4.orig.tar.xz (2014-02-14:06/5)
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index b4b0311d..8eea049c 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -36,6 +36,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz
 * composite (inserts), missing includes doesn't give an error, fix
   (Closes: #744379) see sisu.org for comment
 
+* metadata, pdf, remove link to manifest page where --no-manifest is used
+  (Closes: #744378)
+
 * added sisu.org emacs:evil:org mode notes related to sisu development
 
 %% 6.0.4.orig.tar.xz (2014-02-14:06/5)
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
diff --git a/lib/sisu/v6/shared_metadata.rb b/lib/sisu/v6/shared_metadata.rb
index 546eb788..c2fe06b9 100644
--- a/lib/sisu/v6/shared_metadata.rb
+++ b/lib/sisu/v6/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
diff --git a/sisu.org b/sisu.org
index 22174f23..5563b713 100644
--- a/sisu.org
+++ b/sisu.org
@@ -1053,7 +1053,7 @@ it appears both give faulty text, though in different ways
 
 fixed
 
-**** TODO [#B] #744378 [n|u] sisu: --no-manifest not working anymore
+**** DONE (5.3.5::6.0.5) [#B] #744378 [n|u] sisu: --no-manifest not working anymore :check:
       <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744378>
 
 From: Daniel Baumann <daniel.baumann@progress-technologies.net>
@@ -1070,6 +1070,10 @@ contains the sisu manifest at the end of the document.
 Regards,
 Daniel
 
+***** NOTES/COMMENTS
+
+fix, metadata page in pdf should not contain link to manifest where --no-manifest flag is used
+
 **** TODO ONGOING #746740 [n|u] manpages incomplete
 
 Date: Sat, 03 May 2014 08:45:49 +0200