isodoc 1.6.1 → 1.6.6

data/lib/isodoc/xref.rb

@@ -11,6 +11,8 @@ module IsoDoc
     include XrefGen::Blocks
     include XrefGen::Sections
 
+    attr_reader :klass
+
     def initialize(lang, script, klass, i18n, options = {})
       @anchors = {}
       @lang = lang

data/lib/isodoc/xref/xref_counter.rb

@@ -49,8 +49,7 @@ module IsoDoc::XrefGen
           @base = node["number"][0..-2]
           @letter = @letter_override = node["number"][-1]
         else
-          @number_override = node["number"]
-          @num = n.to_i
+          @number_override = @num = n.to_i
           @base = b
           @letter = ""
         end

data/lib/isodoc/xref/xref_gen.rb

@@ -10,7 +10,7 @@ module IsoDoc::XrefGen
         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] && i.zero? and e["number"] = autonum[b]
             !autonum[b] and e["unnumbered"] = "true"
           end
         end
@@ -29,6 +29,13 @@ module IsoDoc::XrefGen
       @labels["termnote"].gsub(/%/, note.to_s)
     end
 
+    def increment_label(elems, node, counter, increment = true)
+      return "" if elems.size == 1 && !node["number"]
+
+      counter.increment(node) if increment
+      " #{counter.print}"
+    end
+
     def termnote_anchor_names(docxml)
       docxml.xpath(ns("//term[descendant::termnote]")).each do |t|
         c = Counter.new
@@ -39,7 +46,7 @@ module IsoDoc::XrefGen
           @anchors[n["id"]] =
             { label: termnote_label(c.print), type: "termnote", value: c.print,
               xref: l10n("#{anchor(t['id'], :xref)}, "\
-                         "#{@labels["note_xref"]} #{c.print}") }
+                         "#{@labels['note_xref']} #{c.print}") }
         end
       end
     end
@@ -52,11 +59,11 @@ module IsoDoc::XrefGen
           next if n["id"].nil? || n["id"].empty?
 
           c.increment(n)
-          idx = examples.size == 1 && !n["number"] ? "" : c.print
+          idx = increment_label(examples, n, c, false)
           @anchors[n["id"]] = {
             type: "termexample", label: idx, value: c.print,
             xref: l10n("#{anchor(t['id'], :xref)}, "\
-                       "#{@labels["example_xref"]} #{c.print}") }
+                       "#{@labels['example_xref']} #{c.print}") }
         end
       end
     end
@@ -84,9 +91,9 @@ module IsoDoc::XrefGen
         notes.each do |n|
           next if @anchors[n["id"]] || n["id"].nil? || n["id"].empty?
 
-          idx = notes.size == 1 && !n["number"] ? "" : " #{c.increment(n).print}"
-          @anchors[n["id"]] = anchor_struct(idx, n, @labels["note_xref"], 
-                                            "note", false)
+          @anchors[n["id"]] =
+            anchor_struct(increment_label(notes, n, c), n,
+                          @labels["note_xref"], "note", false)
         end
         note_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
       end
@@ -107,10 +114,9 @@ module IsoDoc::XrefGen
         notes.each do |n|
           next if @anchors[n["id"]] || n["id"].nil? || n["id"].empty?
 
-          idx = notes.size == 1 && !n["number"]  ? "" :
-            " #{c.increment(n).print}"
-          @anchors[n["id"]] = anchor_struct(idx, n, @labels["example_xref"],
-                                            "example", n["unnumbered"])
+          @anchors[n["id"]] =
+            anchor_struct(increment_label(notes, n, c), n,
+                          @labels["example_xref"], "example", n["unnumbered"])
         end
         example_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
       end
@@ -124,9 +130,8 @@ module IsoDoc::XrefGen
         notes.each do |n|
           next if n["id"].nil? || n["id"].empty?
 
-          idx = notes.size == 1 && !n["number"] ? "" : " #{c.increment(n).print}"
-          @anchors[n["id"]] = anchor_struct(idx, n, @labels["list"], "list",
-                                            false)
+          @anchors[n["id"]] = anchor_struct(increment_label(notes, n, c), n,
+                                            @labels["list"], "list", false)
           list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
         end
         list_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
@@ -151,9 +156,11 @@ module IsoDoc::XrefGen
     def bookmark_anchor_names(docxml)
       docxml.xpath(ns(".//bookmark")).each do |n|
         next if n["id"].nil? || n["id"].empty?
+
         parent = nil
         n.ancestors.each do |a|
           next unless a["id"] && parent = @anchors.dig(a["id"], :xref)
+
           break
         end
         @anchors[n["id"]] = { type: "bookmark", label: nil, value: nil,

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -8,25 +8,27 @@ module IsoDoc::XrefGen
       "-"
     end
 
-    def subfigure_increment(j, c, t)
-      if t.parent.name == "figure" then j += 1
+    def subfigure_increment(idx, counter, elem)
+      if elem.parent.name == "figure" then idx += 1
       else
-        j = 0
-        c.increment(t)
+        idx = 0
+        counter.increment(elem)
       end
-      j
+      idx
     end
 
     def sequential_figure_names(clause)
       c = Counter.new
       j = 0
-      clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).
-        each do |t|
+      clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]"))
+        .each do |t|
         j = subfigure_increment(j, c, t)
         label = c.print + (j.zero? ? "" : "-#{j}")
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] =
-          anchor_struct(label, nil, @labels["figure"], "figure", t["unnumbered"])
+
+        @anchors[t["id"]] = anchor_struct(
+          label, nil, @labels["figure"], "figure", t["unnumbered"]
+        )
       end
     end
 
@@ -34,8 +36,11 @@ module IsoDoc::XrefGen
       c = Counter.new
       clause.xpath(ns(".//table")).each do |t|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(c.increment(t).print, nil, 
-                                          @labels["table"], "table", t["unnumbered"])
+
+        @anchors[t["id"]] = anchor_struct(
+          c.increment(t).print, nil,
+          @labels["table"], "table", t["unnumbered"]
+        )
       end
     end
 
@@ -43,10 +48,12 @@ module IsoDoc::XrefGen
       c = Counter.new
       clause.xpath(ns(".//formula")).each do |t|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] =
-          anchor_struct(c.increment(t).print, t, 
-                        t["inequality"] ? @labels["inequality"] : @labels["formula"],
-                        "formula", t["unnumbered"])
+
+        @anchors[t["id"]] = anchor_struct(
+          c.increment(t).print, t,
+          t["inequality"] ? @labels["inequality"] : @labels["formula"],
+          "formula", t["unnumbered"]
+        )
       end
     end
 
@@ -57,22 +64,27 @@ module IsoDoc::XrefGen
       c = Counter.new
       clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}")).each do |t|
         next if t["id"].nil? || t["id"].empty?
+
         id = c.increment(t).print
         @anchors[t["id"]] = anchor_struct(id, t, label, klass, t["unnumbered"])
         sequential_permission_names2(t, id)
       end
     end
 
-    def sequential_permission_names2(t, id)
-      sequential_permission_names1(t, id, "permission", @labels["permission"])
-      sequential_permission_names1(t, id, "requirement", @labels["requirement"])
-      sequential_permission_names1(t, id, "recommendation", @labels["recommendation"])
+    def sequential_permission_names2(elem, ident)
+      sequential_permission_names1(elem, ident, "permission",
+                                   @labels["permission"])
+      sequential_permission_names1(elem, ident, "requirement",
+                                   @labels["requirement"])
+      sequential_permission_names1(elem, ident, "recommendation",
+                                   @labels["recommendation"])
     end
 
     def sequential_permission_names1(block, lbl, klass, label)
       c = Counter.new
       block.xpath(ns("./#{klass}")).each do |t|
         next if t["id"].nil? || t["id"].empty?
+
         id = "#{lbl}#{hierfigsep}#{c.increment(t).print}"
         @anchors[t["id"]] = anchor_struct(id, t, label, klass, t["unnumbered"])
         sequential_permission_names2(t, id)
@@ -85,20 +97,22 @@ module IsoDoc::XrefGen
       sequential_formula_names(clause)
       sequential_permission_names(clause, "permission", @labels["permission"])
       sequential_permission_names(clause, "requirement", @labels["requirement"])
-      sequential_permission_names(clause, "recommendation", @labels["recommendation"])
+      sequential_permission_names(clause, "recommendation",
+                                  @labels["recommendation"])
     end
 
     def hierarchical_figure_names(clause, num)
       c = Counter.new
       j = 0
-      clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]")).
-        each do |t|
+      clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]"))
+        .each do |t|
         j = subfigure_increment(j, c, t)
         label = "#{num}#{hiersep}#{c.print}" +
           (j.zero? ? "" : "#{hierfigsep}#{j}")
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(label, nil, @labels["figure"], "figure",
-                                          t["unnumbered"])
+
+        @anchors[t["id"]] = anchor_struct(label, nil, @labels["figure"],
+                                          "figure", t["unnumbered"])
       end
     end
 
@@ -106,6 +120,7 @@ module IsoDoc::XrefGen
       c = Counter.new
       clause.xpath(ns(".//table")).each do |t|
         next if t["id"].nil? || t["id"].empty?
+
         @anchors[t["id"]] =
           anchor_struct("#{num}#{hiersep}#{c.increment(t).print}",
                         nil, @labels["table"], "table", t["unnumbered"])
@@ -116,7 +131,8 @@ module IsoDoc::XrefGen
       hierarchical_table_names(clause, num)
       hierarchical_figure_names(clause, num)
       hierarchical_formula_names(clause, num)
-      hierarchical_permission_names(clause, num, "permission", @labels["permission"])
+      hierarchical_permission_names(clause, num, "permission",
+                                    @labels["permission"])
       hierarchical_permission_names(clause, num, "requirement",
                                     @labels["requirement"])
       hierarchical_permission_names(clause, num, "recommendation",
@@ -127,10 +143,12 @@ module IsoDoc::XrefGen
       c = Counter.new
       clause.xpath(ns(".//formula")).each do |t|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] =
-          anchor_struct("#{num}#{hiersep}#{c.increment(t).print}", nil,
-                        t["inequality"] ? @labels["inequality"] : @labels["formula"],
-                        "formula", t["unnumbered"])
+
+        @anchors[t["id"]] = anchor_struct(
+          "#{num}#{hiersep}#{c.increment(t).print}", nil,
+          t["inequality"] ? @labels["inequality"] : @labels["formula"],
+          "formula", t["unnumbered"]
+        )
       end
     end
 
@@ -138,24 +156,31 @@ module IsoDoc::XrefGen
       c = Counter.new
       clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}")).each do |t|
         next if t["id"].nil? || t["id"].empty?
+
         id = "#{num}#{hiersep}#{c.increment(t).print}"
-        @anchors[t["id"]] = anchor_struct(id, nil, label, klass, t["unnumbered"])
+        @anchors[t["id"]] =
+          anchor_struct(id, nil, label, klass, t["unnumbered"])
         hierarchical_permission_names2(t, id)
       end
     end
 
-    def hierarchical_permission_names2(t, id)
-      hierarchical_permission_names1(t, id, "permission", @labels["permission"])
-      hierarchical_permission_names1(t, id, "requirement", @labels["requirement"])
-      hierarchical_permission_names1(t, id, "recommendation", @labels["recommendation"])
+    def hierarchical_permission_names2(elem, ident)
+      hierarchical_permission_names1(elem, ident, "permission",
+                                     @labels["permission"])
+      hierarchical_permission_names1(elem, ident, "requirement",
+                                     @labels["requirement"])
+      hierarchical_permission_names1(elem, ident, "recommendation",
+                                     @labels["recommendation"])
     end
 
     def hierarchical_permission_names1(block, lbl, klass, label)
       c = Counter.new
       block.xpath(ns("./#{klass}")).each do |t|
         next if t["id"].nil? || t["id"].empty?
+
         id = "#{lbl}#{hierfigsep}#{c.increment(t).print}"
-        @anchors[t["id"]] = anchor_struct(id, nil, label, klass, t["unnumbered"])
+        @anchors[t["id"]] =
+          anchor_struct(id, nil, label, klass, t["unnumbered"])
         hierarchical_permission_names2(t, id)
       end
     end

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -14,20 +14,20 @@ module IsoDoc::XrefGen
       end
     end
 
-    def initial_anchor_names(d)
-      d.xpath(ns("//preface/*")).each { |c| c.element? and preface_names(c) }
+    def initial_anchor_names(doc)
+      doc.xpath(ns("//preface/*")).each { |c| c.element? and preface_names(c) }
       # potentially overridden in middle_section_asset_names()
-      sequential_asset_names(d.xpath(ns("//preface/*")))
+      sequential_asset_names(doc.xpath(ns("//preface/*")))
       n = Counter.new
-      n = section_names(d.at(ns("//clause[@type = 'scope']")), n, 1)
-      n = section_names(d.at(ns(@klass.norm_ref_xpath)), n, 1)
-      n = section_names(d.at(ns("//sections/terms | "\
+      n = section_names(doc.at(ns("//clause[@type = 'scope']")), n, 1)
+      n = section_names(doc.at(ns(@klass.norm_ref_xpath)), n, 1)
+      n = section_names(doc.at(ns("//sections/terms | "\
                                 "//sections/clause[descendant::terms]")), n, 1)
-      n = section_names(d.at(ns("//sections/definitions")), n, 1)
-      clause_names(d, n)
-      middle_section_asset_names(d)
-      termnote_anchor_names(d)
-      termexample_anchor_names(d)
+      n = section_names(doc.at(ns("//sections/definitions")), n, 1)
+      clause_names(doc, n)
+      middle_section_asset_names(doc)
+      termnote_anchor_names(doc)
+      termexample_anchor_names(doc)
     end
 
     def preface_clause_name(clause)
@@ -60,17 +60,17 @@ module IsoDoc::XrefGen
       end
     end
 
-    def middle_section_asset_names(d)
+    def middle_section_asset_names(doc)
       middle_sections = "//clause[@type = 'scope'] | "\
         "#{@klass.norm_ref_xpath} | "\
         "//sections/terms | //preface/* | "\
         "//sections/definitions | //clause[parent::sections]"
-      sequential_asset_names(d.xpath(ns(middle_sections)))
+      sequential_asset_names(doc.xpath(ns(middle_sections)))
     end
 
-    def clause_names(docxml, n)
+    def clause_names(docxml, num)
       docxml.xpath(ns(@klass.middle_clause(docxml))).each_with_index do |c, _i|
-        section_names(c, n, 1)
+        section_names(c, num, 1)
       end
     end
 

data/spec/assets/scripts_override.html

@@ -0,0 +1,3 @@
+<script>
+  This is > also a script
+</script>

data/spec/isodoc/blocks_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe IsoDoc do
                <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>
+                 <autonumber type='example'>A.7</autonumber>
                  <description>
                    <p id='C'>
                      <em>
@@ -100,7 +100,7 @@ RSpec.describe IsoDoc do
                 </ext>
               </bibdata>
               <sections>
-                <clause id="A" inline-header="false" obligation="normative">
+                <clause id="A" inline-header="false" obligation="normative" displayorder="1">
                   <title depth="1">1.<tab/>Change Clause</title>
                       <p id="C">
                         <em>
@@ -150,7 +150,7 @@ RSpec.describe IsoDoc do
                         </tbody>
                       </table>
                       <figure id="H" unnumbered="true"><name>Figure</name></figure>
-                      <example id="F" number="7"><name>EXAMPLE  7</name>
+                      <example id="F" number="A.7"><name>EXAMPLE  A.7</name>
                         <p id="G">This is not generalised further.</p>
                       </example>
                     </quote>
@@ -225,7 +225,7 @@ RSpec.describe IsoDoc do
                      <p class='FigureTitle' style='text-align:center;'>Figure</p>
                    </div>
                    <div id='F' class='example'>
-                     <p class='example-title'>EXAMPLE 7</p>
+                     <p class='example-title'>EXAMPLE A.7</p>
                      <p id='G'>This is not generalised further.</p>
                    </div>
                  </div>
@@ -242,387 +242,320 @@ RSpec.describe IsoDoc do
       .convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 
-  it "processes unlabelled notes (Presentation XML)" do
+  it "processes unlabelled notes" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <note id="A" keep-with-next="true" keep-lines-together="true">
+        <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
+    presxml = <<~OUTPUT
+          <?xml version='1.0'?>
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
+        <preface>
+          <foreword displayorder="1">
+            <note id='A' keep-with-next='true' keep-lines-together='true'>
+              <name>NOTE</name>
+              <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>
+    OUTPUT
+    html = <<~OUTPUT
+      #{HTML_HDR}
+        <br/>
+        <div>
+        <h1 class="ForewordTitle">Foreword</h1>
+        <div id="A" class="Note" style="page-break-after: avoid;page-break-inside: avoid;">
+        <p><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
+        </div>
+        </div>
+        <p class="zzSTDTitle1"/>
+        </div>
+        </body>
+        </html>
+    OUTPUT
+    doc = <<~OUTPUT
+        <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
+        <head><style/></head>
+        <body lang="EN-US" link="blue" vlink="#954F72">
+          <div class="WordSection1">
+            <p>&#160;</p>
+          </div>
+          <p><br clear="all" class="section"/></p>
+          <div class="WordSection2">
+            <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
+            <div>
+              <h1 class="ForewordTitle">Foreword</h1>
+              <div id="A" class="Note"  style='page-break-after: avoid;page-break-inside: avoid;'>
+                <p class="Note"><span class="note_label">NOTE</span><span style="mso-tab-count:1">&#160; </span>These results are based on a study carried out on three different types of kernel.</p>
+              </div>
+            </div>
+            <p>&#160;</p>
+          </div>
+          <p><br clear="all" class="section"/></p>
+          <div class="WordSection3">
+            <p class="zzSTDTitle1"/>
+          </div>
+        </body>
+      </html>
+    OUTPUT
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
-      .convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-            <iso-standard xmlns="http://riboseinc.com/isoxml">
-            <preface><foreword>
-            <note id="A" keep-with-next="true" keep-lines-together="true">
-          <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
-            <?xml version='1.0'?>
-        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
-          <preface>
-            <foreword>
-              <note id='A' keep-with-next='true' keep-lines-together='true'>
-                <name>NOTE</name>
-                <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>
-      OUTPUT
-  end
-
-  it "processes unlabelled notes (HTML)" do
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::HtmlConvert.new({})
-      .convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-            <iso-standard xmlns='http://riboseinc.com/isoxml'>
-          <preface>
-            <foreword>
-              <note id='A' keep-with-next='true' keep-lines-together='true'>
-                <name>NOTE</name>
-                <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_HDR}
-                     <br/>
-                     <div>
-                       <h1 class="ForewordTitle">Foreword</h1>
-                       <div id="A" class="Note" style="page-break-after: avoid;page-break-inside: avoid;">
-                         <p><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
-                       </div>
-                     </div>
-                     <p class="zzSTDTitle1"/>
-                   </div>
-                 </body>
-             </html>
-      OUTPUT
-  end
-
-  it "processes unlabelled notes (Word)" do
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
     expect(xmlpp(IsoDoc::WordConvert.new({})
-      .convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-            <iso-standard xmlns='http://riboseinc.com/isoxml'>
-          <preface>
-            <foreword>
-              <note id='A' keep-with-next='true' keep-lines-together='true'>
-                <name>NOTE</name>
-                <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 xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
-          <head><style/></head>
-          <body lang="EN-US" link="blue" vlink="#954F72">
-            <div class="WordSection1">
-              <p>&#160;</p>
-            </div>
-            <p><br clear="all" class="section"/></p>
-            <div class="WordSection2">
-              <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
-              <div>
-                <h1 class="ForewordTitle">Foreword</h1>
-                <div id="A" class="Note"  style='page-break-after: avoid;page-break-inside: avoid;'>
-                  <p class="Note"><span class="note_label">NOTE</span><span style="mso-tab-count:1">&#160; </span>These results are based on a study carried out on three different types of kernel.</p>
-                </div>
-              </div>
-              <p>&#160;</p>
-            </div>
-            <p><br clear="all" class="section"/></p>
-            <div class="WordSection3">
-              <p class="zzSTDTitle1"/>
-            </div>
-          </body>
-        </html>
-      OUTPUT
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(doc)
   end
 
-  it "processes sequences of 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">
-            <preface><foreword>
-            <note 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>
-        </note>
-            <note 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>
-        </note>
-            </foreword></preface>
-            </iso-standard>
-      INPUT
-        <?xml version='1.0'?>
-        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
-          <preface>
-            <foreword>
-              <note id='note1'>
-                <name>NOTE 1</name>
-                <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
-                  These results are based on a study carried out on three different
-                  types of kernel.
-                </p>
-              </note>
-              <note id='note2'>
-                <name>NOTE 2</name>
-                <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a'>
-                  These results are based on a study carried out on three different
-                  types of kernel.
-                </p>
-              </note>
-            </foreword>
-          </preface>
-        </iso-standard>
-      OUTPUT
-  end
+  it "processes sequences of notes" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <note 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>
+      </note>
+          <note 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>
+      </note>
+          </foreword></preface>
+          </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+      <?xml version='1.0'?>
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
+        <preface>
+          <foreword displayorder="1">
+            <note id='note1'>
+              <name>NOTE 1</name>
+              <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
+                These results are based on a study carried out on three different
+                types of kernel.
+              </p>
+            </note>
+            <note id='note2'>
+              <name>NOTE 2</name>
+              <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a'>
+                These results are based on a study carried out on three different
+                types of kernel.
+              </p>
+            </note>
+          </foreword>
+        </preface>
+      </iso-standard>
+    OUTPUT
 
-  it "processes sequences of notes (HTML)" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({})
-      .convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-            <iso-standard xmlns='http://riboseinc.com/isoxml'>
-          <preface>
-            <foreword>
-              <note id='note1'>
-                <name>NOTE 1</name>
-                <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
-                  These results are based on a study carried out on three different
-                  types of kernel.
-                </p>
-              </note>
-              <note id='note2'>
-                <name>NOTE 2</name>
-                <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a'>
-                  These results are based on a study carried out on three different
-                  types of kernel.
-                </p>
-              </note>
-            </foreword>
-          </preface>
-        </iso-standard>
-      INPUT
-        #{HTML_HDR}
-                     <br/>
-                     <div>
-                       <h1 class="ForewordTitle">Foreword</h1>
-                       <div id="note1" class="Note">
-                         <p><span class="note_label">NOTE  1</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
-                       </div>
-                       <div id="note2" class="Note">
-                         <p><span class="note_label">NOTE  2</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
-                       </div>
+    output = <<~OUTPUT
+      #{HTML_HDR}
+                   <br/>
+                   <div>
+                     <h1 class="ForewordTitle">Foreword</h1>
+                     <div id="note1" class="Note">
+                       <p><span class="note_label">NOTE  1</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
+                     </div>
+                     <div id="note2" class="Note">
+                       <p><span class="note_label">NOTE  2</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
                      </div>
-                     <p class="zzSTDTitle1"/>
                    </div>
-                 </body>
-             </html>
-      OUTPUT
+                   <p class="zzSTDTitle1"/>
+                 </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(output)
   end
 
   it "processes multi-para notes" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({})
-      .convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-            <iso-standard xmlns="http://riboseinc.com/isoxml">
-            <preface><foreword>
-            <note>
-            <name>NOTE</name>
-          <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
-          <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
-        </note>
-            </foreword></preface>
-            </iso-standard>
-      INPUT
-        #{HTML_HDR}
-                  <br/>
-                  <div>
-                    <h1 class="ForewordTitle">Foreword</h1>
-                    <div class="Note">
-                      <p><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
-                      <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
-                    </div>
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <note>
+          <name>NOTE</name>
+        <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+        <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
+      </note>
+          </foreword></preface>
+          </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      #{HTML_HDR}
+                <br/>
+                <div>
+                  <h1 class="ForewordTitle">Foreword</h1>
+                  <div class="Note">
+                    <p><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
+                    <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
                   </div>
-                  <p class="zzSTDTitle1"/>
                 </div>
-              </body>
-          </html>
-      OUTPUT
-  end
-
-  it "processes non-para notes" do
+                <p class="zzSTDTitle1"/>
+              </div>
+            </body>
+        </html>
+    OUTPUT
     expect(xmlpp(IsoDoc::HtmlConvert.new({})
-      .convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-            <iso-standard xmlns="http://riboseinc.com/isoxml">
-            <preface><foreword>
-            <note id="A"><name>NOTE</name>
-            <dl>
-            <dt>A</dt>
-            <dd><p>B</p></dd>
-            </dl>
-            <ul>
-            <li>C</li></ul>
-        </note>
-            </foreword></preface>
-            </iso-standard>
-      INPUT
-        #{HTML_HDR}
-                  <br/>
-                  <div>
-                    <h1 class="ForewordTitle">Foreword</h1>
-                    <div id="A" class="Note"><p><span class="note_label">NOTE</span>&#160; </p>
-              <dl><dt><p>A</p></dt><dd><p>B</p></dd></dl>
-              <ul>
-              <li>C</li></ul>
-          </div>
-                  </div>
-                  <p class="zzSTDTitle1"/>
-                </div>
-              </body>
-          </html>
-
-      OUTPUT
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
 
-  it "processes non-para notes (Word)" do
-    expect(xmlpp(IsoDoc::WordConvert.new({})
-      .convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-            <iso-standard xmlns="http://riboseinc.com/isoxml">
-            <preface><foreword>
-            <note id="A"><name>NOTE</name>
-            <dl>
-            <dt>A</dt>
-            <dd><p>B</p></dd>
-            </dl>
-            <ul>
-            <li>C</li></ul>
-        </note>
-            </foreword></preface>
-            </iso-standard>
-      INPUT
-            <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
-          <head><style/></head>
-          <body lang="EN-US" link="blue" vlink="#954F72">
-            <div class="WordSection1">
-              <p>&#160;</p>
-            </div>
-            <p><br clear="all" class="section"/></p>
-            <div class="WordSection2">
-              <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
-              <div>
-                <h1 class="ForewordTitle">Foreword</h1>
-                <div id="A" class="Note"><p class="Note"><span class="note_label">NOTE</span><span style="mso-tab-count:1">&#160; </span></p>
-            <table class="dl"><tr><td valign="top" align="left"><p align="left" style="margin-left:0pt;text-align:left;">A</p></td><td valign="top"><p class="Note">B</p></td></tr></table>
+  it "processes non-para notes" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <note id="A"><name>NOTE</name>
+          <dl>
+          <dt>A</dt>
+          <dd><p>B</p></dd>
+          </dl>
+          <ul>
+          <li>C</li></ul>
+      </note>
+          </foreword></preface>
+          </iso-standard>
+    INPUT
+    html = <<~OUTPUT
+      #{HTML_HDR}
+                <br/>
+                <div>
+                  <h1 class="ForewordTitle">Foreword</h1>
+                  <div id="A" class="Note"><p><span class="note_label">NOTE</span>&#160; </p>
+            <dl><dt><p>A</p></dt><dd><p>B</p></dd></dl>
             <ul>
             <li>C</li></ul>
         </div>
+                </div>
+                <p class="zzSTDTitle1"/>
               </div>
-              <p>&#160;</p>
-            </div>
-            <p><br clear="all" class="section"/></p>
-            <div class="WordSection3">
-              <p class="zzSTDTitle1"/>
-            </div>
-          </body>
+            </body>
         </html>
-    OUTPUT
-  end
 
-  it "processes paragraphs containing notes" do
-    expect(xmlpp(strip_guid(IsoDoc::HtmlConvert.new({})
-      .convert("test", <<~"INPUT", true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-                <iso-standard xmlns="http://riboseinc.com/isoxml">
-            <preface><foreword>
-            <p id="A">ABC <note id="B"><name>NOTE 1</name><p id="C">XYZ</p></note>
-        <note id="B1"><name>NOTE 2</name><p id="C1">XYZ1</p></note></p>
-        </foreword></preface>
-            </iso-standard>
-      INPUT
-        #{HTML_HDR}
-                  <br/>
-                  <div>
-                    <h1 class='ForewordTitle'>Foreword</h1>
-                    <p id='A'>
-                      ABC
-                      <div id='B' class='Note'>
-                        <p>
-                          <span class='note_label'>NOTE 1</span>
-                          &#160; XYZ
-                        </p>
-                      </div>
-                      <div id='B1' class='Note'>
-                        <p>
-                          <span class='note_label'>NOTE 2</span>
-                          &#160; XYZ1
-                        </p>
-                      </div>
-                    </p>
-                  </div>
-                  <p class='zzSTDTitle1'/>
-                </div>
-              </body>
-            </html>
-      OUTPUT
-  end
-
-  it "processes paragraphs containing notes (Word)" do
-    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
-      .convert("test", <<~"INPUT", true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-                <iso-standard xmlns="http://riboseinc.com/isoxml">
-            <preface><foreword>
-            <p id="A">ABC <note id="B"><name>NOTE 1</name><p id="C">XYZ</p></note>
-        <note id="B1"><name>NOTE 2</name><p id="C1">XYZ1</p></note></p>
-        </foreword></preface>
-            </iso-standard>
-      INPUT
-        <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
-        <head>
-            <style/>
-          </head>
-          <body lang='EN-US' link='blue' vlink='#954F72'>
-            <div class='WordSection1'>
-              <p>&#160;</p>
-            </div>
-            <p>
-              <br clear='all' class='section'/>
-            </p>
-            <div class='WordSection2'>
-              <p>
-                <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
-              </p>
-              <div>
-                <h1 class='ForewordTitle'>Foreword</h1>
-                <p id='A'>ABC </p>
-                <div id='B' class='Note'>
-                  <p class='Note'>
-                    <span class='note_label'>NOTE 1</span>
-                    <span style='mso-tab-count:1'>&#160; </span>
-                    XYZ
-                  </p>
-                </div>
-                <div id='B1' class='Note'>
-                  <p class='Note'>
-                    <span class='note_label'>NOTE 2</span>
-                    <span style='mso-tab-count:1'>&#160; </span>
-                    XYZ1
+    OUTPUT
+    doc = <<~OUTPUT
+          <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
+        <head><style/></head>
+        <body lang="EN-US" link="blue" vlink="#954F72">
+          <div class="WordSection1">
+            <p>&#160;</p>
+          </div>
+          <p><br clear="all" class="section"/></p>
+          <div class="WordSection2">
+            <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
+            <div>
+              <h1 class="ForewordTitle">Foreword</h1>
+              <div id="A" class="Note"><p class="Note"><span class="note_label">NOTE</span><span style="mso-tab-count:1">&#160; </span></p>
+          <table class="dl"><tr><td valign="top" align="left"><p align="left" style="margin-left:0pt;text-align:left;">A</p></td><td valign="top"><p class="Note">B</p></td></tr></table>
+          <ul>
+          <li>C</li></ul>
+      </div>
+            </div>
+            <p>&#160;</p>
+          </div>
+          <p><br clear="all" class="section"/></p>
+          <div class="WordSection3">
+            <p class="zzSTDTitle1"/>
+          </div>
+        </body>
+      </html>
+    OUTPUT
+    expect(xmlpp(IsoDoc::HtmlConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(IsoDoc::WordConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(doc)
+  end
+
+  it "processes paragraphs containing notes" do
+    input = <<~INPUT
+              <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <p id="A">ABC <note id="B"><name>NOTE 1</name><p id="C">XYZ</p></note>
+      <note id="B1"><name>NOTE 2</name><p id="C1">XYZ1</p></note></p>
+      </foreword></preface>
+          </iso-standard>
+    INPUT
+    html = <<~OUTPUT
+      #{HTML_HDR}
+                <br/>
+                <div>
+                  <h1 class='ForewordTitle'>Foreword</h1>
+                  <p id='A'>
+                    ABC
+                    <div id='B' class='Note'>
+                      <p>
+                        <span class='note_label'>NOTE 1</span>
+                        &#160; XYZ
+                      </p>
+                    </div>
+                    <div id='B1' class='Note'>
+                      <p>
+                        <span class='note_label'>NOTE 2</span>
+                        &#160; XYZ1
+                      </p>
+                    </div>
                   </p>
                 </div>
+                <p class='zzSTDTitle1'/>
               </div>
-              <p>&#160;</p>
-            </div>
+            </body>
+          </html>
+    OUTPUT
+
+    doc = <<~OUTPUT
+      <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
+      <head>
+          <style/>
+        </head>
+        <body lang='EN-US' link='blue' vlink='#954F72'>
+          <div class='WordSection1'>
+            <p>&#160;</p>
+          </div>
+          <p>
+            <br clear='all' class='section'/>
+          </p>
+          <div class='WordSection2'>
             <p>
-              <br clear='all' class='section'/>
+              <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
             </p>
-            <div class='WordSection3'>
-              <p class='zzSTDTitle1'/>
+            <div>
+              <h1 class='ForewordTitle'>Foreword</h1>
+              <p id='A'>ABC </p>
+              <div id='B' class='Note'>
+                <p class='Note'>
+                  <span class='note_label'>NOTE 1</span>
+                  <span style='mso-tab-count:1'>&#160; </span>
+                  XYZ
+                </p>
+              </div>
+              <div id='B1' class='Note'>
+                <p class='Note'>
+                  <span class='note_label'>NOTE 2</span>
+                  <span style='mso-tab-count:1'>&#160; </span>
+                  XYZ1
+                </p>
+              </div>
             </div>
-          </body>
-        </html>
-      OUTPUT
+            <p>&#160;</p>
+          </div>
+          <p>
+            <br clear='all' class='section'/>
+          </p>
+          <div class='WordSection3'>
+            <p class='zzSTDTitle1'/>
+          </div>
+        </body>
+      </html>
+    OUTPUT
+    expect(xmlpp(strip_guid(IsoDoc::HtmlConvert.new({})
+      .convert("test", input, true)))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
+      .convert("test", input, true)))).to be_equivalent_to xmlpp(doc)
   end
 
   it "processes figures" do
@@ -658,7 +591,7 @@ RSpec.describe IsoDoc do
     presxml = <<~OUTPUT
           <?xml version='1.0'?>
            <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
-          <preface><foreword>
+          <preface><foreword displayorder="1">
           <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>
         <image src="rice_images/rice_image1.png" height="20" width="30" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png" alt="alttext" title="titletxt"/>
@@ -802,7 +735,7 @@ RSpec.describe IsoDoc do
     presxml = <<~OUTPUT
           <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
         <preface>
-          <foreword>
+          <foreword displayorder="1">
             <figure id='figureA-1'>
               <name>Figure 1</name>
               <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'>
@@ -884,7 +817,7 @@ RSpec.describe IsoDoc do
 
   it "converts SVG (Word)" do
     FileUtils.rm_rf "spec/assets/odf1.emf"
-    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true).gsub(/['"][^'".]+(?<!odf1)(?<!odf)\.emf['"]/, "'_.emf'").gsub(/['"][^'".]+\.(gif|xml)['"]/, "'_.\\1'").gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref")))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
           <preface><foreword>
           <figure id="figureA-1">
@@ -896,42 +829,49 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           </iso-standard>
     INPUT
-                    <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
-                <head>
-                <style>
-                        </style>
-                  </head>
-                  <body lang='EN-US' link='blue' vlink='#954F72'>
-                    <div class='WordSection1'>
-                      <p>&#160;</p>
-                    </div>
-                    <p>
-                      <br clear='all' class='section'/>
-                    </p>
-                    <div class='WordSection2'>
-                      <p>
-                        <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
-                      </p>
-                      <div>
-                        <h1 class='ForewordTitle'>Foreword</h1>
-                        <div id='figureA-1' class='figure'>
-                          <img src='spec/assets/odf.emf'/>
-                          <img src='spec/assets/odf1.emf'/>
-                          <img src='_.emf' height='auto' width='auto'/>
-                           <img src='_.xml' height='20' width='auto'/>
-                        </div>
-                      </div>
-                      <p>&#160;</p>
-                    </div>
-                    <p>
-                      <br clear='all' class='section'/>
-                    </p>
-                    <div class='WordSection3'>
-                      <p class='zzSTDTitle1'/>
-                    </div>
-                  </body>
-                </html>
+    output = <<~OUTPUT
+          <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
+      <head>
+      <style>
+              </style>
+        </head>
+        <body lang='EN-US' link='blue' vlink='#954F72'>
+          <div class='WordSection1'>
+            <p>&#160;</p>
+          </div>
+          <p>
+            <br clear='all' class='section'/>
+          </p>
+          <div class='WordSection2'>
+            <p>
+              <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+            </p>
+            <div>
+              <h1 class='ForewordTitle'>Foreword</h1>
+              <div id='figureA-1' class='figure'>
+                <img src='spec/assets/odf.emf'/>
+                <img src='spec/assets/odf1.emf'/>
+                <img src='_.emf' height='auto' width='auto'/>
+                 <img src='_.xml' height='20' width='auto'/>
+              </div>
+            </div>
+            <p>&#160;</p>
+          </div>
+          <p>
+            <br clear='all' class='section'/>
+          </p>
+          <div class='WordSection3'>
+            <p class='zzSTDTitle1'/>
+          </div>
+        </body>
+      </html>
     OUTPUT
+    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
+      .convert("test", input, true)
+      .gsub(/['"][^'".]+(?<!odf1)(?<!odf)\.emf['"]/, "'_.emf'")
+      .gsub(/['"][^'".]+\.(gif|xml)['"]/, "'_.\\1'")
+      .gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref"))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   context "disable inkscape" do
@@ -942,8 +882,7 @@ RSpec.describe IsoDoc do
       allow_any_instance_of(IsoDoc::WordFunction::Body)
         .to receive(:inkscape_installed?)
 
-      expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
-.convert("test", <<~"INPUT", true).gsub(/['"][^'".]+(?<!odf1)(?<!odf)\.svg['"]/, "'_.svg'").gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref")))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      input = <<~INPUT
             <iso-standard xmlns="http://riboseinc.com/isoxml">
             <preface><foreword>
             <figure id="figureA-1">
@@ -954,46 +893,52 @@ RSpec.describe IsoDoc do
             </foreword></preface>
             </iso-standard>
       INPUT
-                     <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
-                    <head>
-                    <style>
-                            </style>
-                      </head>
-                      <body lang='EN-US' link='blue' vlink='#954F72'>
-                        <div class='WordSection1'>
-                          <p>&#160;</p>
-                        </div>
-                        <p>
-                          <br clear='all' class='section'/>
-                        </p>
-                        <div class='WordSection2'>
-                          <p>
-                            <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
-                          </p>
-                          <div>
-                            <h1 class='ForewordTitle'>Foreword</h1>
-                            <div id='figureA-1' class='figure'>
-                              <img src='spec/assets/odf.emf'/>
-                              <img src='spec/assets/odf1.svg'/>
-                              <img src='_.svg' height='auto' width='auto'/>
-                            </div>
-                          </div>
-                          <p>&#160;</p>
-                        </div>
-                        <p>
-                          <br clear='all' class='section'/>
-                        </p>
-                        <div class='WordSection3'>
-                          <p class='zzSTDTitle1'/>
-                        </div>
-                      </body>
-                    </html>
+      output = <<~OUTPUT
+         <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
+        <head>
+        <style>
+                </style>
+          </head>
+          <body lang='EN-US' link='blue' vlink='#954F72'>
+            <div class='WordSection1'>
+              <p>&#160;</p>
+            </div>
+            <p>
+              <br clear='all' class='section'/>
+            </p>
+            <div class='WordSection2'>
+              <p>
+                <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+              </p>
+              <div>
+                <h1 class='ForewordTitle'>Foreword</h1>
+                <div id='figureA-1' class='figure'>
+                  <img src='spec/assets/odf.emf'/>
+                  <img src='spec/assets/odf1.svg'/>
+                  <img src='_.svg' height='auto' width='auto'/>
+                </div>
+              </div>
+              <p>&#160;</p>
+            </div>
+            <p>
+              <br clear='all' class='section'/>
+            </p>
+            <div class='WordSection3'>
+              <p class='zzSTDTitle1'/>
+            </div>
+          </body>
+        </html>
       OUTPUT
+      expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
+        .convert("test", input, true)
+        .gsub(/['"][^'".]+(?<!odf1)(?<!odf)\.svg['"]/, "'_.svg'")
+        .gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref"))))
+        .to be_equivalent_to xmlpp(output)
     end
   end
 
-  it "processes examples (Presentation XML)" do
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+  it "processes examples" do
+    input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
           <preface><foreword>
           <example id="samplecode" keep-with-next="true" keep-lines-together="true">
@@ -1006,10 +951,11 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           </iso-standard>
     INPUT
+    presxml = <<~OUTPUT
           <?xml version='1.0'?>
       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
         <preface>
-          <foreword>
+          <foreword displayorder="1">
             <example id='samplecode' keep-with-next='true' keep-lines-together='true'>
               <name>EXAMPLE&#xA0;&#x2014; Title</name>
               <p>Hello</p>
@@ -1021,22 +967,8 @@ RSpec.describe IsoDoc do
         </preface>
       </iso-standard>
     OUTPUT
-  end
 
-  it "processes examples (HTML)" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-          <iso-standard xmlns='http://riboseinc.com/isoxml'>
-        <preface>
-          <foreword>
-            <example id='samplecode' keep-with-next='true' keep-lines-together='true'>
-              <name>EXAMPLE&#xA0;&#x2014; Title</name>
-              <p>Hello</p>
-              <sourcecode id='X'><name>Sample</name></sourcecode>
-            </example>
-          </foreword>
-        </preface>
-      </iso-standard>
-    INPUT
+    html = <<~OUTPUT
       #{HTML_HDR}
                        <br/>
                        <div>
@@ -1044,7 +976,12 @@ RSpec.describe IsoDoc do
                          <div id="samplecode" class="example" style="page-break-after: avoid;page-break-inside: avoid;">
                          <p class="example-title">EXAMPLE&#160;&#8212; Title</p>
                  <p>Hello</p>
-                 <pre id='X' class='prettyprint '/>
+                 <pre id='X' class='prettyprint '>
+          <br/>
+          &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+          <br/>
+          &#160;&#160;&#160;&#160;&#160;&#160;&#160;
+             </pre>
           <p class='SourceTitle' style='text-align:center;'>Sample</p>
                          </div>
                        </div>
@@ -1053,22 +990,7 @@ RSpec.describe IsoDoc do
                    </body>
                </html>
     OUTPUT
-  end
-
-  it "processes examples (Word)" do
-    expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-          <iso-standard xmlns='http://riboseinc.com/isoxml'>
-        <preface>
-          <foreword>
-            <example id='samplecode' keep-with-next='true' keep-lines-together='true'>
-              <name>EXAMPLE&#xA0;&#x2014; Title</name>
-              <p>Hello</p>
-              <sourcecode id='X'><name>Sample</name></sourcecode>
-            </example>
-          </foreword>
-        </preface>
-      </iso-standard>
-    INPUT
+    doc = <<~OUTPUT
           <html  xmlns:epub='http://www.idpf.org/2007/ops' lang='en'><head><style>
               </style>
         </head>
@@ -1088,7 +1010,12 @@ RSpec.describe IsoDoc do
               <div id='samplecode' class='example' style='page-break-after: avoid;page-break-inside: avoid;'>
                 <p class='example-title'>EXAMPLE&#160;&#8212; Title</p>
                 <p>Hello</p>
-                <p id='X' class='Sourcecode'/>
+                <p id='X' class='Sourcecode'>
+          <br/>
+          &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+          <br/>
+          &#160;&#160;&#160;&#160;&#160;&#160;&#160;
+          </p>
                 <p class='SourceTitle' style='text-align:center;'>Sample</p>
               </div>
             </div>
@@ -1103,10 +1030,16 @@ RSpec.describe IsoDoc do
         </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)
+    expect(xmlpp(IsoDoc::WordConvert.new({})
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(doc)
   end
 
   it "processes sequences of examples" do
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
           <preface><foreword>
           <example id="samplecode">
@@ -1122,10 +1055,11 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           </iso-standard>
     INPUT
+    output = <<~OUTPUT
           <?xml version='1.0'?>
       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
         <preface>
-          <foreword>
+          <foreword displayorder="1">
             <example id='samplecode'>
               <name>EXAMPLE 1</name>
               <p>Hello</p>
@@ -1142,10 +1076,12 @@ RSpec.describe IsoDoc do
         </preface>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
 
-  it "processes sourcecode (Presentation XML)" do
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+  it "processes sourcecode" do
+    input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
           <preface><foreword>
           <sourcecode lang="ruby" id="samplecode">
@@ -1158,10 +1094,11 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           </iso-standard>
     INPUT
+    presxml = <<~OUTPUT
           <?xml version='1.0'?>
       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
         <preface>
-          <foreword>
+          <foreword displayorder="1">
             <sourcecode lang='ruby' id='samplecode'>
               <name>
                 Figure 1&#xA0;&#x2014; Ruby
@@ -1174,102 +1111,62 @@ RSpec.describe IsoDoc do
         </preface>
       </iso-standard>
     OUTPUT
-  end
 
-  it "processes sourcecode (HTML)" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-          <iso-standard xmlns='http://riboseinc.com/isoxml'>
-        <preface>
-          <foreword>
-            <sourcecode lang='ruby' id='samplecode'>
-              <name>
-                Figure 1&#xA0;&#x2014; Ruby
-                <em>code</em>
-              </name>
-        puts x
-      </sourcecode>
-            <sourcecode unnumbered='true'>
-      Que?
-      </sourcecode>
-          </foreword>
-        </preface>
-      </iso-standard>
-    INPUT
+    html = <<~OUTPUT
       #{HTML_HDR}
                          <br/>
                          <div>
                            <h1 class="ForewordTitle">Foreword</h1>
-                           <pre id="samplecode" class="prettyprint lang-rb"><br/>&#160;&#160;&#160;&#160;&#160;&#160;&#160; <br/>&#160; puts x<br/></pre>
+                           <pre id="samplecode" class="prettyprint lang-rb"><br/>&#160;&#160;&#160;&#160;&#160;&#160;&#160; <br/>&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160; puts x<br/>&#160;&#160;&#160;&#160;&#160;</pre>
                            <p class="SourceTitle" style="text-align:center;">Figure 1&#160;&#8212; Ruby <i>code</i></p>
-                           <pre class='prettyprint '>
-            <br/>
-            Que?
-            <br/>
-          </pre>
+                           <pre class='prettyprint '> Que? </pre>
                          </div>
                          <p class="zzSTDTitle1"/>
                        </div>
                      </body>
                  </html>
     OUTPUT
-  end
 
-  it "processes sourcecode (Word)" do
-    expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-          <iso-standard xmlns='http://riboseinc.com/isoxml'>
-        <preface>
-          <foreword>
-            <sourcecode lang='ruby' id='samplecode'>
-              <name>
-                Figure 1&#xA0;&#x2014; Ruby
-                <em>code</em>
-              </name>
-        puts x
-      </sourcecode>
-            <sourcecode unnumbered='true'>
-      Que?
-      </sourcecode>
-          </foreword>
-        </preface>
-      </iso-standard>
-    INPUT
-          <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
-               <head><style/></head>
-               <body lang="EN-US" link="blue" vlink="#954F72">
-                 <div class="WordSection1">
-                   <p>&#160;</p>
-                 </div>
-                 <p>
-                   <br clear="all" class="section"/>
-                 </p>
-                 <div class="WordSection2">
-                   <p>
-                     <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
-                   </p>
-                     <div>
-                       <h1 class="ForewordTitle">Foreword</h1>
-                       <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160;&#160;&#160;&#160;&#160; <br/>&#160; puts x<br/></p><p class="SourceTitle" style="text-align:center;">Figure 1&#160;&#8212; Ruby <i>code</i></p>
-                       <p class='Sourcecode'>
-        <br/>
-        Que?
-        <br/>
+    doc = <<~OUTPUT
+         <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
+              <head><style/></head>
+              <body lang="EN-US" link="blue" vlink="#954F72">
+                <div class="WordSection1">
+                  <p>&#160;</p>
+                </div>
+                <p>
+                  <br clear="all" class="section"/>
+                </p>
+                <div class="WordSection2">
+                  <p>
+                    <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+                  </p>
+                    <div>
+                      <h1 class="ForewordTitle">Foreword</h1>
+                      <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160;&#160;&#160;&#160;&#160; <br/>&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160; puts x<br/>&#160;&#160;&#160;&#160;&#160; </p><p class="SourceTitle" style="text-align:center;">Figure 1&#160;&#8212; Ruby <i>code</i></p>
+                      <p class='Sourcecode'> Que? </p>
+                    </div>
+                       <p>&#160;</p>
+      </div>
+      <p>
+        <br clear="all" class="section"/>
       </p>
-                     </div>
-                        <p>&#160;</p>
-       </div>
-       <p>
-         <br clear="all" class="section"/>
-       </p>
-       <div class="WordSection3">
-                     <p class="zzSTDTitle1"/>
-                   </div>
-                 </body>
-             </html>
+      <div class="WordSection3">
+                    <p class="zzSTDTitle1"/>
+                  </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)
+    expect(xmlpp(IsoDoc::WordConvert.new({})
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(doc)
   end
 
   it "processes sourcecode with escapes preserved" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
           <preface><foreword>
           <sourcecode id="samplecode">
@@ -1279,6 +1176,7 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           </iso-standard>
     INPUT
+    output = <<~OUTPUT
       #{HTML_HDR}
                   <br/>
                   <div>
@@ -1291,10 +1189,12 @@ RSpec.describe IsoDoc do
               </body>
           </html>
     OUTPUT
+    expect(xmlpp(IsoDoc::HtmlConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
 
   it "processes sourcecode with annotations" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <preface><foreword>
       <sourcecode id="_">puts "Hello, world." <callout target="A">1</callout>
@@ -1308,6 +1208,7 @@ RSpec.describe IsoDoc do
       </foreword></preface>
       </iso-standard>
     INPUT
+    output = <<~OUTPUT
       #{HTML_HDR}
                   <br/>
                   <div>
@@ -1319,10 +1220,12 @@ RSpec.describe IsoDoc do
               </body>
           </html>
     OUTPUT
+    expect(xmlpp(IsoDoc::HtmlConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
 
   it "processes admonitions" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
           <preface><foreword>
           <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="caution" keep-with-next="true" keep-lines-together="true">
@@ -1331,6 +1234,7 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           </iso-standard>
     INPUT
+    output = <<~OUTPUT
       #{HTML_HDR}
                   <br/>
                   <div>
@@ -1344,10 +1248,12 @@ RSpec.describe IsoDoc do
               </body>
           </html>
     OUTPUT
+    expect(xmlpp(IsoDoc::HtmlConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
 
   it "processes admonitions with titles" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
           <preface><foreword>
           <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="caution">
@@ -1357,6 +1263,7 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           </iso-standard>
     INPUT
+    output = <<~OUTPUT
       #{HTML_HDR}
                   <br/>
                   <div>
@@ -1370,10 +1277,12 @@ RSpec.describe IsoDoc do
               </body>
           </html>
     OUTPUT
+    expect(xmlpp(IsoDoc::HtmlConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
 
-  it "processes formulae (PresentationXML)" do
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+  it "processes formulae" do
+    input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
           <preface><foreword>
           <formula id="_be9158af-7e93-4ee2-90c5-26d31c181934" unnumbered="true"  keep-with-next="true" keep-lines-together="true">
@@ -1396,43 +1305,9 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           </iso-standard>
     INPUT
-          <?xml version='1.0'?>
-      <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'>
-              <stem type='AsciiMath'>r = 1 %</stem>
-              <dl id='_e4fe94fe-1cde-49d9-b1ad-743293b7e21d'>
-                <dt>
-                  <stem type='AsciiMath'>r</stem>
-                </dt>
-                <dd>
-                  <p id='_1b99995d-ff03-40f5-8f2e-ab9665a69b77'>is the repeatability limit.</p>
-                </dd>
-              </dl>
-              <note id='_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0'>
-              <name>NOTE</name>
-                <p id='_511aaa98-4116-42af-8e5b-c87cdf5bfdc8'>
-                  [durationUnits] is essentially a duration statement without the "P"
-                  prefix. "P" is unnecessary because between "G" and "U" duration is
-                  always expressed.
-                </p>
-              </note>
-            </formula>
-            <formula id='_be9158af-7e93-4ee2-90c5-26d31c181935'>
-              <name>1</name>
-              <stem type='AsciiMath'>r = 1 %</stem>
-            </formula>
-          </foreword>
-        </preface>
-      </iso-standard>
-    OUTPUT
-  end
-
-  it "processes formulae (HTML)" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-          <iso-standard xmlns="http://riboseinc.com/isoxml">
-          <preface><foreword>
+    presxml = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml"  type='presentation'>
+          <preface><foreword displayorder="1">
           <formula id="_be9158af-7e93-4ee2-90c5-26d31c181934" unnumbered="true"  keep-with-next="true" keep-lines-together="true">
         <stem type="AsciiMath">r = 1 %</stem>
       <dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d">
@@ -1454,6 +1329,7 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           </iso-standard>
     INPUT
+    html = <<~OUTPUT
       #{HTML_HDR}
                   <br/>
                   <div>
@@ -1474,33 +1350,8 @@ RSpec.describe IsoDoc do
               </body>
           </html>
     OUTPUT
-  end
 
-  it "processes formulae (Word)" do
-    expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-          <iso-standard xmlns="http://riboseinc.com/isoxml">
-          <preface><foreword>
-          <formula id="_be9158af-7e93-4ee2-90c5-26d31c181934" unnumbered="true"   keep-with-next="true" keep-lines-together="true">
-        <stem type="AsciiMath">r = 1 %</stem>
-      <dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d">
-        <dt>
-          <stem type="AsciiMath">r</stem>
-        </dt>
-        <dd>
-          <p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the repeatability limit.</p>
-        </dd>
-      </dl>
-          <note id="_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0">
-          <name>NOTE</name>
-        <p id="_511aaa98-4116-42af-8e5b-c87cdf5bfdc8">[durationUnits] is essentially a duration statement without the "P" prefix. "P" is unnecessary because between "G" and "U" duration is always expressed.</p>
-      </note>
-          </formula>
-          <formula id="_be9158af-7e93-4ee2-90c5-26d31c181935"><name>1</name>
-        <stem type="AsciiMath">r = 1 %</stem>
-        </formula>
-          </foreword></preface>
-          </iso-standard>
-    INPUT
+    word = <<~OUTPUT
       <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
            <head>
              <style>
@@ -1568,10 +1419,16 @@ RSpec.describe IsoDoc do
            </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)
+    expect(xmlpp(IsoDoc::WordConvert.new({})
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(word)
   end
 
   it "processes paragraph attributes" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
           <preface><foreword>
           <p align="left" id="_08bfe952-d57f-4150-9c95-5d52098cc2a8">Vache Equipment<br/>
@@ -1581,6 +1438,7 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           </iso-standard>
     INPUT
+    html = <<~OUTPUT
       #{HTML_HDR}
                   <br/>
                   <div>
@@ -1596,19 +1454,8 @@ RSpec.describe IsoDoc do
               </body>
           </html>
     OUTPUT
-  end
 
-  it "processes paragraph attributes (Word)" do
-    expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-          <iso-standard xmlns="http://riboseinc.com/isoxml">
-          <preface><foreword>
-          <p align="left" id="_08bfe952-d57f-4150-9c95-5d52098cc2a8">Vache Equipment<br/>
-      Fictitious<br/>
-      World</p>
-          <p align="justify" keep-with-next="true" keep-lines-together="true">Justify</p>
-          </foreword></preface>
-          </iso-standard>
-    INPUT
+    word = <<~OUTPUT
           <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
         <head><style/></head>
           <body lang="EN-US" link="blue" vlink="#954F72">
@@ -1635,74 +1482,56 @@ RSpec.describe IsoDoc do
           </body>
       </html>
     OUTPUT
+    expect(xmlpp(IsoDoc::HtmlConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(IsoDoc::WordConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(word)
   end
 
-  it "processes blockquotes (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">
-                    <preface><foreword>
-                    <quote id="_044bd364-c832-4b78-8fea-92242402a1d1">
-                  <source type="inline" bibitemid="ISO7301" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>1</referenceFrom></locality></source>
-                  <author>ISO</author>
-                  <p id="_d4fd0a61-f300-4285-abe6-602707590e53">This International Standard gives the minimum specifications for rice (<em>Oryza sativa</em> L.) which is subject to international trade. It is applicable to the following types: husked rice and milled rice, parboiled or not, intended for direct human consumption. It is neither applicable to other products derived from rice, nor to waxy rice (glutinous rice).</p>
-                </quote>
-                    </foreword></preface>
-                    </iso-standard>
+  it "processes blockquotes" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <quote id="_044bd364-c832-4b78-8fea-92242402a1d1">
+        <source type="inline" bibitemid="ISO7301" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>1</referenceFrom></locality></source>
+        <author>ISO</author>
+        <p id="_d4fd0a61-f300-4285-abe6-602707590e53">This International Standard gives the minimum specifications for rice (<em>Oryza sativa</em> L.) which is subject to international trade. It is applicable to the following types: husked rice and milled rice, parboiled or not, intended for direct human consumption. It is neither applicable to other products derived from rice, nor to waxy rice (glutinous rice).</p>
+      </quote>
+          </foreword></preface>
+          </iso-standard>
     INPUT
-      <?xml version='1.0'?>
-         <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
-           <preface>
-             <foreword>
-               <quote id='_044bd364-c832-4b78-8fea-92242402a1d1'>
-                 <source type='inline' bibitemid='ISO7301' citeas='ISO 7301:2011'>
-                   <locality type='clause'>
-                     <referenceFrom>1</referenceFrom>
-                   </locality>ISO 7301:2011, Clause 1
-                 </source>
-                 <author>ISO</author>
-                 <p id='_d4fd0a61-f300-4285-abe6-602707590e53'>
-                   This International Standard gives the minimum specifications for rice
-                   (
-                   <em>Oryza sativa</em>
-                    L.) which is subject to international trade. It is applicable to the
-                   following types: husked rice and milled rice, parboiled or not,
-                   intended for direct human consumption. It is neither applicable to
-                   other products derived from rice, nor to waxy rice (glutinous rice).
-                 </p>
-               </quote>
-             </foreword>
-           </preface>
-         </iso-standard>
-    OUTPUT
-  end
 
-  it "processes blockquotes (HTML)" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-                    <iso-standard xmlns="http://riboseinc.com/isoxml">
-                    <preface><foreword>
-                    <quote id="_044bd364-c832-4b78-8fea-92242402a1d1">
-                  <source type="inline" bibitemid="ISO7301" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>1</referenceFrom></locality>ISO 7301:2011, Clause 1</source>
-                  <author>ISO</author>
-                  <p id="_d4fd0a61-f300-4285-abe6-602707590e53">This International Standard gives the minimum specifications for rice (<em>Oryza sativa</em> L.) which is subject to international trade. It is applicable to the following types: husked rice and milled rice, parboiled or not, intended for direct human consumption. It is neither applicable to other products derived from rice, nor to waxy rice (glutinous rice).</p>
-                </quote>
-                    </foreword></preface>
-                    </iso-standard>
+    presxml = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml"  type='presentation'>
+          <preface><foreword displayorder="1">
+          <quote id="_044bd364-c832-4b78-8fea-92242402a1d1">
+        <source type="inline" bibitemid="ISO7301" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>1</referenceFrom></locality>ISO 7301:2011, Clause 1</source>
+        <author>ISO</author>
+        <p id="_d4fd0a61-f300-4285-abe6-602707590e53">This International Standard gives the minimum specifications for rice (<em>Oryza sativa</em> L.) which is subject to international trade. It is applicable to the following types: husked rice and milled rice, parboiled or not, intended for direct human consumption. It is neither applicable to other products derived from rice, nor to waxy rice (glutinous rice).</p>
+      </quote>
+          </foreword></preface>
+          </iso-standard>
     INPUT
+    html = <<~OUTPUT
       #{HTML_HDR}
-                     <br/>
-                     <div>
-                       <h1 class="ForewordTitle">Foreword</h1>
-                       <div class="Quote" id="_044bd364-c832-4b78-8fea-92242402a1d1">
+              <br/>
+              <div>
+                <h1 class="ForewordTitle">Foreword</h1>
+                <div class="Quote" id="_044bd364-c832-4b78-8fea-92242402a1d1">
 
 
-               <p id="_d4fd0a61-f300-4285-abe6-602707590e53">This International Standard gives the minimum specifications for rice (<i>Oryza sativa</i> L.) which is subject to international trade. It is applicable to the following types: husked rice and milled rice, parboiled or not, intended for direct human consumption. It is neither applicable to other products derived from rice, nor to waxy rice (glutinous rice).</p>
-             <p class="QuoteAttribution">&#8212; ISO, <a href="#ISO7301">ISO 7301:2011, Clause 1</a></p></div>
-                     </div>
-                     <p class="zzSTDTitle1"/>
-                   </div>
-                 </body>
-             </html>
+        <p id="_d4fd0a61-f300-4285-abe6-602707590e53">This International Standard gives the minimum specifications for rice (<i>Oryza sativa</i> L.) which is subject to international trade. It is applicable to the following types: husked rice and milled rice, parboiled or not, intended for direct human consumption. It is neither applicable to other products derived from rice, nor to waxy rice (glutinous rice).</p>
+      <p class="QuoteAttribution">&#8212; ISO, <a href="#ISO7301">ISO 7301:2011, Clause 1</a></p></div>
+              </div>
+              <p class="zzSTDTitle1"/>
+            </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 term domains" do
@@ -1731,273 +1560,11 @@ RSpec.describe IsoDoc do
     OUTPUT
   end
 
-  it "processes permissions (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">
-          <preface><foreword>
-          <permission id="_"   keep-with-next="true" keep-lines-together="true">
-        <label>/ogc/recommendation/wfs/2</label>
-        <inherit>/ss/584/2015/level/1</inherit>
-        <inherit><eref type="inline" bibitemid="rfc2616" citeas="RFC 2616">RFC 2616 (HTTP/1.1)</eref></inherit>
-        <subject>user</subject>
-        <classification> <tag>control-class</tag> <value>Technical</value> </classification><classification> <tag>priority</tag> <value>P0</value> </classification><classification> <tag>family</tag> <value>System and Communications Protection</value> </classification><classification> <tag>family</tag> <value>System and Communications Protocols</value> </classification>
-        <description>
-          <p id="_">I recommend <em>this</em>.</p>
-        </description>
-        <specification exclude="true" type="tabular">
-          <p id="_">This is the object of the recommendation:</p>
-          <table id="_">
-            <tbody>
-              <tr>
-                <td style="text-align:left;">Object</td>
-                <td style="text-align:left;">Value</td>
-              </tr>
-              <tr>
-                <td style="text-align:left;">Mission</td>
-                <td style="text-align:left;">Accomplished</td>
-              </tr>
-            </tbody>
-          </table>
-        </specification>
-        <description>
-          <p id="_">As for the measurement targets,</p>
-        </description>
-        <measurement-target exclude="false">
-          <p id="_">The measurement target shall be measured as:</p>
-          <formula id="_">
-            <stem type="AsciiMath">r/1 = 0</stem>
-          </formula>
-        </measurement-target>
-        <verification exclude="false">
-          <p id="_">The following code will be run for verification:</p>
-          <sourcecode id="_">CoreRoot(success): HttpResponse
-            if (success)
-            recommendation(label: success-response)
-            end
-          </sourcecode>
-        </verification>
-        <import exclude="true">
-          <sourcecode id="_">success-response()</sourcecode>
-        </import>
-      </permission>
-          </foreword></preface>
-          <bibliography><references id="_bibliography" obligation="informative" normative="false">
-      <title>Bibliography</title>
-      <bibitem id="rfc2616" type="standard">  <fetched>2020-03-27</fetched>  <title format="text/plain" language="en" script="Latn">Hypertext Transfer Protocol — HTTP/1.1</title>  <uri type="xml">https://xml2rfc.tools.ietf.org/public/rfc/bibxml/reference.RFC.2616.xml</uri>  <uri type="src">https://www.rfc-editor.org/info/rfc2616</uri>  <docidentifier type="IETF">RFC 2616</docidentifier>  <docidentifier type="rfc-anchor">RFC2616</docidentifier>  <docidentifier type="DOI">10.17487/RFC2616</docidentifier>  <date type="published">    <on>1999-06</on>  </date>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">R. Fielding</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">J. Gettys</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">J. Mogul</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">H. Frystyk</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">L. Masinter</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">P. Leach</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">T. Berners-Lee</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <language>en</language>  <script>Latn</script>  <abstract format="text/plain" language="en" script="Latn">HTTP has been in use by the World-Wide Web global information initiative since 1990. This specification defines the protocol referred to as “HTTP/1.1”, and is an update to RFC 2068.  [STANDARDS-TRACK]</abstract>  <series type="main">    <title format="text/plain" language="en" script="Latn">RFC</title>    <number>2616</number>  </series>  <place>Fremont, CA</place></bibitem>
-      </references></bibliography>
-          </iso-standard>
-    INPUT
-      <?xml version='1.0'?>
-         <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
-           <preface>
-             <foreword>
-               <permission id='_' keep-with-next='true' keep-lines-together='true'>
-                 <name>Permission 1</name>
-                 <label>/ogc/recommendation/wfs/2</label>
-                 <inherit>/ss/584/2015/level/1</inherit>
-                 <inherit>
-                   <eref type='inline' bibitemid='rfc2616' citeas='RFC 2616'>RFC 2616 (HTTP/1.1)</eref>
-                 </inherit>
-                 <subject>user</subject>
-                 <classification>
-                   <tag>control-class</tag>
-                   <value>Technical</value>
-                 </classification>
-                 <classification>
-                   <tag>priority</tag>
-                   <value>P0</value>
-                 </classification>
-                 <classification>
-                   <tag>family</tag>
-                   <value>System and Communications Protection</value>
-                 </classification>
-                 <classification>
-                   <tag>family</tag>
-                   <value>System and Communications Protocols</value>
-                 </classification>
-                 <description>
-                   <p id='_'>
-                     I recommend
-                     <em>this</em>
-                     .
-                   </p>
-                 </description>
-                 <specification exclude='true' type='tabular'>
-                   <p id='_'>This is the object of the recommendation:</p>
-                   <table id='_'>
-                     <tbody>
-                       <tr>
-                         <td style='text-align:left;'>Object</td>
-                         <td style='text-align:left;'>Value</td>
-                       </tr>
-                       <tr>
-                         <td style='text-align:left;'>Mission</td>
-                         <td style='text-align:left;'>Accomplished</td>
-                       </tr>
-                     </tbody>
-                   </table>
-                 </specification>
-                 <description>
-                   <p id='_'>As for the measurement targets,</p>
-                 </description>
-                 <measurement-target exclude='false'>
-                   <p id='_'>The measurement target shall be measured as:</p>
-                   <formula id='_'>
-                     <name>1</name>
-                     <stem type='AsciiMath'>r/1 = 0</stem>
-                   </formula>
-                 </measurement-target>
-                 <verification exclude='false'>
-                   <p id='_'>The following code will be run for verification:</p>
-                   <sourcecode id='_'>
-                     CoreRoot(success): HttpResponse if (success) recommendation(label:
-                     success-response) end
-                   </sourcecode>
-                 </verification>
-                 <import exclude='true'>
-                   <sourcecode id='_'>success-response()</sourcecode>
-                 </import>
-               </permission>
-             </foreword>
-           </preface>
-           <bibliography>
-             <references id='_bibliography' obligation='informative' normative='false'>
-               <title depth="1">Bibliography</title>
-               <bibitem id='rfc2616' type='standard'>
-                 <fetched>2020-03-27</fetched>
-                 <title format='text/plain' language='en' script='Latn'>Hypertext Transfer Protocol&#x2009;&#x2014;&#x2009;HTTP/1.1</title>
-                 <uri type='xml'>https://xml2rfc.tools.ietf.org/public/rfc/bibxml/reference.RFC.2616.xml</uri>
-                 <uri type='src'>https://www.rfc-editor.org/info/rfc2616</uri>
-                 <docidentifier type='IETF'>RFC 2616</docidentifier>
-                 <docidentifier type='rfc-anchor'>RFC2616</docidentifier>
-                 <docidentifier type='DOI'>10.17487/RFC2616</docidentifier>
-                 <date type='published'>
-                   <on>1999-06</on>
-                 </date>
-                 <contributor>
-                   <role type='author'/>
-                   <person>
-                     <name>
-                       <completename language='en'>R. Fielding</completename>
-                     </name>
-                     <affiliation>
-                       <organization>
-                         <name>IETF</name>
-                         <abbreviation>IETF</abbreviation>
-                       </organization>
-                     </affiliation>
-                   </person>
-                 </contributor>
-                 <contributor>
-                   <role type='author'/>
-                   <person>
-                     <name>
-                       <completename language='en'>J. Gettys</completename>
-                     </name>
-                     <affiliation>
-                       <organization>
-                         <name>IETF</name>
-                         <abbreviation>IETF</abbreviation>
-                       </organization>
-                     </affiliation>
-                   </person>
-                 </contributor>
-                 <contributor>
-                   <role type='author'/>
-                   <person>
-                     <name>
-                       <completename language='en'>J. Mogul</completename>
-                     </name>
-                     <affiliation>
-                       <organization>
-                         <name>IETF</name>
-                         <abbreviation>IETF</abbreviation>
-                       </organization>
-                     </affiliation>
-                   </person>
-                 </contributor>
-                 <contributor>
-                   <role type='author'/>
-                   <person>
-                     <name>
-                       <completename language='en'>H. Frystyk</completename>
-                     </name>
-                     <affiliation>
-                       <organization>
-                         <name>IETF</name>
-                         <abbreviation>IETF</abbreviation>
-                       </organization>
-                     </affiliation>
-                   </person>
-                 </contributor>
-                 <contributor>
-                   <role type='author'/>
-                   <person>
-                     <name>
-                       <completename language='en'>L. Masinter</completename>
-                     </name>
-                     <affiliation>
-                       <organization>
-                         <name>IETF</name>
-                         <abbreviation>IETF</abbreviation>
-                       </organization>
-                     </affiliation>
-                   </person>
-                 </contributor>
-                 <contributor>
-                   <role type='author'/>
-                   <person>
-                     <name>
-                       <completename language='en'>P. Leach</completename>
-                     </name>
-                     <affiliation>
-                       <organization>
-                         <name>IETF</name>
-                         <abbreviation>IETF</abbreviation>
-                       </organization>
-                     </affiliation>
-                   </person>
-                 </contributor>
-                 <contributor>
-                   <role type='author'/>
-                   <person>
-                     <name>
-                       <completename language='en'>T. Berners-Lee</completename>
-                     </name>
-                     <affiliation>
-                       <organization>
-                         <name>IETF</name>
-                         <abbreviation>IETF</abbreviation>
-                       </organization>
-                     </affiliation>
-                   </person>
-                 </contributor>
-                 <language>en</language>
-                 <script>Latn</script>
-                 <abstract format='text/plain' language='en' script='Latn'>
-                   HTTP has been in use by the World-Wide Web global information
-                   initiative since 1990. This specification defines the protocol
-                   referred to as &#x201C;HTTP/1.1&#x201D;, and is an update to RFC 2068.
-                   [STANDARDS-TRACK]
-                 </abstract>
-                 <series type='main'>
-                   <title format='text/plain' language='en' script='Latn'>RFC</title>
-                   <number>2616</number>
-                 </series>
-                 <place>Fremont, CA</place>
-               </bibitem>
-             </references>
-           </bibliography>
-         </iso-standard>
-    OUTPUT
-  end
-
-  it "processes permissions (HTML)" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+  it "processes permissions" do
+    input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
           <preface><foreword>
           <permission id="_"   keep-with-next="true" keep-lines-together="true">
-          <name>Permission 1</name>
         <label>/ogc/recommendation/wfs/2</label>
         <inherit>/ss/584/2015/level/1</inherit>
         <inherit><eref type="inline" bibitemid="rfc2616" citeas="RFC 2616">RFC 2616 (HTTP/1.1)</eref></inherit>
@@ -2043,52 +1610,112 @@ RSpec.describe IsoDoc do
         </import>
       </permission>
           </foreword></preface>
-          <bibliography><references id="_bibliography" obligation="informative" normative="false">
+          <bibliography><references id="_bibliography" obligation="informative" normative="false" displayorder="2">
       <title>Bibliography</title>
       <bibitem id="rfc2616" type="standard">  <fetched>2020-03-27</fetched>  <title format="text/plain" language="en" script="Latn">Hypertext Transfer Protocol — HTTP/1.1</title>  <uri type="xml">https://xml2rfc.tools.ietf.org/public/rfc/bibxml/reference.RFC.2616.xml</uri>  <uri type="src">https://www.rfc-editor.org/info/rfc2616</uri>  <docidentifier type="IETF">RFC 2616</docidentifier>  <docidentifier type="rfc-anchor">RFC2616</docidentifier>  <docidentifier type="DOI">10.17487/RFC2616</docidentifier>  <date type="published">    <on>1999-06</on>  </date>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">R. Fielding</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">J. Gettys</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">J. Mogul</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">H. Frystyk</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">L. Masinter</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">P. Leach</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">T. Berners-Lee</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <language>en</language>  <script>Latn</script>  <abstract format="text/plain" language="en" script="Latn">HTTP has been in use by the World-Wide Web global information initiative since 1990. This specification defines the protocol referred to as “HTTP/1.1”, and is an update to RFC 2068.  [STANDARDS-TRACK]</abstract>  <series type="main">    <title format="text/plain" language="en" script="Latn">RFC</title>    <number>2616</number>  </series>  <place>Fremont, CA</place></bibitem>
       </references></bibliography>
           </iso-standard>
     INPUT
-      #{HTML_HDR}
-                   <br/>
-                  <div>
-                    <h1 class="ForewordTitle">Foreword</h1>
-                    <div class="permission" id='_' style='page-break-after: avoid;page-break-inside: avoid;'>
-                    <p class="RecommendationTitle">Permission 1:<br/>/ogc/recommendation/wfs/2</p>
-                    <p><i>Subject: user<br/>
-            Inherits: /ss/584/2015/level/1
-            <br/>
-            Inherits: <a href='#rfc2616'>RFC 2616 (HTTP/1.1)</a>
-            <br/>Control-class: Technical<br/>Priority: P0<br/>Family: System and Communications Protection<br/>Family: System and Communications Protocols</i></p>
-              <div class="requirement-description">
-                <p id="_">I recommend <i>this</i>.</p>
-              </div>
-              <div class="requirement-description">
-                <p id="_">As for the measurement targets,</p>
-              </div>
-              <div class="requirement-measurement-target">
-                <p id="_">The measurement target shall be measured as:</p>
-                <div id="_"><div class="formula"><p><span class="stem">(#(r/1 = 0)#)</span></p></div></div>
-              </div>
-              <div class="requirement-verification">
-                <p id="_">The following code will be run for verification:</p>
-                <pre id="_" class="prettyprint ">CoreRoot(success): HttpResponse<br/>&#160;&#160;&#160;&#160;&#160; if (success)<br/>&#160;&#160;&#160;&#160;&#160; recommendation(label: success-response)<br/>&#160;&#160;&#160;&#160;&#160; end<br/>&#160;&#160;&#160; </pre>
+    presxml = <<~OUTPUT
+            <iso-standard xmlns="http://riboseinc.com/isoxml" type='presentation'>
+            <preface><foreword displayorder='1'>
+            <permission id="_"   keep-with-next="true" keep-lines-together="true">
+            <name>Permission 1</name>
+          <label>/ogc/recommendation/wfs/2</label>
+          <inherit>/ss/584/2015/level/1</inherit>
+          <inherit><eref type="inline" bibitemid="rfc2616" citeas="RFC 2616">RFC 2616 (HTTP/1.1)</eref></inherit>
+          <subject>user</subject>
+          <classification> <tag>control-class</tag> <value>Technical</value> </classification><classification> <tag>priority</tag> <value>P0</value> </classification><classification> <tag>family</tag> <value>System and Communications Protection</value> </classification><classification> <tag>family</tag> <value>System and Communications Protocols</value> </classification>
+          <description>
+            <p id="_">I recommend <em>this</em>.</p>
+          </description>
+          <specification exclude="true" type="tabular">
+            <p id="_">This is the object of the recommendation:</p>
+            <table id="_">
+              <tbody>
+                <tr>
+                  <td style="text-align:left;">Object</td>
+                  <td style="text-align:left;">Value</td>
+                </tr>
+                <tr>
+                  <td style="text-align:left;">Mission</td>
+                  <td style="text-align:left;">Accomplished</td>
+                </tr>
+              </tbody>
+            </table>
+          </specification>
+          <description>
+            <p id="_">As for the measurement targets,</p>
+          </description>
+          <measurement-target exclude="false">
+            <p id="_">The measurement target shall be measured as:</p>
+            <formula id="_">
+            <name>1</name>
+              <stem type="AsciiMath">r/1 = 0</stem>
+            </formula>
+          </measurement-target>
+          <verification exclude="false">
+            <p id="_">The following code will be run for verification:</p>
+            <sourcecode id="_">CoreRoot(success): HttpResponse
+              if (success)
+              recommendation(label: success-response)
+              end
+            </sourcecode>
+          </verification>
+          <import exclude="true">
+            <sourcecode id="_">success-response()</sourcecode>
+          </import>
+        </permission>
+            </foreword></preface>
+            <bibliography><references id="_bibliography" obligation="informative" normative="false"  displayorder='2'>
+        <title depth='1'>Bibliography</title>
+        <bibitem id="rfc2616" type="standard">  <fetched>2020-03-27</fetched>  <title format="text/plain" language="en" script="Latn">Hypertext Transfer Protocol — HTTP/1.1</title>  <uri type="xml">https://xml2rfc.tools.ietf.org/public/rfc/bibxml/reference.RFC.2616.xml</uri>  <uri type="src">https://www.rfc-editor.org/info/rfc2616</uri>  <docidentifier type="IETF">IETF RFC 2616</docidentifier>  <docidentifier type="rfc-anchor">RFC2616</docidentifier>  <docidentifier type="DOI">DOI 10.17487/RFC2616</docidentifier>  <date type="published">    <on>1999-06</on>  </date>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">R. Fielding</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">J. Gettys</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">J. Mogul</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">H. Frystyk</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">L. Masinter</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">P. Leach</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">T. Berners-Lee</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <language>en</language>  <script>Latn</script>  <abstract format="text/plain" language="en" script="Latn">HTTP has been in use by the World-Wide Web global information initiative since 1990. This specification defines the protocol referred to as “HTTP/1.1”, and is an update to RFC 2068.  [STANDARDS-TRACK]</abstract>  <series type="main">    <title format="text/plain" language="en" script="Latn">RFC</title>    <number>2616</number>  </series>  <place>Fremont, CA</place></bibitem>
+        </references></bibliography>
+            </iso-standard>
+      OUTPUT
+      html = <<~OUTPUT
+        #{HTML_HDR}
+                     <br/>
+                    <div>
+                      <h1 class="ForewordTitle">Foreword</h1>
+                      <div class="permission" id='_' style='page-break-after: avoid;page-break-inside: avoid;'>
+                      <p class="RecommendationTitle">Permission 1:<br/>/ogc/recommendation/wfs/2</p>
+                      <p><i>Subject: user<br/>
+              Inherits: /ss/584/2015/level/1
+              <br/>
+              Inherits: <a href='#rfc2616'>RFC 2616 (HTTP/1.1)</a>
+              <br/>Control-class: Technical<br/>Priority: P0<br/>Family: System and Communications Protection<br/>Family: System and Communications Protocols</i></p>
+                <div class="requirement-description">
+                  <p id="_">I recommend <i>this</i>.</p>
+                </div>
+                <div class="requirement-description">
+                  <p id="_">As for the measurement targets,</p>
+                </div>
+                <div class="requirement-measurement-target">
+                  <p id="_">The measurement target shall be measured as:</p>
+                  <div id="_"><div class="formula"><p><span class="stem">(#(r/1 = 0)#)</span>&#160; (1)</p></div></div>
+                </div>
+                <div class="requirement-verification">
+                  <p id="_">The following code will be run for verification:</p>
+                  <pre id="_" class="prettyprint ">CoreRoot(success): HttpResponse<br/>&#160;&#160;&#160;&#160;&#160; if (success)<br/>&#160;&#160;&#160;&#160;&#160; recommendation(label: success-response)<br/>&#160;&#160;&#160;&#160;&#160; end<br/>&#160;&#160;&#160; </pre>
+                </div>
               </div>
-            </div>
+                    </div>
+                    <p class="zzSTDTitle1"/>
+                     <br/>
+               <div>
+                 <h1 class='Section3'>Bibliography</h1>
+                 <p id='rfc2616' class='Biblio'>
+                   [1]&#160; IETF RFC 2616,
+                   <i>Hypertext Transfer Protocol&#8201;&#8212;&#8201;HTTP/1.1</i>
+                 </p>
+               </div>
                   </div>
-                  <p class="zzSTDTitle1"/>
-                   <br/>
-             <div>
-               <h1 class='Section3'>Bibliography</h1>
-               <p id='rfc2616' class='Biblio'>
-                 [1]&#160; IETF RFC 2616,
-                 <i>Hypertext Transfer Protocol&#8201;&#8212;&#8201;HTTP/1.1</i>
-               </p>
-             </div>
-                </div>
-              </body>
-            </html>
+                </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 requirements (Presentation XML)" do
@@ -2145,7 +1772,7 @@ RSpec.describe IsoDoc do
       <?xml version='1.0'?>
         <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
           <preface>
-            <foreword>
+            <foreword displayorder="1">
               <requirement id='A' unnumbered='true' keep-with-next='true' keep-lines-together='true'>
                 <name>Requirement</name>
                 <title>A New Requirement</title>
@@ -2344,7 +1971,7 @@ RSpec.describe IsoDoc do
                  <language current="true">fr</language>
                  <script current="true">Latn</script>
                  </bibdata>
-                 <preface><foreword>
+                 <preface><foreword displayorder="1">
                  <requirement id="A" unnumbered="true"><name>Exigence</name>
                <title>A New Requirement</title>
                <label>/ogc/recommendation/wfs/2</label>
@@ -2510,7 +2137,7 @@ RSpec.describe IsoDoc do
       <?xml version='1.0'?>
          <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
            <preface>
-             <foreword>
+             <foreword displayorder="1">
                <recommendation id='_' obligation='shall,could' keep-with-next='true' keep-lines-together='true'>
                  <name>Recommendation 1</name>
                  <label>/ogc/recommendation/wfs/2</label>
@@ -2673,7 +2300,7 @@ RSpec.describe IsoDoc do
           <bibdata>
           <language current="true">en</language>
           </bibdata>
-              <preface><foreword>
+              <preface><foreword displayorder="1">
         <figure id="_" class="pseudocode" keep-with-next="true" keep-lines-together="true"><name>Figure 1&#xA0;&#x2014; Label</name><p id="_">&#xA0;&#xA0;<strong>A</strong><br/>
       &#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;<smallcap>B</smallcap></p>
       <p id="_">&#xA0;&#xA0;<em>C</em></p></figure>
@@ -2852,7 +2479,7 @@ RSpec.describe IsoDoc do
                  </figure>
                </sections>
                <bibliography>
-                 <references hidden='true' normative='false'>
+                 <references hidden='true' normative='false' displayorder="1">
                    <bibitem id='express_action_schema' type='internal'>
                      <docidentifier type='repository'>express/action_schema</docidentifier>
                    </bibitem>