Fix/presxml 20241106

Gemfile.devel

@@ -1,2 +1,4 @@
-gem "metanorma-standoc", git: "https://github.com/metanorma/metanorma-standoc", branch: "main"
-gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "main"
+gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "fix/presxml-20241106"
+
+
+

lib/isodoc/iso/base_convert.rb

@@ -78,43 +78,18 @@ def table_th_center(docxml)
         end
       end
 
-      def admonition_parse(node, out)
-        type = node["type"]
-        name = admonition_name(node, type)
-        out.div id: node["id"], class: admonition_class(node) do |div|
-          if node.first_element_child.name == "p"
-            admonition_p_parse(node, div, name)
-          else
-            admonition_parse1(node, div, name)
-          end
-        end
-      end
-
       def admonition_class(node)
         if node["type"] == "editorial" then "zzHelp"
         else super
         end
       end
 
-      def admonition_parse1(node, div, name)
-        div.p do |p|
-          admonition_name_parse(node, p, name) if name
-        end
-        node.children.each { |n| parse(n, div) unless n.name == "name" }
-      end
-
-      def admonition_p_parse(node, div, name)
-        div.p do |p|
-          admonition_name_parse(node, p, name) if name
-          node.first_element_child.children.each { |n| parse(n, p) }
-        end
-        node.element_children[1..].each { |n| parse(n, div) }
+      def admonition_p_parse(node, div)
+        admonition_name_in_first_para(node, div)
       end
 
-      # TODO to presentation XML
-      def admonition_name_parse(_node, div, name)
-        name.children.each { |n| parse(n, div) }
-        div << " &#x2014; "
+      def admonition_name_para_delim(para)
+        para << " "
       end
 
       def figure_name_parse(_node, div, name)

lib/isodoc/iso/presentation_xml_convert.rb

@@ -102,7 +102,6 @@ def clause(docxml)
 
       def admonition1(elem)
         super
-        admonition_inline_name(elem)
         admonition_outside_clauses(elem)
       end
 
@@ -118,18 +117,6 @@ def wrap_in_bold(cell)
         cell.children.each { |p| wrap_in_bold(p) }
       end
 
-      # TODO keep name, and append em-dash within it
-      def admonition_inline_name(elem)
-        n = elem.at(ns("./name")) or return
-        if (p = n.next_element) && p&.name == "p"
-          p.add_first_child admonition_name(to_xml(n.remove.children))
-        end
-      end
-
-      def admonition_name(xml)
-        "#{xml} — "
-      end
-
       def bibrender_formattedref(formattedref, xml)
         %w(techreport standard).include? xml["type"] and return
         super
@@ -238,6 +225,14 @@ def render_identifier(ident)
         ret
       end
 
+      def admonition_delim(elem)
+        if elem.at("./*[not(self::xmlns:name)]")&.name == "p"
+          " — "
+        else
+          ""
+        end
+      end
+
       include Init
     end
   end

spec/isodoc/blocks_spec.rb

@@ -185,9 +185,11 @@
     OUTPUT
     expect(Xml::C14n.format(strip_guid(IsoDoc::Iso::PresentationXMLConvert
       .new(presxml_options)
-      .convert("test", input, true)))).to be_equivalent_to Xml::C14n.format(presxml)
+      .convert("test", input, true))))
+      .to be_equivalent_to Xml::C14n.format(presxml)
     expect(Xml::C14n.format(IsoDoc::Iso::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)
     output = IsoDoc::Iso::WordConvert.new({}).convert("test", presxml, true)
     expect(Xml::C14n.format(output
       .sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>")))
@@ -214,8 +216,8 @@
         </clause>
           <foreword displayorder="2"><title>Foreword</title>
           <admonition id="_" type="caution">
-                         <p id='_'>
-                 CAUTION — Only use paddy or parboiled rice for the
+                 <name>CAUTION — </name>
+                  <p id='_'>Only use paddy or parboiled rice for the
                  determination of husked rice yield.
                </p>
         <p id="_">Para 2.</p>
@@ -264,7 +266,7 @@
           </clause>
           <foreword displayorder="2"><title>Foreword</title>
             <admonition id="_" type="caution">
-              <name>CAUTION</name>
+              <name>CAUTION<</name>
             </admonition>
           </foreword>
         </preface>
@@ -311,7 +313,7 @@
       <div>
                <h1 class='ForewordTitle'>Foreword</h1>
                <div id='_' class='Admonition'>
-                        <p>Title — </p>
+                        <p class="AdmonitionTitle" style="text-align:center;">Title</p>
                         <div class="ul_wrap">
          <ul>
            <li>List</li>
@@ -352,8 +354,8 @@
          <sections>
            <title>A</title>
            <admonition id="_" type="important" displayorder="2">
+               <name><strong>IMPORTANT —</strong></name>
              <p id="_">
-               <strong>IMPORTANT — </strong>
                <strong>The electronic file of this document contains colours which are considered to be useful for the correct understanding of the &lt;document&gt;.</strong>
              </p>
            </admonition>
@@ -388,8 +390,8 @@
           </clause>
             <foreword displayorder="2"><title>Foreword</title>
           <admonition id="_" type="editorial">
-                         <p id='_'>EDITORIAL NOTE —
-                 Only use paddy or parboiled rice for the
+                         <name>EDITORIAL NOTE —</name>
+                         <p id="_">Only use paddy or parboiled rice for the
                  determination of husked rice yield.
                </p>
         <p id="_">Para 2.</p>
@@ -403,8 +405,7 @@
              <div>
                <h1 class='ForewordTitle'>Foreword</h1>
                <div id='_' class='zzHelp'>
-                 <p>EDITORIAL NOTE —
-                    Only use paddy or parboiled rice for the
+                 <p>EDITORIAL NOTE — Only use paddy or parboiled rice for the
                    determination of husked rice yield.
                  </p>
                  <p id='_'>Para 2.</p>