--no-metadata turns off appending metadata to doc

* (Closes: #746742)
  "please implement --no-metadata similar to --no-manifest"

2 files changed, 21 insertions, 18 deletions

diff --git a/lib/sisu/ao_doc_str.rb b/lib/sisu/ao_doc_str.rb
index ced4c833..1dbcf9e8 100644
--- a/lib/sisu/ao_doc_str.rb
+++ b/lib/sisu/ao_doc_str.rb
@@ -68,6 +68,7 @@ module SiSU_AO_DocumentStructureExtract
       @pbn=SiSU_AO_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_new])
       @pbl=SiSU_AO_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_line])
       @per=SiSU_AO_Persist::PersistDocStructExt.new
+      @make=SiSU_Env::ProcessingSettings.new(@md)
     end
     def ln_get(lv)
       case lv
@@ -1229,23 +1230,25 @@ module SiSU_AO_DocumentStructureExtract
         }
       end
       tuned_file << @pb
-      h={
-        ln: 1,
-        lc: 1,
-        obj: 'Metadata',
-        autonum_: false,
-        ocn_: false,
-      }
-      tuned_file << SiSU_AO_DocumentStructure::ObjectHeading.new.heading_insert(h)
-      h={
-        ln: 4,
-        lc: 2,
-        obj: 'SiSU Metadata, document information',
-        name: 'metadata',
-        autonum_: false,
-        ocn_: false,
-      }
-      tuned_file << SiSU_AO_DocumentStructure::ObjectHeading.new.heading_insert(h)
+      if @make.build.metadata?
+        h={
+          ln: 1,
+          lc: 1,
+          obj: 'Metadata',
+          autonum_: false,
+          ocn_: false,
+        }
+        tuned_file << SiSU_AO_DocumentStructure::ObjectHeading.new.heading_insert(h)
+        h={
+          ln: 4,
+          lc: 2,
+          obj: 'SiSU Metadata, document information',
+          name: 'metadata',
+          autonum_: false,
+          ocn_: false,
+        }
+        tuned_file << SiSU_AO_DocumentStructure::ObjectHeading.new.heading_insert(h)
+      end
       h={
         obj: 'eof',
       }
diff --git a/lib/sisu/hub_options.rb b/lib/sisu/hub_options.rb
index fe371bd1..194858f7 100644
--- a/lib/sisu/hub_options.rb
+++ b/lib/sisu/hub_options.rb
@@ -905,7 +905,7 @@ module SiSU_Commandline
         else { bool: false, set: :na }
         end
         act[:metadata]=if select_arr.inspect \
-        =~/"--inc-metadata"/
+        =~/"--metadata"|"--inc-metadata"/
           { bool: true, set: :on }
         elsif select_arr.inspect \
         =~/"--(?:exc|no)-metadata"/ \