isodoc 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04b4a5b6d5f00722c0939f1b75ffaeaeb4fc4e7a6f36ebec40e19b93df9f38f1
-  data.tar.gz: 41baee0c2174ce3de7c02afdb1179e6445d37e10233f22b396089e1eb60c1a22
+  metadata.gz: 6cd5c7cab435113879315a8de5d3219df7577d057df5adee3a87f7431b9d17f7
+  data.tar.gz: 22f07d9de5b5b8a26c57ca5321a53fafd591e6703615921d9a79d939c0276295
 SHA512:
-  metadata.gz: '0823e689e87baac6d76bd7b7622a34976418e1da41be9bdeb4a308456ba36a4ec009dc72b59e7b1da0c416c0dbb95f1e6425f436f496540803ac3e4e48baa5f1'
-  data.tar.gz: f48233075744aa6ccc52e743870a5cf8952fe248b67527e913ac0c343a868f19eafe0a3dc3aaeb056dc1f58c12c7b849748f91c548755e586e4f55bcdad84bca
+  metadata.gz: 1ca2bd4cf9b70ea4eb12d118c26e66e90340070453e132db89e7b6748a1a02f8a10f62c5944e2b1ffe6e18d4a69504b08f7b687ec6b8a573983f58d03de12b48
+  data.tar.gz: 1b6702e74e5041ad95509cf1b8655e044f36f27a0fa3cbd12e6ac82684e6b535ed1c3ad9ea6ad938ab2cb42a3880f2e0153ddb0424bf322d4238806616582a54

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -1,6 +1,6 @@
 term_def_boilerplate: 
 scope: Domaine d'application
-symbolabbrev: Symboles et termes abrégés
+symbolsabbrev: Symboles et termes abrégés
 abbrev: Termes abrégés
 symbols: Symboles
 table_of_contents: Sommaire

data/lib/isodoc/base_style/metanorma_word.css

@@ -16,6 +16,12 @@ td {
 tr {
   page-break-after: avoid; }
 
+table.MsoISOTableBig tr {
+  page-break-inside: auto; }
+
+table.MsoISOTableBig td {
+  page-break-inside: auto; }
+
 span.stem {
   font-family: "Cambria Math",serif;
   mso-ascii-font-family: "Cambria Math";

data/lib/isodoc/base_style/metanorma_word.scss

@@ -13,6 +13,12 @@ table.MsoISOTable tr
 td { page-break-inside:avoid; }
 tr { page-break-after:avoid; }
 
+table.MsoISOTableBig tr
+    {page-break-inside:auto;}
+
+table.MsoISOTableBig td
+    {page-break-inside:auto;}
+
 span.stem
     {font-family:"Cambria Math",serif;
     mso-ascii-font-family:"Cambria Math";

data/lib/isodoc/function/blocks.rb

@@ -181,6 +181,7 @@ module IsoDoc::Function
     def quote_attribution(node, out)
       author = node.at(ns("./author"))
       source = node.at(ns("./source"))
+      return if author.nil? && source.nil?
       out.p **{ class: "QuoteAttribution" } do |p|
         p << "&mdash; #{author.text}" if author
         p << ", " if author && source

data/lib/isodoc/function/references.rb

@@ -54,7 +54,8 @@ module IsoDoc::Function
     def bibitem_ref_code(b)
       id = b.at(ns("./docidentifier[@type = 'metanorma']"))
       id1 = pref_ref_code(b)
-      id2 = b.at(ns("./docidentifier[@type = 'DOI' or @type = 'ISSN' or @type = 'ISBN']")) 
+      id2 = b.at(ns("./docidentifier[@type = 'DOI' or @type = 'ISSN' or "\
+                    "@type = 'ISBN']")) 
       return [id, id1, id2] if id || id1 || id2
       id = Nokogiri::XML::Node.new("docidentifier", b.document)
       id << "(NO ID)"
@@ -193,7 +194,8 @@ module IsoDoc::Function
     def bibliography_parse(node, out)
       title = node&.at(ns("./title"))&.text || ""
       out.div do |div|
-        clause_parse_title(node, div, node.at(ns("./title")), out, { class: "Section3" })
+        clause_parse_title(node, div, node.at(ns("./title")), out,
+                           { class: "Section3" })
         biblio_list(node, div, true)
       end
     end

data/lib/isodoc/function/table.rb

@@ -82,6 +82,7 @@ module IsoDoc::Function
     def make_tr_attr(td, row, totalrows, header)
       style = td.name == "th" ? "font-weight:bold;" : ""
       td["align"] and style += "text-align:#{td['align']};"
+      td["valign"] and style += "vertical-align:#{td['valign']};"
       rowmax = td["rowspan"] ? row + td["rowspan"].to_i - 1 : row
       style += <<~STYLE
         border-top:#{row.zero? ? "#{SW} 1.5pt;" : 'none;'}

data/lib/isodoc/function/to_word_html.rb

@@ -221,6 +221,7 @@ module IsoDoc::Function
         when "feedback-statement" then feedback_parse(node, out)
         when "passthrough" then passthrough_parse(node, out)
         when "variant" then variant_parse(node, out)
+        when "amend" then amend_parse(node, out)
         when "tab" then clausedelimspace(out) # in Presentation XML only
         else
           error_parse(node, out)

data/lib/isodoc/function/utils.rb

@@ -184,7 +184,7 @@ module IsoDoc::Function
 
     def labelled_ancestor(node)
       !node.ancestors('example, requirement, recommendation, permission, '\
-                             'table, figure, sourcecode').empty?
+                             'note, table, figure, sourcecode').empty?
     end
   end
 end

data/lib/isodoc/i18n.rb

@@ -1,6 +1,5 @@
 require "yaml"
 
-# TODO: Cleanup and generalize
 module IsoDoc
   class I18n
     def load_yaml(lang, script, i18nyaml = nil)

data/lib/isodoc/presentation_function/block.rb

@@ -134,5 +134,19 @@ module IsoDoc
       n = @xrefs.anchor(f['id'], :label, false)
       prefix_name(f, " — ", l10n("#{@i18n.table} #{n}"), "name")
     end
+
+    # we use this to eliminate the semantic amend blocks from rendering
+    def amend(docxml)
+      docxml.xpath(ns("//amend")).each do |f|
+        amend1(f)
+      end
+    end
+
+    def amend1(f)
+      f.xpath(ns("./autonumber")).each { |a| a.remove }
+      f.xpath(ns("./newcontent")).each { |a| a.name = "quote" }
+      f.xpath(ns("./description")).each { |a| a.replace(a.children) }
+      f.replace(f.children)
+    end
   end
 end

data/lib/isodoc/presentation_xml_convert.rb

@@ -30,6 +30,7 @@ module IsoDoc
     end
 
     def block(docxml)
+      amend docxml
       table docxml
       figure docxml
       sourcecode docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.2.3".freeze
+  VERSION = "1.2.4".freeze
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -127,7 +127,7 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     def list_add(xpath, lvl)
       xpath.each do |list|
         (list.xpath(".//li") - list.xpath(".//ol//li | .//ul//li")).each do |l|
-          l.xpath("./p | ./div").each_with_index do |p, i|
+          l.xpath("./p | ./div | ./table").each_with_index do |p, i|
             next if i == 0
             p.wrap(%{<div class="ListContLevel#{lvl}"/>})
           end

data/lib/isodoc/word_function/table.rb

@@ -29,7 +29,7 @@ module IsoDoc::WordFunction
         border-bottom:#{SW1} #{rowmax == totalrows ? '1.5' : '1.0'}pt;
         mso-border-bottom-alt:#{SW1} #{rowmax == totalrows ? '1.5' : '1.0'}pt;
       STYLE
-      { rowspan: td["rowspan"], colspan: td["colspan"],
+      { rowspan: td["rowspan"], colspan: td["colspan"], valign: td["valign"],
         align: td["align"], style: style.gsub(/\n/, "") }
     end
 
@@ -38,7 +38,8 @@ module IsoDoc::WordFunction
         summary: node["summary"],
         width: node["width"],
         style: "mso-table-anchor-horizontal:column;"\
-        "mso-table-overlap:never;border-spacing:0;border-width:1px;#{keep_style(node)}"
+        "mso-table-overlap:never;border-spacing:0;border-width:1px;#{keep_style(node)}",
+        class: (node.text.length > 4000 ? "MsoISOTableBig" : "MsoISOTable")
       }))
     end
 

data/lib/isodoc/xref.rb

@@ -41,6 +41,7 @@ module IsoDoc
 
     # extract names for all anchors, xref and label
     def parse(docxml)
+      amend_preprocess(docxml)
       initial_anchor_names(docxml)
       back_anchor_names(docxml)
       # preempt clause notes with all other types of note (ISO default)

data/lib/isodoc/xref/xref_counter.rb

@@ -8,17 +8,20 @@ module IsoDoc::XrefGen
       @subseq = ""
       @letter_override = nil
       @number_override = nil
+      @base = ""
     end
 
     def new_subseq_increment(node)
       @subseq = node["subsequence"]
       @num += 1
       @letter = node["subsequence"] ? "a" : ""
+      @base = ""
       if node["number"]
-        /^(?<n>\d*)(?<a>[a-z]*)$/ =~ node["number"]
-        if n || a
-          @letter_override = @letter = a if a
-          @number_override = @num = n.to_i if n
+        /^(?<b>.*?)(?<n>\d*)(?<a>[a-z]*)$/ =~ node["number"]
+        if !n.empty? || !a.empty?
+          @letter_override = @letter = a unless a.empty?
+          @number_override = @num = n.to_i unless n.empty?
+          @base = b
         else
           @letter_override = node["number"]
           @letter = @letter_override if /^[a-z]$/.match(@letter_override)
@@ -28,8 +31,13 @@ module IsoDoc::XrefGen
 
     def sequence_increment(node)
       if node["number"]
+        @base = ""
         @number_override = node["number"]
-        @num = @number_override.to_i if /^\d+$/.match(@number_override)
+        /^(?<b>.*?)(?<n>\d+)$/ =~ node["number"]
+        unless n.nil? || n.empty?
+          @num = n.to_i
+          @base = b
+        end
       else
         @num += 1
       end
@@ -37,8 +45,14 @@ module IsoDoc::XrefGen
 
     def subsequence_increment(node)
       if node["number"]
+        @base = ""
         @letter_override = node["number"]
-        @letter = @letter_override if /^[a-z]$/.match(@letter_override)
+        /^(?<b>.*?)(?<n>\d*)(?<a>[a-z]+)$/ =~ node["number"]
+        unless a.empty?
+          @letter = a
+          @base = b
+          @number_override = @num = n.to_i unless n.empty?
+        end
       else
         @letter = (@letter.ord + 1).chr.to_s
       end
@@ -59,7 +73,7 @@ module IsoDoc::XrefGen
     end
 
     def print
-      "#{@number_override || @num}#{@letter_override || @letter}"
+      "#{@base}#{@number_override || @num}#{@letter_override || @letter}"
     end
 
     def listlabel(depth)

data/lib/isodoc/xref/xref_gen.rb

@@ -2,6 +2,29 @@ require_relative "xref_gen_seq.rb"
 
 module IsoDoc::XrefGen
   module Blocks
+    NUMBERED_BLOCKS = %w(termnote termexample note example requirement
+    recommendation permission figure table formula admonition sourcecode).freeze
+
+    def amend_preprocess(xmldoc)
+      xmldoc.xpath(ns("//amend[newcontent]")).each do |a|
+        autonum = amend_autonums(a)
+        NUMBERED_BLOCKS.each do |b|
+          a.xpath(ns("./newcontent//#{b}")).each_with_index do |e, i|
+            autonum[b] and i == 0 and e["number"] = autonum[b]
+            !autonum[b] and e["unnumbered"] = "true"
+          end
+        end
+      end
+    end
+
+    def amend_autonums(a)
+      autonum = {}
+      a.xpath(ns("./autonumber")).each do |n|
+        autonum[n["type"]] = n.text
+      end
+      autonum
+    end
+
     def termnote_label(n)
       @labels["termnote"].gsub(/%/, n.to_s)
     end
@@ -27,7 +50,7 @@ module IsoDoc::XrefGen
         examples.each do |n|
           return if n["id"].nil? || n["id"].empty?
           c.increment(n)
-          idx = examples.size == 1 ? "" : c.print
+          idx = examples.size == 1 && !n["number"] ? "" : c.print
           @anchors[n["id"]] = {
             type: "termexample", label: idx, 
             xref: l10n("#{anchor(t['id'], :xref)}, "\
@@ -54,7 +77,7 @@ module IsoDoc::XrefGen
         c = Counter.new
         notes.each do |n|
           next if @anchors[n["id"]] || n["id"].nil? || n["id"].empty?
-          idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
+          idx = notes.size == 1 && !n["number"] ? "" : " #{c.increment(n).print}"
           @anchors[n["id"]] = anchor_struct(idx, n, @labels["note_xref"], 
                                             "note", false)
         end
@@ -76,7 +99,7 @@ module IsoDoc::XrefGen
         notes.each do |n|
           next if @anchors[n["id"]]
           next if n["id"].nil? || n["id"].empty?
-          idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
+          idx = notes.size == 1 && !n["number"]  ? "" : " #{c.increment(n).print}"
           @anchors[n["id"]] = anchor_struct(idx, n, @labels["example_xref"],
                                             "example", n["unnumbered"])
         end
@@ -91,7 +114,7 @@ module IsoDoc::XrefGen
         c = Counter.new
         notes.each do |n|
           next if n["id"].nil? || n["id"].empty?
-          idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
+          idx = notes.size == 1 && !n["number"] ? "" : " #{c.increment(n).print}"
           @anchors[n["id"]] = anchor_struct(idx, n, @labels["list"], "list", false)
           list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
         end

data/spec/isodoc/blocks_spec.rb

@@ -1,6 +1,243 @@
 require "spec_helper"
 
 RSpec.describe IsoDoc do
+  it "processes amend blocks" do
+    input = <<~INPUT
+    <standard-document xmlns='https://www.metanorma.org/ns/standoc'>
+         <bibdata type='standard'>
+           <title language='en' format='text/plain'>Document title</title>
+           <language>en</language>
+           <script>Latn</script>
+           <status>
+             <stage>published</stage>
+           </status>
+           <copyright>
+             <from>2020</from>
+           </copyright>
+           <ext>
+             <doctype>article</doctype>
+           </ext>
+         </bibdata>
+         <sections>
+           <clause id='A' inline-header='false' obligation='normative'>
+             <title>Change Clause</title>
+             <amend id='B' change='modify' path='//table[2]' path_end='//table[2]/following-sibling:example[1]' title='Change'>
+               <autonumber type='table'>2</autonumber>
+               <autonumber type='example'>7</autonumber>
+               <description>
+                 <p id='C'>
+                   <em>
+                     This table contains information on polygon cells which are not
+                     included in ISO 10303-52. Remove table 2 completely and replace
+                     with:
+                   </em>
+                 </p>
+               </description>
+               <newcontent id='D'>
+                 <table id='E'>
+                   <name>Edges of triangle and quadrilateral cells</name>
+                   <tbody>
+                     <tr>
+                       <th colspan='2' valign='middle' align='center'>triangle</th>
+                       <th colspan='2' valign='middle' align='center'>quadrilateral</th>
+                     </tr>
+                     <tr>
+                       <td valign='middle' align='center'>edge</td>
+                       <td valign='middle' align='center'>vertices</td>
+                       <td valign='middle' align='center'>edge</td>
+                       <td valign='middle' align='center'>vertices</td>
+                     </tr>
+                     <tr>
+                       <td valign='middle' align='center'>1</td>
+                       <td valign='middle' align='center'>1, 2</td>
+                       <td valign='middle' align='center'>1</td>
+                       <td valign='middle' align='center'>1, 2</td>
+                     </tr>
+                     <tr>
+                       <td valign='middle' align='center'>2</td>
+                       <td valign='middle' align='center'>2, 3</td>
+                       <td valign='middle' align='center'>2</td>
+                       <td valign='middle' align='center'>2, 3</td>
+                     </tr>
+                     <tr>
+                       <td valign='middle' align='center'>3</td>
+                       <td valign='middle' align='center'>3, 1</td>
+                       <td valign='middle' align='center'>3</td>
+                       <td valign='middle' align='center'>3, 4</td>
+                     </tr>
+                     <tr>
+                       <td valign='top' align='left'/>
+                       <td valign='top' align='left'/>
+                       <td valign='middle' align='center'>4</td>
+                       <td valign='middle' align='center'>4, 1</td>
+                     </tr>
+                   </tbody>
+                 </table>
+                 <figure id="H"><name>Figure</name></figure>
+                 <example id='F'>
+                   <p id='G'>This is not generalised further.</p>
+                 </example>
+               </newcontent>
+             </amend>
+           </clause>
+         </sections>
+       </standard-document>
+    INPUT
+    presxml = <<~OUTPUT
+    <standard-document xmlns="https://www.metanorma.org/ns/standoc">
+            <bibdata type="standard">
+              <title language="en" format="text/plain">Document title</title>
+              <language>en</language>
+              <script>Latn</script>
+              <status>
+                <stage>published</stage>
+              </status>
+              <copyright>
+                <from>2020</from>
+              </copyright>
+              <ext>
+                <doctype>article</doctype>
+              </ext>
+            </bibdata>
+            <sections>
+              <clause id="A" inline-header="false" obligation="normative">
+                <title depth="1">1.<tab/>Change Clause</title>
+                    <p id="C">
+                      <em>
+                        This table contains information on polygon cells which are not
+                        included in ISO 10303-52. Remove table 2 completely and replace
+                        with:
+                      </em>
+                    </p>
+                  <quote id="D">
+                    <table id="E" number="2">
+                      <name>Table 2&#xA0;&#x2014; Edges of triangle and quadrilateral cells</name>
+                      <tbody>
+                        <tr>
+                          <th colspan="2" valign="middle" align="center">triangle</th>
+                          <th colspan="2" valign="middle" align="center">quadrilateral</th>
+                        </tr>
+                        <tr>
+                          <td valign="middle" align="center">edge</td>
+                          <td valign="middle" align="center">vertices</td>
+                          <td valign="middle" align="center">edge</td>
+                          <td valign="middle" align="center">vertices</td>
+                        </tr>
+                        <tr>
+                          <td valign="middle" align="center">1</td>
+                          <td valign="middle" align="center">1, 2</td>
+                          <td valign="middle" align="center">1</td>
+                          <td valign="middle" align="center">1, 2</td>
+                        </tr>
+                        <tr>
+                          <td valign="middle" align="center">2</td>
+                          <td valign="middle" align="center">2, 3</td>
+                          <td valign="middle" align="center">2</td>
+                          <td valign="middle" align="center">2, 3</td>
+                        </tr>
+                        <tr>
+                          <td valign="middle" align="center">3</td>
+                          <td valign="middle" align="center">3, 1</td>
+                          <td valign="middle" align="center">3</td>
+                          <td valign="middle" align="center">3, 4</td>
+                        </tr>
+                        <tr>
+                          <td valign="top" align="left"/>
+                          <td valign="top" align="left"/>
+                          <td valign="middle" align="center">4</td>
+                          <td valign="middle" align="center">4, 1</td>
+                        </tr>
+                      </tbody>
+                    </table>
+                    <figure id="H" unnumbered="true"><name>Figure</name></figure>
+                    <example id="F" number="7"><name>EXAMPLE  7</name>
+                      <p id="G">This is not generalised further.</p>
+                    </example>
+                  </quote>
+              </clause>
+            </sections>
+          </standard-document>
+    OUTPUT
+    html = <<~OUTPUT
+    <html lang='en'>
+         <head/>
+         <body lang='en'>
+           <div class='title-section'>
+             <p>&#160;</p>
+           </div>
+           <br/>
+           <div class='prefatory-section'>
+             <p>&#160;</p>
+           </div>
+           <br/>
+           <div class='main-section'>
+             <p class='zzSTDTitle1'>Document title</p>
+             <div id='A'>
+               <h1>1.&#160; Change Clause</h1>
+               <p id='C'>
+                 <i>
+                    This table contains information on polygon cells which are not
+                   included in ISO 10303-52. Remove table 2 completely and replace
+                   with:
+                 </i>
+               </p>
+               <div class='Quote' id="D">
+                 <p class='TableTitle' style='text-align:center;'>Table 2&#160;&#8212; Edges of triangle and quadrilateral cells</p>
+                 <table id='E' class='MsoISOTable' style='border-width:1px;border-spacing:0;'>
+                   <tbody>
+                     <tr>
+                       <th colspan='2' style='font-weight:bold;text-align:center;vertical-align:middle;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;' scope='row'>triangle</th>
+                       <th colspan='2' style='font-weight:bold;text-align:center;vertical-align:middle;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;' scope='row'>quadrilateral</th>
+                     </tr>
+                     <tr>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>edge</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>vertices</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>edge</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>vertices</td>
+                     </tr>
+                     <tr>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>1</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>1, 2</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>1</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>1, 2</td>
+                     </tr>
+                     <tr>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>2</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>2, 3</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>2</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>2, 3</td>
+                     </tr>
+                     <tr>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>3</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>3, 1</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>3</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.0pt;'>3, 4</td>
+                     </tr>
+                     <tr>
+                       <td style='text-align:left;vertical-align:top;border-top:none;border-bottom:solid windowtext 1.5pt;'/>
+                       <td style='text-align:left;vertical-align:top;border-top:none;border-bottom:solid windowtext 1.5pt;'/>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.5pt;'>4</td>
+                       <td style='text-align:center;vertical-align:middle;border-top:none;border-bottom:solid windowtext 1.5pt;'>4, 1</td>
+                     </tr>
+                   </tbody>
+                 </table>
+                 <div id='H' class='figure'>
+                   <p class='FigureTitle' style='text-align:center;'>Figure</p>
+                 </div>
+                 <div id='F' class='example'>
+                   <p class='example-title'>EXAMPLE 7</p>
+                   <p id='G'>This is not generalised further.</p>
+                 </div>
+               </div>
+             </div>
+           </div>
+         </body>
+       </html>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
+  end
+
   it "processes unlabelled notes (Presentation XML)" do
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">