isodoc 0.9.23 → 0.10.0

data/lib/isodoc/html_function/html.rb

@@ -93,7 +93,7 @@ module IsoDoc::HtmlFunction
       <<~HEAD.freeze
     function toclevel() { var i; var text = "";
       for(i = 1; i <= #{@htmlToClevels}; i++) {
-        if (i > 1) { text += ","; } text += "h" + i + ":not(.TermNum)"; } 
+        if (i > 1) { text += ","; } text += "h" + i + ":not(:empty):not(.TermNum)"; } 
       return text;}
       HEAD
     end
@@ -259,7 +259,7 @@ module IsoDoc::HtmlFunction
 
     def datauri(i)
       type = i["src"].split(".")[-1]
-      bin = File.read(@localdir + i["src"], encoding: "utf-8")
+      bin = IO.binread(File.join(@localdir, i["src"]))
       data = Base64.strict_encode64(bin)
       i["src"] = "data:image/#{type};base64,#{data}"
     end

data/lib/isodoc/metadata.rb

@@ -8,15 +8,7 @@ module IsoDoc
     end
 
     def initialize(lang, script, labels)
-      @metadata = {
-        tc: "XXXX",
-        sc: "XXXX",
-        wg: "XXXX",
-        editorialgroup: [],
-        secretariat: "XXXX",
-        obsoletes: nil,
-        obsoletes_part: nil
-      }
+      @metadata = {}
       DATETYPES.each { |w| @metadata["#{w}date".to_sym] = "XXX" }
       @lang = lang
       @script = script
@@ -77,49 +69,9 @@ module IsoDoc
 
     def author(xml, _out)
       personal_authors(xml)
-      tc(xml)
-      sc(xml)
-      wg(xml)
-      secretariat(xml)
       agency(xml)
     end
 
-    def tc(xml)
-      tc_num = xml.at(ns("//bibdata/editorialgroup/technical-committee/@number"))
-      tc_type = xml.at(ns("//bibdata/editorialgroup/technical-committee/@type"))&.
-        text || "TC"
-      if tc_num
-        tcid = "#{tc_type} #{tc_num.text}"
-        set(:tc,  tcid)
-        set(:editorialgroup, get[:editorialgroup] << tcid)
-      end
-    end
-
-    def sc(xml)
-      sc_num = xml.at(ns("//bibdata/editorialgroup/subcommittee/@number"))
-      sc_type = xml.at(ns("//bibdata/editorialgroup/subcommittee/@type"))&.text || "SC"
-      if sc_num
-        scid = "#{sc_type} #{sc_num.text}"
-        set(:sc, scid)
-        set(:editorialgroup, get[:editorialgroup] << scid)
-      end
-    end
-
-    def wg(xml)
-      wg_num = xml.at(ns("//bibdata/editorialgroup/workgroup/@number"))
-      wg_type = xml.at(ns("//bibdata/editorialgroup/workgroup/@type"))&.text || "WG"
-      if wg_num
-        wgid = "#{wg_type} #{wg_num.text}"
-        set(:wg, wgid)
-        set(:editorialgroup, get[:editorialgroup] << wgid)
-      end
-    end
-
-    def secretariat(xml)
-      sec = xml.at(ns("//bibdata/editorialgroup/secretariat"))
-      set(:secretariat, sec.text) if sec
-    end
-
     def bibdate(isoxml, _out)
       isoxml.xpath(ns("//bibdata/date")).each do |d|
         set("#{d['type']}date".to_sym, Common::date_range(d))
@@ -127,13 +79,9 @@ module IsoDoc
     end
 
     def doctype(isoxml, _out)
-      b = isoxml.at(ns("//bibdata")) || return
-      return unless b["type"]
-      t = b["type"].split(/[- ]/).map{ |w| w.capitalize }.join(" ")
+      b = isoxml&.at(ns("//bibdata/ext/doctype"))&.text || return
+      t = b.split(/[- ]/).map{ |w| w.capitalize }.join(" ")
       set(:doctype, t)
-      ics = []
-      isoxml.xpath(ns("//bibdata/ics/code")).each { |i| ics << i.text }
-      set(:ics, ics.empty? ? "XXX" : ics.join(", "))
     end
 
     def iso?(org)
@@ -156,10 +104,14 @@ module IsoDoc
     end
 
     def docstatus(isoxml, _out)
-      docstatus = isoxml.at(ns("//bibdata/status"))
+      docstatus = isoxml.at(ns("//bibdata/status/stage"))
       set(:unpublished, true)
       if docstatus
-        set(:status, status_print(docstatus.text))
+        set(:stage, status_print(docstatus.text))
+        i = isoxml&.at(ns("//bibdata/status/substage"))&.text and
+          set(:substage, i)
+        i = isoxml&.at(ns("//bibdata/status/iteration"))&.text and
+          set(:iteration, i)
         set(:unpublished, unpublished(docstatus.text))
       end
     end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.9.23".freeze
+  VERSION = "0.10.0".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -1,5 +1,18 @@
 module IsoDoc::WordFunction
   module Body
+    def anchor_names(docxml)
+      super
+      renumber_footnotes(docxml)
+    end
+
+    # undo merger of seen footnotes
+    def renumber_footnotes(docxml)
+      docxml.xpath(ns("//fn[not(ancestor::table or "\
+                      "ancestor::figure)]")).each_with_index do |f, i|
+        f["reference"] = (i + 1).to_s
+      end
+    end
+
     def make_body1(body, _docxml)
       FileUtils.rm_rf tmpimagedir
       FileUtils.mkdir tmpimagedir

data/spec/isodoc/blocks_spec.rb

@@ -242,6 +242,10 @@ INPUT
 <figure id="figure-B">
 <pre>A &lt;
 B</pre>
+</figure>
+<figure id="figure-C" unnumbered="true">
+<pre>A &lt;
+B</pre>
 </figure>
     </foreword></preface>
     </iso-standard>
@@ -264,6 +268,11 @@ B</pre>
 <pre>A &lt;
 B</pre>
 <p class="FigureTitle" align="center">Figure 2</p>
+</div>
+               <div class="figure" id="figure-C">
+<pre>A &lt;
+B</pre>
+<p class="FigureTitle" align="center"/>
 </div>
                </div>
                <p class="zzSTDTitle1"/>
@@ -371,6 +380,9 @@ B</pre>
 </example>
     <example id="samplecode2">
   <p>Hello</p>
+</example>
+    <example id="samplecode3" unnumbered="true">
+  <p>Hello</p>
 </example>
     </foreword></preface>
     </iso-standard>
@@ -387,6 +399,10 @@ B</pre>
                  <p class="example-title">EXAMPLE  2</p>
                  <p>Hello</p>
                  </div>
+                 <div id="samplecode3" class="example">
+                 <p class="example-title">EXAMPLE</p>
+                 <p>Hello</p>
+                 </div>
                </div>
                <p class="zzSTDTitle1"/>
              </div>
@@ -572,7 +588,7 @@ B</pre>
     expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
-    <formula id="_be9158af-7e93-4ee2-90c5-26d31c181934">
+    <formula id="_be9158af-7e93-4ee2-90c5-26d31c181934" unnumbered="true">
   <stem type="AsciiMath">r = 1 %</stem>
 <dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d">
   <dt>
@@ -586,6 +602,9 @@ B</pre>
   <p id="_511aaa98-4116-42af-8e5b-c87cdf5bfdc8">[durationUnits] is essentially a duration statement without the "P" prefix. "P" is unnecessary because between "G" and "U" duration is always expressed.</p>
 </note>
     </formula>
+    <formula id="_be9158af-7e93-4ee2-90c5-26d31c181935">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </formula>
     </foreword></preface>
     </iso-standard>
     INPUT
@@ -593,7 +612,7 @@ B</pre>
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <div id="_be9158af-7e93-4ee2-90c5-26d31c181934" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</p></div><p>where</p><dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d"><dt>
+                 <div id="_be9158af-7e93-4ee2-90c5-26d31c181934" class="formula"><p><span class="stem">(#(r = 1 %)#)</span></p></div><p>where</p><dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d"><dt>
            <span class="stem">(#(r)#)</span>
          </dt><dd>
            <p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the repeatability limit.</p>
@@ -601,8 +620,9 @@ B</pre>
 
 
            <div id="_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0" class="Note"><p><span class="note_label">NOTE</span>&#160; [durationUnits] is essentially a duration statement without the "P" prefix. "P" is unnecessary because between "G" and "U" duration is always expressed.</p></div>
-           </div>
 
+                 <div id="_be9158af-7e93-4ee2-90c5-26d31c181935" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</p></div>
+                 </div>
                <p class="zzSTDTitle1"/>
              </div>
            </body>
@@ -825,7 +845,7 @@ World</p>
     expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
-    <requirement id="_">
+    <requirement id="A" unnumbered="true">
   <title>A New Requirement</title>
   <label>/ogc/recommendation/wfs/2</label>
   <inherit>/ss/584/2015/level/1</inherit>
@@ -853,7 +873,7 @@ World</p>
   </description>
   <measurement-target exclude="false">
     <p id="_">The measurement target shall be measured as:</p>
-    <formula id="_">
+    <formula id="B">
       <stem type="AsciiMath">r/1 = 0</stem>
     </formula>
   </measurement-target>
@@ -876,7 +896,7 @@ World</p>
         <br/>
       <div>
         <h1 class="ForewordTitle">Foreword</h1>
-        <div class="require"><p class="AdmonitionTitle">Requirement 1:<br/>/ogc/recommendation/wfs/2. A New Requirement</p>
+        <div class="require"><p class="AdmonitionTitle"><br/>/ogc/recommendation/wfs/2. A New Requirement</p>
 
   <div class="requirement-inherit">/ss/584/2015/level/1</div>
   <div class="requirement-description">
@@ -888,7 +908,7 @@ World</p>
   </div>
   <div class="requirement-measurement-target">
     <p id="_">The measurement target shall be measured as:</p>
-    <div id="_" class="formula"><p><span class="stem">(#(r/1 = 0)#)</span>&#160; (1)</p></div>
+    <div id="B" class="formula"><p><span class="stem">(#(r/1 = 0)#)</span>&#160; (1)</p></div>
 
 
   </div>

data/spec/isodoc/footnotes_spec.rb

@@ -70,19 +70,22 @@ RSpec.describe IsoDoc do
                <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <p>A.<a href="#ftn2" epub:type="footnote"><sup>2</sup></a></p>
+                 <p>A.<a href="#ftn1" epub:type="footnote"><sup>1</sup></a></p>
                  <p>B.<a href="#ftn2" epub:type="footnote"><sup>2</sup></a></p>
-                 <p>C.<a href="#ftn1" epub:type="footnote"><sup>1</sup></a></p>
+                 <p>C.<a href="#ftn3" epub:type="footnote"><sup>3</sup></a></p>
                </div>
                <p>&#160;</p>
              </div>
              <p><br clear="all" class="section"/></p>
              <div class="WordSection3">
                <p class="zzSTDTitle1"/>
+               <aside id="ftn1">
+         <p id="_1e228e29-baef-4f38-b048-b05a051747e4">Formerly denoted as 15 % (m/m).</p>
+       </aside>
                <aside id="ftn2">
          <p id="_1e228e29-baef-4f38-b048-b05a051747e4">Formerly denoted as 15 % (m/m).</p>
        </aside>
-               <aside id="ftn1">
+               <aside id="ftn3">
          <p id="_1e228e29-baef-4f38-b048-b05a051747e4">Hello! denoted as 15 % (m/m).</p>
        </aside>
              </div>

data/spec/isodoc/metadata_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe IsoDoc do
     INPUT
   expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <bibdata type="international-standard">
+    <bibdata type="standard">
   <title>The Incredible Mr Ripley</title>
   <title language="en">Cereals and pulses</title>
   <uri>URL A</uri>
@@ -73,7 +73,11 @@ RSpec.describe IsoDoc do
   </contributor>
   <language>en</language>
   <script>Latn</script>
-  <status>Committee Draft</status>
+  <status>
+    <stage>Committee Draft</stage>
+    <substage>Withdrawn</substage>
+    <iteration>2</iteration>
+  </status>
   <copyright>
     <from>2016</from>
     <owner>
@@ -82,16 +86,13 @@ RSpec.describe IsoDoc do
       </organization>
     </owner>
   </copyright>
-  <editorialgroup>
-    <technical-committee number="34">Food products</technical-committee>
-    <subcommittee number="4">Cereals and pulses</subcommittee>
-    <workgroup number="3">Rice Group</workgroup>
-    <secretariat>GB</secretariat>
-  </editorialgroup>
+  <ext>
+  <doctype>international-standard</doctype>
+  </ext>
 </bibdata>
 </iso-standard>
 INPUT
-{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>["Barney Rubble", "Fred Flintstone"], :authors_affiliations=>{"Slate Inc., Bedrock"=>["Barney Rubble"], ""=>["Fred Flintstone"]}, :circulateddate=>"2015", :confirmeddate=>"2017", :copieddate=>"2016", :createddate=>"2010&ndash;2011", :doc=>"URL E", :docnumber=>"17301-1", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :edition=>"2", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :html=>"URL B", :ics=>"XXX", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :pdf=>"URL D", :publisheddate=>"2011", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :status=>"Committee draft", :tc=>"TC 34", :transmitteddate=>"2020", :unchangeddate=>"2019", :unpublished=>true, :updateddate=>"2018", :url=>"URL A", :wg=>"WG 3", :xml=>"URL C"}
+{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>["Barney Rubble", "Fred Flintstone"], :authors_affiliations=>{"Slate Inc., Bedrock"=>["Barney Rubble"], ""=>["Fred Flintstone"]}, :circulateddate=>"2015", :confirmeddate=>"2017", :copieddate=>"2016", :createddate=>"2010&ndash;2011", :doc=>"URL E", :docnumber=>"17301-1", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :edition=>"2", :html=>"URL B", :implementeddate=>"XXX", :issueddate=>"XXX", :iteration=>"2", :obsoleteddate=>"2014", :pdf=>"URL D", :publisheddate=>"2011", :receiveddate=>"XXX", :revdate=>"2016-05-01", :stage=>"Committee draft", :substage=>"Withdrawn", :transmitteddate=>"2020", :unchangeddate=>"2019", :unpublished=>true, :updateddate=>"2018", :url=>"URL A", :xml=>"URL C"}
 OUTPUT
   end
 
@@ -102,7 +103,7 @@ OUTPUT
     INPUT
   expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <bibdata type="international-standard">
+    <bibdata type="standard">
   <title language="fr" format="text/plain">Céréales et légumineuses</ti>
   <title language="en" format="text/plain">Cereals and pulses</title>
   <docidentifier>17301-1-3</docidentifier>
@@ -127,7 +128,7 @@ OUTPUT
   </contributor>
   <language>en</language>
   <script>Latn</script>
-  <status>Published</status>
+  <status><stage>Published</stage></status>
   <copyright>
     <from>2016</from>
     <owner>
@@ -143,20 +144,16 @@ OUTPUT
   <relation type="partOf">
     <docidentifier>IEC 8122</docidentifier>
   </relation>
-  <editorialgroup>
-    <technical-committee number="34" type="ABC">Food products</technical-committee>
-    <subcommittee number="4" type="DEF">Cereals and pulses</subcommittee>
-    <workgroup number="3" type="GHI">Rice Group</workgroup>
-  </editorialgroup>
-  <ics><code>1.2.3</code></ics>
-  <ics><code>1.2.3</code></ics>
+  <ext>
+  <doctype>international-standard</doctype>
+  </ext>
 </bibdata><version>
   <revision-date>2016-05-01</revision-date>
   <draft>12</draft>
 </version>
 </iso-standard>
 INPUT
-{:accesseddate=>"XXX", :agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :circulateddate=>"XXX", :confirmeddate=>"XXX", :copieddate=>"XXX", :createddate=>"XXX", :docnumber=>"17301-1-3", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" (draft 12, 2016-05-01)", :edition=>nil, :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :ics=>"1.2.3, 1.2.3", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :partof=>"IEC 8122", :publisheddate=>"XXX", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"DEF 4", :secretariat=>"XXXX", :status=>"Published", :tc=>"ABC 34", :transmitteddate=>"XXX", :unchangeddate=>"XXX", :unpublished=>false, :updateddate=>"XXX", :wg=>"GHI 3"}
+{:accesseddate=>"XXX", :agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :circulateddate=>"XXX", :confirmeddate=>"XXX", :copieddate=>"XXX", :createddate=>"XXX", :docnumber=>"17301-1-3", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" (draft 12, 2016-05-01)", :edition=>nil, :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :partof=>"IEC 8122", :publisheddate=>"XXX", :receiveddate=>"XXX", :revdate=>"2016-05-01", :stage=>"Published", :transmitteddate=>"XXX", :unchangeddate=>"XXX", :unpublished=>false, :updateddate=>"XXX"}
 OUTPUT
   end
 

data/spec/isodoc/ref_spec.rb

@@ -34,7 +34,10 @@ RSpec.describe IsoDoc do
     </organization>
   </contributor>
   <note format="text/plain" reference="1">ISO DATE: Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
-  <allparts>true</allparts>
+  <extent type="part">
+  <referenceFrom>all</referenceFrom>
+  </extent>
+
 </bibitem>
 <bibitem id="ISO20483" type="standard">
   <title format="text/plain">Cereals and pulses</title>

data/spec/isodoc/table_spec.rb

@@ -55,6 +55,10 @@ RSpec.describe IsoDoc do
 </dl>
 <note><p>This is a table about rice</p></note>
 </table>
+
+<table id="tableD-2" unnumbered="true">
+<tbody><tr><td>A</td></tr></tbody>
+</table>
 </foreword>
 </preface>
 </iso-standard>
@@ -114,6 +118,14 @@ RSpec.describe IsoDoc do
                    <p><span class="note_label">NOTE</span>&#160; This is a table about rice</p>
                  </div>
                </table>
+               <p class="TableTitle" align="center"/>
+               <table id="tableD-2" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0">
+                 <tbody>
+                   <tr>
+                     <td style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">A</td>
+                   </tr>
+                 </tbody>
+               </table>
              </div>
              <p class="zzSTDTitle1"/>
            </div>

data/spec/isodoc/xref_spec.rb

@@ -38,7 +38,7 @@ RSpec.describe IsoDoc do
     </p>
     </foreword>
     </preface>
-    </iso-standard
+    </iso-standard>
     INPUT
            <div class="WordSection2">
              <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
@@ -51,9 +51,21 @@ RSpec.describe IsoDoc do
     OUTPUT
   end
 
+  it "warns of missing crossreference" do
+    expect { IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true) }.to output(/No label has been processed for ID N1/).to_stderr
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface>
+    <foreword>
+    <p>
+    <xref target="N1"/>
+    </preface>
+    </iso-standard>
+    INPUT
+  end
+
 
   it "cross-references notes" do
-    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)). to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface>
     <foreword>
@@ -134,48 +146,48 @@ RSpec.describe IsoDoc do
            </p>
                </div>
                 <br/>
-             <div class="Section3" id="intro">
+                <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 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>
-                 <div id="N" 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>
-                 <p>
-                   <a href="#N">Note</a>
-                 </p>
-               </div>
-               <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
+             <p class="zzSTDTitle1"/>
+             <div id="scope">
+               <h1>1.&#160; Scope</h1>
+               <div id="N" 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="widgets">
-                 <h1>3.&#160; Widgets</h1>
-                 <div id="widgets1"><h2>3.1. </h2>
+               <p>
+                 <a href="#N">Note</a>
+               </p>
+             </div>
+             <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
+       </div>
+             <div id="widgets">
+               <h1>3.&#160; Widgets</h1>
+               <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>
 
            </div>
-               </div>
-               <br/>
-               <div id="annex1" class="Section3">
-                 <div id="annex1a"><h2>A.1. </h2>
+             </div>
+             <br/>
+             <div id="annex1" class="Section3">
+               <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"><h2>A.2. </h2>
+               <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>
-               </div>
              </div>
-           </body>
+           </div>
+         </body>
        </html>
     OUTPUT
   end
@@ -202,7 +214,7 @@ RSpec.describe IsoDoc do
   <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">
+        <figure id="N2" unnumbered="true">
   <name>Split-it-right sample divider</name>
   <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
   </figure>
@@ -240,7 +252,7 @@ RSpec.describe IsoDoc do
   </figure>
     </clause>
     <clause id="annex1b">
-        <figure id="Anote1">
+        <figure id="Anote1" unnumbered="true">
   <name>Split-it-right sample divider</name>
   <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
   </figure>
@@ -258,13 +270,13 @@ RSpec.describe IsoDoc do
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p>
            <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="#N2">Figure (??)</a>
+           <a href="#N">Figure 2</a>
+           <a href="#note1">Figure 3</a>
+           <a href="#note2">Figure 4</a>
            <a href="#AN">Figure A.1</a>
-           <a href="#Anote1">Figure A.2</a>
-           <a href="#Anote2">Figure A.3</a>
+           <a href="#Anote1">Figure (??)</a>
+           <a href="#Anote2">Figure A.2</a>
            </p>
                </div>
                <br/>
@@ -278,7 +290,7 @@ RSpec.describe IsoDoc do
                <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>
+         <p class="FigureTitle" align="center">Split-it-right sample divider</p></div>
        </div>
              </div>
                <p class="zzSTDTitle1"/>
@@ -287,9 +299,9 @@ RSpec.describe IsoDoc do
                  <div id="N" 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 class="FigureTitle" align="center">Figure 2&#160;&#8212; Split-it-right sample divider</p></div>
                  <p>
-                   <a href="#N">Figure 3</a>
+                   <a href="#N">Figure 2</a>
                  </p>
                </div>
                <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
@@ -300,12 +312,12 @@ RSpec.describe IsoDoc do
                <div id="note1" class="figure">
 
          <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
-         <p class="FigureTitle" align="center">Figure 4&#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>
            <div id="note2" class="figure">
 
          <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
-         <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>
+         <p class="FigureTitle" align="center">Figure 4&#160;&#8212; Split-it-right sample divider</p></div>
+         <p>    <a href="#note1">Figure 3</a> <a href="#note2">Figure 4</a> </p>
            </div>
                </div>
                <br/>
@@ -320,11 +332,11 @@ RSpec.describe IsoDoc do
                <div id="Anote1" class="figure">
 
          <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
-         <p class="FigureTitle" align="center">Figure A.2&#160;&#8212; Split-it-right sample divider</p></div>
+         <p class="FigureTitle" align="center">Split-it-right sample divider</p></div>
            <div id="Anote2" class="figure">
 
          <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
-         <p class="FigureTitle" align="center">Figure A.3&#160;&#8212; Split-it-right sample divider</p></div>
+         <p class="FigureTitle" align="center">Figure A.2&#160;&#8212; Split-it-right sample divider</p></div>
            </div>
                </div>
              </div>
@@ -465,7 +477,7 @@ RSpec.describe IsoDoc do
   <p>Hello</p>
 </example>
 <clause id="xyz"><title>Preparatory</title>
-        <example id="N2">
+        <example id="N2" unnumbered="true">
   <p>Hello</p>
 </example>
 </clause>
@@ -484,7 +496,7 @@ RSpec.describe IsoDoc do
         <example id="note1">
   <p>Hello</p>
 </example>
-        <example id="note2">
+        <example id="note2" unnumbered="true">
   <p>Hello</p>
 </example>
 <p>    <xref target="note1"/> <xref target="note2"/> </p>
@@ -498,7 +510,7 @@ RSpec.describe IsoDoc do
 </example>
     </clause>
     <clause id="annex1b">
-        <example id="Anote1">
+        <example id="Anote1" unnumbered="true">
   <p>Hello</p>
 </example>
         <example id="Anote2">
@@ -514,13 +526,13 @@ RSpec.describe IsoDoc do
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p>
            <a href="#N1">Introduction, Example</a>
-           <a href="#N2">Preparatory, Example</a>
+           <a href="#N2">Preparatory, Example (??)</a>
            <a href="#N">Clause 1, Example</a>
            <a href="#note1">Clause 3.1, Example  1</a>
-           <a href="#note2">Clause 3.1, Example  2</a>
+           <a href="#note2">Clause 3.1, Example (??)</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>
+           <a href="#Anote1">Annex A.2, Example (??)</a>
+           <a href="#Anote2">Annex A.2, Example  1</a>
            </p>
                </div>
                <br/>
@@ -553,10 +565,10 @@ RSpec.describe IsoDoc do
                <div id="note1" class="example"><p class="example-title">EXAMPLE  1</p>
          <p>Hello</p>
        </div>
-               <div id="note2" class="example"><p class="example-title">EXAMPLE  2</p>
+               <div id="note2" class="example"><p class="example-title">EXAMPLE</p>
          <p>Hello</p>
        </div>
-       <p>    <a href="#note1">Example  1</a> <a href="#note2">Example  2</a> </p>
+       <p>    <a href="#note1">Example  1</a> <a href="#note2">Example (??)</a> </p>
            </div>
                </div>
                <br/>
@@ -567,10 +579,10 @@ RSpec.describe IsoDoc do
        </div>
            </div>
                  <div id="annex1b"><h2>A.2. </h2>
-               <div id="Anote1" class="example"><p class="example-title">EXAMPLE  1</p>
+               <div id="Anote1" class="example"><p class="example-title">EXAMPLE</p>
          <p>Hello</p>
        </div>
-               <div id="Anote2" class="example"><p class="example-title">EXAMPLE  2</p>
+               <div id="Anote2" class="example"><p class="example-title">EXAMPLE  1</p>
          <p>Hello</p>
        </div>
            </div>
@@ -602,7 +614,7 @@ RSpec.describe IsoDoc do
   <stem type="AsciiMath">r = 1 %</stem>
   </formula>
   <clause id="xyz"><title>Preparatory</title>
-    <formula id="N2">
+    <formula id="N2" unnumbered="true">
   <stem type="AsciiMath">r = 1 %</stem>
   </formula>
 </clause>
@@ -635,7 +647,7 @@ RSpec.describe IsoDoc do
   </formula>
     </clause>
     <clause id="annex1b">
-    <formula id="Anote1">
+    <formula id="Anote1" unnumbered="true">
   <stem type="AsciiMath">r = 1 %</stem>
   </formula>
     <formula id="Anote2">
@@ -651,13 +663,13 @@ RSpec.describe IsoDoc do
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p>
            <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="#N2">Preparatory, Formula ((??))</a>
+           <a href="#N">Clause 1, Formula (2)</a>
+           <a href="#note1">Clause 3.1, Formula (3)</a>
+           <a href="#note2">Clause 3.1, Formula (4)</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>
+           <a href="#Anote1">Annex A.2, Formula ((??))</a>
+           <a href="#Anote2">Annex A.2, Formula (A.2)</a>
            </p>
                </div>
                             <br/>
@@ -665,15 +677,15 @@ RSpec.describe IsoDoc do
                <h1 class="IntroTitle">Introduction</h1>
                <div id="N1" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</p></div>
                        <div id="xyz"><h2>Preparatory</h2>
-    <div id="N2" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (2)</p></div>
+    <div id="N2" class="formula"><p><span class="stem">(#(r = 1 %)#)</span></p></div>
                 </div>
              </div>
                <p class="zzSTDTitle1"/>
                <div id="scope">
                  <h1>1.&#160; Scope</h1>
-                 <div id="N" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (3)</p></div>
+                 <div id="N" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (2)</p></div>
                  <p>
-                   <a href="#N">Formula (3)</a>
+                   <a href="#N">Formula (2)</a>
                  </p>
                </div>
                <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
@@ -681,9 +693,9 @@ RSpec.describe IsoDoc do
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
                  <div id="widgets1"><h2>3.1. </h2>
-           <div id="note1" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (4)</p></div>
-           <div id="note2" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (5)</p></div>
-         <p>    <a href="#note1">Formula (4)</a> <a href="#note2">Formula (5)</a> </p>
+           <div id="note1" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (3)</p></div>
+           <div id="note2" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (4)</p></div>
+         <p>    <a href="#note1">Formula (3)</a> <a href="#note2">Formula (4)</a> </p>
            </div>
                </div>
                <br/>
@@ -692,8 +704,8 @@ RSpec.describe IsoDoc do
            <div id="AN" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (A.1)</p></div>
            </div>
                  <div id="annex1b"><h2>A.2. </h2>
-           <div id="Anote1" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (A.2)</p></div>
-           <div id="Anote2" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (A.3)</p></div>
+           <div id="Anote1" class="formula"><p><span class="stem">(#(r = 1 %)#)</span></p></div>
+           <div id="Anote2" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (A.2)</p></div>
            </div>
                </div>
              </div>
@@ -723,7 +735,7 @@ RSpec.describe IsoDoc do
   <stem type="AsciiMath">r = 1 %</stem>
   </requirement>
   <clause id="xyz"><title>Preparatory</title>
-    <requirement id="N2">
+    <requirement id="N2" unnumbered="true">
   <stem type="AsciiMath">r = 1 %</stem>
   </requirement>
 </clause>
@@ -756,7 +768,7 @@ RSpec.describe IsoDoc do
   </requirement>
     </clause>
     <clause id="annex1b">
-    <requirement id="Anote1">
+    <requirement id="Anote1" unnumbered="true">
   <stem type="AsciiMath">r = 1 %</stem>
   </requirement>
     <requirement id="Anote2">
@@ -772,13 +784,13 @@ RSpec.describe IsoDoc do
         <h1 class="ForewordTitle">Foreword</h1>
         <p>
     <a href="#N1">Introduction, Requirement 1</a>
-    <a href="#N2">Preparatory, Requirement 2</a>
-    <a href="#N">Clause 1, Requirement 3</a>
-    <a href="#note1">Clause 3.1, Requirement 4</a>
-    <a href="#note2">Clause 3.1, Requirement 5</a>
+    <a href="#N2">Preparatory, Requirement (??)</a>
+    <a href="#N">Clause 1, Requirement 2</a>
+    <a href="#note1">Clause 3.1, Requirement 3</a>
+    <a href="#note2">Clause 3.1, Requirement 4</a>
     <a href="#AN">Annex A.1, Requirement A.1</a>
-    <a href="#Anote1">Annex A.2, Requirement A.2</a>
-    <a href="#Anote2">Annex A.2, Requirement A.3</a>
+    <a href="#Anote1">Annex A.2, Requirement (??)</a>
+    <a href="#Anote2">Annex A.2, Requirement A.2</a>
     </p>
       </div>
       <br/>
@@ -788,7 +800,7 @@ RSpec.describe IsoDoc do
   <span class="stem">(#(r = 1 %)#)</span>
   </div>
         <div id="xyz"><h2>Preparatory</h2>
-    <div class="require"><p class="AdmonitionTitle">Requirement 2:</p>
+    <div class="require"><p class="AdmonitionTitle"/>
   <span class="stem">(#(r = 1 %)#)</span>
   </div>
 </div>
@@ -796,11 +808,11 @@ RSpec.describe IsoDoc do
       <p class="zzSTDTitle1"/>
       <div id="scope">
         <h1>1.&#160; Scope</h1>
-        <div class="require"><p class="AdmonitionTitle">Requirement 3:</p>
+        <div class="require"><p class="AdmonitionTitle">Requirement 2:</p>
   <span class="stem">(#(r = 1 %)#)</span>
   </div>
         <p>
-          <a href="#N">Requirement 3</a>
+          <a href="#N">Requirement 2</a>
         </p>
       </div>
       <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
@@ -808,13 +820,13 @@ RSpec.describe IsoDoc do
       <div id="widgets">
         <h1>3.&#160; Widgets</h1>
         <div id="widgets1"><h2>3.1. </h2>
-    <div class="require"><p class="AdmonitionTitle">Requirement 4:</p>
+    <div class="require"><p class="AdmonitionTitle">Requirement 3:</p>
   <span class="stem">(#(r = 1 %)#)</span>
   </div>
-    <div class="require"><p class="AdmonitionTitle">Requirement 5:</p>
+    <div class="require"><p class="AdmonitionTitle">Requirement 4:</p>
   <span class="stem">(#(r = 1 %)#)</span>
   </div>
-  <p>    <a href="#note1">Requirement 4</a> <a href="#note2">Requirement 5</a> </p>
+  <p>    <a href="#note1">Requirement 3</a> <a href="#note2">Requirement 4</a> </p>
     </div>
       </div>
       <br/>
@@ -825,10 +837,10 @@ RSpec.describe IsoDoc do
   </div>
     </div>
         <div id="annex1b"><h2>A.2. </h2>
-    <div class="require"><p class="AdmonitionTitle">Requirement A.2:</p>
+    <div class="require"><p class="AdmonitionTitle"/>
   <span class="stem">(#(r = 1 %)#)</span>
   </div>
-    <div class="require"><p class="AdmonitionTitle">Requirement A.3:</p>
+    <div class="require"><p class="AdmonitionTitle">Requirement A.2:</p>
   <span class="stem">(#(r = 1 %)#)</span>
   </div>
     </div>
@@ -860,7 +872,7 @@ OUTPUT
   <stem type="AsciiMath">r = 1 %</stem>
   </recommendation>
   <clause id="xyz"><title>Preparatory</title>
-    <recommendation id="N2">
+    <recommendation id="N2" unnumbered="true">
   <stem type="AsciiMath">r = 1 %</stem>
   </recommendation>
 </clause>
@@ -893,7 +905,7 @@ OUTPUT
   </recommendation>
     </clause>
     <clause id="annex1b">
-    <recommendation id="Anote1">
+    <recommendation id="Anote1" unnumbered="true">
   <stem type="AsciiMath">r = 1 %</stem>
   </recommendation>
     <recommendation id="Anote2">
@@ -909,13 +921,13 @@ OUTPUT
         <h1 class="ForewordTitle">Foreword</h1>
         <p>
     <a href="#N1">Introduction, Recommendation 1</a>
-    <a href="#N2">Preparatory, Recommendation 2</a>
-    <a href="#N">Clause 1, Recommendation 3</a>
-    <a href="#note1">Clause 3.1, Recommendation 4</a>
-    <a href="#note2">Clause 3.1, Recommendation 5</a>
+    <a href="#N2">Preparatory, Recommendation (??)</a>
+    <a href="#N">Clause 1, Recommendation 2</a>
+    <a href="#note1">Clause 3.1, Recommendation 3</a>
+    <a href="#note2">Clause 3.1, Recommendation 4</a>
     <a href="#AN">Annex A.1, Recommendation A.1</a>
-    <a href="#Anote1">Annex A.2, Recommendation A.2</a>
-    <a href="#Anote2">Annex A.2, Recommendation A.3</a>
+    <a href="#Anote1">Annex A.2, Recommendation (??)</a>
+    <a href="#Anote2">Annex A.2, Recommendation A.2</a>
     </p>
       </div>
       <br/>
@@ -925,7 +937,7 @@ OUTPUT
   <span class="stem">(#(r = 1 %)#)</span>
   </div>
         <div id="xyz"><h2>Preparatory</h2>
-    <div class="recommend"><p class="AdmonitionTitle">Recommendation 2:</p>
+    <div class="recommend"><p class="AdmonitionTitle"/>
   <span class="stem">(#(r = 1 %)#)</span>
   </div>
 </div>
@@ -933,11 +945,11 @@ OUTPUT
       <p class="zzSTDTitle1"/>
       <div id="scope">
         <h1>1.&#160; Scope</h1>
-        <div class="recommend"><p class="AdmonitionTitle">Recommendation 3:</p>
+        <div class="recommend"><p class="AdmonitionTitle">Recommendation 2:</p>
   <span class="stem">(#(r = 1 %)#)</span>
   </div>
         <p>
-          <a href="#N">Recommendation 3</a>
+          <a href="#N">Recommendation 2</a>
         </p>
       </div>
       <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
@@ -945,13 +957,13 @@ OUTPUT
       <div id="widgets">
         <h1>3.&#160; Widgets</h1>
         <div id="widgets1"><h2>3.1. </h2>
-    <div class="recommend"><p class="AdmonitionTitle">Recommendation 4:</p>
+    <div class="recommend"><p class="AdmonitionTitle">Recommendation 3:</p>
   <span class="stem">(#(r = 1 %)#)</span>
   </div>
-    <div class="recommend"><p class="AdmonitionTitle">Recommendation 5:</p>
+    <div class="recommend"><p class="AdmonitionTitle">Recommendation 4:</p>
   <span class="stem">(#(r = 1 %)#)</span>
   </div>
-  <p>    <a href="#note1">Recommendation 4</a> <a href="#note2">Recommendation 5</a> </p>
+  <p>    <a href="#note1">Recommendation 3</a> <a href="#note2">Recommendation 4</a> </p>
     </div>
       </div>
       <br/>
@@ -962,10 +974,10 @@ OUTPUT
   </div>
     </div>
         <div id="annex1b"><h2>A.2. </h2>
-    <div class="recommend"><p class="AdmonitionTitle">Recommendation A.2:</p>
+    <div class="recommend"><p class="AdmonitionTitle"/>
   <span class="stem">(#(r = 1 %)#)</span>
   </div>
-    <div class="recommend"><p class="AdmonitionTitle">Recommendation A.3:</p>
+    <div class="recommend"><p class="AdmonitionTitle">Recommendation A.2:</p>
   <span class="stem">(#(r = 1 %)#)</span>
   </div>
     </div>
@@ -997,7 +1009,7 @@ OUTPUT
   <stem type="AsciiMath">r = 1 %</stem>
   </permission>
   <clause id="xyz"><title>Preparatory</title>
-    <permission id="N2">
+    <permission id="N2" unnumbered="true">
   <stem type="AsciiMath">r = 1 %</stem>
   </permission>
 </clause>
@@ -1030,7 +1042,7 @@ OUTPUT
   </permission>
     </clause>
     <clause id="annex1b">
-    <permission id="Anote1">
+    <permission id="Anote1" unnumbered="true">
   <stem type="AsciiMath">r = 1 %</stem>
   </permission>
     <permission id="Anote2">
@@ -1046,13 +1058,13 @@ OUTPUT
         <h1 class="ForewordTitle">Foreword</h1>
         <p>
     <a href="#N1">Introduction, Permission 1</a>
-    <a href="#N2">Preparatory, Permission 2</a>
-    <a href="#N">Clause 1, Permission 3</a>
-    <a href="#note1">Clause 3.1, Permission 4</a>
-    <a href="#note2">Clause 3.1, Permission 5</a>
+    <a href="#N2">Preparatory, Permission (??)</a>
+    <a href="#N">Clause 1, Permission 2</a>
+    <a href="#note1">Clause 3.1, Permission 3</a>
+    <a href="#note2">Clause 3.1, Permission 4</a>
     <a href="#AN">Annex A.1, Permission A.1</a>
-    <a href="#Anote1">Annex A.2, Permission A.2</a>
-    <a href="#Anote2">Annex A.2, Permission A.3</a>
+    <a href="#Anote1">Annex A.2, Permission (??)</a>
+    <a href="#Anote2">Annex A.2, Permission A.2</a>
     </p>
       </div>
       <br/>
@@ -1062,7 +1074,7 @@ OUTPUT
   <span class="stem">(#(r = 1 %)#)</span>
   </div>
         <div id="xyz"><h2>Preparatory</h2>
-    <div class="permission"><p class="AdmonitionTitle">Permission 2:</p>
+    <div class="permission"><p class="AdmonitionTitle"/>
   <span class="stem">(#(r = 1 %)#)</span>
   </div>
 </div>
@@ -1070,11 +1082,11 @@ OUTPUT
       <p class="zzSTDTitle1"/>
       <div id="scope">
         <h1>1.&#160; Scope</h1>
-        <div class="permission"><p class="AdmonitionTitle">Permission 3:</p>
+        <div class="permission"><p class="AdmonitionTitle">Permission 2:</p>
   <span class="stem">(#(r = 1 %)#)</span>
   </div>
         <p>
-          <a href="#N">Permission 3</a>
+          <a href="#N">Permission 2</a>
         </p>
       </div>
       <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
@@ -1082,13 +1094,13 @@ OUTPUT
       <div id="widgets">
         <h1>3.&#160; Widgets</h1>
         <div id="widgets1"><h2>3.1. </h2>
-    <div class="permission"><p class="AdmonitionTitle">Permission 4:</p>
+    <div class="permission"><p class="AdmonitionTitle">Permission 3:</p>
   <span class="stem">(#(r = 1 %)#)</span>
   </div>
-    <div class="permission"><p class="AdmonitionTitle">Permission 5:</p>
+    <div class="permission"><p class="AdmonitionTitle">Permission 4:</p>
   <span class="stem">(#(r = 1 %)#)</span>
   </div>
-  <p>    <a href="#note1">Permission 4</a> <a href="#note2">Permission 5</a> </p>
+  <p>    <a href="#note1">Permission 3</a> <a href="#note2">Permission 4</a> </p>
     </div>
       </div>
       <br/>
@@ -1099,10 +1111,10 @@ OUTPUT
   </div>
     </div>
         <div id="annex1b"><h2>A.2. </h2>
-    <div class="permission"><p class="AdmonitionTitle">Permission A.2:</p>
+    <div class="permission"><p class="AdmonitionTitle"/>
   <span class="stem">(#(r = 1 %)#)</span>
   </div>
-    <div class="permission"><p class="AdmonitionTitle">Permission A.3:</p>
+    <div class="permission"><p class="AdmonitionTitle">Permission A.2:</p>
   <span class="stem">(#(r = 1 %)#)</span>
   </div>
     </div>
@@ -1240,7 +1252,7 @@ OUTPUT
     </tbody>
     </table>
   <clause id="xyz"><title>Preparatory</title>
-    <table id="N2">
+    <table id="N2" unnumbered="true">
     <name>Repeatability and reproducibility of husked rice yield</name>
     <tbody>
     <tr>
@@ -1308,7 +1320,7 @@ OUTPUT
     </table>
     </clause>
     <clause id="annex1b">
-        <table id="Anote1">
+        <table id="Anote1" unnumbered="true">
     <name>Repeatability and reproducibility of husked rice yield</name>
     <tbody>
     <tr>
@@ -1338,13 +1350,13 @@ OUTPUT
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p>
        <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="#N2">Table (??)</a>
+       <a href="#N">Table 2</a>
+       <a href="#note1">Table 3</a>
+       <a href="#note2">Table 4</a>
        <a href="#AN">Table A.1</a>
-       <a href="#Anote1">Table A.2</a>
-       <a href="#Anote2">Table A.3</a>
+       <a href="#Anote1">Table (??)</a>
+       <a href="#Anote2">Table A.2</a>
        </p>
                </div>
                             <br/>
@@ -1361,14 +1373,14 @@ OUTPUT
                  </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>
+       <p class="TableTitle" align="center">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 3&#160;&#8212; Repeatability and reproducibility of husked rice yield
+                   Table 2&#160;&#8212; Repeatability and reproducibility of husked rice yield
                  </p>
                  <table id="N" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0">
                    <tbody>
@@ -1380,7 +1392,7 @@ OUTPUT
                    </tbody>
                  </table>
                  <p>
-                   <a href="#N">Table 3</a>
+                   <a href="#N">Table 2</a>
                  </p>
                </div>
                <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
@@ -1388,9 +1400,9 @@ OUTPUT
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
                  <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>
+           <p class="TableTitle" align="center">Table 3&#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 4&#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 3</a> <a href="#note2">Table 4</a> </p>
        </div>
                </div>
                <br/>
@@ -1399,8 +1411,8 @@ OUTPUT
            <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"><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>
+           <p class="TableTitle" align="center">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.2&#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>
                </div>
              </div>