Merge pull request #126 from metanorma/fix/refactor-xrefs-oct24

Fix/refactor xrefs oct24

Gemfile.devel

@@ -0,0 +1,4 @@
+gem "metanorma-standoc", git: "https://github.com/metanorma/metanorma-standoc", branch: "main"
+gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "fix/refactor-xrefs-oct24"
+gem "metanorma-iso", git: "https://github.com/metanorma/metanorma-iso", branch: "fix/refactor-xrefs-oct24"
+gem "metanorma-jis", git: "https://github.com/metanorma/metanorma-jis", branch: "fix/refactor-xrefs-oct24"

lib/isodoc/plateau/base_convert.rb

@@ -8,10 +8,6 @@ module BaseConvert
 
       def para_parse(node, out)
         out.p **attr_code(para_attrs(node)) do |p|
-          unless @termdomain.empty?
-            p << "&lt;#{@termdomain}&gt; "
-            @termdomain = ""
-          end
           @lang == "ja" and p << "&#x3000;"
           node.children.each { |n| parse(n, p) }
         end

lib/isodoc/plateau/init.rb

@@ -11,9 +11,8 @@ def metadata_init(lang, script, locale, labels)
       end
 
       def xref_init(lang, script, _klass, labels, options)
-        @xrefs = Xref.new(lang, script,
-                          HtmlConvert.new(language: lang, script:),
-                          labels, options)
+        p = HtmlConvert.new(language: lang, script:)
+        @xrefs = Xref.new(lang, script, p, labels, options)
       end
 
       def i18n_init(lang, script, locale, i18nyaml = nil)

spec/isodoc/blocks_spec.rb

@@ -87,6 +87,11 @@
                   was estimated to be 18,2 min for this example.
                 </p>
               </fn>
+              <p keep-with-next="true">
+               <strong>
+                  Key
+               </strong>
+            </p>
               <p class="dl">A: B</p>
               <source status="generalisation">
                 [SOURCE:
@@ -153,6 +158,11 @@
                      </p>
                    </div>
                  </aside>
+               <p style="page-break-after: avoid;">
+                  <b>
+                     Key
+                  </b>
+               </p>
                  <p class="dl">A: B</p>
                  <div class="BlockSource">
                    <p>
@@ -204,7 +214,8 @@
       .convert("test", input, true).gsub(/&lt;/, "&#x3c;"))))
       .to be_equivalent_to Xml::C14n.format(presxml)
     expect(Xml::C14n.format(strip_guid(IsoDoc::Plateau::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)
   end
 
   it "processes subfigures" do
@@ -569,8 +580,7 @@
     presxml = <<~OUTPUT
       <standard-document xmlns="https://www.metanorma.org/ns/standoc" type="presentation">
          <preface><clause type="toc" id="_" displayorder="1"><title depth="1">Contents</title></clause>
-
-           <foreword id="A" displayorder="2">
+           <foreword id="A" displayorder="2">><title>Foreword</title>
              <p id="B">
              <table id="C"><name>Table 1</name><thead> </thead>
              <colgroup><col width="100%"/></colgroup>
@@ -606,10 +616,10 @@
         </annex>
         </standard-document>
     OUTPUT
-    expect(strip_guid(IsoDoc::Plateau::PresentationXMLConvert
+    expect(strip_guid(Xml::C14n.format(IsoDoc::Plateau::PresentationXMLConvert
       .new(presxml_options)
       .convert("test", input, true))
-      .sub(%r{<localized-strings>.*</localized-strings>}m, ""))
-      .to be_equivalent_to (presxml)
+      .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
+      .to be_equivalent_to Xml::C14n.format(presxml)
   end
 end