RubyGems - metanorma-iso - Versions diffs - 1.8.4 → 1.8.5 - Mend

metanorma-iso 1.8.4 → 1.8.5

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

Files changed (25) hide show

checksums.yaml +4 -4
data/.rubocop.yml +1 -1
data/lib/isodoc/iso/base_convert.rb +13 -13
data/lib/isodoc/iso/html/isodoc.css +475 -20
data/lib/isodoc/iso/html/isodoc.scss +456 -23
data/lib/isodoc/iso/html/wordstyle.css +202 -31
data/lib/isodoc/iso/html/wordstyle.scss +194 -32
data/lib/isodoc/iso/iso.amendment.xsl +69 -13
data/lib/isodoc/iso/iso.international-standard.xsl +69 -13
data/lib/isodoc/iso/metadata.rb +2 -2
data/lib/isodoc/iso/word_convert.rb +153 -39
data/lib/metanorma/iso/version.rb +1 -1
data/metanorma-iso.gemspec +1 -1
data/spec/isodoc/amd_spec.rb +193 -201
data/spec/isodoc/blocks_spec.rb +100 -88
data/spec/isodoc/i18n_spec.rb +36 -36
data/spec/isodoc/inline_spec.rb +2 -2
data/spec/isodoc/iso_spec.rb +86 -138
data/spec/isodoc/postproc_spec.rb +19 -10
data/spec/isodoc/ref_spec.rb +6 -6
data/spec/isodoc/section_spec.rb +301 -306
data/spec/isodoc/table_spec.rb +166 -231
data/spec/isodoc/terms_spec.rb +11 -8
data/spec/isodoc/xref_spec.rb +147 -118
metadata +3 -3

data/spec/isodoc/inline_spec.rb CHANGED Viewed

@@ -318,7 +318,7 @@ RSpec.describe IsoDoc do
       <?xml version='1.0'?>
       <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
         <preface>
-          <foreword>
+          <foreword displayorder="1">
             <p>
               <eref bibitemid="IEV" citeas="IEV" type="inline">
                 <locality type="clause">
@@ -372,7 +372,7 @@ RSpec.describe IsoDoc do
           </foreword>
         </preface>
         <bibliography>
-          <references id="_normative_references" normative="true" obligation="informative">
+          <references id="_normative_references" normative="true" obligation="informative" displayorder="2">
             <title depth="1">1<tab/>
               Normative References</title>
             <bibitem id="ISO712" type="standard">

data/spec/isodoc/iso_spec.rb CHANGED Viewed

@@ -177,8 +177,8 @@ RSpec.describe IsoDoc::Iso do
     OUTPUT
   end
-  it "processes examples (Presentation XML)" do
-    output = IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true)
+  it "processes examples" do
+    input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
         <preface>
           <foreword>
@@ -190,11 +190,11 @@ RSpec.describe IsoDoc::Iso do
         </preface>
       </iso-standard>
     INPUT
-    expect(xmlpp(output)).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    presxml = <<~OUTPUT
       <?xml version='1.0'?>
       <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
         <preface>
-          <foreword>
+          <foreword displayorder="1">
             <example id="samplecode">
               <name>EXAMPLE — Title</name>
               <p>Hello</p>
@@ -203,22 +203,8 @@ RSpec.describe IsoDoc::Iso do
         </preface>
       </iso-standard>
     OUTPUT
-  end
-  it "processes examples (HTML)" do
-    output = IsoDoc::Iso::HtmlConvert.new({}).convert("test", <<~"INPUT", true)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <preface>
-          <foreword>
-            <example id="samplecode">
-              <name>EXAMPLE — Title</name>
-              <p>Hello</p>
-            </example>
-          </foreword>
-        </preface>
-      </iso-standard>
-    INPUT
-    expect(xmlpp(output)).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    html = <<~OUTPUT
       #{HTML_HDR}
             <br/>
             <div>
@@ -232,10 +218,49 @@ RSpec.describe IsoDoc::Iso do
         </body>
       </html>
     OUTPUT
+    word = <<~OUTPUT
+          <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="samplecode" class="example">
+              <p><span class="example_label">EXAMPLE&#160;&#8212; Title</span><span style="mso-tab-count:1">&#160; </span>Hello</p>
+            </div>
+          </div>
+          <p>&#160;</p>
+        </div>
+        <p>
+          <br clear="all" class="section"/>
+        </p>
+        <div class="WordSection3">
+          <p class="zzSTDTitle1"/>
+        </div>
+        <br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
+        <div class="colophon"/>
+      </body>
+    OUTPUT
+    expect(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true)).to be_equivalent_to xmlpp(presxml)
+    expect(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", presxml, true)).to be_equivalent_to xmlpp(html)
+    output = IsoDoc::Iso::WordConvert.new({}).convert("test", presxml, true)
+    expect(xmlpp(output
+      .sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>")))
+      .to be_equivalent_to xmlpp(word)
   end
-  it "processes sequences of examples (Presentation XML)" do
-    output = IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true)
+  it "processes sequences of examples" do
+    input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
         <preface>
           <foreword>
@@ -250,11 +275,11 @@ RSpec.describe IsoDoc::Iso do
         </preface>
       </iso-standard>
     INPUT
-    expect(xmlpp(output)).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    presxml = <<~OUTPUT
       <?xml version='1.0'?>
       <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
         <preface>
-          <foreword>
+          <foreword displayorder="1">
             <example id="samplecode">
               <name>EXAMPLE 1</name>
               <quote>Hello</quote>
@@ -267,26 +292,7 @@ RSpec.describe IsoDoc::Iso do
         </preface>
       </iso-standard>
     OUTPUT
-  end
-  it "processes sequences of examples (HTML)" do
-    output = IsoDoc::Iso::HtmlConvert.new({}).convert("test", <<~"INPUT", true)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <preface>
-          <foreword>
-            <example id="samplecode">
-              <name>EXAMPLE 1</name>
-              <quote>Hello</quote>
-            </example>
-            <example id="samplecode2">
-              <name>EXAMPLE 2 — Title</name>
-              <p>Hello</p>
-            </example>
-          </foreword>
-        </preface>
-      </iso-standard>
-    INPUT
-    expect(xmlpp(output)).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    html = <<~OUTPUT
       #{HTML_HDR}
             <br/>
             <div>
@@ -304,105 +310,47 @@ RSpec.describe IsoDoc::Iso do
         </body>
       </html>
     OUTPUT
-  end
-  it "processes examples (Word)" do
-    output = IsoDoc::Iso::WordConvert.new({}).convert("test", <<~"INPUT", true)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <preface>
-          <foreword>
-            <example id="samplecode">
-              <name>EXAMPLE — Title</name>
-              <p>Hello</p>
-            </example>
-          </foreword>
-        </preface>
-      </iso-standard>
-    INPUT
-    expect(xmlpp(output.sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>")))
-      .to be_equivalent_to xmlpp(<<~"OUTPUT")
-        <body lang="EN-US" link="blue" vlink="#954F72">
-          <div class="WordSection1">
-            <p>&#160;</p>
-          </div>
+    word = <<~OUTPUT
+          <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="WordSection2">
-            <p>
-              <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
-            </p>
-            <div>
-              <h1 class="ForewordTitle">Foreword</h1>
-              <div id="samplecode" class="example">
-                <p><span class="example_label">EXAMPLE&#160;&#8212; Title</span><span style="mso-tab-count:1">&#160; </span>Hello</p>
-              </div>
+          <div>
+            <h1 class="ForewordTitle">Foreword</h1>
+            <div id="samplecode" class="example">
+              <p><span class="example_label">EXAMPLE  1</span><span style="mso-tab-count:1">&#160; </span></p>
+              <div class="Quote">Hello</div>
             </div>
-            <p>&#160;</p>
-          </div>
-          <p>
-            <br clear="all" class="section"/>
-          </p>
-          <div class="WordSection3">
-            <p class="zzSTDTitle1"/>
-          </div>
-          <br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
-          <div class="colophon"/>
-        </body>
-      OUTPUT
-  end
-  it "processes sequences of examples (Word)" do
-    output = IsoDoc::Iso::WordConvert.new({}).convert("test", <<~"INPUT", true)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <preface>
-          <foreword>
-            <example id="samplecode">
-              <name>EXAMPLE 1</name>
-              <quote>Hello</quote>
-            </example>
-            <example id="samplecode2">
-              <name>EXAMPLE 2 — Title</name>
-              <p>Hello</p>
-            </example>
-          </foreword>
-        </preface>
-      </iso-standard>
-    INPUT
-    expect(xmlpp(output.sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>")))
-      .to be_equivalent_to xmlpp(<<~"OUTPUT")
-        <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="samplecode" class="example">
-                <p><span class="example_label">EXAMPLE  1</span><span style="mso-tab-count:1">&#160; </span></p>
-                <div class="Quote">Hello</div>
-              </div>
-              <div id="samplecode2" class="example">
-                <p><span class="example_label">EXAMPLE  2&#160;&#8212; Title</span><span style="mso-tab-count:1">&#160; </span>Hello</p>
-              </div>
+            <div id="samplecode2" class="example">
+              <p><span class="example_label">EXAMPLE  2&#160;&#8212; Title</span><span style="mso-tab-count:1">&#160; </span>Hello</p>
             </div>
-            <p>&#160;</p>
           </div>
-          <p>
-            <br clear="all" class="section"/>
-          </p>
-          <div class="WordSection3">
-            <p class="zzSTDTitle1"/>
-          </div>
-          <br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
-          <div class="colophon"/>
-        </body>
-      OUTPUT
+          <p>&#160;</p>
+        </div>
+        <p>
+          <br clear="all" class="section"/>
+        </p>
+        <div class="WordSection3">
+          <p class="zzSTDTitle1"/>
+        </div>
+        <br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
+        <div class="colophon"/>
+      </body>
+    OUTPUT
+    expect(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true)).to be_equivalent_to xmlpp(presxml)
+    expect(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", presxml, true)).to be_equivalent_to xmlpp(html)
+    output = IsoDoc::Iso::WordConvert.new({}).convert("test", presxml, true)
+    expect(xmlpp(output
+      .sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>")))
+      .to be_equivalent_to xmlpp(word)
   end
 end

data/spec/isodoc/postproc_spec.rb CHANGED Viewed

@@ -148,6 +148,9 @@ RSpec.describe IsoDoc do
                 An Appendix</title>
             </appendix>
           </annex>
+          <bibliography>
+            <references id="R" normative="false"><title>Bibliography</title></references>
+          </bibliography>
         </iso-standard>
       INPUT
@@ -163,7 +166,7 @@ RSpec.describe IsoDoc do
         </p>
         <div class="Section3">
           <a id="P" name="P"/>
-          <h1 class="Annex">Annex</h1>
+          <p class="ANNEX">Annex</p>
           <div>
             <a id="Q" name="Q"/>
             <p class="h2Annex">A.1
@@ -177,6 +180,12 @@ RSpec.describe IsoDoc do
               An Appendix</p>
           </div>
         </div>
+        <p class='MsoNormal'>
+          <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+        </p>
+        <div>
+          <p class='BiblioTitle'>Bibliography</p>
+        </div>
       </div>
     OUTPUT
   end
@@ -227,9 +236,9 @@ RSpec.describe IsoDoc do
           <p class="TermNum">
             <a id="paddy1" name="paddy1"/>1.1</p>
           <p class="Terms" style="text-align:left;">paddy</p>
-          <p class="MsoNormal">
+          <p class="Definition">
             <a id="_eb29b35e-123e-4d1c-b50b-2714d41e747f" name="_eb29b35e-123e-4d1c-b50b-2714d41e747f"/>rice retaining its husk after threshing</p>
-          <p class="MsoNormal">[SOURCE:
+          <p class="Source">[SOURCE:
             <a href="#ISO7301">ISO 7301:2011, 3.1</a>
             , modified — The term &quot;cargo rice&quot; is shown as deprecated, and Note 1 to entry is not included here]</p>
         </div>
@@ -297,8 +306,9 @@ RSpec.describe IsoDoc do
           <p class="MsoToc1">
             <span lang="EN-GB" xml:lang="EN-GB">
               <span style="mso-element:field-begin"/>
-              <span style="mso-spacerun:yes"> </span>TOC
-                 \o &quot;1-3&quot; \h \z \u
+              <span style='mso-spacerun:yes'>&#xA0;</span>
+              TOC \o "1-3" \h \z \t "Heading 1;1;ANNEX;1;Biblio Title;1;Foreword
+              Title;1;Intro Title;1"
               <span style="mso-element:field-separator"/></span>
             <span class="MsoHyperlink">
               <span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
@@ -658,14 +668,14 @@ RSpec.describe IsoDoc do
         </p>
         <div class="Section3">
           <a id="P" name="P"/>
-          <div class="example">
+          <div class="Example">
             <a id="_63112cbc-cde0-435f-9553-e0b8c4f5851c" name="_63112cbc-cde0-435f-9553-e0b8c4f5851c"/>
-            <p class="example">
+            <p class="Example">
               <span style="mso-tab-count:1">  </span>'1M', '01M', and '0001M' all describe the calendar month January.</p>
           </div>
-          <div class="example">
+          <div class="Example">
             <a id="_63112cbc-cde0-435f-9553-e0b8c4f5851d" name="_63112cbc-cde0-435f-9553-e0b8c4f5851d"/>
-            <p class="example">
+            <p class="Example">
               <span style="mso-tab-count:1">  </span>'2M', '02M', and '0002M' all describe the calendar month February.</p>
           </div>
         </div>
@@ -726,7 +736,6 @@ RSpec.describe IsoDoc do
                 </tr>
               </table>
             </div>
-            <p class="FigureTitle" style="text-align:center;"/>
           </div>
         </div>
       </div>

data/spec/isodoc/ref_spec.rb CHANGED Viewed

@@ -155,7 +155,7 @@ RSpec.describe IsoDoc do
           <language current="true">en</language>
         </bibdata>
         <preface>
-          <foreword>
+          <foreword displayorder="1">
             <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">
               <eref bibitemid="ISO712">ISO 712</eref>
               <eref bibitemid="ISBN">[1]</eref>
@@ -168,7 +168,7 @@ RSpec.describe IsoDoc do
           </foreword>
         </preface>
         <bibliography>
-          <references id="_normative_references" normative="true" obligation="informative">
+          <references id="_normative_references" normative="true" obligation="informative" displayorder="2">
             <title depth="1">1<tab/>Normative References</title>
             <p>The following documents are referred to in the text in such a way that
                        some or all of their content constitutes requirements of this document.
@@ -231,14 +231,14 @@ RSpec.describe IsoDoc do
                 <link target="http://www.icc.or.at"/>
                 )</formattedref>
-              <docidentifier type="ICC">167</docidentifier>
+              <docidentifier type="ICC">ICC 167</docidentifier>
             </bibitem>
             <note>
               <name>NOTE</name>
               <p>This is an annotation of ISO 20483:2013-2014</p>
             </note>
           </references>
-          <references id="_bibliography" normative="false" obligation="informative">
+          <references id="_bibliography" normative="false" obligation="informative" displayorder="3">
             <title depth="1">Bibliography</title>
             <bibitem id="ISBN" type="ISBN">
               <title format="text/plain">Chemicals for analytical laboratory use</title>
@@ -294,7 +294,7 @@ RSpec.describe IsoDoc do
             </bibitem>
             <bibitem id="ref11">
               <title>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</title>
-              <docidentifier type="IETF">RFC 10</docidentifier>
+              <docidentifier type="IETF">IETF RFC 10</docidentifier>
             </bibitem>
             <bibitem id="ref12">
               <formattedref format="application/x-isodoc+xml">CitationWorks. 2019.
@@ -302,7 +302,7 @@ RSpec.describe IsoDoc do
                 <em>How to cite a reference</em>
                 .</formattedref>
               <docidentifier type="metanorma">[Citn]</docidentifier>
-              <docidentifier type="IETF">RFC 20</docidentifier>
+              <docidentifier type="IETF">IETF RFC 20</docidentifier>
             </bibitem>
           </references>
         </bibliography>

data/spec/isodoc/section_spec.rb CHANGED Viewed

@@ -86,100 +86,86 @@ RSpec.describe IsoDoc do
     INPUT
     presxml = <<~OUTPUT
-      <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
-        <preface>
-          <foreword obligation='informative'>
-            <title>Foreword</title>
-            <p id='A'>This is a preamble</p>
-          </foreword>
-          <introduction id='B' obligation='informative'>
-          <title depth='1'>0<tab/>Introduction</title>
-            <clause id='C' inline-header='false' obligation='informative'>
-              <title depth='2'>0.1<tab/>Introduction Subsection</title>
+        <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+          <preface>
+            <foreword obligation="informative" displayorder="1">
+              <title>Foreword</title>
+              <p id="A">This is a preamble</p>
+            </foreword>
+            <introduction id="B" obligation="informative" displayorder="2">
+              <title depth="1">0<tab/>Introduction</title>
+              <clause id="C" inline-header="false" obligation="informative">
+                <title depth="2">0.1<tab/>Introduction Subsection</title>
+              </clause>
+              <p>This is patent boilerplate</p>
+            </introduction>
+          </preface>
+          <sections>
+            <clause id="D" obligation="normative" type="scope" displayorder="3">
+              <title depth="1">1<tab/>Scope</title>
+              <p id="E">Text</p>
             </clause>
-            <p>This is patent boilerplate</p>
-          </introduction>
-        </preface>
-        <sections>
-          <clause id='D' obligation='normative' type="scope">
-            <title depth='1'>1<tab/>Scope</title>
-            <p id='E'>Text</p>
-          </clause>
-          <clause id='H' obligation='normative'>
-            <title depth='1'>3<tab/>Terms, Definitions, Symbols and Abbreviated Terms</title>
-            <terms id='I' obligation='normative'>
-              <title depth='2'>3.1<tab/>Normal Terms</title>
-              <term id='J'>
-                <name>3.1.1</name>
-                <preferred>Term2</preferred>
-              </term>
-            </terms>
-            <definitions id='K' inline-header='true'>
-              <title>3.2</title>
+            <clause id="H" obligation="normative" displayorder="5">
+              <title depth="1">3<tab/>Terms, Definitions, Symbols and Abbreviated Terms</title>
+              <terms id="I" obligation="normative">
+                <title depth="2">3.1<tab/>Normal Terms</title>
+                <term id="J"><name>3.1.1</name>
+                  <preferred>Term2</preferred>
+                </term>
+              </terms>
+              <definitions id="K" inline-header="true"><title>3.2</title>
+                <dl>
+                  <dt>Symbol</dt>
+                  <dd>Definition</dd>
+                </dl>
+              </definitions>
+            </clause>
+            <definitions id="L" displayorder="6"><title>4</title>
               <dl>
                 <dt>Symbol</dt>
                 <dd>Definition</dd>
               </dl>
             </definitions>
-          </clause>
-          <definitions id='L'>
-            <title>4</title>
-            <dl>
-              <dt>Symbol</dt>
-              <dd>Definition</dd>
-            </dl>
-          </definitions>
-          <clause id='M' inline-header='false' obligation='normative'>
-            <title depth='1'>5<tab/>Clause 4</title>
-            <clause id='N' inline-header='false' obligation='normative'>
-              <title depth='2'>5.1<tab/>Introduction</title>
-            </clause>
-            <clause id='O' inline-header='false' obligation='normative'>
-              <title depth='2'>5.2<tab/>Clause 4.2</title>
-            </clause>
-          </clause>
-        </sections>
-        <annex id='P' inline-header='false' obligation='normative'>
-          <title>
-            <strong>Annex A</strong>
-            <br/>
-            (normative)
-            <br/>
-            <br/>
-            <strong>Annex</strong>
-          </title>
-          <clause id='Q' inline-header='false' obligation='normative'>
-            <title depth='2'>A.1<tab/>Annex A.1</title>
-            <clause id='Q1' inline-header='false' obligation='normative'>
-              <title depth='3'>A.1.1<tab/>Annex A.1a</title>
+            <clause id="M" inline-header="false" obligation="normative" displayorder="7">
+              <title depth="1">5<tab/>Clause 4</title>
+              <clause id="N" inline-header="false" obligation="normative">
+                <title depth="2">5.1<tab/>Introduction</title>
+              </clause>
+              <clause id="O" inline-header="false" obligation="normative">
+                <title depth="2">5.2<tab/>Clause 4.2</title>
+              </clause>
             </clause>
-          </clause>
-          <appendix id='Q2' inline-header='false' obligation='normative'>
-            <title depth='2'>Appendix 1<tab/>An Appendix</title>
-            <clause id='Q2a' inline-header='false' obligation='normative'>
-              <title depth='3'>
-                Appendix 1.1
-                <tab/>
-                Appendix subclause
-              </title>
+          </sections>
+          <annex id="P" inline-header="false" obligation="normative" displayorder="8">
+            <title><strong>Annex A</strong><br/>(normative)<br/><br/><strong>Annex</strong></title>
+            <clause id="Q" inline-header="false" obligation="normative">
+              <title depth="2">A.1<tab/>Annex A.1</title>
+              <clause id="Q1" inline-header="false" obligation="normative">
+                <title depth="3">A.1.1<tab/>Annex A.1a</title>
+              </clause>
             </clause>
-          </appendix>
-          <references id='Q3' normative='false'>
-            <title depth='2'>A.2<tab/>Annex Bibliography</title>
-          </references>
-        </annex>
-        <bibliography>
-          <references id='R' obligation='informative' normative='true'>
-            <title depth='1'>2<tab/>Normative References</title>
-          </references>
-          <clause id='S' obligation='informative'>
-            <title depth='1'>Bibliography</title>
-            <references id='T' obligation='informative' normative='false'>
-              <title depth='2'>Bibliography Subsection</title>
+            <appendix id="Q2" inline-header="false" obligation="normative">
+              <title depth="2">Appendix 1<tab/>An Appendix</title>
+              <clause id="Q2a" inline-header="false" obligation="normative">
+                <title depth="3">Appendix 1.1<tab/>Appendix subclause</title>
+              </clause>
+            </appendix>
+            <references id="Q3" normative="false">
+              <title depth="2">A.2<tab/>Annex Bibliography</title>
             </references>
-          </clause>
-        </bibliography>
-      </iso-standard>
+          </annex>
+          <bibliography>
+            <references id="R" normative="true" obligation="informative" displayorder="4">
+              <title depth="1">2<tab/>Normative References</title>
+            </references>
+            <clause id="S" obligation="informative" displayorder="9">
+              <title depth="1">Bibliography</title>
+              <references id="T" normative="false" obligation="informative">
+                <title depth="2">Bibliography Subsection</title>
+              </references>
+            </clause>
+          </bibliography>
+        </iso-standard>
     OUTPUT
     html = <<~OUTPUT
@@ -259,7 +245,7 @@ RSpec.describe IsoDoc do
               <div id="Q2">
                 <h2>Appendix 1&#160; An Appendix</h2>
                 <div id="Q2a">
-                  <h3>Appendix 1.1 &#160; Appendix subclause </h3>
+                  <h3>Appendix 1.1&#160; Appendix subclause</h3>
                 </div>
               </div>
               <div>
@@ -281,7 +267,7 @@ RSpec.describe IsoDoc do
     word = <<~OUTPUT
       <body lang="EN-US" link="blue" vlink="#954F72">
         <div class="WordSection1">
-          <p> </p>
+          <p>&#160;</p>
         </div>
         <p>
           <br class="section" clear="all"/>
@@ -292,7 +278,7 @@ RSpec.describe IsoDoc do
           </p>
           <div>
             <h1 class="ForewordTitle">Foreword</h1>
-            <p id="A">This is a preamble</p>
+            <p id="A" class='ForewordText'>This is a preamble</p>
           </div>
           <p>
             <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
@@ -308,7 +294,7 @@ RSpec.describe IsoDoc do
             </div>
             <p>This is patent boilerplate</p>
           </div>
-          <p> </p>
+          <p>&#160;</p>
         </div>
         <p>
           <br class="section" clear="all"/>
@@ -383,7 +369,6 @@ RSpec.describe IsoDoc do
           </p>
           <div class="Section3" id="P">
             <h1 class="Annex">
-              <b>Annex A</b>
               <br/>(normative)
               <br/>
               <br/>
@@ -409,7 +394,7 @@ RSpec.describe IsoDoc do
               </div>
             </div>
             <div>
-              <h2 class="Section3">A.2
+              <h2 class="BiblioTitle">A.2
                 <span style="mso-tab-count:1">&#160; </span>
                 Annex Bibliography</h2>
             </div>
@@ -418,9 +403,9 @@ RSpec.describe IsoDoc do
             <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
           </p>
           <div>
-            <h1 class="Section3">Bibliography</h1>
+            <h1 class="BiblioTitle">Bibliography</h1>
             <div>
-              <h2 class="Section3">Bibliography Subsection</h2>
+              <h2 class="BiblioTitle">Bibliography Subsection</h2>
             </div>
           </div>
         </div>
@@ -428,12 +413,16 @@ RSpec.describe IsoDoc do
         <div class="colophon"/>
       </body>
     OUTPUT
-    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true)))
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true)))
       .to be_equivalent_to xmlpp(presxml)
-    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", presxml, true)))
+    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", presxml, true)))
       .to be_equivalent_to xmlpp(html)
-    expect(xmlpp(IsoDoc::Iso::WordConvert.new({}).convert("test", presxml, true)
-      .sub(/^.*<body /m, "<body ").sub(%r{</body>.*$}m, "</body>"))).to be_equivalent_to xmlpp(word)
+    expect(xmlpp(IsoDoc::Iso::WordConvert.new({})
+      .convert("test", presxml, true)
+      .sub(/^.*<body /m, "<body ").sub(%r{</body>.*$}m, "</body>")))
+      .to be_equivalent_to xmlpp(word)
   end
   it "processes subclauses with and without titles" do
@@ -455,7 +444,7 @@ RSpec.describe IsoDoc do
     presxml = <<~OUTPUT
       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
         <sections>
-          <clause id='D' obligation='normative'>
+          <clause id='D' obligation='normative' displayorder="1">
             <title depth='1'>1<tab/>Scope</title>
             <clause id='D1' obligation='normative'>
               <title depth='2'>1.1<tab/>Scope 1</title>
@@ -497,38 +486,42 @@ RSpec.describe IsoDoc do
         </body>
       </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true)))
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true)))
       .to be_equivalent_to xmlpp(presxml)
-    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", presxml, true)))
+    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", presxml, true)))
       .to be_equivalent_to xmlpp(html)
   end
   it "processes simple terms & definitions" do
-    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({})
-      .convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-        <iso-standard xmlns="http://riboseinc.com/isoxml">
-          <sections>
-            <terms id="H" obligation="normative">
-              <title>Terms, Definitions, Symbols and Abbreviated Terms</title>
-              <term id="J">
-                <name>1.1</name>
-                <preferred>Term2</preferred>
-              </term>
-            </terms>
-          </sections>
-        </iso-standard>
-      INPUT
-        #{HTML_HDR}
-              <p class="zzSTDTitle1"/>
-              <div id="H">
-                <h1>Terms, Definitions, Symbols and Abbreviated Terms</h1>
-                <p class="TermNum" id="J">1.1</p>
-                <p class="Terms" style="text-align:left;">Term2</p>
-              </div>
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <sections>
+          <terms id="H" obligation="normative">
+            <title>Terms, Definitions, Symbols and Abbreviated Terms</title>
+            <term id="J">
+              <name>1.1</name>
+              <preferred>Term2</preferred>
+            </term>
+          </terms>
+        </sections>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      #{HTML_HDR}
+            <p class="zzSTDTitle1"/>
+            <div id="H">
+              <h1>Terms, Definitions, Symbols and Abbreviated Terms</h1>
+              <p class="TermNum" id="J">1.1</p>
+              <p class="Terms" style="text-align:left;">Term2</p>
             </div>
-          </body>
-        </html>
-      OUTPUT
+          </div>
+        </body>
+      </html>
+    OUTPUT
+    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
   it "processes inline section headers" do
@@ -686,191 +679,193 @@ RSpec.describe IsoDoc do
       </bipm-standard>
     INPUT
     presxml = <<~OUTPUT
-   <iso-standard xmlns='https://open.ribose.com/standards/bipm' type='presentation'>
-  <bibdata>
-    <language current='true'>en</language>
-    <script current='true'>Latn</script>
-  </bibdata>
-  <sections>
-    <clause id='A'>
-      <title>1</title>
-      <bookmark id='_'/>
-      <bookmark id='_'/>
-      <bookmark id='_'/>
-      <bookmark id='_'/>
-      <bookmark id='_'/>
-      <clause id='B' inline-header='true'>
-        <title>1.1</title>
-        <bookmark id='_'/>
-        <bookmark id='_'/>
-        <bookmark id='_'/>
-        <bookmark id='_'/>
-      </clause>
-    </clause>
-  </sections>
-  <indexsect id='_'>
-    <title>Index</title>
-    <ul>
-      <li>
-        <em>Dasein</em>
-        , see
-        <em>Eman</em>
-        cipation, &#xEA;tre
-      </li>
-      <li>
-        &#xE9;long&#xE9;,
-        <xref target='_' pagenumber='true'>Clause 1</xref>
-      </li>
-      <li>
-        <em>Eman</em>
-        cipation,
-        <xref target='_' pagenumber='true'>Clause 1</xref>
-        ,
-        <xref target='_' pagenumber='true'>1.1</xref>
-        <ul>
-          <li>
-            dans la France,
-            <xref target='_' pagenumber='true'>Clause 1</xref>
-            <ul>
-              <li>
-                &#xE0; Paris,
-                <xref target='_' pagenumber='true'>1.1</xref>
-              </li>
-              <li>
-                en Bretagne,
-                <xref target='_' pagenumber='true'>Clause 1</xref>
-              </li>
-            </ul>
-          </li>
-          <li>
-            dans les &#xC9;tats-Unis,
-            <xref target='_' pagenumber='true'>1.1</xref>
-          </li>
-        </ul>
-      </li>
-      <li>
-        &#xEA;tre
-        <ul>
-          <li>
-            Husserl, see zebra, see also
-            <em>Eman</em>
-            cipation, zebra
-            <ul>
-              <li>
-                en allemand,
-                <xref target='_' pagenumber='true'>Clause 1</xref>
-              </li>
-            </ul>
-          </li>
-        </ul>
-      </li>
-      <li>
-        zebra,
-        <xref target='_' pagenumber='true'>1.1</xref>
-      </li>
-    </ul>
-  </indexsect>
-</iso-standard>
+         <iso-standard xmlns='https://open.ribose.com/standards/bipm' type='presentation'>
+        <bibdata>
+          <language current='true'>en</language>
+          <script current='true'>Latn</script>
+        </bibdata>
+        <sections>
+          <clause id='A' displayorder="1">
+            <title>1</title>
+            <bookmark id='_'/>
+            <bookmark id='_'/>
+            <bookmark id='_'/>
+            <bookmark id='_'/>
+            <bookmark id='_'/>
+            <clause id='B' inline-header='true'>
+              <title>1.1</title>
+              <bookmark id='_'/>
+              <bookmark id='_'/>
+              <bookmark id='_'/>
+              <bookmark id='_'/>
+            </clause>
+          </clause>
+        </sections>
+        <indexsect id='_'>
+          <title>Index</title>
+          <ul>
+            <li>
+              <em>Dasein</em>
+              , see
+              <em>Eman</em>
+              cipation, &#xEA;tre
+            </li>
+            <li>
+              &#xE9;long&#xE9;,
+              <xref target='_' pagenumber='true'>Clause 1</xref>
+            </li>
+            <li>
+              <em>Eman</em>
+              cipation,
+              <xref target='_' pagenumber='true'>Clause 1</xref>
+              ,
+              <xref target='_' pagenumber='true'>1.1</xref>
+              <ul>
+                <li>
+                  dans la France,
+                  <xref target='_' pagenumber='true'>Clause 1</xref>
+                  <ul>
+                    <li>
+                      &#xE0; Paris,
+                      <xref target='_' pagenumber='true'>1.1</xref>
+                    </li>
+                    <li>
+                      en Bretagne,
+                      <xref target='_' pagenumber='true'>Clause 1</xref>
+                    </li>
+                  </ul>
+                </li>
+                <li>
+                  dans les &#xC9;tats-Unis,
+                  <xref target='_' pagenumber='true'>1.1</xref>
+                </li>
+              </ul>
+            </li>
+            <li>
+              &#xEA;tre
+              <ul>
+                <li>
+                  Husserl, see zebra, see also
+                  <em>Eman</em>
+                  cipation, zebra
+                  <ul>
+                    <li>
+                      en allemand,
+                      <xref target='_' pagenumber='true'>Clause 1</xref>
+                    </li>
+                  </ul>
+                </li>
+              </ul>
+            </li>
+            <li>
+              zebra,
+              <xref target='_' pagenumber='true'>1.1</xref>
+            </li>
+          </ul>
+        </indexsect>
+      </iso-standard>
     OUTPUT
     html = <<~OUTPUT
-    <html lang='en'>
-  <head/>
-  <body lang='en'>
-    <div class='title-section'>
-      <p>&#160;</p>
-    </div>
-    <br/>
-    <div class='prefatory-section'>
-      <p>&#160;</p>
-    </div>
-    <br/>
-    <div class='main-section'>
-      <p class='zzSTDTitle1'/>
-      <div id='A'>
-        <h1>1</h1>
-        <a id='_'/>
-        <a id='_'/>
-        <a id='_'/>
-        <a id='_'/>
-        <a id='_'/>
-        <div id='B'>
-          <span class='zzMoveToFollowing'>
-            <b>1.1&#160; </b>
-          </span>
-          <a id='_'/>
-          <a id='_'/>
-          <a id='_'/>
-          <a id='_'/>
-        </div>
-      </div>
-      <div id='_'>
-        <h1>Index</h1>
-        <ul>
-          <li>
-            <i>Dasein</i>
-             , see
-            <i>Eman</i>
-             cipation, &#234;tre
-          </li>
-          <li>
-             &#233;long&#233;,
-            <a href='#_'>Clause 1</a>
-          </li>
-          <li>
-            <i>Eman</i>
-             cipation,
-            <a href='#_'>Clause 1</a>
-             ,
-            <a href='#_'>1.1</a>
-            <ul>
-              <li>
-                 dans la France,
-                <a href='#_'>Clause 1</a>
-                <ul>
-                  <li>
-                     &#224; Paris,
-                    <a href='#_'>1.1</a>
-                  </li>
-                  <li>
-                     en Bretagne,
-                    <a href='#_'>Clause 1</a>
-                  </li>
-                </ul>
-              </li>
-              <li>
-                 dans les &#201;tats-Unis,
-                <a href='#_'>1.1</a>
-              </li>
-            </ul>
-          </li>
-          <li>
-             &#234;tre
-            <ul>
-              <li>
-                 Husserl, see zebra, see also
-                <i>Eman</i>
-                 cipation, zebra
-                <ul>
-                  <li>
-                     en allemand,
-                    <a href='#_'>Clause 1</a>
-                  </li>
-                </ul>
-              </li>
-            </ul>
-          </li>
-          <li>
-             zebra,
-            <a href='#_'>1.1</a>
-          </li>
-        </ul>
-      </div>
-    </div>
-  </body>
-</html>
+          <html lang='en'>
+        <head/>
+        <body lang='en'>
+          <div class='title-section'>
+            <p>&#160;</p>
+          </div>
+          <br/>
+          <div class='prefatory-section'>
+            <p>&#160;</p>
+          </div>
+          <br/>
+          <div class='main-section'>
+            <p class='zzSTDTitle1'/>
+            <div id='A'>
+              <h1>1</h1>
+              <a id='_'/>
+              <a id='_'/>
+              <a id='_'/>
+              <a id='_'/>
+              <a id='_'/>
+              <div id='B'>
+                <span class='zzMoveToFollowing'>
+                  <b>1.1&#160; </b>
+                </span>
+                <a id='_'/>
+                <a id='_'/>
+                <a id='_'/>
+                <a id='_'/>
+              </div>
+            </div>
+            <div id='_'>
+              <h1>Index</h1>
+              <ul>
+                <li>
+                  <i>Dasein</i>
+                   , see
+                  <i>Eman</i>
+                   cipation, &#234;tre
+                </li>
+                <li>
+                   &#233;long&#233;,
+                  <a href='#_'>Clause 1</a>
+                </li>
+                <li>
+                  <i>Eman</i>
+                   cipation,
+                  <a href='#_'>Clause 1</a>
+                   ,
+                  <a href='#_'>1.1</a>
+                  <ul>
+                    <li>
+                       dans la France,
+                      <a href='#_'>Clause 1</a>
+                      <ul>
+                        <li>
+                           &#224; Paris,
+                          <a href='#_'>1.1</a>
+                        </li>
+                        <li>
+                           en Bretagne,
+                          <a href='#_'>Clause 1</a>
+                        </li>
+                      </ul>
+                    </li>
+                    <li>
+                       dans les &#201;tats-Unis,
+                      <a href='#_'>1.1</a>
+                    </li>
+                  </ul>
+                </li>
+                <li>
+                   &#234;tre
+                  <ul>
+                    <li>
+                       Husserl, see zebra, see also
+                      <i>Eman</i>
+                       cipation, zebra
+                      <ul>
+                        <li>
+                           en allemand,
+                          <a href='#_'>Clause 1</a>
+                        </li>
+                      </ul>
+                    </li>
+                  </ul>
+                </li>
+                <li>
+                   zebra,
+                  <a href='#_'>1.1</a>
+                </li>
+              </ul>
+            </div>
+          </div>
+        </body>
+      </html>
     OUTPUT
-    expect(xmlpp(strip_guid(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true)
-      .gsub(%r{<localized-strings>.*</localized-strings>}m, "")))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(strip_guid(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true)
+      .gsub(%r{<localized-strings>.*</localized-strings>}m, ""))))
+      .to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({})
       .convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end