metanorma-iso 1.8.1 → 1.8.6

data/spec/asciidoctor/section_spec.rb

@@ -101,20 +101,6 @@ RSpec.describe Asciidoctor::ISO do
             <title>Terms, definitions, symbols and abbreviated terms</title>
             <terms id="_" obligation="normative">
               <title>Normal Terms</title>
-              <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-              <p id="_">ISO and IEC maintain terminological databases for use in standardization at the following addresses:</p>
-              <ul id="_">
-                <li>
-                  <p id="_">ISO Online browsing platform: available at
-
-                    <link target="http://www.iso.org/obp"/></p>
-                </li>
-                <li>
-                  <p id="_">IEC Electropedia: available at
-
-                    <link target="http://www.electropedia.org"/></p>
-                </li>
-              </ul>
               <term id="term-term2">
                 <preferred>Term2</preferred>
               </term>

data/spec/asciidoctor/validate_spec.rb

@@ -517,7 +517,8 @@ RSpec.describe Asciidoctor::ISO do
       <<iso123>>
     INPUT
     expect(File.read("test.err"))
-      .to include "iso123 does not have a corresponding anchor ID in the bibliography"
+      .to include "iso123 does not have a corresponding anchor ID "\
+                  "in the bibliography"
   end
 
   it "warns that undated reference has locality" do
@@ -530,9 +531,10 @@ RSpec.describe Asciidoctor::ISO do
       [bibliography]
       == Normative References
       * [[[iso123,ISO 123]]] _Standard_
-      INPUT
-      expect(File.read("test.err"))
-        .to include "undated reference ISO 123 should not contain specific elements"
+    INPUT
+    expect(File.read("test.err"))
+      .to include "undated reference ISO 123 should not contain "\
+                  "specific elements"
   end
 
   it "do not warn that undated reference which is a bibliographic reference has locality" do
@@ -545,9 +547,10 @@ RSpec.describe Asciidoctor::ISO do
       [bibliography]
       == Bibliography
       * [[[iso123,1]]] _Standard_
-      INPUT
-      expect(File.read("test.err"))
-        .not_to include "undated reference [1] should not contain specific elements"
+    INPUT
+    expect(File.read("test.err"))
+      .not_to include "undated reference [1] should not contain specific "\
+                      "elements"
   end
 
   it "do not warn that undated IEV reference has locality" do
@@ -560,9 +563,10 @@ RSpec.describe Asciidoctor::ISO do
       [bibliography]
       == Normative References
       * [[[iev,IEV]]] _Standard_
-      INPUT
-      expect(File.read("test.err"))
-        .not_to include "undated reference IEV should not contain specific elements"
+    INPUT
+    expect(File.read("test.err"))
+      .not_to include "undated reference IEV should not contain specific "\
+                      "elements"
   end
 
   it "do not warn that in print has locality" do
@@ -575,8 +579,10 @@ RSpec.describe Asciidoctor::ISO do
       [bibliography]
       == Normative References
       * [[[iev,ISO 123:--]]] _Standard_
-      INPUT
-      expect(File.read("test.err")).not_to include "undated reference ISO 123 should not contain specific elements"
+    INPUT
+    expect(File.read("test.err"))
+      .not_to include "undated reference ISO 123 should not contain specific "\
+                      "elements"
   end
 
   it "warns of Non-reference in bibliography" do
@@ -641,7 +647,8 @@ RSpec.describe Asciidoctor::ISO do
       == Clause
       ISO 12121
     INPUT
-    expect(File.read("test.err")).not_to include "number not broken up in threes"
+    expect(File.read("test.err"))
+      .not_to include "number not broken up in threes"
   end
 
   it "Style warning if decimal point" do
@@ -681,7 +688,8 @@ RSpec.describe Asciidoctor::ISO do
       == Clause
       95 ± 5 %
     INPUT
-    expect(File.read("test.err")).to include "unbracketed tolerance before percent sign"
+    expect(File.read("test.err"))
+      .to include "unbracketed tolerance before percent sign"
   end
 
   it "Style warning if dots in abbreviation" do
@@ -721,7 +729,8 @@ RSpec.describe Asciidoctor::ISO do
       == Clause
       5 °
     INPUT
-    expect(File.read("test.err")).to include "space between number and degrees/minutes/seconds"
+    expect(File.read("test.err"))
+      .to include "space between number and degrees/minutes/seconds"
   end
 
   it "Style warning if no space between number and SI unit" do
@@ -731,7 +740,8 @@ RSpec.describe Asciidoctor::ISO do
       == Clause
       A measurement of 5Bq was taken.
     INPUT
-    expect(File.read("test.err")).to include "no space between number and SI unit"
+    expect(File.read("test.err"))
+      .to include "no space between number and SI unit"
   end
 
   it "Style warning if mins used" do
@@ -777,7 +787,8 @@ RSpec.describe Asciidoctor::ISO do
       == Symbols and Abbreviated Terms
     INPUT
     expect(File.read("test.err"))
-      .to include "Only one Symbols and Abbreviated Terms section in the standard"
+      .to include "Only one Symbols and Abbreviated Terms section "\
+                  "in the standard"
   end
 
   it "Style warning if Symbols and Abbreviated Terms contains extraneous matter" do
@@ -789,7 +800,8 @@ RSpec.describe Asciidoctor::ISO do
       Paragraph
     INPUT
     expect(File.read("test.err"))
-      .to include "Symbols and Abbreviated Terms can only contain a definition list"
+      .to include "Symbols and Abbreviated Terms can only contain "\
+                  "a definition list"
   end
 
   it "Warning if missing foreword" do
@@ -902,7 +914,9 @@ RSpec.describe Asciidoctor::ISO do
 
       Paragraph
     INPUT
-    expect(File.read("test.err")).to include "Normative References must be followed by Terms and Definitions"
+    expect(File.read("test.err"))
+      .to include "Normative References must be followed by "\
+                  "Terms and Definitions"
 
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
@@ -924,7 +938,9 @@ RSpec.describe Asciidoctor::ISO do
 
       Paragraph
     INPUT
-    expect(File.read("test.err")).not_to include "Normative References must be followed by Terms and Definitions"
+    expect(File.read("test.err"))
+      .not_to include "Normative References must be followed by "\
+                      "Terms and Definitions"
   end
 
   it "Warning if there are no clauses in the document" do
@@ -944,7 +960,8 @@ RSpec.describe Asciidoctor::ISO do
       == Symbols and Abbreviated Terms
 
     INPUT
-    expect(File.read("test.err")).to include "Document must contain at least one clause"
+    expect(File.read("test.err"))
+      .to include "Document must contain at least one clause"
 
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
@@ -967,7 +984,8 @@ RSpec.describe Asciidoctor::ISO do
       == Symbols and Abbreviated Terms
 
     INPUT
-    expect(File.read("test.err")).not_to include "Document must contain at least one clause"
+    expect(File.read("test.err"))
+      .not_to include "Document must contain at least one clause"
   end
 
   it "Warning if scope occurs after Terms and Definitions" do
@@ -989,7 +1007,8 @@ RSpec.describe Asciidoctor::ISO do
       == Scope
 
     INPUT
-    expect(File.read("test.err")).to include "Scope must occur before Terms and Definitions"
+    expect(File.read("test.err"))
+      .to include "Scope must occur before Terms and Definitions"
 
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
@@ -1014,7 +1033,8 @@ RSpec.describe Asciidoctor::ISO do
       == Scope
 
     INPUT
-    expect(File.read("test.err")).not_to include "Scope must occur before Terms and Definitions"
+    expect(File.read("test.err"))
+      .not_to include "Scope must occur before Terms and Definitions"
   end
 
   it "Warning if Symbols and Abbreviated Terms does not occur immediately after Terms and Definitions" do
@@ -1036,7 +1056,8 @@ RSpec.describe Asciidoctor::ISO do
       == Symbols and Abbreviated Terms
 
     INPUT
-    expect(File.read("test.err")).to include "Only annexes and references can follow clauses"
+    expect(File.read("test.err"))
+      .to include "Only annexes and references can follow clauses"
 
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
@@ -1062,7 +1083,8 @@ RSpec.describe Asciidoctor::ISO do
       == Symbols and Abbreviated Terms
 
     INPUT
-    expect(File.read("test.err")).not_to include "Only annexes and references can follow clauses"
+    expect(File.read("test.err"))
+      .not_to include "Only annexes and references can follow clauses"
   end
 
   it "Warning if no normative references" do
@@ -1088,7 +1110,8 @@ RSpec.describe Asciidoctor::ISO do
       == Appendix C
 
     INPUT
-    expect(File.read("test.err")).to include "Document must include (references) Normative References"
+    expect(File.read("test.err"))
+      .to include "Document must include (references) Normative References"
 
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
@@ -1117,9 +1140,57 @@ RSpec.describe Asciidoctor::ISO do
       == Appendix C
 
     INPUT
-    expect(File.read("test.err")).not_to include "Document must include (references) Normative References"
+    expect(File.read("test.err"))
+      .not_to include "Document must include (references) Normative References"
+  end
+
+  it "Warning if there are two Terms sections" do
+    Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+      #{VALIDATING_BLANK_HDR}
+
+      == Scope
+
+      == Terms and definitions
+
+      == A Clause
+
+      [heading=terms and definitions]
+      == Terms related to clinical psychology
+
+    INPUT
+    expect(File.read("test.err"))
+      .to include "Only annexes and references can follow clauses"
+  end
+
+  it "No warning if there are two Terms sections in a Vocabulary document" do
+    Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :no-isobib:
+      :docsubtype: vocabulary
+
+      == Scope
+
+      == Terms and definitions
+
+      == A Clause
+
+      [heading=terms and definitions]
+      == Terms related to clinical psychology
+
+      [heading=symbols and abbreviated terms]
+      == Symbols related to clinical psychology
+
+    INPUT
+    expect(File.read("test.err"))
+      .not_to include "Only annexes and references can follow clauses"
+    expect(File.read("test.err"))
+      .to include "Only terms, annexes and references can follow clauses"
   end
 
+
   it "Warning if final section is not named Bibliography" do
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       #{VALIDATING_BLANK_HDR}
@@ -1149,7 +1220,8 @@ RSpec.describe Asciidoctor::ISO do
       == Appendix C
 
     INPUT
-    expect(File.read("test.err")).to include "There are sections after the final Bibliography"
+    expect(File.read("test.err"))
+      .to include "There are sections after the final Bibliography"
 
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
@@ -1184,7 +1256,8 @@ RSpec.describe Asciidoctor::ISO do
       == Appendix C
 
     INPUT
-    expect(File.read("test.err")).not_to include "There are sections after the final Bibliography"
+    expect(File.read("test.err"))
+      .not_to include "There are sections after the final Bibliography"
   end
 
   it "Warning if final section is not styled Bibliography" do
@@ -1212,7 +1285,8 @@ RSpec.describe Asciidoctor::ISO do
       == Bibliography
 
     INPUT
-    expect(File.read("test.err")).to include "Section not marked up as [bibliography]"
+    expect(File.read("test.err"))
+      .to include "Section not marked up as [bibliography]"
   end
 
   it "Warning if final section is not styled Bibliography false" do
@@ -1245,7 +1319,8 @@ RSpec.describe Asciidoctor::ISO do
       == Bibliography
 
     INPUT
-    expect(File.read("test.err")).not_to include "Section not marked up as [bibliography]"
+    expect(File.read("test.err"))
+      .not_to include "Section not marked up as [bibliography]"
   end
 
   it "Warning if English title intro and no French title intro" do
@@ -1536,7 +1611,8 @@ RSpec.describe Asciidoctor::ISO do
       [align=mid-air]
       Para
     INPUT
-    expect(File.read("test.err")).to include 'value of attribute "align" is invalid; must be equal to'
+    expect(File.read("test.err"))
+      .to include 'value of attribute "align" is invalid; must be equal to'
   end
 
   it "Warn if more than 7 levels of subclause" do
@@ -1568,7 +1644,8 @@ RSpec.describe Asciidoctor::ISO do
       ====== Clause
 
     INPUT
-    expect(File.read("test.err")).to include "Exceeds the maximum clause depth of 7"
+    expect(File.read("test.err"))
+      .to include "Exceeds the maximum clause depth of 7"
   end
 
   it "Do not warn if not more than 7 levels of subclause" do
@@ -1597,7 +1674,8 @@ RSpec.describe Asciidoctor::ISO do
       ====== Clause
 
     INPUT
-    expect(File.read("test.err")).not_to include "exceeds the maximum clause depth of 7"
+    expect(File.read("test.err"))
+      .not_to include "exceeds the maximum clause depth of 7"
   end
 
   it "Warn if term citation in Terms & Definitions not preceded with italicised term" do
@@ -1609,8 +1687,9 @@ RSpec.describe Asciidoctor::ISO do
       === Term
 
       The definition of a term (<<term>>) is a part of the specialized vocabulary of a particular field
-      INPUT
-      expect(File.read("test.err")).to include "term citation not preceded with italicised term"
+    INPUT
+    expect(File.read("test.err"))
+      .to include "term citation not preceded with italicised term"
   end
 
   it "Warn if an undated reference has no associated footnote" do
@@ -1621,7 +1700,8 @@ RSpec.describe Asciidoctor::ISO do
       == Bibliography
       * [[[ISO8,ISO 8:--]]], _Title_
     INPUT
-    expect(File.read("test.err")).to include \
-      "Reference ISO8 does not have an associated footnote indicating unpublished status"
+    expect(File.read("test.err"))
+      .to include "Reference ISO8 does not have an associated footnote "\
+                  "indicating unpublished status"
   end
 end

data/spec/isodoc/amd_spec.rb

@@ -75,7 +75,7 @@ RSpec.describe IsoDoc do
             </ext>
           </bibdata>
           <preface>
-            <foreword>
+            <foreword displayorder="1">
               <p>
                 <xref target="N">Scope, Note</xref>
                 <xref target="note1">Widgets, 1, Note 1</xref>
@@ -87,7 +87,7 @@ RSpec.describe IsoDoc do
             </foreword>
           </preface>
           <sections>
-            <clause id="scope">
+            <clause id="scope" displayorder="3">
               <title depth="1">Scope</title>
               <note id="N">
                 <name>NOTE</name>
@@ -99,8 +99,8 @@ RSpec.describe IsoDoc do
                 <xref target="N">Note</xref>
               </p>
             </clause>
-            <terms id="terms"/>
-            <clause id="widgets">
+            <terms id="terms" displayorder="2"/>
+            <clause id="widgets" displayorder="4">
               <title depth="1">Widgets</title>
               <clause id="widgets1" inline-header="true">
                 <note id="note1">
@@ -122,7 +122,7 @@ RSpec.describe IsoDoc do
               </clause>
             </clause>
           </sections>
-          <annex id="annex1">
+          <annex id="annex1" displayorder="5">
             <title>
               <strong>Annex A</strong>
               <br/>(informative)</title>
@@ -235,97 +235,102 @@ RSpec.describe IsoDoc do
     INPUT
     expect(xmlpp(output).sub(%r{<localized-strings>.*</localized-strings>}m, ""))
       .to be_equivalent_to xmlpp(<<~"OUTPUT")
-        <?xml version='1.0'?>
-        <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
-          <bibdata>
-            <ext>
-              <doctype language="">amendment</doctype>
-            </ext>
-          </bibdata>
-          <preface>
-            <foreword obligation="informative">
-              <title>Foreword</title>
-              <p id="A">This is a preamble
-
-                <xref target="C">0.1</xref>
-                <xref target="C1">0.2</xref>
-                <xref target="D">Scope</xref>
-                <xref target="H">[H]</xref>
-                <xref target="I">[I]</xref>
-                <xref target="J">[J]</xref>
-                <xref target="K">[K]</xref>
-                <xref target="L">[L]</xref>
-                <xref target="M">Clause 4</xref>
-                <xref target="N">Introduction</xref>
-                <xref target="O">Clause 4.2</xref>
-                <xref target="P">Annex A</xref>
-                <xref target="Q">A.1</xref>
-                <xref target="Q1">A.1.1</xref>
-                <xref target="Q2">Annex A, Appendix 1</xref>
-                <xref target="R">[R]</xref></p>
-            </foreword>
-            <introduction id="B" obligation="informative">
-              <title depth="1">Introduction</title>
-              <clause id="C" inline-header="false" obligation="informative">
-                <title depth="2">Introduction Subsection</title>
-              </clause>
-              <clause id="C1" inline-header="true" obligation="informative">Text</clause>
-            </introduction>
-          </preface>
-          <sections>
-            <clause id="D" obligation="normative" type="scope">
-              <title depth="1">Scope</title>
-              <p id="E">Text</p>
-            </clause>
-            <clause id="M" inline-header="false" obligation="normative">
-              <title depth="1">Clause 4</title>
-              <clause id="N" inline-header="false" obligation="normative">
-                <title depth="2">Introduction</title>
-              </clause>
-              <clause id="O" inline-header="false" obligation="normative">
-                <title depth="2">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>
-            </clause>
-            <appendix id="Q2" inline-header="false" obligation="normative">
-              <title depth="2">Appendix 1
-
-                <tab/>
-                An Appendix</title>
-            </appendix>
-          </annex>
-          <bibliography>
-            <references id="R" normative="true" obligation="informative">
-              <title depth="1">Normative References</title>
-            </references>
-            <clause id="S" obligation="informative">
-              <title depth="1">Bibliography</title>
-              <references id="T" normative="false" obligation="informative">
-                <title depth="2">Bibliography Subsection</title>
-              </references>
-            </clause>
-          </bibliography>
-        </iso-standard>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+         <bibdata>
+           <ext>
+             <doctype language=''>amendment</doctype>
+           </ext>
+         </bibdata>
+         
+         <preface>
+           <foreword obligation='informative' displayorder='1'>
+             <title>Foreword</title>
+             <p id='A'>
+               This is a preamble 
+               <xref target='C'>0.1</xref>
+               <xref target='C1'>0.2</xref>
+               <xref target='D'>Scope</xref>
+               <xref target='H'>[H]</xref>
+               <xref target='I'>[I]</xref>
+               <xref target='J'>[J]</xref>
+               <xref target='K'>[K]</xref>
+               <xref target='L'>[L]</xref>
+               <xref target='M'>Clause 4</xref>
+               <xref target='N'>Introduction</xref>
+               <xref target='O'>Clause 4.2</xref>
+               <xref target='P'>Annex A</xref>
+               <xref target='Q'>A.1</xref>
+               <xref target='Q1'>A.1.1</xref>
+               <xref target='Q2'>Annex A, Appendix 1</xref>
+               <xref target='R'>[R]</xref>
+             </p>
+           </foreword>
+           <introduction id='B' obligation='informative' displayorder='2'>
+             <title depth='1'>Introduction</title>
+             <clause id='C' inline-header='false' obligation='informative'>
+               <title depth='2'>Introduction Subsection</title>
+             </clause>
+             <clause id='C1' inline-header='true' obligation='informative'>Text</clause>
+           </introduction>
+         </preface>
+         <sections>
+           <clause id='D' obligation='normative' type='scope' displayorder='3'>
+             <title depth='1'>Scope</title>
+             <p id='E'>Text</p>
+           </clause>
+           <clause id='M' inline-header='false' obligation='normative' displayorder='5'>
+             <title depth='1'>Clause 4</title>
+             <clause id='N' inline-header='false' obligation='normative'>
+               <title depth='2'>Introduction</title>
+             </clause>
+             <clause id='O' inline-header='false' obligation='normative'>
+               <title depth='2'>Clause 4.2</title>
+             </clause>
+           </clause>
+         </sections>
+         <annex id='P' inline-header='false' obligation='normative' displayorder='6'>
+           <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 id='Q2' inline-header='false' obligation='normative'>
+             <title depth='2'>
+               Appendix 1
+               <tab/>
+               An Appendix
+             </title>
+           </appendix>
+         </annex>
+         <bibliography>
+           <references id='R' normative='true' obligation='informative' displayorder='4'>
+             <title depth='1'>Normative References</title>
+           </references>
+           <clause id='S' obligation='informative' displayorder='7'>
+             <title depth='1'>Bibliography</title>
+             <references id='T' normative='false' obligation='informative'>
+               <title depth='2'>Bibliography Subsection</title>
+             </references>
+           </clause>
+         </bibliography>
+       </iso-standard>
       OUTPUT
   end
 
@@ -423,109 +428,96 @@ RSpec.describe IsoDoc do
       </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-      <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
-        <bibdata>
-          <ext>
-            <doctype language="">amendment</doctype>
-          </ext>
-        </bibdata>
-        <boilerplate>
-          <copyright-statement>
-            <clause>
-              <title depth="1">Copyright</title>
-            </clause>
-          </copyright-statement>
-          <license-statement>
-            <clause>
-              <title depth="1">License</title>
-            </clause>
-          </license-statement>
-          <legal-statement>
-            <clause>
-              <title depth="1">Legal</title>
-            </clause>
-          </legal-statement>
-          <feedback-statement>
-            <clause>
-              <title depth="1">Feedback</title>
-            </clause>
-          </feedback-statement>
-        </boilerplate>
-        <preface>
-          <abstract obligation="informative">
-            <title>Abstract</title>
-          </abstract>
-          <foreword obligation="informative">
-            <title>Foreword</title>
-            <p id="A">This is a preamble</p>
-          </foreword>
-          <introduction id="B" obligation="informative">
-            <title depth="1">Introduction</title>
-            <clause id="C" inline-header="false" obligation="informative">
-              <title depth="2">Introduction Subsection</title>
-            </clause>
-          </introduction>
-          <clause id="B1">
-            <title depth="1">Dedication</title>
-          </clause>
-          <clause id="B2">
-            <title depth="1">Note to reader</title>
-          </clause>
-          <acknowledgements obligation="informative">
-            <title>Acknowledgements</title>
-          </acknowledgements>
-        </preface>
-        <sections>
-          <clause id="M" inline-header="false" obligation="normative">
-            <title depth="1">Clause 4</title>
-            <clause id="N" inline-header="false" obligation="normative">
-              <title depth="2">Introduction</title>
-            </clause>
-            <clause id="O" inline-header="false" obligation="normative">
-              <title depth="2">Clause 4.2</title>
-            </clause>
-            <clause id="O1" inline-header="true" obligation="normative"/>
-          </clause>
-          <clause id="D" obligation="normative">
-            <title depth="1">Scope</title>
-            <p id="E">Text</p>
-          </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>
-          </clause>
-        </annex>
-        <annex id="P1" inline-header="false" obligation="normative">
-          <title>
-            <strong>Annex B</strong>
-            <br/>(normative)</title>
-        </annex>
-        <bibliography>
-          <references id="R" normative="true" obligation="informative">
-            <title depth="1">Normative References</title>
-          </references>
-          <clause id="S" obligation="informative">
-            <title depth="1">Bibliography</title>
-            <references id="T" normative="false" obligation="informative">
-              <title depth="2">Bibliography Subsection</title>
-            </references>
-          </clause>
-        </bibliography>
-      </iso-standard>
+       <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+         <bibdata>
+           <ext>
+             <doctype language="">amendment</doctype>
+           </ext>
+         </bibdata>
+         <boilerplate>
+           <copyright-statement>
+             <clause>
+               <title depth="1">Copyright</title>
+             </clause>
+           </copyright-statement>
+           <license-statement>
+             <clause>
+               <title depth="1">License</title>
+             </clause>
+           </license-statement>
+           <legal-statement>
+             <clause>
+               <title depth="1">Legal</title>
+             </clause>
+           </legal-statement>
+           <feedback-statement>
+             <clause>
+               <title depth="1">Feedback</title>
+             </clause>
+           </feedback-statement>
+         </boilerplate>
+         <preface>
+           <abstract obligation="informative" displayorder="1">
+             <title>Abstract</title>
+           </abstract>
+           <foreword obligation="informative" displayorder="2">
+             <title>Foreword</title>
+             <p id="A">This is a preamble</p>
+           </foreword>
+           <introduction id="B" obligation="informative" displayorder="3">
+             <title depth="1">Introduction</title>
+             <clause id="C" inline-header="false" obligation="informative">
+               <title depth="2">Introduction Subsection</title>
+             </clause>
+           </introduction>
+           <clause id="B1" displayorder="4">
+             <title depth="1">Dedication</title>
+           </clause>
+           <clause id="B2" displayorder="5">
+             <title depth="1">Note to reader</title>
+           </clause>
+           <acknowledgements obligation="informative" displayorder="6">
+             <title>Acknowledgements</title>
+           </acknowledgements>
+         </preface>
+         <sections>
+           <clause id="M" inline-header="false" obligation="normative" displayorder="8">
+             <title depth="1">Clause 4</title>
+             <clause id="N" inline-header="false" obligation="normative">
+               <title depth="2">Introduction</title>
+             </clause>
+             <clause id="O" inline-header="false" obligation="normative">
+               <title depth="2">Clause 4.2</title>
+             </clause>
+             <clause id="O1" inline-header="true" obligation="normative"/>
+           </clause>
+           <clause id="D" obligation="normative" displayorder="9">
+             <title depth="1">Scope</title>
+             <p id="E">Text</p>
+           </clause>
+         </sections>
+         <annex id="P" inline-header="false" obligation="normative" displayorder="10">
+           <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>
+         </annex>
+         <annex id="P1" inline-header="false" obligation="normative" displayorder="11"><title><strong>Annex B</strong><br/>(normative)</title></annex>
+         <bibliography>
+           <references id="R" normative="true" obligation="informative" displayorder="7">
+             <title depth="1">Normative References</title>
+           </references>
+           <clause id="S" obligation="informative" displayorder="12">
+             <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
       <html lang="en" xmlns:epub="http://www.idpf.org/2007/ops">
@@ -617,9 +609,9 @@ RSpec.describe IsoDoc do
                 <br/>
                 <b>Annex</b></h1>
               <div id="Q">
-                <h2>A.1 &#160; Annex A.1</h2>
+                <h2>A.1&#160; Annex A.1</h2>
                 <div id="Q1">
-                  <h3>A.1.1 &#160; Annex A.1a</h3>
+                  <h3>A.1.1&#160; Annex A.1a</h3>
                 </div>
               </div>
             </div>