isodoc 1.2.1 → 1.2.6

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_function/inline.rb

@@ -7,17 +7,25 @@ module IsoDoc
     def anchor_linkend(node, linkend)
       if node["citeas"].nil? && node["bibitemid"]
         return @xrefs.anchor(node["bibitemid"] ,:xref) || "???"
+      elsif node["target"] && node["droploc"]
+        return @xrefs.anchor(node["target"], :value) || 
+          @xrefs.anchor(node["target"], :label) || 
+          @xrefs.anchor(node["target"], :xref) || "???"
       elsif node["target"] && !/.#./.match(node["target"])
-        linkend = @xrefs.anchor(node["target"], :xref)
-        container = @xrefs.anchor(node["target"], :container, false)
-        (container && get_note_container_id(node) != container &&
-         @xrefs.get[node["target"]]) &&
-        linkend = prefix_container(container, linkend, node["target"])
-        linkend = capitalise_xref(node, linkend)
+        linkend = anchor_linkend1(node)
       end
       linkend || "???"
     end
 
+    def anchor_linkend1(node)
+      linkend = @xrefs.anchor(node["target"], :xref)
+      container = @xrefs.anchor(node["target"], :container, false)
+      (container && get_note_container_id(node) != container &&
+       @xrefs.get[node["target"]]) &&
+      linkend = prefix_container(container, linkend, node["target"])
+      capitalise_xref(node, linkend)
+    end
+
     def capitalise_xref(node, linkend)
       return linkend unless %w(Latn Cyrl Grek).include? @script
       return linkend&.capitalize if node["case"] == "capital"
@@ -59,14 +67,19 @@ module IsoDoc
       refs.each_with_index do |r, i|
         delim = ","
         delim = ";" if r.name == "localityStack" && i>0
-        if r.name == "localityStack"
-          r.elements.each_with_index do |rr, j|
-            ret += eref_localities0(rr, j, target, delim)
-            delim = ","
-          end
-        else
-          ret += eref_localities0(r, i, target, delim)
+        ret = eref_locality_stack(r, i, target, delim, ret)
+      end
+      ret
+    end
+
+    def eref_locality_stack(r, i, target, delim, ret)
+      if r.name == "localityStack"
+        r.elements.each_with_index do |rr, j|
+          ret += eref_localities0(rr, j, target, delim)
+          delim = ","
         end
+      else
+        ret += eref_localities0(r, i, target, delim)
       end
       ret
     end
@@ -79,7 +92,7 @@ module IsoDoc
       end
     end
 
-     # TODO: move to localization file
+    # TODO: move to localization file
     def eref_localities1_zh(target, type, from, to, delim)
       ret = "#{delim} 第#{from.text}" if from
       ret += "–#{to.text}" if to

data/lib/isodoc/presentation_xml_convert.rb

@@ -1,6 +1,7 @@
 require_relative "presentation_function/block"
 require_relative "presentation_function/inline"
 require_relative "presentation_function/section"
+require_relative "presentation_function/bibdata"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -14,10 +15,12 @@ module IsoDoc
       @xrefs.parse docxml
       info docxml, nil
       conversions(docxml)
+      docxml.root["type"] = "presentation"
       docxml.to_xml
     end
 
     def conversions(docxml)
+      bibdata docxml
       section docxml
       block docxml
       inline docxml
@@ -30,6 +33,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.1".freeze
+  VERSION = "1.2.6".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -27,6 +27,7 @@ module IsoDoc::WordFunction
     def make_body2(body, docxml)
       body.div **{ class: "WordSection2" } do |div2|
         boilerplate docxml, div2
+        preface_block docxml, div2
         abstract docxml, div2
         foreword docxml, div2
         introduction docxml, div2

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_anchor.rb

@@ -35,11 +35,15 @@ module IsoDoc::XrefGen
     end
 
     def anchor_struct_xref(lbl, elem)
+      l10n("#{elem} #{anchor_struct_value(lbl, elem)}")
+    end
+
+    def anchor_struct_value(lbl, elem)
       case elem
-      when @labels["formula"] then l10n("#{elem} (#{lbl})")
-      when @labels["inequality"] then l10n("#{elem} (#{lbl})")
+      when @labels["formula"] then "(#{lbl})"
+      when @labels["inequality"] then "(#{lbl})"
       else
-        l10n("#{elem} #{lbl}")
+        lbl
       end
     end
 
@@ -50,6 +54,7 @@ module IsoDoc::XrefGen
       ret[:xref].gsub!(/ $/, "")
       ret[:container] = @klass.get_clause_id(container) unless container.nil?
       ret[:type] = type
+      ret[:value] = anchor_struct_value(lbl, elem)
       ret
     end
   end

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
@@ -13,7 +36,7 @@ module IsoDoc::XrefGen
           return if n["id"].nil? || n["id"].empty?
           c.increment(n)
           @anchors[n["id"]] =
-            { label: termnote_label(c.print), type: "termnote",
+            { label: termnote_label(c.print), type: "termnote", value: c.print,
               xref: l10n("#{anchor(t['id'], :xref)}, "\
                          "#{@labels["note_xref"]} #{c.print}") }
         end
@@ -27,9 +50,9 @@ 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, 
+            type: "termexample", label: idx, value: c.print,
             xref: l10n("#{anchor(t['id'], :xref)}, "\
                        "#{@labels["example_xref"]} #{c.print}") }
         end
@@ -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/lib/isodoc/xref/xref_sect_gen.rb

@@ -113,7 +113,7 @@ module IsoDoc::XrefGen
 
     def annex_names(clause, num)
       @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
-                                 type: "clause",
+                                 type: "clause", value: num.to_s,
                                  xref: "#{@labels["annex"]} #{num}", level: 1 }
       if a = single_annex_special_section(clause)
         annex_names1(a, "#{num}", 1)

data/lib/isodoc/xslfo_convert.rb

@@ -23,6 +23,10 @@ module IsoDoc
       nil
     end
 
+    def pdf_options(docxml)
+      ""
+    end
+
     def convert(input_filename, file = nil, debug = false, output_filename = nil)
       file = File.read(input_filename, encoding: "utf-8") if file.nil?
       docxml, filename, dir = convert_init(file, input_filename, debug)
@@ -34,7 +38,8 @@ module IsoDoc
       FileUtils.rm_rf dir
       ::Metanorma::Output::XslfoPdf.new.convert(input_filename,
                                                 output_filename || "#{filename}.#{@suffix}", 
-                                               File.join(@libdir, pdf_stylesheet(docxml)))
+                                               File.join(@libdir, pdf_stylesheet(docxml)),
+                                               pdf_options(docxml))
     end
 
     def xref_parse(node, out)

data/spec/assets/i18n.yaml

@@ -13,4 +13,13 @@ inform_annex: informa
 all_parts: ĉiuj partoj
 locality: {
   table: Tabelo
+  }
+doctype_dict: {
+  brochure: broŝuro
+  }
+stage_dict: {
+  published: publikigita
 }
+substage_dict: {
+  withdrawn: fortirita
+  }

data/spec/isodoc/blocks_spec.rb

@@ -1,6 +1,257 @@
 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" type="presentation">
+            <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>
+            <local_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>
+</local_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">
@@ -12,7 +263,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <note id='A' keep-with-next='true' keep-lines-together='true'>
@@ -115,7 +366,7 @@ OUTPUT
     </iso-standard>
 INPUT
 <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <note id='note1'>
@@ -403,7 +654,7 @@ B</pre>
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-     <iso-standard xmlns="http://riboseinc.com/isoxml">
+     <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
     <preface><foreword>
     <figure id="figureA-1" keep-with-next="true" keep-lines-together="true">
   <name>Figure 1&#xA0;&#x2014; Split-it-right <em>sample</em> divider<fn reference="1"><p>X</p></fn></name>
@@ -703,7 +954,7 @@ OUTPUT
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <example id='samplecode' keep-with-next='true' keep-lines-together='true'>
@@ -819,7 +1070,7 @@ OUTPUT
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <example id='samplecode'>
@@ -855,7 +1106,7 @@ Que?
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <sourcecode lang='ruby' id='samplecode'>
@@ -1093,7 +1344,7 @@ Que?
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <formula id='_be9158af-7e93-4ee2-90c5-26d31c181934' unnumbered='true' keep-with-next='true' keep-lines-together='true'>
@@ -1346,7 +1597,7 @@ it "processes blockquotes (Presentation XML)" do
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword>
              <quote id='_044bd364-c832-4b78-8fea-92242402a1d1'>
@@ -1485,7 +1736,7 @@ it "processes blockquotes (Presentation XML)" do
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword>
              <permission id='_' keep-with-next='true' keep-lines-together='true'>
@@ -1845,7 +2096,7 @@ Inherits: <a href='#rfc2616'>RFC 2616 (HTTP/1.1)</a>
     </iso-standard>
     INPUT
      <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword>
              <requirement id='A' unnumbered='true' keep-with-next='true' keep-lines-together='true'>
@@ -2045,11 +2296,15 @@ end
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
            <language>fr</language>
            <script>Latn</script>
          </bibdata>
+         <local_bibdata>
+  <language>fr</language>
+  <script>Latn</script>
+</local_bibdata>
          <preface>
            <foreword>
              <requirement id='A' unnumbered='true'>
@@ -2114,6 +2369,10 @@ end
     <language>fr</language>
     <script>Latn</script>
     </bibdata>
+    <local_bibdata>
+  <language>fr</language>
+  <script>Latn</script>
+</local_bibdata>
     <preface><foreword>
     <requirement id="A" unnumbered="true">
     <name>Exigence</name>
@@ -2276,7 +2535,7 @@ end
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword>
              <recommendation id='_' obligation='shall,could' keep-with-next='true' keep-lines-together='true'>
@@ -2440,10 +2699,13 @@ end
 </preface></itu-standard>
 INPUT
 <?xml version='1.0'?>
-<itu-standard xmlns='http://riboseinc.com/isoxml'>
+<itu-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <bibdata>
     <language>en</language>
   </bibdata>
+  <local_bibdata>
+  <language>en</language>
+</local_bibdata>
   <preface>
     <foreword>
       <figure id='_' class='pseudocode' keep-with-next='true' keep-lines-together='true'>
@@ -2472,6 +2734,9 @@ end
   <bibdata>
     <language>en</language>
   </bibdata>
+  <local_bibdata>
+  <language>en</language>
+</local_bibdata>
   <preface>
     <foreword>
       <figure id='_' class='pseudocode' keep-with-next='true' keep-lines-together='true'>
@@ -2514,6 +2779,9 @@ OUTPUT
   <bibdata>
     <language>en</language>
   </bibdata>
+  <local_bibdata>
+  <language>en</language>
+</local_bibdata>
   <preface>
     <foreword>
       <figure id='_' class='pseudocode' keep-with-next='true' keep-lines-together='true'>