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

Fix/refactor xrefs oct24

Gemfile.devel

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

lib/isodoc/generic/base_convert.rb

@@ -13,8 +13,7 @@ def term_cleanup(docxml)
         docxml.xpath("//p[@class = 'Terms']").each do |d|
           h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
           d["id"] = h2["id"]
-          d.children.first.previous =
-            "<strong>#{to_xml(h2.remove.children)}</strong>&#xa0;"
+          d.add_first_child "<strong>#{to_xml(h2.remove.children)}</strong>&#xa0;"
         end
         docxml
       end

lib/isodoc/generic/init.rb

@@ -12,7 +12,7 @@ def metadata_init(lang, script, locale, i18n)
       end
 
       def xref_init(lang, script, _klass, i18n, options)
-        html = HtmlConvert.new(language: lang, script: script)
+        html = PresentationXMLConvert.new(language: lang, script: script)
         @xrefs = Xref.new(lang, script, html, i18n, options)
       end
 

spec/isodoc/html_convert_spec.rb

@@ -501,7 +501,7 @@
   it "processes pre" do
     input = <<~"INPUT"
       <generic-standard xmlns="#{Metanorma::Generic::DOCUMENT_NAMESPACE}">
-      <preface><foreword displayorder="1">
+      <preface><foreword displayorder="1"><title>Foreword</title>
       <pre>ABC</pre>
       </foreword></preface>
       </generic-standard>
@@ -529,7 +529,7 @@
   it "processes keyword" do
     input = <<~"INPUT"
       <generic-standard xmlns="#{Metanorma::Generic::DOCUMENT_NAMESPACE}">
-      <preface><foreword displayorder="1">
+      <preface><foreword displayorder="1"><title>Foreword</title>
       <keyword>ABC</keyword>
       </foreword></preface>
       </generic-standard>
@@ -693,15 +693,23 @@
               </term>
             </terms>
             <definitions id='K'>
-              <title>2.2.</title>
+             <title depth="2">
+               2.2.
+               <tab/>
+               Symbols
+            </title>
               <dl>
                 <dt>Symbol</dt>
                 <dd>Definition</dd>
               </dl>
             </definitions>
           </clause>
           <definitions id='L' displayorder='6'>
-            <title>3.</title>
+          <title depth="1">
+            3.
+            <tab/>
+            Symbols
+         </title>
             <dl>
               <dt>Symbol</dt>
               <dd>Definition</dd>