debug rendering of amend and /bibdata/identifier: metanorma/metanorma…

…-model-iso#80
metanorma · Sep 9, 2024 · accc201 · accc201
1 parent 3165e81
commit accc201
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/lib/isodoc/presentation_function/block.rb b/lib/isodoc/presentation_function/block.rb
@@ -119,8 +119,8 @@ def amend(docxml)
     end
 
     def amend1(elem)
-      elem.xpath(ns("./locality | localityStack | autonumber | " \
-                    "classification | contributor")).each(&:remove)
+      elem.xpath(ns("./locality | ./localityStack | ./autonumber | " \
+                    "./classification | ./contributor")).each(&:remove)
       elem.xpath(ns("./newcontent")).each { |a| a.name = "quote" }
       elem.xpath(ns("./description")).each { |a| a.replace(a.children) }
       elem.replace(elem.children)

diff --git a/lib/isodoc/presentation_function/metadata.rb b/lib/isodoc/presentation_function/metadata.rb
@@ -5,6 +5,12 @@ def metadata(docxml)
       fonts_metadata(docxml)
       attachments_extract(docxml)
       preprocess_xslt_insert(docxml)
+      localized_strings(docxml)
+      a = docxml.at(ns("//metanorma-extension")) or return
+      a.elements.empty? and a.remove
+    end
+
+    def localized_strings(docxml)
       a = docxml.at(ns("//bibdata")) or return
       a.next =
         "<localized-strings>#{i8n_name(trim_hash(@i18n.get), '').join}" \
@@ -69,7 +75,7 @@ def fonts_metadata(xmldoc)
 
     def presmeta_insert_pt(xmldoc)
       xmldoc.at(ns("//presentation-metadata")) ||
-        extension_insert_pt(xml).children.last
+        extension_insert_pt(xmldoc).children.last
     end
 
     def presmeta(name, value)

diff --git a/spec/isodoc/blocks_notes_spec.rb b/spec/isodoc/blocks_notes_spec.rb
@@ -105,12 +105,16 @@
         </body>
       </html>
     OUTPUT
-    expect(Xml::C14n.format(strip_guid(IsoDoc::PresentationXMLConvert.new(presxml_options)
-      .convert("test", input, true)))).to be_equivalent_to Xml::C14n.format(presxml)
+    expect(Xml::C14n.format(strip_guid(IsoDoc::PresentationXMLConvert
+      .new(presxml_options)
+      .convert("test", input, true))))
+      .to be_equivalent_to Xml::C14n.format(presxml)
     expect(Xml::C14n.format(IsoDoc::HtmlConvert.new({})
-      .convert("test", presxml, true))).to be_equivalent_to Xml::C14n.format(html)
+      .convert("test", presxml, true)))
+      .to be_equivalent_to Xml::C14n.format(html)
     expect(Xml::C14n.format(IsoDoc::WordConvert.new({})
-      .convert("test", presxml, true))).to be_equivalent_to Xml::C14n.format(doc)
+      .convert("test", presxml, true)))
+      .to be_equivalent_to Xml::C14n.format(doc)
   end
 
   it "processes sequences of notes" do

diff --git a/spec/isodoc/presentation_xml_metadata_spec.rb b/spec/isodoc/presentation_xml_metadata_spec.rb
@@ -202,6 +202,7 @@
     presxml = <<~OUTPUT
       <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
         <bibdata/>
+        <metanorma-extension>
           <presentation-metadata>
           <name>font-license-agreement</name>
           <value>no-install-fonts</value>
@@ -214,6 +215,7 @@
           <name>fonts</name>
           <value>font1</value>
         </presentation-metadata>
+        </metanorma-extension>
         <preface> <clause type="toc" id="_" displayorder="1"> <title depth="1">Table of contents</title> </clause> </preface>
                  <sections>
            <clause id='A' inline-header='false' obligation='normative' displayorder='2'>