metanorma-iso 1.3.26 → 1.4.3.pre.alpha

data/spec/asciidoctor-iso/table_spec.rb

@@ -150,7 +150,7 @@ RSpec.describe Asciidoctor::ISO do
            <tr>
              <th rowspan="2" align="left">Defect</th>
              <th colspan="4" align="center">Maximum permissible mass fraction of defects in husked rice<br/>
-       <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>w</mi><mi>max</mi></msub></math></stem></th>
+       <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>w</mi><mo>max</mo></msub></math></stem></th>
            </tr>
          <tr>
              <th align="left">in husked rice</th>

data/spec/isodoc/amd_spec.rb

@@ -491,7 +491,7 @@ OUTPUT
     <title language='fr' format='text/plain' type='title-main'>Titre Principal</title>
     <title language='fr' format='text/plain' type='title-part'>Part du Titre</title>
     <title language='fr' format='text/plain' type='title-amd'>Fraction massique de matière étrangère, riz usiné (non gluant), diviseurs d’échantillon et recommandations relatives aux conditions d’entreposage et de transport</title>
-    <docidentifier type='iso'>ISO/PreNWIP3 17301-1:2016/Amd.1</docidentifier>
+    <docidentifier type='ISO'>ISO/PreNWIP3 17301-1:2016/Amd.1</docidentifier>
     <docidentifier type='iso-with-lang'>ISO/PreNWIP3 17301-1:2016/Amd.1(E)</docidentifier>
     <docidentifier type='iso-reference'>ISO/PreNWIP3 17301-1:2016/Amd.1:2017(E)</docidentifier>
     <docnumber>17301</docnumber>
@@ -563,7 +563,53 @@ OUTPUT
   <sections/>
 </iso-standard>
 INPUT
-{:agency=>"ISO", :authors=>[], :authors_affiliations=>{}, :createddate=>"2016-05-01", :docnumber=>"ISO/PreNWIP3 17301-1:2016/Amd.1", :docnumber_lang=>"ISO/PreNWIP3 17301-1:2016/Amd.1(E)", :docnumber_reference=>"ISO/PreNWIP3 17301-1:2016/Amd.1:2017(E)", :docnumeric=>"17301", :docsubtitle=>"Introduction Fran&#xe7;aise&nbsp;&mdash; Titre Principal&nbsp;&mdash; Partie&nbsp;1: Part du Titre", :docsubtitleamd=>"Fraction massique de mati&#xe8;re &#xe9;trang&#xe8;re, riz usin&#xe9; (non gluant), diviseurs d&#x2019;&#xe9;chantillon et recommandations relatives aux conditions d&#x2019;entreposage et de transport", :docsubtitleamdlabel=>"AMENDMENT&nbsp;1", :docsubtitlecorrlabel=>"RECTIFICATIF TECHNIQUE&nbsp;2", :docsubtitleintro=>"Introduction Fran&#xe7;aise", :docsubtitlemain=>"Titre Principal", :docsubtitlepart=>"Part du Titre", :docsubtitlepartlabel=>"Partie&nbsp;1", :doctitle=>"Introduction&nbsp;&mdash; Main Title&#x2009;&#x2014;&#x2009;Title&nbsp;&mdash; Part&nbsp;1: Title Part", :doctitleamd=>"Mass fraction of extraneous matter, milled rice (nonglutinous), sample dividers and recommendations relating to storage and transport conditions", :doctitleamdlabel=>"AMENDMENT&nbsp;1", :doctitlecorrlabel=>"TECHNICAL CORRIGENDUM&nbsp;2", :doctitleintro=>"Introduction", :doctitlemain=>"Main Title&#x2009;&#x2014;&#x2009;Title", :doctitlepart=>"Title Part", :doctitlepartlabel=>"Part&nbsp;1", :doctype=>"Amendment", :docyear=>"2017", :draft=>"0.3.4", :draftinfo=>" (draft 0.3.4, 2000-01-01)", :edition=>"2", :editorialgroup=>["A 1", "B 2", "C 3"], :ics=>"1, 2, 3", :keywords=>[], :obsoletes=>nil, :obsoletes_part=>nil, :publisher=>"International Organization for Standardization", :revdate=>"2000-01-01", :revdate_monthyear=>"January 2000", :sc=>"B 2", :secretariat=>"SECRETARIAT", :stage=>"10", :stage_int=>10, :stageabbr=>"NWIP", :statusabbr=>"PreNWIP3", :tc=>"A 1", :tc_docnumber=>[], :unpublished=>true, :wg=>"C 3"}
+{:agency=>"ISO",
+:authors=>[],
+:authors_affiliations=>{},
+:createddate=>"2016-05-01",
+:docnumber=>"ISO/PreNWIP3 17301-1:2016/Amd.1",
+:docnumber_lang=>"ISO/PreNWIP3 17301-1:2016/Amd.1(E)",
+:docnumber_reference=>"ISO/PreNWIP3 17301-1:2016/Amd.1:2017(E)",
+:docnumeric=>"17301",
+:docsubtitle=>"Introduction Fran&#xe7;aise&nbsp;&mdash; Titre Principal&nbsp;&mdash; Partie&nbsp;1: Part du Titre",
+:docsubtitleamd=>"Fraction massique de mati&#xe8;re &#xe9;trang&#xe8;re, riz usin&#xe9; (non gluant), diviseurs d&#x2019;&#xe9;chantillon et recommandations relatives aux conditions d&#x2019;entreposage et de transport",
+:docsubtitleamdlabel=>"AMENDMENT&nbsp;1",
+:docsubtitlecorrlabel=>"RECTIFICATIF TECHNIQUE&nbsp;2",
+:docsubtitleintro=>"Introduction Fran&#xe7;aise",
+:docsubtitlemain=>"Titre Principal",
+:docsubtitlepart=>"Part du Titre",
+:docsubtitlepartlabel=>"Partie&nbsp;1",
+:doctitle=>"Introduction&nbsp;&mdash; Main Title&#x2009;&#x2014;&#x2009;Title&nbsp;&mdash; Part&nbsp;1: Title Part",
+:doctitleamd=>"Mass fraction of extraneous matter, milled rice (nonglutinous), sample dividers and recommendations relating to storage and transport conditions",
+:doctitleamdlabel=>"AMENDMENT&nbsp;1",
+:doctitlecorrlabel=>"TECHNICAL CORRIGENDUM&nbsp;2",
+:doctitleintro=>"Introduction",
+:doctitlemain=>"Main Title&#x2009;&#x2014;&#x2009;Title",
+:doctitlepart=>"Title Part",
+:doctitlepartlabel=>"Part&nbsp;1",
+:doctype=>"Amendment",
+:docyear=>"2017",
+:draft=>"0.3.4",
+:draftinfo=>" (draft 0.3.4, 2000-01-01)",
+:edition=>"2",
+:editorialgroup=>["A 1", "B 2", "C 3"],
+:ics=>"1, 2, 3",
+:keywords=>[],
+:obsoletes=>nil,
+:obsoletes_part=>nil,
+:publisher=>"International Organization for Standardization",
+:revdate=>"2000-01-01",
+:revdate_monthyear=>"January 2000",
+:sc=>"B 2",
+:secretariat=>"SECRETARIAT",
+:stage=>"10",
+:stage_int=>10,
+:stageabbr=>"NWIP",
+:statusabbr=>"PreNWIP3",
+:tc=>"A 1",
+:tc_docnumber=>[],
+:unpublished=>true,
+:wg=>"C 3"}
 OUTPUT
   end
 

data/spec/isodoc/blocks_spec.rb

@@ -8,12 +8,10 @@ RSpec.describe IsoDoc do
     <formula id="_be9158af-7e93-4ee2-90c5-26d31c181934" unnumbered="true">
   <stem type="AsciiMath">r = 1 %</stem>
 <dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d">
-  <dt>
-    <stem type="AsciiMath">r</stem>
-  </dt>
-  <dd>
-    <p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the repeatability limit.</p>
-  </dd>
+  <dt> <stem type="AsciiMath">r</stem> </dt>
+  <dd> <p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the repeatability limit.</p> </dd>
+  <dt> <stem type="AsciiMath">s_1</stem> </dt>
+  <dd> <p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the other repeatability limit.</p> </dd>
 </dl>
     <note id="_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0">
   <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>
@@ -26,29 +24,55 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
         #{HTML_HDR}
-               <br/>
-               <div>
-                 <h1 class="ForewordTitle">Foreword</h1>
-                 <div id="_be9158af-7e93-4ee2-90c5-26d31c181934" class="formula"><p><span class="stem">(#(r = 1 %)#)</span></p></div><p style='page-break-after:avoid;'>where</p><dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d" class='formula_dl'><dt>
-           <span class="stem">(#(r)#)</span>
-         </dt><dd>
-           <p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the repeatability limit.</p>
-         </dd></dl>
-
-
-           <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 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>
-       </html>
+         <br/>
+      <div>
+        <h1 class='ForewordTitle'>Foreword</h1>
+        <div id='_be9158af-7e93-4ee2-90c5-26d31c181934'><div class='formula'>
+          <p>
+            <span class='stem'>(#(r = 1 %)#)</span>
+          </p>
+        </div>
+        <p style='page-break-after:avoid;'>where</p>
+        <dl id='_e4fe94fe-1cde-49d9-b1ad-743293b7e21d' class='formula_dl'>
+          <dt>
+            <span class='stem'>(#(r)#)</span>
+          </dt>
+          <dd>
+            <p id='_1b99995d-ff03-40f5-8f2e-ab9665a69b77'>is the repeatability limit.</p>
+          </dd>
+          <dt>
+            <span class='stem'>(#(s_1)#)</span>
+          </dt>
+          <dd>
+            <p id='_1b99995d-ff03-40f5-8f2e-ab9665a69b77'>is the other repeatability limit.</p>
+          </dd>
+        </dl>
+        <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'><div class='formula'>
+          <p>
+            <span class='stem'>(#(r = 1 %)#)</span>
+            &#160; (1)
+          </p>
+        </div>
+        </div>
+      </div>
+      <p class='zzSTDTitle1'/>
+    </div>
+  </body>
+</html>
     OUTPUT
   end
 
   it "processes formulae (Word)" do
-    expect((IsoDoc::Iso::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(%r{^.*<div>\s*<h1 class="ForewordTitle">}m, '<div><h1 class="ForewordTitle">').sub(%r{<p>\&#160;</p>\s*</div>.*$}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(IsoDoc::Iso::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(%r{^.*<div>\s*<h1 class="ForewordTitle">}m, '<div><h1 class="ForewordTitle">').sub(%r{<p>\&#160;</p>\s*</div>.*$}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <formula id="_be9158af-7e93-4ee2-90c5-26d31c181934" unnumbered="true">
@@ -60,6 +84,8 @@ RSpec.describe IsoDoc do
   <dd>
     <p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the repeatability limit.</p>
   </dd>
+  <dt> <stem type="AsciiMath">s_1</stem> </dt>
+  <dd> <p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the other repeatability limit.</p> </dd>
 </dl>
     <note id="_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0">
   <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>
@@ -73,7 +99,7 @@ RSpec.describe IsoDoc do
     INPUT
     <div>
                <h1 class='ForewordTitle'>Foreword</h1>
-               <div id='_be9158af-7e93-4ee2-90c5-26d31c181934' class='formula'>
+               <div id='_be9158af-7e93-4ee2-90c5-26d31c181934'><div class='formula'>
                  <p>
                    <span class='stem'>(#(r = 1 %)#)</span>
                  </p>
@@ -90,6 +116,16 @@ RSpec.describe IsoDoc do
                      <p id='_1b99995d-ff03-40f5-8f2e-ab9665a69b77'>is the repeatability limit.</p>
                    </td>
                  </tr>
+                 <tr>
+  <td valign='top' align='left'>
+    <p align='left' style='margin-left:0pt;text-align:left;'>
+      <span class='stem'>(#(s_1)#)</span>
+    </p>
+  </td>
+  <td valign='top'>
+    <p id='_1b99995d-ff03-40f5-8f2e-ab9665a69b77'>is the other repeatability limit.</p>
+  </td>
+</tr>
                </table>
                <div id='_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0' class='Note'>
                  <p class='Note'>
@@ -100,16 +136,65 @@ RSpec.describe IsoDoc do
                    always expressed.
                  </p>
                </div>
-               <div id='_be9158af-7e93-4ee2-90c5-26d31c181935' class='formula'>
+               </div>
+               <div id='_be9158af-7e93-4ee2-90c5-26d31c181935'><div class='formula'>
                  <p>
                    <span class='stem'>(#(r = 1 %)#)</span>
                    <span style='mso-tab-count:1'>&#160; </span>
                    (1)
                  </p>
                </div>
+               </div>
              </div>
     OUTPUT
   end
 
+   it "processes formulae with single definition list entry" do
+    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <formula id="_be9158af-7e93-4ee2-90c5-26d31c181934" unnumbered="true">
+  <stem type="AsciiMath">r = 1 %</stem>
+<dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d">
+  <dt>
+    <stem type="AsciiMath">r</stem>
+  </dt>
+  <dd>
+    <p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the repeatability limit.</p>
+  </dd>
+</dl>
+    <note id="_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0">
+  <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
+        #{HTML_HDR}
+               <br/>
+               <div>
+                 <h1 class="ForewordTitle">Foreword</h1>
+                 <div id="_be9158af-7e93-4ee2-90c5-26d31c181934"><div class="formula"><p><span class="stem">(#(r = 1 %)#)</span></p></div>
+<span class='zzMoveToFollowing'>
+                 where 
+                 <span class='stem'>(#(r)#)</span>
+               </span>
+               <p id='_1b99995d-ff03-40f5-8f2e-ab9665a69b77'>is the repeatability limit.</p>
+
+           <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"><div class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</p></div></div>
+                 </div>
+               <p class="zzSTDTitle1"/>
+             </div>
+           </body>
+       </html>
+    OUTPUT
+  end
+
 
 end

data/spec/isodoc/inline_spec.rb

@@ -243,7 +243,7 @@ RSpec.describe IsoDoc do
            <a href="#ISO712">ISO 712, Clause 1</a>
            <a href="#ISO712">ISO 712, 1.5</a>
            <a href="#ISO712">A</a>
-           <a href="#ISO712">ISO 712, </a>
+           <a href="#ISO712">ISO 712, Whole of text</a>
            <a href="#ISO712">ISO 712, Prelude 7</a>
            <a href="#ISO712">A</a>
            </p>
@@ -251,7 +251,7 @@ RSpec.describe IsoDoc do
                <p class="zzSTDTitle1"/>
                <div>
                  <h1>1&#160; Normative references</h1>
-                 <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
+                 <p id="ISO712" class="NormRef">ISO 712, <i>Cereals and cereal products</i></p>
                </div>
              </div>
            </body>

data/spec/isodoc/metadata_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
     <title type="title-intro" language="fr" format="text/plain">Céréales et légumineuses</title>
     <title type="title-main" language="fr" format="text/plain">Spécification et méthodes d'essai</title>
     <title type="title-part" language="fr" format="text/plain">Riz</title>
-  <docidentifier type="iso">ISO/PreCD3 17301-1</docidentifier>
+  <docidentifier type="ISO">ISO/PreCD3 17301-1</docidentifier>
   <docidentifier type="iso-with-lang">ISO/PreCD3 17301-1 (E)</docidentifier>
   <docidentifier type="iso-reference">ISO/PreCD3 17301-1:2000 (E)</docidentifier>
   <docidentifier type="iso-tc">17301</docidentifier>
@@ -78,7 +78,51 @@ RSpec.describe IsoDoc::Iso::Metadata do
 </bibdata>
 </iso-standard>
 INPUT
-{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>[], :authors_affiliations=>{}, :createddate=>"2010&ndash;2011", :docnumber=>"ISO/PreCD3 17301-1", :docnumber_lang=>"ISO/PreCD3 17301-1 (E)", :docnumber_reference=>"ISO/PreCD3 17301-1:2000 (E)", :docnumeric=>"1730", :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1: Riz", :docsubtitleintro=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses", :docsubtitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai", :docsubtitlepart=>"Riz", :docsubtitlepartlabel=>"Partie&nbsp;1", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1: Rice", :doctitleintro=>"Cereals and pulses", :doctitlemain=>"Specifications and test methods", :doctitlepart=>"Rice", :doctitlepartlabel=>"Part&nbsp;1", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :edition=>"2", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :ics=>nil, :keywords=>["kw2", "kw1"], :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :publisheddate=>"2011", :publisher=>"International Organization for Standardization", :revdate=>"2016-05-01", :revdate_monthyear=>"May 2016", :sc=>"SC 4", :secretariat=>"GB", :stage=>"30", :stage_int=>30, :stageabbr=>"CD", :statusabbr=>"PreCD3", :tc=>"TC 34", :tc_docnumber=>["17301", "17302"], :unpublished=>true, :wg=>"WG 3"}
+{:accesseddate=>"2012",
+:activateddate=>"2013",
+:agency=>"ISO",
+:authors=>[],
+:authors_affiliations=>{},
+:createddate=>"2010&ndash;2011",
+:docnumber=>"ISO/PreCD3 17301-1",
+:docnumber_lang=>"ISO/PreCD3 17301-1 (E)",
+:docnumber_reference=>"ISO/PreCD3 17301-1:2000 (E)",
+:docnumeric=>"1730",
+:docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1: Riz",
+:docsubtitleintro=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses",
+:docsubtitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai",
+:docsubtitlepart=>"Riz",
+:docsubtitlepartlabel=>"Partie&nbsp;1",
+:doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1: Rice",
+:doctitleintro=>"Cereals and pulses",
+:doctitlemain=>"Specifications and test methods",
+:doctitlepart=>"Rice",
+:doctitlepartlabel=>"Part&nbsp;1",
+:doctype=>"International Standard",
+:docyear=>"2016",
+:draft=>"0.4",
+:draftinfo=>" (draft 0.4, 2016-05-01)",
+:edition=>"2",
+:editorialgroup=>["TC 34", "SC 4", "WG 3"],
+:ics=>nil,
+:keywords=>["kw2", "kw1"],
+:obsoleteddate=>"2014",
+:obsoletes=>nil,
+:obsoletes_part=>nil,
+:publisheddate=>"2011",
+:publisher=>"International Organization for Standardization",
+:revdate=>"2016-05-01",
+:revdate_monthyear=>"May 2016",
+:sc=>"SC 4",
+:secretariat=>"GB",
+:stage=>"30",
+:stage_int=>30,
+:stageabbr=>"CD",
+:statusabbr=>"PreCD3",
+:tc=>"TC 34",
+:tc_docnumber=>["17301", "17302"],
+:unpublished=>true,
+:wg=>"WG 3"}
 OUTPUT
   end
 
@@ -100,7 +144,7 @@ OUTPUT
     <title type="title-main" language="fr" format="text/plain">Spécification et méthodes d'essai</title>
     <title type="title-part" language="fr" format="text/plain">Riz</title>
   </title>
-  <docidentifier type="iso">ISO/IEC/CD 17301-1-3</docidentifier>
+  <docidentifier type="ISO">ISO/IEC/CD 17301-1-3</docidentifier>
   <docidentifier type="iso-with-lang">ISO/IEC/CD 17301-1-3 (E)</docidentifier>
   <docidentifier type="iso-reference">ISO/IEC/CD 17301-1-3 (E)</docidentifier>
   <docidentifier type="iso-tc">17301</docidentifier>
@@ -159,7 +203,45 @@ OUTPUT
 </bibdata>
 </iso-standard>
 INPUT
-{:agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :docnumber=>"ISO/IEC/CD 17301-1-3", :docnumber_lang=>"ISO/IEC/CD 17301-1-3 (E)", :docnumber_reference=>"ISO/IEC/CD 17301-1-3 (E)", :docnumeric=>nil, :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1&ndash;3: Riz", :docsubtitleintro=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses", :docsubtitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai", :docsubtitlepart=>"Riz", :docsubtitlepartlabel=>"Partie&nbsp;1&ndash;3", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1&ndash;3: Rice", :doctitleintro=>"Cereals and pulses", :doctitlemain=>"Specifications and test methods", :doctitlepart=>"Rice", :doctitlepartlabel=>"Part&nbsp;1&ndash;3", :doctype=>"International Standard", :docyear=>"2016", :draft=>nil, :draftinfo=>"", :edition=>nil, :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :ics=>"1.2.3, 1.2.3", :keywords=>[], :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :publisher=>"International Organization for Standardization and International Electrotechnical Commission", :revdate=>nil, :revdate_monthyear=>nil, :sc=>"DEF 4", :secretariat=>"XXXX", :stage=>"60", :stage_int=>60, :statusabbr=>"IS", :tc=>"ABC 34", :tc_docnumber=>["17301"], :unpublished=>false, :wg=>"GHI 3"}
+{:agency=>"ISO/IEC",
+:authors=>[],
+:authors_affiliations=>{},
+:docnumber=>"ISO/IEC/CD 17301-1-3",
+:docnumber_lang=>"ISO/IEC/CD 17301-1-3 (E)",
+:docnumber_reference=>"ISO/IEC/CD 17301-1-3 (E)",
+:docnumeric=>nil,
+:docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1&ndash;3: Riz",
+:docsubtitleintro=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses",
+:docsubtitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai",
+:docsubtitlepart=>"Riz",
+:docsubtitlepartlabel=>"Partie&nbsp;1&ndash;3",
+:doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1&ndash;3: Rice",
+:doctitleintro=>"Cereals and pulses",
+:doctitlemain=>"Specifications and test methods",
+:doctitlepart=>"Rice",
+:doctitlepartlabel=>"Part&nbsp;1&ndash;3",
+:doctype=>"International Standard",
+:docyear=>"2016",
+:draft=>nil,
+:draftinfo=>"",
+:edition=>nil,
+:editorialgroup=>["ABC 34", "DEF 4", "GHI 3"],
+:ics=>"1.2.3, 1.2.3",
+:keywords=>[],
+:obsoletes=>"IEC 8121",
+:obsoletes_part=>"3.1",
+:publisher=>"International Organization for Standardization and International Electrotechnical Commission",
+:revdate=>nil,
+:revdate_monthyear=>nil,
+:sc=>"DEF 4",
+:secretariat=>"XXXX",
+:stage=>"60",
+:stage_int=>60,
+:statusabbr=>"IS",
+:tc=>"ABC 34",
+:tc_docnumber=>["17301"],
+:unpublished=>false,
+:wg=>"GHI 3"}
 OUTPUT
   end
 

data/spec/isodoc/postproc_spec.rb

@@ -730,7 +730,7 @@ end
       <a name='boilerplate-place' id='boilerplate-place'/>
       Dilbert Associates
     </p>
-    <p align='left' style='text-align:left' class='zzAddress'>
+    <p align='left' style='text-align:left;' class='zzAddress'>
       <a name='boilerplate-address' id='boilerplate-address'/>
       Elbonia 5000
     </p>

data/spec/isodoc/ref_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe IsoDoc do
       <abbreviation>ISO</abbreviation>
     </organization>
   </contributor>
-  <note format="text/plain" reference="1">ISO DATE: Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
+  <note format="text/plain" reference="1" type="ISO DATE">Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
   <extent type="part">
   <referenceFrom>all</referenceFrom>
   </extent>
@@ -142,7 +142,7 @@ RSpec.describe IsoDoc do
                <p id="ISO16634" class="NormRef">ISO 16634:-- (all parts)<a class="FootnoteRef" href="#fn:1"><sup>1</sup></a>, <i>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i></p>
                <p id="ISO20483" class="NormRef">ISO 20483:2013-2014, <i>Cereals and pulses</i></p>
                <p id="ref1" class="NormRef">ICC 167, <span style="font-variant:small-caps;">Standard No I.C.C 167</span>. <i>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</i> (see <a href="http://www.icc.or.at">http://www.icc.or.at</a>)</p>
-               <div id="" class="Note">
+               <div class="Note">
                  <p><span class="note_label">NOTE</span>&#160; This is an annotation of ISO 20483:2013-2014</p>
                </div>
              </div>
@@ -151,16 +151,16 @@ RSpec.describe IsoDoc do
                <h1 class="Section3">Bibliography</h1>
                <p id="ISBN" class="Biblio">[1]&#160; <i>Chemicals for analytical laboratory use</i></p>
                <p id="ISSN" class="Biblio">[2]&#160; <i>Instruments for analytical laboratory use</i></p>
-               <div id="" class="Note">
+               <div class="Note">
   <p><span class="note_label">NOTE</span>&#160; This is an annotation of document ISSN.</p>
 </div>
-<div id="" class="Note">
+<div class="Note">
   <p><span class="note_label">NOTE</span>&#160; This is another annotation of document ISSN.</p>
 </div>
                <p id="ISO3696" class="Biblio">[3]&#160; ISO 3696, <i>Water for analytical laboratory use</i></p>
                <p id="ref10" class="Biblio">[10]&#160; <span style="font-variant:small-caps;">Standard No I.C.C 167</span>. <i>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</i> (see <a href="http://www.icc.or.at">http://www.icc.or.at</a>)</p>
                <p id="ref11" class="Biblio">[5]&#160; IETF RFC 10, <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i></p>
-               <p id="ref12" class="Biblio">[6]&#160; Citn, IETF RFC 20, CitationWorks. 2019. <i>How to cite a reference</i>.</p>
+               <p id="ref12" class="Biblio">Citn&#160; IETF RFC 20, CitationWorks. 2019. <i>How to cite a reference</i>.</p>
              </div>
              <aside id="fn:1" class="footnote">
          <p>Under preparation. (Stage at the time of publication ISO/DIS 16634)</p>

data/spec/isodoc/table_spec.rb

@@ -87,11 +87,11 @@ RSpec.describe IsoDoc do
           <td style='text-align:left;border-top:none;border-bottom:solid windowtext 1.5pt;;text-align:center;vertical-align:middle;' scope='col'>Arborio</td>
           <td style='text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;;text-align:center;vertical-align:middle;' scope='col'>
             Drago
-            <a href='#tableD-1a' class='TableFootnoteRef'>a)</a>
+            <a href='#tableD-1a' class='TableFootnoteRef'>a</a>
           </td>
           <td style='text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;;text-align:center;vertical-align:middle;' scope='col'>
             Balilla
-            <a href='#tableD-1a' class='TableFootnoteRef'>a)</a>
+            <a href='#tableD-1a' class='TableFootnoteRef'>a</a>
           </td>
           <td style='text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;;text-align:center;vertical-align:middle;' scope='col'>Thaibonnet</td>
         </tr>
@@ -128,7 +128,7 @@ RSpec.describe IsoDoc do
         </tr>
         <tr>
           <td colspan='5' style='border-top:0pt;border-bottom:solid windowtext 1.5pt;'>
-            <div id='' class='Note'>
+            <div class='Note'>
               <p>
                 <span class='note_label'>NOTE</span>
                 &#xA0; This is a table about rice
@@ -138,7 +138,7 @@ RSpec.describe IsoDoc do
               <div id='fn:tableD-1a'>
                 <p id='_0fe65e9a-5531-408e-8295-eeff35f41a55' class='TableFootnote'>
                   <span>
-                    <span id='tableD-1a' class='TableFootnoteRef'>a)</span>
+                    <span id='tableD-1a' class='TableFootnoteRef'>a</span>
                     &#xA0;
                   </span>
                   Parboiled rice.
@@ -233,8 +233,8 @@ OUTPUT
                      </tr>
                      <tr>
                        <td align="center" style="border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;" valign="middle">Arborio</td>
-                       <td align="center" style="border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;" valign="middle">Drago<a href="#tableD-1a" class="TableFootnoteRef">a)</a></td>
-                       <td align="center" style="border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;" valign="middle">Balilla<a href="#tableD-1a" class="TableFootnoteRef">a)</a></td>
+                       <td align="center" style="border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;" valign="middle">Drago<a href="#tableD-1a" class="TableFootnoteRef">a</a></td>
+                       <td align="center" style="border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;" valign="middle">Balilla<a href="#tableD-1a" class="TableFootnoteRef">a</a></td>
                        <td align="center" style="border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;" valign="middle">Thaibonnet</td>
                      </tr>
                    </thead>
@@ -268,10 +268,10 @@ OUTPUT
                        <td align="center" style="border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:0pt;mso-border-bottom-alt:0pt;">2,26</td>
                        <td align="center" style="border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:0pt;mso-border-bottom-alt:0pt;">6,06</td>
                      </tr>
-                   <tr><td colspan="5" style="border-top:0pt;mso-border-top-alt:0pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;"><div id="" class="Note">
+                   <tr><td colspan="5" style="border-top:0pt;mso-border-top-alt:0pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;"><div class="Note">
                      <p class="Note"><span class="note_label">NOTE</span><span style="mso-tab-count:1">&#xA0; </span>This is a table about rice</p>
                    </div><div class="TableFootnote"><div><a name="ftntableD-1a" id="ftntableD-1a"></a>
-         <p class="TableFootnote"><a name="_0fe65e9a-5531-408e-8295-eeff35f41a55" id="_0fe65e9a-5531-408e-8295-eeff35f41a55"></a><span><span class="TableFootnoteRef"><a name="tableD-1a" id="tableD-1a"></a>a)</span><span style="mso-tab-count:1">&#xA0; </span></span>Parboiled rice.</p>
+         <p class="TableFootnote"><a name="_0fe65e9a-5531-408e-8295-eeff35f41a55" id="_0fe65e9a-5531-408e-8295-eeff35f41a55"></a><span><span class="TableFootnoteRef"><a name="tableD-1a" id="tableD-1a"></a>a</span><span style="mso-tab-count:1">&#xA0; </span></span>Parboiled rice.</p>
        </div></div></td></tr></tfoot>