metanorma-iso 1.8.4 → 1.9.0.1

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.8.4".freeze
+    VERSION = "1.9.0.1".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -27,11 +27,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files`.split("\n")
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "isodoc", "~> 1.6.2"
-  spec.add_dependency "metanorma-standoc", "~> 1.9.0"
-  spec.add_dependency "mn2sts", "~> 1.8.0"
+  spec.add_dependency "isodoc", "~> 1.7.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.10.0"
+  spec.add_dependency "mnconvert", "~> 1.8.0"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "tokenizer", "~> 0.3.0"
   spec.add_dependency "twitter_cldr"

data/spec/asciidoctor/section_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe Asciidoctor::ISO do
   it "processes sections" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       == Foreword
 
@@ -56,6 +56,7 @@ RSpec.describe Asciidoctor::ISO do
 
       === Bibliography Subsection
     INPUT
+    output = <<~OUTPUT
       #{BLANK_HDR}
         <preface>
           <foreword id="_" obligation="informative">
@@ -151,10 +152,12 @@ RSpec.describe Asciidoctor::ISO do
         </bibliography>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes section obligations" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       [obligation=informative]
       == Clause 1
@@ -167,6 +170,7 @@ RSpec.describe Asciidoctor::ISO do
       [appendix,obligation=informative]
       == Annex
     INPUT
+    output = <<~OUTPUT
       #{BLANK_HDR}
         <sections>
           <clause id="_" inline-header="false" obligation="informative">
@@ -184,10 +188,12 @@ RSpec.describe Asciidoctor::ISO do
         </annex>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes inline headers" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       == Clause 1
 
@@ -200,6 +206,7 @@ RSpec.describe Asciidoctor::ISO do
       [%inline-header]
       === Clause Aa
     INPUT
+    output = <<~OUTPUT
       #{BLANK_HDR}
         <sections>
           <clause id="_" inline-header="false" obligation="normative">
@@ -217,16 +224,19 @@ RSpec.describe Asciidoctor::ISO do
         </annex>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes blank headers" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       == Clause 1
 
       === {blank}
 
     INPUT
+    output = <<~OUTPUT
       #{BLANK_HDR}
         <sections>
           <clause id="_" inline-header="false" obligation="normative">
@@ -236,10 +246,12 @@ RSpec.describe Asciidoctor::ISO do
         </sections>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes terms & definitions with external source" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       Foreword
@@ -250,6 +262,7 @@ RSpec.describe Asciidoctor::ISO do
       === Term1
 
     INPUT
+    output = <<~OUTPUT
         #{BLANK_HDR.sub(/<boilerplate>/, '<termdocsource bibitemid="iso1234"/><termdocsource bibitemid="iso5678"/><boilerplate>')}
         <preface>
           <foreword id="_" obligation="informative">
@@ -285,10 +298,12 @@ RSpec.describe Asciidoctor::ISO do
         </sections>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes empty terms & definitions" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       Foreword
@@ -297,6 +312,7 @@ RSpec.describe Asciidoctor::ISO do
 
 
     INPUT
+    output = <<~OUTPUT
       #{BLANK_HDR}
         <preface>
           <foreword id="_" obligation="informative">
@@ -331,10 +347,12 @@ RSpec.describe Asciidoctor::ISO do
       </iso-standard>
 
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes empty terms & definitions with external source" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       Foreword
@@ -343,6 +361,7 @@ RSpec.describe Asciidoctor::ISO do
       == Terms and Definitions
 
     INPUT
+    output = <<~OUTPUT
       #{BLANK_HDR.sub(/<boilerplate>/, '<termdocsource bibitemid="iso1234"/><termdocsource bibitemid="iso5678"/><boilerplate>')}
         <preface>
           <foreword id="_" obligation="informative">
@@ -375,5 +394,107 @@ RSpec.describe Asciidoctor::ISO do
         </sections>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "ignores multiple terms & definitions in default documents" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      == Terms and Definitions
+
+      == Clause
+
+      [heading=terms and definitions]
+      == More terms
+
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+               <sections>
+           <terms id='_' obligation='normative'>
+             <title>Terms and definitions</title>
+             <p id='_'>No terms and definitions are listed in this document.</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>
+           </terms>
+           <clause id='_' inline-header='false' obligation='normative'>
+             <title>Clause</title>
+           </clause>
+           <clause id='_' inline-header='false' obligation='normative'>
+             <title>More terms</title>
+           </clause>
+         </sections>
+       </iso-standard>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "permits multiple terms & definitions in vocabulary documents" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR.sub(/:nodoc:/, ":nodoc:\n:docsubtype: vocabulary")}
+
+      == Terms and Definitions
+
+      == Clause
+
+      [heading=terms and definitions]
+      == More terms
+
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR.sub(%r{<doctype>article</doctype>}, "<doctype>article</doctype><subdoctype>vocabulary</subdoctype>")}
+               <sections>
+           <terms id='_' obligation='normative'>
+             <title>Terms and definitions</title>
+             <p id='_'>No terms and definitions are listed in this document.</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>
+           </terms>
+           <clause id='_' inline-header='false' obligation='normative'>
+             <title>Clause</title>
+           </clause>
+           <terms id='_' obligation='normative'>
+             <title>More terms</title>
+           </terms>
+         </sections>
+       </iso-standard>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 end

data/spec/asciidoctor/validate_spec.rb

@@ -802,6 +802,18 @@ RSpec.describe Asciidoctor::ISO do
     expect(File.read("test.err"))
       .to include "Symbols and Abbreviated Terms can only contain "\
                   "a definition list"
+
+    Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+      #{VALIDATING_BLANK_HDR}
+
+      == Symbols and Abbreviated Terms
+
+      A:: B
+    INPUT
+    expect(File.read("test.err"))
+      .not_to include "Symbols and Abbreviated Terms can only contain "\
+                  "a definition list"
+
   end
 
   it "Warning if missing foreword" do
@@ -1187,7 +1199,9 @@ RSpec.describe Asciidoctor::ISO do
     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"
+      .not_to include "Scope must occur before Terms and Definitions"
+    expect(File.read("test.err"))
+      .to include "Only annexes and references can follow terms and clauses"
   end
 
 
@@ -1678,20 +1692,6 @@ RSpec.describe Asciidoctor::ISO do
       .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
-    Asciidoctor.convert(<<~"INPUT", *OPTIONS)
-      #{VALIDATING_BLANK_HDR}
-      == Terms and Definitions
-
-      [[term]]
-      === 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"
-  end
-
   it "Warn if an undated reference has no associated footnote" do
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       #{VALIDATING_BLANK_HDR}

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="2">
               <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="3"/>
+            <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>