isodoc 1.6.4 → 1.7.0

data/lib/isodoc/xref/xref_gen.rb

@@ -3,7 +3,7 @@ require_relative "xref_gen_seq"
 module IsoDoc::XrefGen
   module Blocks
     NUMBERED_BLOCKS = %w(termnote termexample note example requirement
-    recommendation permission figure table formula admonition sourcecode).freeze
+                         recommendation permission figure table formula admonition sourcecode).freeze
 
     def amend_preprocess(xmldoc)
       xmldoc.xpath(ns("//amend[newcontent]")).each do |a|
@@ -60,9 +60,9 @@ module IsoDoc::XrefGen
 
           c.increment(n)
           idx = increment_label(examples, n, c, false)
-          @anchors[n["id"]] = {
-            type: "termexample", label: idx, value: c.print,
-            xref: l10n("#{anchor(t['id'], :xref)}, "\
+          @anchors[n["id"]] =
+            { type: "termexample", label: idx, value: c.print,
+              xref: l10n("#{anchor(t['id'], :xref)}, "\
                        "#{@labels['example_xref']} #{c.print}") }
         end
       end
@@ -86,9 +86,8 @@ module IsoDoc::XrefGen
 
     def note_anchor_names(sections)
       sections.each do |s|
-        notes = s.xpath(CHILD_NOTES_XPATH)
         c = Counter.new
-        notes.each do |n|
+        (notes = s.xpath(CHILD_NOTES_XPATH)).each do |n|
           next if @anchors[n["id"]] || n["id"].nil? || n["id"].empty?
 
           @anchors[n["id"]] =
@@ -105,13 +104,12 @@ module IsoDoc::XrefGen
       "xmlns:example | ./xmlns:example".freeze
 
     CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions | "\
-      "./references"
+      "./references".freeze
 
     def example_anchor_names(sections)
       sections.each do |s|
-        notes = s.xpath(CHILD_EXAMPLES_XPATH)
         c = Counter.new
-        notes.each do |n|
+        (notes = s.xpath(CHILD_EXAMPLES_XPATH)).each do |n|
           next if @anchors[n["id"]] || n["id"].nil? || n["id"].empty?
 
           @anchors[n["id"]] =
@@ -145,14 +143,44 @@ module IsoDoc::XrefGen
         label = "#{prev_label}.#{label}" unless prev_label.empty?
         label = "#{list_anchor[:xref]} #{label}" if refer_list
         li["id"] and @anchors[li["id"]] =
-          { xref: "#{label})", type: "listitem", 
-            container: list_anchor[:container] }
+                       { xref: "#{label})", type: "listitem",
+                         container: list_anchor[:container] }
         li.xpath(ns("./ol")).each do |ol|
           list_item_anchor_names(ol, list_anchor, depth + 1, label, false)
         end
       end
     end
 
+    def deflist_anchor_names(sections)
+      sections.each do |s|
+        notes = s.xpath(ns(".//dl")) - s.xpath(ns(".//clause//dl")) -
+          s.xpath(ns(".//appendix//dl")) - s.xpath(ns(".//dl//dl"))
+        c = Counter.new
+        notes.each do |n|
+          next if n["id"].nil? || n["id"].empty?
+
+          @anchors[n["id"]] =
+            anchor_struct(increment_label(notes, n, c), n,
+                          @labels["deflist"], "deflist", false)
+          deflist_term_anchor_names(n, @anchors[n["id"]])
+        end
+        deflist_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
+      end
+    end
+
+    def deflist_term_anchor_names(list, list_anchor)
+      list.xpath(ns("./dt")).each do |li|
+        label = li.text
+        label = l10n("#{list_anchor[:xref]}: #{label}")
+        li["id"] and @anchors[li["id"]] =
+                       { xref: label, type: "deflistitem",
+                         container: list_anchor[:container] }
+        li.xpath(ns("./dl")).each do |dl|
+          deflist_term_anchor_names(dl, list_anchor)
+        end
+      end
+    end
+
     def bookmark_anchor_names(docxml)
       docxml.xpath(ns(".//bookmark")).each do |n|
         next if n["id"].nil? || n["id"].empty?

data/spec/isodoc/blocks_spec.rb

@@ -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>
@@ -256,7 +256,7 @@ RSpec.describe IsoDoc do
           <?xml version='1.0'?>
       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
         <preface>
-          <foreword>
+          <foreword displayorder="1">
             <note id='A' keep-with-next='true' keep-lines-together='true'>
               <name>NOTE</name>
               <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
@@ -332,7 +332,7 @@ RSpec.describe IsoDoc do
       <?xml version='1.0'?>
       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
         <preface>
-          <foreword>
+          <foreword displayorder="1">
             <note id='note1'>
               <name>NOTE 1</name>
               <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
@@ -591,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"/>
@@ -735,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'>
@@ -955,7 +955,7 @@ RSpec.describe IsoDoc do
           <?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>
@@ -1030,9 +1030,12 @@ 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)
+    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
@@ -1056,7 +1059,7 @@ RSpec.describe IsoDoc do
           <?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>
@@ -1073,7 +1076,8 @@ RSpec.describe IsoDoc do
         </preface>
       </iso-standard>
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(output)
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
 
   it "processes sourcecode" do
@@ -1094,7 +1098,7 @@ RSpec.describe IsoDoc do
           <?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
@@ -1153,13 +1157,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)
+    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">
@@ -1169,6 +1176,7 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           </iso-standard>
     INPUT
+    output = <<~OUTPUT
       #{HTML_HDR}
                   <br/>
                   <div>
@@ -1181,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>
@@ -1198,6 +1208,7 @@ RSpec.describe IsoDoc do
       </foreword></preface>
       </iso-standard>
     INPUT
+    output = <<~OUTPUT
       #{HTML_HDR}
                   <br/>
                   <div>
@@ -1209,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">
@@ -1221,6 +1234,7 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           </iso-standard>
     INPUT
+    output = <<~OUTPUT
       #{HTML_HDR}
                   <br/>
                   <div>
@@ -1234,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">
@@ -1247,6 +1263,7 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           </iso-standard>
     INPUT
+    output = <<~OUTPUT
       #{HTML_HDR}
                   <br/>
                   <div>
@@ -1260,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">
@@ -1286,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">
@@ -1344,6 +1329,7 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           </iso-standard>
     INPUT
+    html = <<~OUTPUT
       #{HTML_HDR}
                   <br/>
                   <div>
@@ -1364,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>
@@ -1458,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/>
@@ -1471,6 +1438,7 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           </iso-standard>
     INPUT
+    html = <<~OUTPUT
       #{HTML_HDR}
                   <br/>
                   <div>
@@ -1486,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">
@@ -1525,10 +1482,14 @@ 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")
+  it "processes blockquotes" do
+    input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
           <preface><foreword>
           <quote id="_044bd364-c832-4b78-8fea-92242402a1d1">
@@ -1539,37 +1500,10 @@ RSpec.describe IsoDoc do
           </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>
+    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>
@@ -1578,21 +1512,26 @@ RSpec.describe IsoDoc do
           </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
@@ -1621,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>
@@ -1933,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
@@ -2035,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>
@@ -2234,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>
@@ -2400,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>
@@ -2563,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>
@@ -2742,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>