RubyGems - isodoc - Versions diffs - 1.6.7 → 1.7.2 - Mend

isodoc 1.6.7 → 1.7.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (44) hide show

checksums.yaml +4 -4
data/isodoc.gemspec +1 -1
data/lib/isodoc-yaml/i18n-ar.yaml +19 -25
data/lib/isodoc-yaml/i18n-de.yaml +1 -0
data/lib/isodoc-yaml/i18n-en.yaml +1 -0
data/lib/isodoc-yaml/i18n-es.yaml +1 -0
data/lib/isodoc-yaml/i18n-fr.yaml +1 -0
data/lib/isodoc-yaml/i18n-ru.yaml +1 -0
data/lib/isodoc-yaml/i18n-zh-Hans.yaml +1 -0
data/lib/isodoc.rb +1 -0
data/lib/isodoc/convert.rb +1 -1
data/lib/isodoc/function/blocks.rb +180 -168
data/lib/isodoc/function/form.rb +39 -36
data/lib/isodoc/function/inline.rb +5 -1
data/lib/isodoc/function/references.rb +1 -1
data/lib/isodoc/function/to_word_html.rb +206 -204
data/lib/isodoc/html_convert.rb +0 -4
data/lib/isodoc/html_function/form.rb +48 -45
data/lib/isodoc/html_function/html.rb +2 -0
data/lib/isodoc/html_function/postprocess.rb +9 -4
data/lib/isodoc/presentation_function/block.rb +7 -4
data/lib/isodoc/presentation_function/inline.rb +29 -12
data/lib/isodoc/presentation_function/section.rb +1 -2
data/lib/isodoc/presentation_xml_convert.rb +2 -2
data/lib/isodoc/version.rb +1 -1
data/lib/isodoc/xref.rb +8 -7
data/lib/isodoc/xref/xref_anchor.rb +45 -44
data/lib/isodoc/xref/xref_counter.rb +113 -103
data/lib/isodoc/xref/xref_gen.rb +39 -11
data/lib/metanorma/output.rb +7 -0
data/lib/metanorma/output/base.rb +13 -0
data/lib/metanorma/output/utils.rb +17 -0
data/lib/metanorma/output/xslfo.rb +21 -0
data/spec/assets/outputtest/a.xml +66 -0
data/spec/assets/outputtest/iso.international-standard.xsl +3011 -0
data/spec/isodoc/blocks_spec.rb +327 -243
data/spec/isodoc/form_spec.rb +94 -90
data/spec/isodoc/inline_spec.rb +431 -234
data/spec/isodoc/postproc_spec.rb +68 -25
data/spec/isodoc/terms_spec.rb +2 -2
data/spec/isodoc/xref_spec.rb +274 -652
metadata +8 -18
data/lib/isodoc/html_function/sectionsplit.rb +0 -230
data/spec/isodoc/sectionsplit_spec.rb +0 -190

data/spec/isodoc/postproc_spec.rb CHANGED Viewed

@@ -344,6 +344,62 @@ RSpec.describe IsoDoc do
     expect(word).to match(%r{Anta&#x16D;parolo</h1>})
   end
+  it "cleans up HTML output preface placeholder paragraphs" do
+    FileUtils.rm_f "test.doc"
+    FileUtils.rm_f "test.html"
+    IsoDoc::HtmlConvert.new(
+      { bodyfont: "Zapf",
+        monospacefont: "Consolas",
+        headerfont: "Comic Sans",
+        normalfontsize: "30pt",
+        monospacefontsize: "29pt",
+        smallerfontsize: "28pt",
+        footnotefontsize: "27pt",
+        htmlstylesheet: "spec/assets/html.scss",
+        htmlstylesheet_override: "spec/assets/html_override.css",
+        htmlcoverpage: "spec/assets/htmlcover.html",
+        htmlintropage: "spec/assets/htmlintro.html",
+        scripts: "spec/assets/scripts.html",
+        scripts_override: "spec/assets/scripts_override.html",
+        i18nyaml: "spec/assets/i18n.yaml",
+        ulstyle: "l1",
+        olstyle: "l2" },
+    ).convert("test", <<~"INPUT", false)
+              <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <note>
+        <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+      </note>
+          </foreword></preface>
+          </iso-standard>
+    INPUT
+    html = Nokogiri::XML(File.read("test.html")).at("//body")
+    html.xpath("//script").each(&:remove)
+    expect(html.to_xml).to be_equivalent_to <<~OUTPUT
+      <body lang="en" xml:lang="en">
+          <div class="title-section">
+      /* an empty html cover page */
+          </div>
+          <br/>
+          <div class="prefatory-section">
+      /* an empty html intro page */
+      <ul id="toc-list"/>
+          </div>
+          <br/>
+          <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
+            <br/>
+            <div>
+              <h1 class="ForewordTitle">Anta&#x16D;parolo</h1>
+              <div class="Note">
+                <p>&#xA0; These results are based on a study carried out on three different types of kernel.</p>
+              </div>
+            </div>
+            <p class="zzSTDTitle1"/>
+          </main>
+      </body>
+    OUTPUT
+  end
   it "converts definition lists to tables for Word" do
     FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
@@ -1277,17 +1333,17 @@ RSpec.describe IsoDoc do
   it "does not lose HTML escapes in postprocessing" do
     FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
-    IsoDoc::HtmlConvert.new(options)
-      .convert("test", <<~"INPUT", false)
-            <iso-standard xmlns="http://riboseinc.com/isoxml">
-            <preface><foreword>
-            <sourcecode id="samplecode">
-            <name>XML code</name>
-          &lt;xml&gt; &amp;
-        </sourcecode>
-            </foreword></preface>
-            </iso-standard>
-      INPUT
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <sourcecode id="samplecode">
+          <name>XML code</name>
+        &lt;xml&gt; &amp;
+      </sourcecode>
+          </foreword></preface>
+          </iso-standard>
+    INPUT
+    IsoDoc::HtmlConvert.new(options).convert("test", input, false)
     html = File.read("test.html")
       .sub(/^.*<main class="main-section">/m, '<main class="main-section">')
       .sub(%r{</main>.*$}m, "</main>")
@@ -1303,22 +1359,10 @@ RSpec.describe IsoDoc do
         <p class="zzSTDTitle1"></p>
       </main>
     OUTPUT
-  end
-  it "does not lose HTML escapes in postprocessing (Word)" do
     FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
-    IsoDoc::WordConvert.new(options)
-      .convert("test", <<~"INPUT", false)
-            <iso-standard xmlns="http://riboseinc.com/isoxml">
-            <preface><foreword>
-            <sourcecode id="samplecode">
-            <name>XML code</name>
-          &lt;xml&gt; &amp;
-        </sourcecode>
-            </foreword></preface>
-            </iso-standard>
-      INPUT
+    IsoDoc::WordConvert.new(options).convert("test", input, false)
     word = File.read("test.doc")
       .sub(/^.*<div class="WordSection2">/m, '<div class="WordSection2">')
       .sub(%r{<p class="MsoNormal">\s*<br clear="all" class="section"/>\s*</p>\s*<div class="WordSection3">.*$}m, "")
@@ -2227,7 +2271,6 @@ RSpec.describe IsoDoc do
     output = <<~OUTPUT
       <body lang='en' xml:lang='en'>
         <main class='main-section'>
-          <button onclick='topFunction()' id='myBtn' title='Go to top'>Top</button>
           <br/>
           <div>
             <h1 class='ForewordTitle'>Foreword</h1>

data/spec/isodoc/terms_spec.rb CHANGED Viewed

@@ -189,7 +189,7 @@ RSpec.describe IsoDoc do
                <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>
                  [MODIFICATION] The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
              [/TERMREF]</p>
-             <p>[TERMREF] Termbase IEV, term ID xyz [/TERMREF]</p>
+             <p>[TERMREF] t1 [/TERMREF]</p>
       <p>[TERMREF] Termbase IEV, term ID xyz [MODIFICATION]with adjustments [/TERMREF]</p>
       <p class="TermNum" id="paddy">1.2.</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
              <p class="AltTerms" style="text-align:left;">rough rice</p>
@@ -233,7 +233,7 @@ RSpec.describe IsoDoc do
                <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>
                  [MODIFICATION] The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
              [/TERMREF]</p>
-             <p>[TERMREF] Termbase IEV, term ID xyz [/TERMREF]</p>
+             <p>[TERMREF] t1 [/TERMREF]</p>
       <p>[TERMREF] Termbase IEV, term ID xyz [MODIFICATION]with adjustments [/TERMREF]</p>
       <p class="TermNum" id="paddy">1.2.</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
              <p class="AltTerms" style="text-align:left;">rough rice</p>

data/spec/isodoc/xref_spec.rb CHANGED Viewed

@@ -2213,110 +2213,23 @@ RSpec.describe IsoDoc do
           </iso-standard>
     INPUT
     output = <<~OUTPUT
-      <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
-          <preface>
-            <foreword displayorder='1'>
-              <p>
-                <xref target='N1'>Introduction, List</xref>
-                <xref target='N2'>Preparatory, List</xref>
-                <xref target='N'>Clause 1, List</xref>
-                <xref target='note1'>Clause 3.1, List 1</xref>
-                <xref target='note2'>Clause 3.1, List 2</xref>
-                <xref target='AN'>Annex A.1, List</xref>
-                <xref target='Anote1'>Annex A.2, List 1</xref>
-                <xref target='Anote2'>Annex A.2, List 2</xref>
-              </p>
-            </foreword>
-            <introduction id='intro' displayorder='2'>
-              <ol id='N1'>
-                <li>
-                  <p>A</p>
-                </li>
-              </ol>
-              <clause id='xyz'>
-                <title depth='2'>Preparatory</title>
-                <ol id='N2'>
-                  <li>
-                    <p>A</p>
-                  </li>
-                </ol>
-              </clause>
-            </introduction>
-          </preface>
-          <sections>
-            <clause id='scope' type='scope' displayorder='3'>
-              <title depth='1'>
-                1.
-                <tab/>
-                Scope
-              </title>
-              <ol id='N'>
-                <li>
-                  <p>A</p>
-                </li>
-              </ol>
-            </clause>
-            <terms id='terms' displayorder='4'>
-              <title>2.</title>
-            </terms>
-            <clause id='widgets' displayorder='5'>
-              <title depth='1'>
-                3.
-                <tab/>
-                Widgets
-              </title>
-              <clause id='widgets1'>
-                <title>3.1.</title>
-                <ol id='note1'>
-                  <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
-                    These results are based on a study carried out on three different
-                    types of kernel.
-                  </p>
-                </ol>
-                <ol id='note2'>
-                  <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a'>
-                    These results are based on a study carried out on three different
-                    types of kernel.
-                  </p>
-                </ol>
-              </clause>
-            </clause>
-          </sections>
-          <annex id='annex1' displayorder='6'>
-            <title>
-              <strong>Annex A</strong>
-              <br/>
-              (informative)
-            </title>
-            <clause id='annex1a'>
-              <title>A.1.</title>
-              <ol id='AN'>
-                <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
-                  These results are based on a study carried out on three different
-                  types of kernel.
-                </p>
-              </ol>
-            </clause>
-            <clause id='annex1b'>
-              <title>A.2.</title>
-              <ol id='Anote1'>
-                <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
-                  These results are based on a study carried out on three different
-                  types of kernel.
-                </p>
-              </ol>
-              <ol id='Anote2'>
-                <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a'>
-                  These results are based on a study carried out on three different
-                  types of kernel.
-                </p>
-              </ol>
-            </clause>
-          </annex>
-        </iso-standard>
+      <foreword displayorder='1'>
+        <p>
+          <xref target='N1'>Introduction, List</xref>
+          <xref target='N2'>Preparatory, List</xref>
+          <xref target='N'>Clause 1, List</xref>
+          <xref target='note1'>Clause 3.1, List 1</xref>
+          <xref target='note2'>Clause 3.1, List 2</xref>
+          <xref target='AN'>Annex A.1, List</xref>
+          <xref target='Anote1'>Annex A.2, List 1</xref>
+          <xref target='Anote2'>Annex A.2, List 2</xref>
+        </p>
+      </foreword>
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
-      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
+    expect(xmlpp(Nokogiri::XML(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .at("//xmlns:foreword").to_xml))
+      .to be_equivalent_to xmlpp(output)
   end
   it "cross-references list items" do
@@ -2382,105 +2295,23 @@ RSpec.describe IsoDoc do
           </iso-standard>
     INPUT
     output = <<~OUTPUT
-      <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
-          <preface>
-            <foreword displayorder='1'>
-              <p>
-                <xref target='N1'>Introduction, a)</xref>
-                <xref target='N2'>Preparatory, 1)</xref>
-                <xref target='N'>Clause 1, i)</xref>
-                <xref target='note1'>Clause 3.1, List 1 a)</xref>
-                <xref target='note2'>Clause 3.1, List 2 I)</xref>
-                <xref target='AN'>Annex A.1, A)</xref>
-                <xref target='Anote1'>Annex A.2, List 1 iv)</xref>
-                <xref target='Anote2'>Annex A.2, List 2 a)</xref>
-              </p>
-            </foreword>
-            <introduction id='intro' displayorder='2'>
-              <ol id='N01'>
-                <li id='N1'>
-                  <p>A</p>
-                </li>
-              </ol>
-              <clause id='xyz'>
-                <title depth='2'>Preparatory</title>
-                <ol id='N02' type='arabic'>
-                  <li id='N2'>
-                    <p>A</p>
-                  </li>
-                </ol>
-              </clause>
-            </introduction>
-          </preface>
-          <sections>
-            <clause id='scope' type='scope' displayorder='3'>
-              <title depth='1'>
-                1.
-                <tab/>
-                Scope
-              </title>
-              <ol id='N0' type='roman'>
-                <li id='N'>
-                  <p>A</p>
-                </li>
-              </ol>
-            </clause>
-            <terms id='terms' displayorder='4'>
-              <title>2.</title>
-            </terms>
-            <clause id='widgets' displayorder='5'>
-              <title depth='1'>
-                3.
-                <tab/>
-                Widgets
-              </title>
-              <clause id='widgets1'>
-                <title>3.1.</title>
-                <ol id='note1l' type='alphabet'>
-                  <li id='note1'>
-                    <p>A</p>
-                  </li>
-                </ol>
-                <ol id='note2l' type='roman_upper'>
-                  <li id='note2'>
-                    <p>A</p>
-                  </li>
-                </ol>
-              </clause>
-            </clause>
-          </sections>
-          <annex id='annex1' displayorder='6'>
-            <title>
-              <strong>Annex A</strong>
-              <br/>
-              (informative)
-            </title>
-            <clause id='annex1a'>
-              <title>A.1.</title>
-              <ol id='ANl' type='alphabet_upper'>
-                <li id='AN'>
-                  <p>A</p>
-                </li>
-              </ol>
-            </clause>
-            <clause id='annex1b'>
-              <title>A.2.</title>
-              <ol id='Anote1l' type='roman' start='4'>
-                <li id='Anote1'>
-                  <p>A</p>
-                </li>
-              </ol>
-              <ol id='Anote2l'>
-                <li id='Anote2'>
-                  <p>A</p>
-                </li>
-              </ol>
-            </clause>
-          </annex>
-        </iso-standard>
+      <foreword displayorder='1'>
+        <p>
+          <xref target='N1'>Introduction, a)</xref>
+          <xref target='N2'>Preparatory, 1)</xref>
+          <xref target='N'>Clause 1, i)</xref>
+          <xref target='note1'>Clause 3.1, List 1 a)</xref>
+          <xref target='note2'>Clause 3.1, List 2 I)</xref>
+          <xref target='AN'>Annex A.1, A)</xref>
+          <xref target='Anote1'>Annex A.2, List 1 iv)</xref>
+          <xref target='Anote2'>Annex A.2, List 2 a)</xref>
+        </p>
+      </foreword>
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
-      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
+    expect(xmlpp(Nokogiri::XML(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .at("//xmlns:foreword").to_xml))
+      .to be_equivalent_to xmlpp(output)
   end
   it "cross-references nested list items" do
@@ -2523,65 +2354,187 @@ RSpec.describe IsoDoc do
       </iso-standard>
     INPUT
     output = <<~OUTPUT
-          <?xml version='1.0'?>
-      <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
-        <preface>
-          <foreword displayorder="1">
-            <p>
-              <xref target='N'>Clause 1, a)</xref>
-              <xref target='note1'>Clause 1, a.1)</xref>
-              <xref target='note2'>Clause 1, a.1.i)</xref>
-              <xref target='AN'>Clause 1, a.1.i.A)</xref>
-              <xref target='Anote1'>Clause 1, a.1.i.A.I)</xref>
-              <xref target='Anote2'>Clause 1, a.1.i.A.I.a)</xref>
-            </p>
+      <foreword displayorder="1">
+        <p>
+          <xref target='N'>Clause 1, a)</xref>
+          <xref target='note1'>Clause 1, a.1)</xref>
+          <xref target='note2'>Clause 1, a.1.i)</xref>
+          <xref target='AN'>Clause 1, a.1.i.A)</xref>
+          <xref target='Anote1'>Clause 1, a.1.i.A.I)</xref>
+          <xref target='Anote2'>Clause 1, a.1.i.A.I.a)</xref>
+        </p>
+      </foreword>
+    OUTPUT
+    expect(xmlpp(Nokogiri::XML(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .at("//xmlns:foreword").to_xml))
+      .to be_equivalent_to xmlpp(output)
+  end
+  it "cross-references definition lists" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface>
+          <foreword>
+          <p>
+          <xref target="N1"/>
+          <xref target="N2"/>
+          <xref target="N"/>
+          <xref target="note1"/>
+          <xref target="note2"/>
+          <xref target="AN"/>
+          <xref target="Anote1"/>
+          <xref target="Anote2"/>
+          </p>
           </foreword>
-        </preface>
-        <sections>
-          <clause id='scope' type="scope" displayorder="2">
-          <title depth='1'>
-        1.
-        <tab/>
-        Scope
-      </title>
-            <ol id='N1'>
-              <li id='N'>
-                <p>A</p>
-                <ol>
-                  <li id='note1'>
-                    <p>A</p>
-                    <ol>
-                      <li id='note2'>
-                        <p>A</p>
-                        <ol>
-                          <li id='AN'>
-                            <p>A</p>
-                            <ol>
-                              <li id='Anote1'>
-                                <p>A</p>
-                                <ol>
-                                  <li id='Anote2'>
-                                    <p>A</p>
-                                  </li>
-                                </ol>
-                              </li>
-                            </ol>
-                          </li>
-                        </ol>
-                      </li>
-                    </ol>
-                  </li>
-                </ol>
-              </li>
-            </ol>
+          <introduction id="intro">
+           <dl id="N1">
+        <li><p>A</p></li>
+      </dl>
+        <clause id="xyz"><title>Preparatory</title>
+           <dl id="N2">
+        <li><p>A</p></li>
+      </dl>
+      </clause>
+          </introduction>
+          </preface>
+          <sections>
+          <clause id="scope" type="scope"><title>Scope</title>
+          <dl id="N">
+        <li><p>A</p></li>
+      </dl>
           </clause>
-        </sections>
-      </iso-standard>
+          <terms id="terms"/>
+          <clause id="widgets"><title>Widgets</title>
+          <clause id="widgets1">
+          <dl id="note1">
+        <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+      </dl>
+          <dl id="note2">
+        <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
+      </dl>
+          </clause>
+          </clause>
+          </sections>
+          <annex id="annex1">
+          <clause id="annex1a">
+          <dl id="AN">
+        <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+      </dl>
+          </clause>
+          <clause id="annex1b">
+          <dl id="Anote1">
+        <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+      </dl>
+          <dl id="Anote2">
+        <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
+      </dl>
+          </clause>
+          </annex>
+          </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      <foreword displayorder='1'>
+        <p>
+          <xref target='N1'>Introduction, Definition List</xref>
+          <xref target='N2'>Preparatory, Definition List</xref>
+          <xref target='N'>Clause 1, Definition List</xref>
+          <xref target='note1'>Clause 3.1, Definition List 1</xref>
+          <xref target='note2'>Clause 3.1, Definition List 2</xref>
+          <xref target='AN'>Annex A.1, Definition List</xref>
+          <xref target='Anote1'>Annex A.2, Definition List 1</xref>
+          <xref target='Anote2'>Annex A.2, Definition List 2</xref>
+        </p>
+      </foreword>
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
-      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
+    expect(xmlpp(Nokogiri::XML(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .at("//xmlns:foreword").to_xml))
+      .to be_equivalent_to xmlpp(output)
   end
+    it "cross-references definition list terms" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface>
+          <foreword>
+          <p>
+          <xref target="N1"/>
+          <xref target="N2"/>
+          <xref target="N"/>
+          <xref target="note1"/>
+          <xref target="note2"/>
+          <xref target="AN"/>
+          <xref target="Anote1"/>
+          <xref target="Anote2"/>
+          </p>
+          </foreword>
+          <introduction id="intro">
+          <dl id="N01">
+        <dt id="N1"><p>A</p></dt>
+      </dl>
+        <clause id="xyz"><title>Preparatory</title>
+           <dl id="N02" type="arabic">
+        <dt id="N2"><p>A</p></dt>
+      </dl>
+      </clause>
+          </introduction>
+          </preface>
+          <sections>
+          <clause id="scope" type="scope"><title>Scope</title>
+          <dl id="N0" type="roman">
+        <dt id="N"><p>A</p></dt>
+      </dl>
+          </clause>
+          <terms id="terms"/>
+          <clause id="widgets"><title>Widgets</title>
+          <clause id="widgets1">
+          <dl id="note1l" type="alphabet">
+        <dt id="note1"><p>A</p></dt>
+      </dl>
+          <dl id="note2l" type="roman_upper">
+        <dt id="note2"><p>A</p></dt>
+      </dl>
+          </clause>
+          </clause>
+          </sections>
+          <annex id="annex1">
+          <clause id="annex1a">
+          <dl id="ANl" type="alphabet_upper">
+        <dt id="AN"><p>A</p></dt>
+      </dl>
+          </clause>
+          <clause id="annex1b">
+          <dl id="Anote1l" type="roman" start="4">
+        <dt id="Anote1"><p>A</p></dt>
+      </dl>
+          <dl id="Anote2l">
+        <dt id="Anote2"><p>A</p></dt>
+      </dl>
+          </clause>
+          </annex>
+          </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      <foreword displayorder='1'>
+        <p>
+        <xref target='N1'>Introduction, Definition List: A</xref>
+        <xref target='N2'>Preparatory, Definition List: A</xref>
+        <xref target='N'>Clause 1, Definition List: A</xref>
+        <xref target='note1'>Clause 3.1, Definition List 1: A</xref>
+        <xref target='note2'>Clause 3.1, Definition List 2: A</xref>
+        <xref target='AN'>Annex A.1, Definition List: A</xref>
+        <xref target='Anote1'>Annex A.2, Definition List 1: A</xref>
+        <xref target='Anote2'>Annex A.2, Definition List 2: A</xref>
+        </p>
+      </foreword>
+    OUTPUT
+    expect(xmlpp(Nokogiri::XML(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .at("//xmlns:foreword").to_xml))
+      .to be_equivalent_to xmlpp(output)
+    end
   it "cross-references bookmarks" do
     input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -2646,94 +2599,23 @@ RSpec.describe IsoDoc do
           </iso-standard>
     INPUT
     output = <<~OUTPUT
-      <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
-          <preface>
-            <foreword displayorder='1'>
-              <p>
-                <xref target='N1'>Introduction</xref>
-                <xref target='N2'>Preparatory</xref>
-                <xref target='N'>Clause 1</xref>
-                <xref target='note1'>Note 2</xref>
-                <xref target='note2'>Clause 3.1</xref>
-                <xref target='AN'>Annex A.1</xref>
-                <xref target='Anote1'>Figure A.1</xref>
-                <xref target='Anote2'>Annex A.2</xref>
-              </p>
-            </foreword>
-            <introduction id='intro' displayorder='2'>
-              <p id='N01'>
-                <bookmark id='N1'/>
-              </p>
-              <clause id='xyz'>
-                <title depth='2'>Preparatory</title>
-                <p id='N02' type='arabic'>
-                  <bookmark id='N2'/>
-                </p>
-              </clause>
-            </introduction>
-          </preface>
-          <sections>
-            <clause id='scope' type='scope' displayorder='3'>
-              <title depth='1'>
-                1.
-                <tab/>
-                Scope
-              </title>
-              <p id='N0' type='roman'>
-                <bookmark id='N'/>
-              </p>
-            </clause>
-            <terms id='terms' displayorder='4'>
-              <title>2.</title>
-            </terms>
-            <clause id='widgets' displayorder='5'>
-              <title depth='1'>
-                3.
-                <tab/>
-                Widgets
-              </title>
-              <clause id='widgets1'>
-                <title>3.1.</title>
-                <note id='note0'>
-                  <name>NOTE 1</name>
-                </note>
-                <note id='note1l' type='alphabet'>
-                  <name>NOTE 2</name>
-                  <bookmark id='note1'/>
-                </note>
-                <p id='note2l' type='roman_upper'>
-                  <bookmark id='note2'/>
-                </p>
-              </clause>
-            </clause>
-          </sections>
-          <annex id='annex1' displayorder='6'>
-            <title>
-              <strong>Annex A</strong>
-              <br/>
-              (informative)
-            </title>
-            <clause id='annex1a'>
-              <title>A.1.</title>
-              <p id='ANl' type='alphabet_upper'>
-                <bookmark id='AN'/>
-              </p>
-            </clause>
-            <clause id='annex1b'>
-              <title>A.2.</title>
-              <figure id='Anote1l' type='roman' start='4'>
-                <name>Figure A.1</name>
-                <bookmark id='Anote1'/>
-              </figure>
-              <p id='Anote2l'>
-                <bookmark id='Anote2'/>
-              </p>
-            </clause>
-          </annex>
-        </iso-standard>
+      <foreword displayorder='1'>
+        <p>
+          <xref target='N1'>Introduction</xref>
+          <xref target='N2'>Preparatory</xref>
+          <xref target='N'>Clause 1</xref>
+          <xref target='note1'>Note 2</xref>
+          <xref target='note2'>Clause 3.1</xref>
+          <xref target='AN'>Annex A.1</xref>
+          <xref target='Anote1'>Figure A.1</xref>
+          <xref target='Anote2'>Annex A.2</xref>
+        </p>
+      </foreword>
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
-      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
+    expect(xmlpp(Nokogiri::XML(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .at("//xmlns:foreword").to_xml))
+      .to be_equivalent_to xmlpp(output)
   end
   it "realises subsequences" do
@@ -2781,9 +2663,6 @@ RSpec.describe IsoDoc do
       </iso-standard>
     INPUT
     output = <<~OUTPUT
-      <?xml version='1.0'?>
-      <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
-        <preface>
           <foreword id='fwd' displayorder="1">
             <p>
               <xref target='N1'>Figure 1</xref>
@@ -2796,45 +2675,11 @@ RSpec.describe IsoDoc do
       <xref target='N8'>Figure 5</xref>
             </p>
           </foreword>
-          <introduction id='intro' displayorder="2">
-            <figure id='N1'>
-              <name>Figure 1&#xA0;&#x2014; Split-it-right sample divider</name>
-              <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
-            </figure>
-            <figure id='N2' subsequence='A'>
-              <name>Figure 2a&#xA0;&#x2014; Split-it-right sample divider</name>
-              <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
-            </figure>
-            <figure id='N3' subsequence='A'>
-              <name>Figure 2b&#xA0;&#x2014; Split-it-right sample divider</name>
-              <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
-            </figure>
-            <figure id='N4' subsequence='B'>
-              <name>Figure 3a&#xA0;&#x2014; Split-it-right sample divider</name>
-              <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
-            </figure>
-            <figure id='N5' subsequence='B'>
-              <name>Figure 3b&#xA0;&#x2014; Split-it-right sample divider</name>
-              <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
-            </figure>
-            <figure id='N6' subsequence='B'>
-              <name>Figure 3c&#xA0;&#x2014; Split-it-right sample divider</name>
-              <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
-            </figure>
-            <figure id='N7'>
-              <name>Figure 4&#xA0;&#x2014; Split-it-right sample divider</name>
-              <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
-            </figure>
-            <figure id='N8'>
-              <name>Figure 5&#xA0;&#x2014; Split-it-right sample divider</name>
-              <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
-            </figure>
-          </introduction>
-        </preface>
-      </iso-standard>
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
-      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
+    expect(xmlpp(Nokogiri::XML(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .at("//xmlns:foreword").to_xml))
+      .to be_equivalent_to xmlpp(output)
   end
   it "realises numbering overrides" do
@@ -3004,276 +2849,53 @@ RSpec.describe IsoDoc do
       </iso-standard>
     INPUT
     output = <<~OUTPUT
-      <?xml version='1.0'?>
-          <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
-            <preface>
-              <foreword id='fwd' displayorder='1'>
-                <p>
-                  <xref target='N1'>Figure 1</xref>
-                  <xref target='N2'>Figure A</xref>
-                  <xref target='N3'>Figure B</xref>
-                  <xref target='N4'>Figure 7</xref>
-                  <xref target='N5'>Figure 8</xref>
-                  <xref target='N6'>Figure 9a</xref>
-                  <xref target='N7'>Figure 9c</xref>
-                  <xref target='N8'>Figure 9d</xref>
-                  <xref target='N9'>Figure 20f</xref>
-                  <xref target='N10'>Figure 20g</xref>
-                  <xref target='N11'>Figure A.1</xref>
-                  <xref target='N12'>Figure A.2</xref>
-                  <xref target='N13'>Figure 100</xref>
-                </p>
-                <p>
-                  <xref target='S1'>Clause 1bis</xref>
-                  <xref target='S2'>Clause 2bis</xref>
-                  <xref target='S3'>Clause 3bis</xref>
-                  <xref target='S4'>Clause 3bis.4bis</xref>
-                  <xref target='S12'>Clause 12bis</xref>
-                  <xref target='S13'>Clause 13bis</xref>
-                  <xref target='S14'>Clause 13bis.14bis</xref>
-                  <xref target='S15'>Clause 13bis.14bit</xref>
-                  <xref target='S16'>Clause 13bis.14biu</xref>
-                  <xref target='S17'>Clause 13bis.0</xref>
-                  <xref target='S18'>Clause 13bis.1</xref>
-                  <xref target='S19'>Clause 13bis.2</xref>
-                  <xref target='S20'>Clause 13bis.a</xref>
-                  <xref target='S21'>Clause 13bis.b</xref>
-                  <xref target='S22'>Clause 13bis.B</xref>
-                  <xref target='S23'>Clause 13bis.C</xref>
-                  <xref target='S24'>Clause 16bis</xref>
-                  <xref target='S25'>Annex A</xref>
-                  <xref target='S26'>Annex 17bis</xref>
-                  <xref target='S27'>Annex 17bis.18bis</xref>
-                  <xref target='S28'>Annex 17bit</xref>
-                  <xref target='S29'>Bibliography</xref>
-                  <xref target='S30'>Bibliography Subsection</xref>
-                </p>
-              </foreword>
-              <introduction id='intro' displayorder='2'>
-                <figure id='N1'>
-                  <name>Figure 1&#xA0;&#x2014; Split-it-right sample divider</name>
-                  <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
-                </figure>
-                <figure id='N2' number='A'>
-                  <name>Figure A&#xA0;&#x2014; Split-it-right sample divider</name>
-                  <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
-                </figure>
-                <figure id='N3'>
-                  <name>Figure B&#xA0;&#x2014; Split-it-right sample divider</name>
-                  <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
-                </figure>
-                <figure id='N4' number='7'>
-                  <name>Figure 7&#xA0;&#x2014; Split-it-right sample divider</name>
-                  <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
-                </figure>
-                <figure id='N5'>
-                  <name>Figure 8&#xA0;&#x2014; Split-it-right sample divider</name>
-                  <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
-                </figure>
-                <figure id='N6' subsequence='B'>
-                  <name>Figure 9a&#xA0;&#x2014; Split-it-right sample divider</name>
-                  <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
-                </figure>
-                <figure id='N7' subsequence='B' number='c'>
-                  <name>Figure 9c&#xA0;&#x2014; Split-it-right sample divider</name>
-                  <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
-                </figure>
-                <figure id='N8' subsequence='B'>
-                  <name>Figure 9d&#xA0;&#x2014; Split-it-right sample divider</name>
-                  <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
-                </figure>
-                <figure id='N9' subsequence='C' number='20f'>
-                  <name>Figure 20f&#xA0;&#x2014; Split-it-right sample divider</name>
-                  <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
-                </figure>
-                <figure id='N10' subsequence='C'>
-                  <name>Figure 20g&#xA0;&#x2014; Split-it-right sample divider</name>
-                  <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
-                </figure>
-                <figure id='N11' number='A.1'>
-                  <name>Figure A.1&#xA0;&#x2014; Split-it-right sample divider</name>
-                  <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
-                </figure>
-                <figure id='N12'>
-                  <name>Figure A.2&#xA0;&#x2014; Split-it-right sample divider</name>
-                  <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
-                </figure>
-                <figure id='N13' number='100'>
-                  <name>Figure 100&#xA0;&#x2014; Split-it-right sample divider</name>
-                  <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
-                </figure>
-              </introduction>
-            </preface>
-            <sections>
-              <clause id='S1' number='1bis' type='scope' inline-header='false' obligation='normative' displayorder='3'>
-                <title depth='1'>
-                  1bis.
-                  <tab/>
-                  Scope
-                </title>
-                <p id='_'>Text</p>
-              </clause>
-              <terms id='S3' number='3bis' obligation='normative' displayorder='5'>
-                <title depth='1'>
-                  3bis.
-                  <tab/>
-                  Terms and definitions
-                </title>
-                <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-                <term id='S4' number='4bis'>
-                  <name>3bis.4bis.</name>
-                  <preferred>Term1</preferred>
-                </term>
-              </terms>
-              <definitions id='S12' number='12bis' type='abbreviated_terms' obligation='normative' displayorder='6'>
-                <title depth='1'>
-                  12bis.
-                  <tab/>
-                  Abbreviated terms
-                </title>
-              </definitions>
-              <clause id='S13' number='13bis' inline-header='false' obligation='normative' displayorder='7'>
-                <title depth='1'>
-                  13bis.
-                  <tab/>
-                  Clause 4
-                </title>
-                <clause id='S14' number='14bis' inline-header='false' obligation='normative'>
-                  <title depth='2'>
-                    13bis.14bis.
-                    <tab/>
-                    Introduction
-                  </title>
-                </clause>
-                <clause id='S15' inline-header='false' obligation='normative'>
-                  <title depth='2'>
-                    13bis.14bit.
-                    <tab/>
-                    Clause A
-                  </title>
-                </clause>
-                <clause id='S16' inline-header='false' obligation='normative'>
-                  <title depth='2'>
-                    13bis.14biu.
-                    <tab/>
-                    Clause B
-                  </title>
-                </clause>
-                <clause id='S17' number='0' inline-header='false' obligation='normative'>
-                  <title depth='2'>
-                    13bis.0.
-                    <tab/>
-                    Clause C
-                  </title>
-                </clause>
-                <clause id='S18' inline-header='false' obligation='normative'>
-                  <title depth='2'>
-                    13bis.1.
-                    <tab/>
-                    Clause D
-                  </title>
-                </clause>
-                <clause id='S19' inline-header='false' obligation='normative'>
-                  <title depth='2'>
-                    13bis.2.
-                    <tab/>
-                    Clause E
-                  </title>
-                </clause>
-                <clause id='S20' number='a' inline-header='false' obligation='normative'>
-                  <title depth='2'>
-                    13bis.a.
-                    <tab/>
-                    Clause F
-                  </title>
-                </clause>
-                <clause id='S21' inline-header='false' obligation='normative'>
-                  <title depth='2'>
-                    13bis.b.
-                    <tab/>
-                    Clause G
-                  </title>
-                </clause>
-                <clause id='S22' number='B' inline-header='false' obligation='normative'>
-                  <title depth='2'>
-                    13bis.B.
-                    <tab/>
-                    Clause H
-                  </title>
-                </clause>
-                <clause id='S23' inline-header='false' obligation='normative'>
-                  <title depth='2'>
-                    13bis.C.
-                    <tab/>
-                    Clause I
-                  </title>
-                </clause>
-              </clause>
-              <clause id='S24' number='16bis' inline-header='false' obligation='normative' displayorder='8'>
-                <title depth='1'>
-                  16bis.
-                  <tab/>
-                  Terms and Definitions
-                </title>
-              </clause>
-            </sections>
-            <annex id='S25' obligation='normative' displayorder='9'>
-              <title>
-                <strong>Annex A</strong>
-                <br/>
-                (normative)
-                <br/>
-                <br/>
-                <strong>First Annex</strong>
-              </title>
-            </annex>
-            <annex id='S26' number='17bis' inline-header='false' obligation='normative' displayorder='10'>
-              <title>
-                <strong>Annex 17bis</strong>
-                <br/>
-                (normative)
-                <br/>
-                <br/>
-                <strong>Annex</strong>
-              </title>
-              <clause id='S27' number='18bis' inline-header='false' obligation='normative'>
-                <title depth='2'>
-                  17bis.18bis.
-                  <tab/>
-                  Annex A.1
-                </title>
-              </clause>
-            </annex>
-            <annex id='S28' inline-header='false' obligation='normative' displayorder='11'>
-              <title>
-                <strong>Annex 17bit</strong>
-                <br/>
-                (normative)
-                <br/>
-                <br/>
-                <strong>Another Annex</strong>
-              </title>
-            </annex>
-            <bibliography>
-              <references id='S2' number='2bis' normative='true' obligation='informative' displayorder='4'>
-                <title depth='1'>
-                  2bis.
-                  <tab/>
-                  Normative references
-                </title>
-                <p id='_'>There are no normative references in this document.</p>
-              </references>
-              <clause id='S29' number='19bis' obligation='informative' displayorder='12'>
-                <title depth='1'>Bibliography</title>
-                <references id='S30' number='20bis' normative='false' obligation='informative'>
-                  <title depth='2'>Bibliography Subsection</title>
-                </references>
-              </clause>
-            </bibliography>
-          </iso-standard>
+      <foreword id='fwd' displayorder='1'>
+        <p>
+          <xref target='N1'>Figure 1</xref>
+          <xref target='N2'>Figure A</xref>
+          <xref target='N3'>Figure B</xref>
+          <xref target='N4'>Figure 7</xref>
+          <xref target='N5'>Figure 8</xref>
+          <xref target='N6'>Figure 9a</xref>
+          <xref target='N7'>Figure 9c</xref>
+          <xref target='N8'>Figure 9d</xref>
+          <xref target='N9'>Figure 20f</xref>
+          <xref target='N10'>Figure 20g</xref>
+          <xref target='N11'>Figure A.1</xref>
+          <xref target='N12'>Figure A.2</xref>
+          <xref target='N13'>Figure 100</xref>
+        </p>
+        <p>
+          <xref target='S1'>Clause 1bis</xref>
+          <xref target='S2'>Clause 2bis</xref>
+          <xref target='S3'>Clause 3bis</xref>
+          <xref target='S4'>Clause 3bis.4bis</xref>
+          <xref target='S12'>Clause 12bis</xref>
+          <xref target='S13'>Clause 13bis</xref>
+          <xref target='S14'>Clause 13bis.14bis</xref>
+          <xref target='S15'>Clause 13bis.14bit</xref>
+          <xref target='S16'>Clause 13bis.14biu</xref>
+          <xref target='S17'>Clause 13bis.0</xref>
+          <xref target='S18'>Clause 13bis.1</xref>
+          <xref target='S19'>Clause 13bis.2</xref>
+          <xref target='S20'>Clause 13bis.a</xref>
+          <xref target='S21'>Clause 13bis.b</xref>
+          <xref target='S22'>Clause 13bis.B</xref>
+          <xref target='S23'>Clause 13bis.C</xref>
+          <xref target='S24'>Clause 16bis</xref>
+          <xref target='S25'>Annex A</xref>
+          <xref target='S26'>Annex 17bis</xref>
+          <xref target='S27'>Annex 17bis.18bis</xref>
+          <xref target='S28'>Annex 17bit</xref>
+          <xref target='S29'>Bibliography</xref>
+          <xref target='S30'>Bibliography Subsection</xref>
+        </p>
+      </foreword>
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
-      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
+    expect(xmlpp(Nokogiri::XML(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .at("//xmlns:foreword").to_xml))
+      .to be_equivalent_to xmlpp(output)
   end
   it "realises roman counter for xrefs" do