metanorma-iso 1.8.4 → 1.8.5

data/lib/isodoc/iso/metadata.rb

@@ -38,12 +38,12 @@ module IsoDoc
           set(:statusabbr, status_abbrev(docstatus["abbreviation"] || "??",
                                          isoxml&.at(ns("//bibdata/status/substage"))&.text,
                                          isoxml&.at(ns("//bibdata/status/iteration"))&.text,
-                                         isoxml&.at(ns("//version/draft"))&.text,
+                                         isoxml&.at(ns("//bibdata/version/draft"))&.text,
                                          isoxml&.at(ns("//bibdata/ext/doctype"))&.text))
           unpublished(docstatus.text) and
             set(:stageabbr, docstatus["abbreviation"])
         end
-        revdate = isoxml.at(ns("//version/revision-date"))
+        revdate = isoxml.at(ns("//bibdata/version/revision-date"))
         set(:revdate, revdate&.text)
       end
 

data/lib/isodoc/iso/word_convert.rb

@@ -14,34 +14,34 @@ module IsoDoc
         @htmlToClevels = 3 if @htmlToClevels.zero?
       end
 
+      def font_choice(options)
+        if options[:script] == "Hans" then '"Source Han Sans",serif'
+        else '"Cambria",serif'
+        end
+      end
+
       def default_fonts(options)
-        {
-          bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif' :
-                     '"Cambria",serif'),
-                     headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' :
-                                  '"Cambria",serif'),
-                                  monospacefont: '"Courier New",monospace',
-                                  normalfontsize: "11.0pt",
-                                  monospacefontsize: "9.0pt",
-                                  smallerfontsize: "10.0pt",
-                                  footnotefontsize: "10.0pt",
-        }
+        { bodyfont: font_choice(options),
+          headerfont: font_choice(options),
+          monospacefont: '"Courier New",monospace',
+          normalfontsize: "11.0pt",
+          monospacefontsize: "9.0pt",
+          smallerfontsize: "10.0pt",
+          footnotefontsize: "10.0pt" }
       end
 
       def default_file_locations(options)
-        {
-          htmlstylesheet: (options[:alt] ? html_doc_path("style-human.scss") :
-                           html_doc_path("style-iso.scss")),
-        htmlcoverpage: html_doc_path("html_iso_titlepage.html"),
-        htmlintropage: html_doc_path("html_iso_intro.html"),
-        wordstylesheet: html_doc_path("wordstyle.scss"),
-        standardstylesheet: html_doc_path("isodoc.scss"),
-        header: html_doc_path("header.html"),
-        wordcoverpage: html_doc_path("word_iso_titlepage.html"),
-        wordintropage: html_doc_path("word_iso_intro.html"),
-        ulstyle: "l3", 
-        olstyle: "l2",
-        }
+        a = options[:alt] ? "style-human.scss" : "style-iso.scss"
+        { htmlstylesheet: html_doc_path(a),
+          htmlcoverpage: html_doc_path("html_iso_titlepage.html"),
+          htmlintropage: html_doc_path("html_iso_intro.html"),
+          wordstylesheet: html_doc_path("wordstyle.scss"),
+          standardstylesheet: html_doc_path("isodoc.scss"),
+          header: html_doc_path("header.html"),
+          wordcoverpage: html_doc_path("word_iso_titlepage.html"),
+          wordintropage: html_doc_path("word_iso_intro.html"),
+          ulstyle: "l3",
+          olstyle: "l2" }
       end
 
       def make_body(xml, docxml)
@@ -54,9 +54,10 @@ module IsoDoc
         end
       end
 
-      def colophon(body, docxml)
-        stage =  @meta.get[:stage_int]
+      def colophon(body, _docxml)
+        stage = @meta.get[:stage_int]
         return if !stage.nil? && stage < 60
+
         body.br **{ clear: "all", style: "page-break-before:left;"\
                     "mso-break-type:section-break" }
         body.div **{ class: "colophon" } do |div|
@@ -67,35 +68,55 @@ module IsoDoc
         super
         xml.xpath("//div[@class = 'figure']//table[@class = 'dl']").each do |t|
           t["class"] = "figdl"
-          d = t.add_previous_sibling("<div class='figdl'/>")
+          d = t.add_previous_sibling("<div class='figdl' "\
+                                     "style='page-break-after:avoid;'/>")
           t.parent = d.first
         end
       end
 
       # force Annex h2 down to be p.h2Annex, so it is not picked up by ToC
-      def word_annex_cleanup1(docxml, i)
-        docxml.xpath("//h#{i}[ancestor::*[@class = 'Section3']]").each do |h2|
+      def word_annex_cleanup1(docxml, lvl)
+        docxml.xpath("//h#{lvl}[ancestor::*[@class = 'Section3']]").each do |h2|
           h2.name = "p"
-          h2["class"] = "h#{i}Annex"
+          h2["class"] = "h#{lvl}Annex"
         end
       end
 
       def word_annex_cleanup(docxml)
-        word_annex_cleanup1(docxml, 2)
-        word_annex_cleanup1(docxml, 3)
-        word_annex_cleanup1(docxml, 4)
-        word_annex_cleanup1(docxml, 5)
-        word_annex_cleanup1(docxml, 6)
+        (2..6).each { |i| word_annex_cleanup1(docxml, i) }
+      end
+
+      def word_annex_cleanup_h1(docxml)
+        docxml.xpath("//h1[@class = 'Annex']").each do |h|
+          h.name = "p"
+          h["class"] = "ANNEX"
+        end
+        %w(BiblioTitle ForewordTitle IntroTitle).each do |s|
+          docxml.xpath("//*[@class = '#{s}']").each do |h|
+            h.name = "p"
+          end
+        end
+      end
+
+      def style_cleanup(docxml)
+        word_annex_cleanup_h1(docxml)
+        style_cleanup1(docxml)
+      end
+
+      def style_cleanup1(docxml)
+        docxml.xpath("//*[@class = 'example']").each do |p|
+          p["class"] = "Example"
+        end
       end
 
       def authority_hdr_cleanup(docxml)
-        docxml&.xpath("//div[@class = 'boilerplate-license']").each do |d|
+        docxml&.xpath("//div[@class = 'boilerplate-license']")&.each do |d|
           d.xpath(".//h1").each do |p|
             p.name = "p"
             p["class"] = "zzWarningHdr"
           end
         end
-        docxml&.xpath("//div[@class = 'boilerplate-copyright']").each do |d|
+        docxml&.xpath("//div[@class = 'boilerplate-copyright']")&.each do |d|
           d.xpath(".//h1").each do |p|
             p.name = "p"
             p["class"] = "zzCopyrightHdr"
@@ -120,11 +141,104 @@ module IsoDoc
       def word_cleanup(docxml)
         authority_hdr_cleanup(docxml)
         super
+        style_cleanup(docxml)
         docxml
       end
 
-      def footnote_reference_format(a)
-        a.children = "<span class='MsoFootnoteReference'>#{a.children.to_xml}</span>)"
+      def word_toc_preface(level)
+        <<~TOC.freeze
+          <span lang="EN-GB"><span
+            style='mso-element:field-begin'></span><span
+            style='mso-spacerun:yes'>&#xA0;</span>TOC
+            \\o &quot;1-#{level}&quot; \\h \\z \\t &quot;Heading
+            1;1;ANNEX;1;Biblio Title;1;Foreword Title;1;Intro Title;1&quot; <span
+            style='mso-element:field-separator'></span></span>
+        TOC
+      end
+
+      def footnote_reference_format(link)
+        link.children =
+          "<span class='MsoFootnoteReference'>#{link.children.to_xml}</span>)"
+      end
+
+      def bibliography_attrs
+        { class: "BiblioTitle" }
+      end
+
+      def bibliography(xml, out)
+        f = xml.at(ns(bibliography_xpath)) and f["hidden"] != "true" or return
+        page_break(out)
+        out.div do |div|
+          div.h1 **bibliography_attrs do |h1|
+            f&.at(ns("./title"))&.children&.each { |c2| parse(c2, h1) }
+          end
+          biblio_list(f, div, true)
+        end
+      end
+
+      def bibliography_parse(node, out)
+        node["hidden"] != true or return
+        out.div do |div|
+          clause_parse_title(node, div, node.at(ns("./title")), out,
+                             bibliography_attrs)
+          biblio_list(node, div, true)
+        end
+      end
+
+      def para_class(node)
+        if !node.ancestors("definition").empty? && !@in_footnote
+          "Definition"
+        elsif !node.ancestors("foreword").empty? && !@in_footnote
+          "ForewordText"
+        else
+          super
+        end
+      end
+
+      def termref_attrs
+        { class: "Source" }
+      end
+
+      def termref_parse(node, out)
+        out.p **termref_attrs do |p|
+          p << "[TERMREF]"
+          node.children.each { |n| parse(n, p) }
+          p << "[/TERMREF]"
+        end
+      end
+
+      def figure_name_attrs(node)
+        s = node.ancestors("annex").empty? ? "FigureTitle" : "AnnexFigureTitle"
+        { class: s, style: "text-align:center;" }
+      end
+
+      def figure_name_parse(node, div, name)
+        return if name.nil?
+
+        div.p **figure_name_attrs(node) do |p|
+          name.children.each { |n| parse(n, p) }
+        end
+      end
+
+      def table_title_attrs(node)
+        s = node.ancestors("annex").empty? ? "Tabletitle" : "AnnexTableTitle"
+        { class: s, style: "text-align:center;" }
+      end
+
+      def table_title_parse(node, out)
+        name = node.at(ns("./name")) or return
+        out.p **table_title_attrs(node) do |p|
+          name&.children&.each { |n| parse(n, p) }
+        end
+      end
+
+      def annex_name(_annex, name, div)
+        return if name.nil?
+
+        name&.at(ns("./strong"))&.remove # supplied by CSS list numbering
+        div.h1 **{ class: "Annex" } do |t|
+          name.children.each { |c2| parse(c2, t) }
+        end
       end
 
       include BaseConvert

data/lib/metanorma/iso/version.rb

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

data/metanorma-iso.gemspec

@@ -27,7 +27,7 @@ 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"

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>