isodoc 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dede2446b862431d30638a1f7f05f1048d70b153a343bd5e0ebc021a35f34f83
-  data.tar.gz: bef3d35e5e3e09a384768c961e4360dab94ec5760a090876ee8754b924c8a3a7
+  metadata.gz: a4f2f216823cbdfeb106c0128976a8b169cb948d10f15c2155e9c33c80add4b4
+  data.tar.gz: 2cfe4c21e05f213c3608c98eefd19646737b2147ace16e401a80bf574e681cb2
 SHA512:
-  metadata.gz: ed5cc8a8cd5fe504f7c6696e905e650840017b358d0d99d90546bed01397cfe7217d19c6a1e852368dc846044fc0a3467229abdd3285ffeedf966d624c162b44
-  data.tar.gz: 1523ac224ab7527eefe744e352aff22c746fbbc52689b451590a38b62c41c317afb6b4594c2f4ea7e8f9b4ea914144dedd4394cd68a50dbf16f6d607cd889e12
+  metadata.gz: 655d05528bc7ad95d7713405fcf3bf7f78d0487b7064b0bd4ae20a1bc700b92b7af7fd320cbff2a806f8618140ffd27b822e7350d163764dcbe441c1a50ebebe
+  data.tar.gz: fb82d19c1a01a6c10d7c626bef3dd9dd2e722d3e58d5dc87beb227081e75b36eeb50f8c811e08ca1aefb79616f09a7a46f51658f4b1bc1f5138599a39ba19e0e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (0.8.5)
+    isodoc (0.8.6)
       asciimath
       html2doc (~> 0.8.1)
       htmlentities (~> 4.3.4)

data/lib/isodoc/function/blocks.rb

@@ -4,7 +4,7 @@ module IsoDoc::Function
 
     def note_label(node)
       n = get_anchors[node["id"]]
-      return @note_lbl if n.nil? || n[:label].empty?
+      return @note_lbl if n.nil? || n[:label].nil? || n[:label].empty?
       l10n("#{@note_lbl} #{n[:label]}")
     end
 

data/lib/isodoc/function/references.rb

@@ -132,7 +132,7 @@ module IsoDoc::Function
       f = isoxml.at(ns(q)) or return num
       out.div do |div|
         num = num + 1
-        clause_name("#{num}.", @normref_lbl, div, nil)
+        clause_name(num, @normref_lbl, div, nil)
         norm_ref_preface(f, div)
         biblio_list(f, div, false)
       end

data/lib/isodoc/function/section.rb

@@ -1,12 +1,13 @@
 module IsoDoc::Function
   module Section
     def inline_header_title(out, node, c1)
+      title = c1&.content || ""
       out.span **{ class: "zzMoveToFollowing" } do |s|
         s.b do |b|
           if get_anchors[node['id']][:label]
-            b << "#{get_anchors[node['id']][:label]}. #{c1.content} "
+            b << "#{get_anchors[node['id']][:label]}. #{title} "
           else
-            b << "#{c1.content} "
+            b << "#{title} "
           end
         end
       end
@@ -19,19 +20,16 @@ module IsoDoc::Function
         div.send "h#{get_anchors[node['id']][:level]}" do |h|
           lbl = get_anchors[node['id']][:label]
           h << "#{lbl}. " if lbl
-          c1.children.each { |c2| parse(c2, h) }
+          c1&.children&.each { |c2| parse(c2, h) }
         end
       end
     end
 
     def clause_parse(node, out)
       out.div **attr_code(id: node["id"]) do |div|
-        node.children.each do |c1|
-          if c1.name == "title"
-            clause_parse_title(node, div, c1, out)
-          else
-            parse(c1, div)
-          end
+        clause_parse_title(node, div, node.at(ns("./title")), out)
+        node.children.reject { |c1| c1.name == "title" }.each do |c1|
+          parse(c1, div)
         end
       end
     end
@@ -40,7 +38,7 @@ module IsoDoc::Function
       header_class = {} if header_class.nil?
       div.h1 **attr_code(header_class) do |h1|
         if num
-          h1 << num
+          h1 << "#{num}."
           insert_tab(h1, 1)
         end
         h1 << title
@@ -55,13 +53,10 @@ module IsoDoc::Function
     def clause(isoxml, out)
       isoxml.xpath(ns(MIDDLE_CLAUSE)).each do |c|
         out.div **attr_code(id: c["id"]) do |s|
-          c.elements.each do |c1|
-            if c1.name == "title"
-              clause_name("#{get_anchors[c['id']][:label]}.",
-                          c1.content, s, nil)
-            else
-              parse(c1, s)
-            end
+          clause_name(get_anchors[c['id']][:label],
+                      c&.at(ns("./title"))&.content, s, nil)
+          c.elements.reject { |c1| c1.name == "title" }.each do |c1|
+            parse(c1, s)
           end
         end
       end
@@ -92,7 +87,7 @@ module IsoDoc::Function
       f = isoxml.at(ns("//clause[title = 'Scope']")) or return num
       out.div **attr_code(id: f["id"]) do |div|
         num = num + 1
-        clause_name("#{num}.", @scope_lbl, div, nil)
+        clause_name(num, @scope_lbl, div, nil)
         f.elements.each do |e|
           parse(e, div) unless e.name == "title"
         end
@@ -141,7 +136,7 @@ module IsoDoc::Function
       f = isoxml.at(ns(TERM_CLAUSE)) or return num
       out.div **attr_code(id: f["id"]) do |div|
         num = num + 1
-        clause_name("#{num}.", terms_defs_title(f), div, nil)
+        clause_name(num, terms_defs_title(f), div, nil)
         term_defs_boilerplate(div, isoxml.xpath(ns(".//termdocsource")),
                               f.at(ns(".//term")), f.at(ns("./p")))
         f.elements.each do |e|
@@ -160,7 +155,7 @@ module IsoDoc::Function
       f = isoxml.at(ns("//sections/definitions")) or return num
       out.div **attr_code(id: f["id"], class: "Symbols") do |div|
         num = num + 1
-        clause_name("#{num}.", @symbols_lbl, div, nil)
+        clause_name(num, @symbols_lbl, div, nil)
         f.elements.each do |e|
           parse(e, div) unless e.name == "title"
         end

data/lib/isodoc/function/xref_gen.rb

@@ -53,7 +53,7 @@ module IsoDoc::Function
           next if @anchors[n["id"]]
           next if n["id"].nil? || n["id"].empty?
           idx = notes.size == 1 ? "" : " #{i + 1}"
-          @anchors[n["id"]] = anchor_struct(idx, s, @note_xref_lbl)
+          @anchors[n["id"]] = anchor_struct(idx, n, @note_xref_lbl)
         end
         note_anchor_names(s.xpath(ns("./clause | ./appendix")))
       end
@@ -70,7 +70,7 @@ module IsoDoc::Function
           next if @anchors[n["id"]]
           next if n["id"].nil? || n["id"].empty?
           idx = notes.size == 1 ? "" : " #{i + 1}"
-          @anchors[n["id"]] = anchor_struct(idx, s, @example_xref_lbl)
+          @anchors[n["id"]] = anchor_struct(idx, n, @example_xref_lbl)
         end
         example_anchor_names(s.xpath(ns("./clause | ./appendix")))
       end
@@ -83,7 +83,7 @@ module IsoDoc::Function
         notes.each_with_index do |n, i|
           next if n["id"].nil? || n["id"].empty?
           idx = notes.size == 1 ? "" : " #{i + 1}"
-          @anchors[n["id"]] = anchor_struct(idx, s, @list_lbl)
+          @anchors[n["id"]] = anchor_struct(idx, n, @list_lbl)
           list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
         end
         list_anchor_names(s.xpath(ns("./clause | ./appendix")))

data/lib/isodoc/function/xref_sect_gen.rb

@@ -12,8 +12,8 @@ module IsoDoc::Function
     def initial_anchor_names(d)
       preface_names(d.at(ns("//foreword")))
       preface_names(d.at(ns("//introduction")))
-      n = 0
-      n = section_names(d.at(ns("//clause[title = 'Scope']")), n, 1)
+      sequential_asset_names(d.xpath(ns("//foreword | //introduction")))
+      n = section_names(d.at(ns("//clause[title = 'Scope']")), 0, 1)
       n = section_names(d.at(ns(
         "//references[title = 'Normative References' or title = 'Normative references']")), n, 1)
       n = section_names(d.at(ns("//sections/terms | "\
@@ -25,11 +25,18 @@ module IsoDoc::Function
       termexample_anchor_names(d)
     end
 
+    def preface_clause_name(c)
+      ret = c.at(ns("./title"))&.text || c.name.capitalize
+      ret
+    end
+
     # in StanDoc, prefaces have no numbering; they are referenced only by title
     def preface_names(clause)
       return if clause.nil?
+      @anchors[clause["id"]] =
+        { label: nil, level: 1, xref: preface_clause_name(clause) }
       clause.xpath(ns("./clause")).each_with_index do |c, i|
-        preface_names1(c, c.at(ns("./title"))&.text, "#{clause.at(ns('./title'))&.text}, #{i+1}", 2)
+        preface_names1(c, c.at(ns("./title"))&.text, "#{preface_clause_name(clause)}, #{i+1}", 2)
       end
     end
 
@@ -37,7 +44,6 @@ module IsoDoc::Function
       label = title || parent_title
       @anchors[clause["id"]] =
         { label: nil, level: level, xref: label }
-      # subclauses are not prefixed with "Clause"
       clause.xpath(ns("./clause | ./terms | ./term | ./definitions")).
         each_with_index do |c, i|
         preface_names1(c, c.at(ns("./title"))&.text, "#{label} #{i+1}", level + 1)
@@ -75,8 +81,7 @@ module IsoDoc::Function
 
     def section_names1(clause, num, level)
       @anchors[clause["id"]] =
-        { label: num, level: level, xref: num }
-      # subclauses are not prefixed with "Clause"
+        { label: num, level: level, xref: l10n("#{@clause_lbl} #{num}") }
       clause.xpath(ns("./clause | ./terms | ./term | ./definitions")).
         each_with_index do |c, i|
         section_names1(c, "#{num}.#{i + 1}", level + 1)
@@ -100,8 +105,9 @@ module IsoDoc::Function
     end
 
     def annex_names1(clause, num, level)
-      @anchors[clause["id"]] = { label: num, xref: num, level: level }
-      clause.xpath(ns(".//clause")).each_with_index do |c, i|
+      @anchors[clause["id"]] = { label: num, xref: "#{@annex_lbl} #{num}",
+                                 level: level }
+      clause.xpath(ns("./clause")).each_with_index do |c, i|
         annex_names1(c, "#{num}.#{i + 1}", level + 1)
       end
     end

data/lib/isodoc/metadata.rb

@@ -85,7 +85,7 @@ module IsoDoc
     def doctype(isoxml, _out)
       b = isoxml.at(ns("//bibdata")) || return
       return unless b["type"]
-      t = b["type"].split(/-/).map{ |w| w.capitalize }.join(" ")
+      t = b["type"].split(/[- ]/).map{ |w| w.capitalize }.join(" ")
       set(:doctype, t)
       ics = []
       isoxml.xpath(ns("//bibdata/ics/code")).each { |i| ics << i.text }

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.8.5".freeze
+  VERSION = "0.8.6".freeze
 end

data/spec/isodoc/section_spec.rb

@@ -42,7 +42,10 @@ RSpec.describe IsoDoc do
        </clause>
        <clause id="O" inline-header="false" obligation="normative">
          <title>Clause 4.2</title>
-       </clause></clause>
+       </clause>
+       <clause id="O1" inline-header="false" obligation="normative">
+       </clause>
+        </clause>
 
        </sections><annex id="P" inline-header="false" obligation="normative">
          <title>Annex</title>
@@ -120,6 +123,9 @@ RSpec.describe IsoDoc do
          </div>
                   <div id="O">
            <h2>5.2. Clause 4.2</h2>
+         </div>
+                  <div id="O1">
+           <h2>5.3. </h2>
          </div>
                 </div>
                 <br/>
@@ -187,7 +193,10 @@ OUTPUT
        </clause>
        <clause id="O" inline-header="false" obligation="normative">
          <title>Clause 4.2</title>
-       </clause></clause>
+       </clause>
+       <clause id="O1" inline-header="false" obligation="normative">
+       </clause>
+        </clause>
 
        </sections><annex id="P" inline-header="false" obligation="normative">
          <title>Annex</title>
@@ -280,6 +289,9 @@ OUTPUT
         </div>
                  <div id="O">
           <h2>5.2. Clause 4.2</h2>
+        </div>
+                 <div id="O1">
+          <h2>5.3. </h2>
         </div>
                </div>
                <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
@@ -502,4 +514,48 @@ OUTPUT
 OUTPUT
     end
 
+        it "processes sections without titles" do
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <preface>
+       <introduction id="M" inline-header="false" obligation="normative"><clause id="N" inline-header="false" obligation="normative">
+         <title>Intro</title>
+       </clause>
+       <clause id="O" inline-header="true" obligation="normative">
+       </clause></clause>
+       </preface>
+       <sections>
+       <clause id="M1" inline-header="false" obligation="normative"><clause id="N1" inline-header="false" obligation="normative">
+       </clause>
+       <clause id="O1" inline-header="true" obligation="normative">
+       </clause></clause>
+       </sections>
+
+      </iso-standard>
+    INPUT
+    #{HTML_HDR}
+             <br/>
+             <div class="Section3" id="M">
+               <h1 class="IntroTitle">Introduction</h1>
+               <div id="N"><h2>Intro</h2>
+     
+        </div>
+               <div id="O"><span class="zzMoveToFollowing"><b> </b></span>
+        </div>
+             </div>
+             <p class="zzSTDTitle1"/>
+             <div id="M1">
+               <h1>1.&#160; </h1>
+               <div id="N1"><h2>1.1. </h2>
+        </div>
+               <div id="O1"><span class="zzMoveToFollowing"><b>1.2.  </b></span>
+        </div>
+             </div>
+           </div>
+         </body>
+       </html>
+OUTPUT
+    end
+
+
 end

data/spec/isodoc/xref_spec.rb

@@ -7,6 +7,8 @@ RSpec.describe IsoDoc do
     <preface>
     <foreword>
     <p>
+    <xref target="N1"/>
+    <xref target="N2"/>
     <xref target="N"/>
     <xref target="note1"/>
     <xref target="note2"/>
@@ -15,6 +17,16 @@ RSpec.describe IsoDoc do
     <xref target="Anote2"/>
     </p>
     </foreword>
+    <introduction id="intro">
+    <note id="N1">
+  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83e">These results are based on a study carried out on three different types of kernel.</p>
+</note>
+<clause id="xyz"><title>Preparatory</title>
+    <note id="N2">
+  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83d">These results are based on a study carried out on three different types of kernel.</p>
+</note>
+</clause>
+    </introduction>
     </preface>
     <sections>
     <clause id="scope"><title>Scope</title>
@@ -60,14 +72,26 @@ RSpec.describe IsoDoc do
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p>
+                 <a href="#N1">Introduction, Note</a>
+                 <a href="#N2">Preparatory, Note</a>
            <a href="#N">Clause 1, Note</a>
-           <a href="#note1">3.1, Note  1</a>
-           <a href="#note2">3.1, Note  2</a>
-           <a href="#AN">A.1, Note</a>
-           <a href="#Anote1">A.2, Note  1</a>
-           <a href="#Anote2">A.2, Note  2</a>
+           <a href="#note1">Clause 3.1, Note  1</a>
+           <a href="#note2">Clause 3.1, Note  2</a>
+           <a href="#AN">Annex A.1, Note</a>
+           <a href="#Anote1">Annex A.2, Note  1</a>
+           <a href="#Anote2">Annex A.2, Note  2</a>
            </p>
                </div>
+                <br/>
+             <div class="Section3" id="intro">
+               <h1 class="IntroTitle">Introduction</h1>
+               <div id="N1" class="Note">
+                 <p><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
+               </div>
+                <div id="xyz"><h2>Preparatory</h2>
+                <div id="N2" class="Note"><p><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
+                </div>
+             </div>
                <p class="zzSTDTitle1"/>
                <div id="scope">
                  <h1>1.&#160; Scope</h1>
@@ -91,7 +115,7 @@ RSpec.describe IsoDoc do
        </div>
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
-                 <div id="widgets1">
+                 <div id="widgets1"><h2>3.1. </h2>
            <div id="note1" class="Note"><p><span class="note_label">NOTE  1</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
            <div id="note2" class="Note"><p><span class="note_label">NOTE  2</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
        <p>    <a href="#note1">Note  1</a> <a href="#note2">Note  2</a> </p>
@@ -100,10 +124,10 @@ RSpec.describe IsoDoc do
                </div>
                <br/>
                <div id="annex1" class="Section3">
-                 <div id="annex1a">
+                 <div id="annex1a"><h2>A.1. </h2>
            <div id="AN" class="Note"><p><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
            </div>
-                 <div id="annex1b">
+                 <div id="annex1b"><h2>A.2. </h2>
            <div id="Anote1" class="Note"><p><span class="note_label">NOTE  1</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
            <div id="Anote2" class="Note"><p><span class="note_label">NOTE  2</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
            </div>
@@ -120,6 +144,8 @@ RSpec.describe IsoDoc do
         <preface>
     <foreword id="fwd">
     <p>
+    <xref target="N1"/>
+    <xref target="N2"/>
     <xref target="N"/>
     <xref target="note1"/>
     <xref target="note2"/>
@@ -128,6 +154,18 @@ RSpec.describe IsoDoc do
     <xref target="Anote2"/>
     </p>
     </foreword>
+        <introduction id="intro">
+        <figure id="N1">
+  <name>Split-it-right sample divider</name>
+  <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
+  </figure>
+  <clause id="xyz"><title>Preparatory</title>
+        <figure id="N2">
+  <name>Split-it-right sample divider</name>
+  <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
+  </figure>
+</clause>
+    </introduction>
     </preface>
     <sections>
     <clause id="scope"><title>Scope</title>
@@ -177,23 +215,39 @@ RSpec.describe IsoDoc do
                <div id="fwd">
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p>
-           <a href="#N">Figure 1</a>
-           <a href="#note1">Figure 2</a>
-           <a href="#note2">Figure 3</a>
+           <a href="#N1">Figure 1</a>
+           <a href="#N2">Figure 2</a>
+           <a href="#N">Figure 3</a>
+           <a href="#note1">Figure 4</a>
+           <a href="#note2">Figure 5</a>
            <a href="#AN">Figure A.1</a>
            <a href="#Anote1">Figure A.2</a>
            <a href="#Anote2">Figure A.3</a>
            </p>
                </div>
+               <br/>
+             <div class="Section3" id="intro">
+               <h1 class="IntroTitle">Introduction</h1>
+               <div id="N1" class="figure">
+
+         <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
+         <p class="FigureTitle" align="center">Figure 1&#160;&#8212; Split-it-right sample divider</p></div>
+         <div id="xyz"><h2>Preparatory</h2>
+               <div id="N2" class="figure">
+
+         <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
+         <p class="FigureTitle" align="center">Figure 2&#160;&#8212; Split-it-right sample divider</p></div>
+       </div>
+             </div>
                <p class="zzSTDTitle1"/>
                <div id="scope">
                  <h1>1.&#160; Scope</h1>
                  <div id="N" class="figure">
 
          <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
-         <p class="FigureTitle" align="center">Figure 1&#160;&#8212; Split-it-right sample divider</p></div>
+         <p class="FigureTitle" align="center">Figure 3&#160;&#8212; Split-it-right sample divider</p></div>
                  <p>
-                   <a href="#N">Figure 1</a>
+                   <a href="#N">Figure 3</a>
                  </p>
                </div>
                <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
@@ -209,27 +263,27 @@ RSpec.describe IsoDoc do
        </div>
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
-                 <div id="widgets1">
+                 <div id="widgets1"><h2>3.1. </h2>
                <div id="note1" class="figure">
 
          <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
-         <p class="FigureTitle" align="center">Figure 2&#160;&#8212; Split-it-right sample divider</p></div>
+         <p class="FigureTitle" align="center">Figure 4&#160;&#8212; Split-it-right sample divider</p></div>
            <div id="note2" class="figure">
 
          <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
-         <p class="FigureTitle" align="center">Figure 3&#160;&#8212; Split-it-right sample divider</p></div>
-         <p>    <a href="#note1">Figure 2</a> <a href="#note2">Figure 3</a> </p>
+         <p class="FigureTitle" align="center">Figure 5&#160;&#8212; Split-it-right sample divider</p></div>
+         <p>    <a href="#note1">Figure 4</a> <a href="#note2">Figure 5</a> </p>
            </div>
                </div>
                <br/>
                <div id="annex1" class="Section3">
-                 <div id="annex1a">
+                 <div id="annex1a"><h2>A.1. </h2>
                <div id="AN" class="figure">
 
          <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
          <p class="FigureTitle" align="center">Figure A.1&#160;&#8212; Split-it-right sample divider</p></div>
            </div>
-                 <div id="annex1b">
+                 <div id="annex1b"><h2>A.2. </h2>
                <div id="Anote1" class="figure">
 
          <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
@@ -329,7 +383,7 @@ RSpec.describe IsoDoc do
        </div>
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
-                 <div id="widgets1">
+                 <div id="widgets1"><h2>3.1. </h2>
          <div id="N" class="figure">
              <div id="note1" class="figure">
 
@@ -345,9 +399,9 @@ RSpec.describe IsoDoc do
                </div>
                <br/>
                <div id="annex1" class="Section3">
-                 <div id="annex1a">
+                 <div id="annex1a"><h2>A.1. </h2>
          </div>
-                 <div id="annex1b">
+                 <div id="annex1b"><h2>A.2. </h2>
          <div id="AN" class="figure">
              <div id="Anote1" class="figure">
 
@@ -372,6 +426,8 @@ RSpec.describe IsoDoc do
         <preface>
     <foreword>
     <p>
+    <xref target="N1"/>
+    <xref target="N2"/>
     <xref target="N"/>
     <xref target="note1"/>
     <xref target="note2"/>
@@ -380,6 +436,16 @@ RSpec.describe IsoDoc do
     <xref target="Anote2"/>
     </p>
     </foreword>
+        <introduction id="intro">
+        <example id="N1">
+  <p>Hello</p>
+</example>
+<clause id="xyz"><title>Preparatory</title>
+        <example id="N2">
+  <p>Hello</p>
+</example>
+</clause>
+    </introduction>
     </preface>
     <sections>
     <clause id="scope"><title>Scope</title>
@@ -423,14 +489,33 @@ RSpec.describe IsoDoc do
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p>
+           <a href="#N1">Introduction, Example</a>
+           <a href="#N2">Preparatory, Example</a>
            <a href="#N">Clause 1, Example</a>
-           <a href="#note1">3.1, Example  1</a>
-           <a href="#note2">3.1, Example  2</a>
-           <a href="#AN">A.1, Example</a>
-           <a href="#Anote1">A.2, Example  1</a>
-           <a href="#Anote2">A.2, Example  2</a>
+           <a href="#note1">Clause 3.1, Example  1</a>
+           <a href="#note2">Clause 3.1, Example  2</a>
+           <a href="#AN">Annex A.1, Example</a>
+           <a href="#Anote1">Annex A.2, Example  1</a>
+           <a href="#Anote2">Annex A.2, Example  2</a>
            </p>
                </div>
+               <br/>
+             <div class="Section3" id="intro">
+               <h1 class="IntroTitle">Introduction</h1>
+               <table id="N1" class="example">
+                 <tr>
+                   <td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE</td>
+                   <td valign="top" class="example">
+         <p>Hello</p>
+       </td>
+                 </tr>
+               </table>
+               <div id="xyz"><h2>Preparatory</h2>
+               <table id="N2" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE</td><td valign="top" class="example">
+         <p>Hello</p>
+       </td></tr></table>
+       </div>
+             </div>
                <p class="zzSTDTitle1"/>
                <div id="scope">
                  <h1>1.&#160; Scope</h1>
@@ -459,7 +544,7 @@ RSpec.describe IsoDoc do
        </div>
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
-                 <div id="widgets1">
+                 <div id="widgets1"><h2>3.1. </h2>
                <table id="note1" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE  1</td><td valign="top" class="example">
          <p>Hello</p>
        </td></tr></table>
@@ -471,12 +556,12 @@ RSpec.describe IsoDoc do
                </div>
                <br/>
                <div id="annex1" class="Section3">
-                 <div id="annex1a">
+                 <div id="annex1a"><h2>A.1. </h2>
                <table id="AN" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE</td><td valign="top" class="example">
          <p>Hello</p>
        </td></tr></table>
            </div>
-                 <div id="annex1b">
+                 <div id="annex1b"><h2>A.2. </h2>
                <table id="Anote1" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE  1</td><td valign="top" class="example">
          <p>Hello</p>
        </td></tr></table>
@@ -497,6 +582,8 @@ RSpec.describe IsoDoc do
             <preface>
     <foreword>
     <p>
+    <xref target="N1"/>
+    <xref target="N2"/>
     <xref target="N"/>
     <xref target="note1"/>
     <xref target="note2"/>
@@ -505,6 +592,16 @@ RSpec.describe IsoDoc do
     <xref target="Anote2"/>
     </p>
     </foreword>
+    <introduction id="intro">
+    <formula id="N1">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </formula>
+  <clause id="xyz"><title>Preparatory</title>
+    <formula id="N2">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </formula>
+</clause>
+    </introduction>
     </preface>
     <sections>
     <clause id="scope"><title>Scope</title>
@@ -562,20 +659,30 @@ RSpec.describe IsoDoc do
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p>
-           <a href="#N">Clause 1, Formula (1)</a>
-           <a href="#note1">3.1, Formula (2)</a>
-           <a href="#note2">3.1, Formula (3)</a>
-           <a href="#AN">A.1, Formula (A.1)</a>
-           <a href="#Anote1">A.2, Formula (A.2)</a>
-           <a href="#Anote2">A.2, Formula (A.3)</a>
+           <a href="#N1">Introduction, Formula (1)</a>
+           <a href="#N2">Preparatory, Formula (2)</a>
+           <a href="#N">Clause 1, Formula (3)</a>
+           <a href="#note1">Clause 3.1, Formula (4)</a>
+           <a href="#note2">Clause 3.1, Formula (5)</a>
+           <a href="#AN">Annex A.1, Formula (A.1)</a>
+           <a href="#Anote1">Annex A.2, Formula (A.2)</a>
+           <a href="#Anote2">Annex A.2, Formula (A.3)</a>
            </p>
                </div>
+                            <br/>
+             <div class="Section3" id="intro">
+               <h1 class="IntroTitle">Introduction</h1>
+               <div id="N1" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</div>
+                       <div id="xyz"><h2>Preparatory</h2>
+    <div id="N2" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (2)</div>
+                </div>
+             </div>
                <p class="zzSTDTitle1"/>
                <div id="scope">
                  <h1>1.&#160; Scope</h1>
-                 <div id="N" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</div>
+                 <div id="N" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (3)</div>
                  <p>
-                   <a href="#N">Formula (1)</a>
+                   <a href="#N">Formula (3)</a>
                  </p>
                </div>
                <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
@@ -591,18 +698,18 @@ RSpec.describe IsoDoc do
        </div>
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
-                 <div id="widgets1">
-           <div id="note1" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (2)</div>
-           <div id="note2" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (3)</div>
-         <p>    <a href="#note1">Formula (2)</a> <a href="#note2">Formula (3)</a> </p>
+                 <div id="widgets1"><h2>3.1. </h2>
+           <div id="note1" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (4)</div>
+           <div id="note2" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (5)</div>
+         <p>    <a href="#note1">Formula (4)</a> <a href="#note2">Formula (5)</a> </p>
            </div>
                </div>
                <br/>
                <div id="annex1" class="Section3">
-                 <div id="annex1a">
+                 <div id="annex1a"><h2>A.1. </h2>
            <div id="AN" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (A.1)</div>
            </div>
-                 <div id="annex1b">
+                 <div id="annex1b"><h2>A.2. </h2>
            <div id="Anote1" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (A.2)</div>
            <div id="Anote2" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (A.3)</div>
            </div>
@@ -619,6 +726,8 @@ RSpec.describe IsoDoc do
         <preface>
     <foreword>
     <p>
+    <xref target="N1"/>
+    <xref target="N2"/>
     <xref target="N"/>
     <xref target="note1"/>
     <xref target="note2"/>
@@ -627,6 +736,30 @@ RSpec.describe IsoDoc do
     <xref target="Anote2"/>
     </p>
     </foreword>
+    <introduction id="intro">
+    <table id="N1">
+    <name>Repeatability and reproducibility of husked rice yield</name>
+    <tbody>
+    <tr>
+      <td align="left">Number of laboratories retained after eliminating outliers</td>
+      <td align="center">13</td>
+      <td align="center">11</td>
+    </tr>
+    </tbody>
+    </table>
+  <clause id="xyz"><title>Preparatory</title>
+    <table id="N2">
+    <name>Repeatability and reproducibility of husked rice yield</name>
+    <tbody>
+    <tr>
+      <td align="left">Number of laboratories retained after eliminating outliers</td>
+      <td align="center">13</td>
+      <td align="center">11</td>
+    </tr>
+    </tbody>
+    </table>
+</clause>
+    </introduction>
     </preface>
     <sections>
     <clause id="scope"><title>Scope</title>
@@ -712,19 +845,38 @@ RSpec.describe IsoDoc do
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p>
-       <a href="#N">Table 1</a>
-       <a href="#note1">Table 2</a>
-       <a href="#note2">Table 3</a>
+       <a href="#N1">Table 1</a>
+       <a href="#N2">Table 2</a>
+       <a href="#N">Table 3</a>
+       <a href="#note1">Table 4</a>
+       <a href="#note2">Table 5</a>
        <a href="#AN">Table A.1</a>
        <a href="#Anote1">Table A.2</a>
        <a href="#Anote2">Table A.3</a>
        </p>
                </div>
+                            <br/>
+             <div class="Section3" id="intro">
+               <h1 class="IntroTitle">Introduction</h1>
+               <p class="TableTitle" align="center">Table 1&#160;&#8212; Repeatability and reproducibility of husked rice yield</p>
+               <table id="N1" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0">
+                 <tbody>
+                   <tr>
+                     <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td>
+                     <td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td>
+                     <td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td>
+                   </tr>
+                 </tbody>
+               </table>
+                      <div id="xyz"><h2>Preparatory</h2>
+       <p class="TableTitle" align="center">Table 2&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="N2" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0"><tbody><tr><td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
+       </div>
+             </div>
                <p class="zzSTDTitle1"/>
                <div id="scope">
                  <h1>1.&#160; Scope</h1>
                  <p class="TableTitle" align="center">
-                   Table 1&#160;&#8212; Repeatability and reproducibility of husked rice yield
+                   Table 3&#160;&#8212; Repeatability and reproducibility of husked rice yield
                  </p>
                  <table id="N" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0">
                    <tbody>
@@ -736,7 +888,7 @@ RSpec.describe IsoDoc do
                    </tbody>
                  </table>
                  <p>
-                   <a href="#N">Table 1</a>
+                   <a href="#N">Table 3</a>
                  </p>
                </div>
                <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
@@ -752,18 +904,18 @@ RSpec.describe IsoDoc do
        </div>
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
-                 <div id="widgets1">
-           <p class="TableTitle" align="center">Table 2&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="note1" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0"><tbody><tr><td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
-           <p class="TableTitle" align="center">Table 3&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="note2" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0"><tbody><tr><td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
-       <p>    <a href="#note1">Table 2</a> <a href="#note2">Table 3</a> </p>
+                 <div id="widgets1"><h2>3.1. </h2>
+           <p class="TableTitle" align="center">Table 4&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="note1" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0"><tbody><tr><td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
+           <p class="TableTitle" align="center">Table 5&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="note2" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0"><tbody><tr><td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
+       <p>    <a href="#note1">Table 4</a> <a href="#note2">Table 5</a> </p>
        </div>
                </div>
                <br/>
                <div id="annex1" class="Section3">
-                 <div id="annex1a">
+                 <div id="annex1a"><h2>A.1. </h2>
            <p class="TableTitle" align="center">Table A.1&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="AN" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0"><tbody><tr><td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
        </div>
-                 <div id="annex1b">
+                 <div id="annex1b"><h2>A.2. </h2>
            <p class="TableTitle" align="center">Table A.2&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="Anote1" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0"><tbody><tr><td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
            <p class="TableTitle" align="center">Table A.3&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="Anote2" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0"><tbody><tr><td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
        </div>
@@ -810,9 +962,9 @@ RSpec.describe IsoDoc do
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p>
-           <a href="#note1">2.1, Note 1</a>
-           <a href="#note2">2.2, Note 1</a>
-           <a href="#note3">2.2, Note 2</a>
+           <a href="#note1">Clause 2.1, Note 1</a>
+           <a href="#note2">Clause 2.2, Note 1</a>
+           <a href="#note3">Clause 2.2, Note 2</a>
            </p>
                </div>
                <p class="zzSTDTitle1"/>
@@ -928,16 +1080,16 @@ RSpec.describe IsoDoc do
     <a href="#C1">Introduction, 2</a>
     <a href="#D">Clause 1</a>
     <a href="#H">Clause 3</a>
-    <a href="#I">3.1</a>
-    <a href="#J">3.1.1</a>
-    <a href="#K">3.2</a>
+    <a href="#I">Clause 3.1</a>
+    <a href="#J">Clause 3.1.1</a>
+    <a href="#K">Clause 3.2</a>
     <a href="#L">Clause 4</a>
     <a href="#M">Clause 5</a>
-    <a href="#N">5.1</a>
-    <a href="#O">5.2</a>
+    <a href="#N">Clause 5.1</a>
+    <a href="#O">Clause 5.2</a>
     <a href="#P">Annex A</a>
-    <a href="#Q">A.1</a>
-    <a href="#Q1">A.1.1</a>
+    <a href="#Q">Annex A.1</a>
+    <a href="#Q1">Annex A.1.1</a>
     <a href="#R">Clause 2</a>
     </p>
     </div>
@@ -947,7 +1099,7 @@ RSpec.describe IsoDoc do
                <div id="C">
           <h2>Introduction Subsection</h2>
         </div>
-               <div id="C1">Text</div>
+               <div id="C1"><h2/>Text</div>
              </div>
     <p class="zzSTDTitle1"/>
     <div id="D">
@@ -1024,6 +1176,8 @@ RSpec.describe IsoDoc do
     <preface>
     <foreword>
     <p>
+    <xref target="N1"/>
+    <xref target="N2"/>
     <xref target="N"/>
     <xref target="note1"/>
     <xref target="note2"/>
@@ -1032,6 +1186,16 @@ RSpec.describe IsoDoc do
     <xref target="Anote2"/>
     </p>
     </foreword>
+    <introduction id="intro">
+     <ol id="N1">
+  <li><p>A</p></li>
+</ol>
+  <clause id="xyz"><title>Preparatory</title>
+     <ol id="N2">
+  <li><p>A</p></li>
+</ol>
+</clause>
+    </introduction>
     </preface>
     <sections>
     <clause id="scope"><title>Scope</title>
@@ -1073,14 +1237,28 @@ RSpec.describe IsoDoc do
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p>
+           <a href="#N1">Introduction, List</a>
+           <a href="#N2">Preparatory, List</a>
            <a href="#N">Clause 1, List</a>
-           <a href="#note1">3.1, List  1</a>
-           <a href="#note2">3.1, List  2</a>
-           <a href="#AN">A.1, List</a>
-           <a href="#Anote1">A.2, List  1</a>
-           <a href="#Anote2">A.2, List  2</a>
+           <a href="#note1">Clause 3.1, List  1</a>
+           <a href="#note2">Clause 3.1, List  2</a>
+           <a href="#AN">Annex A.1, List</a>
+           <a href="#Anote1">Annex A.2, List  1</a>
+           <a href="#Anote2">Annex A.2, List  2</a>
            </p>
                </div>
+                            <br/>
+             <div class="Section3" id="intro">
+               <h1 class="IntroTitle">Introduction</h1>
+               <ol type="a">
+         <li><p>A</p></li>
+       </ol>
+       <div id="xyz"><h2>Preparatory</h2>
+            <ol type="a">
+         <li><p>A</p></li>
+       </ol>
+       </div>
+             </div>
                <p class="zzSTDTitle1"/>
                <div id="scope">
                  <h1>1.&#160; Scope</h1>
@@ -1101,7 +1279,7 @@ RSpec.describe IsoDoc do
        </div>
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
-                 <div id="widgets1">
+                 <div id="widgets1"><h2>3.1. </h2>
            <ol type="a">
          <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
        </ol>
@@ -1112,12 +1290,12 @@ RSpec.describe IsoDoc do
                </div>
                <br/>
                <div id="annex1" class="Section3">
-                 <div id="annex1a">
+                 <div id="annex1a"><h2>A.1. </h2>
            <ol type="a">
          <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
        </ol>
            </div>
-                 <div id="annex1b">
+                 <div id="annex1b"><h2>A.2. </h2>
            <ol type="a">
          <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
        </ol>
@@ -1138,6 +1316,8 @@ RSpec.describe IsoDoc do
     <preface>
     <foreword>
     <p>
+    <xref target="N1"/>
+    <xref target="N2"/>
     <xref target="N"/>
     <xref target="note1"/>
     <xref target="note2"/>
@@ -1146,10 +1326,20 @@ RSpec.describe IsoDoc do
     <xref target="Anote2"/>
     </p>
     </foreword>
+    <introduction id="intro">
+    <ol id="N01">
+  <li id="N1"><p>A</p></li>
+</ol>
+  <clause id="xyz"><title>Preparatory</title>
+     <ol id="N02">
+  <li id="N2"><p>A</p></li>
+</ol>
+</clause>
+    </introduction>
     </preface>
     <sections>
     <clause id="scope"><title>Scope</title>
-    <ol id="N1">
+    <ol id="N0">
   <li id="N"><p>A</p></li>
 </ol>
     </clause>
@@ -1187,14 +1377,28 @@ RSpec.describe IsoDoc do
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p>
+           <a href="#N1">Introduction, a)</a>
+           <a href="#N2">Preparatory, a)</a>
            <a href="#N">Clause 1, a)</a>
-           <a href="#note1">3.1, List  1 a)</a>
-           <a href="#note2">3.1, List  2 a)</a>
-           <a href="#AN">A.1, a)</a>
-           <a href="#Anote1">A.2, List  1 a)</a>
-           <a href="#Anote2">A.2, List  2 a)</a>
+           <a href="#note1">Clause 3.1, List  1 a)</a>
+           <a href="#note2">Clause 3.1, List  2 a)</a>
+           <a href="#AN">Annex A.1, a)</a>
+           <a href="#Anote1">Annex A.2, List  1 a)</a>
+           <a href="#Anote2">Annex A.2, List  2 a)</a>
            </p>
                </div>
+                            <br/>
+             <div class="Section3" id="intro">
+               <h1 class="IntroTitle">Introduction</h1>
+               <ol type="a">
+         <li><p>A</p></li>
+       </ol>
+               <div id="xyz"><h2>Preparatory</h2>
+     <ol type="a">
+        <li><p>A</p></li>
+        </ol>
+        </div>
+             </div>
                <p class="zzSTDTitle1"/>
                <div id="scope">
                  <h1>1.&#160; Scope</h1>
@@ -1215,7 +1419,7 @@ RSpec.describe IsoDoc do
        </div>
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
-                 <div id="widgets1">
+                 <div id="widgets1"><h2>3.1. </h2>
            <ol type="a">
          <li><p>A</p></li>
        </ol>
@@ -1226,12 +1430,12 @@ RSpec.describe IsoDoc do
                </div>
                <br/>
                <div id="annex1" class="Section3">
-                 <div id="annex1a">
+                 <div id="annex1a"><h2>A.1. </h2>
            <ol type="a">
          <li><p>A</p></li>
        </ol>
            </div>
-                 <div id="annex1b">
+                 <div id="annex1b"><h2>A.2. </h2>
            <ol type="a">
          <li><p>A</p></li>
        </ol>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-04 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath