metanorma-iso 1.3.23 → 1.4.0

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/i18n_spec.rb

@@ -59,11 +59,11 @@ RSpec.describe IsoDoc do
        <appendix id="Q2" inline-header="false" obligation="normative">
          <title>An Appendix</title>
        </appendix>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>
@@ -203,11 +203,11 @@ RSpec.describe IsoDoc do
               <appendix id="Q2" inline-header="false" obligation="normative">
          <title>An Appendix</title>
        </appendix>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>
@@ -347,11 +347,11 @@ RSpec.describe IsoDoc do
               <appendix id="Q2" inline-header="false" obligation="normative">
          <title>An Appendix</title>
        </appendix>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>
@@ -492,7 +492,7 @@ RSpec.describe IsoDoc do
               <appendix id="Q2" inline-header="false" obligation="normative">
          <title>An Appendix</title>
        </appendix>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
          <bibitem id="ISO712" type="standard">
   <title format="text/plain">Cereals and cereal products</title>
@@ -506,7 +506,7 @@ RSpec.describe IsoDoc do
 </bibitem>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>

data/spec/isodoc/inline_spec.rb

@@ -158,7 +158,7 @@ RSpec.describe IsoDoc do
     <eref type="inline" bibitemid="ISO712" citeas="ISO 712">A</stem>
     </p>
     </foreword></preface>
-    <bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
+    <bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
 <bibitem id="ISO712" type="standard">
   <title format="text/plain">Cereals and cereal products</title>
   <docidentifier>ISO 712</docidentifier>
@@ -213,7 +213,7 @@ RSpec.describe IsoDoc do
     <eref type="inline" bibitemid="ISO712" citeas="ISO 712">A</eref>
     </p>
     </foreword></preface>
-    <bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
+    <bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
 <bibitem id="ISO712" type="standard">
   <title format="text/plain">Cereals and cereal products</title>
   <docidentifier>ISO 712</docidentifier>
@@ -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/iso_spec.rb

@@ -96,7 +96,7 @@ RSpec.describe IsoDoc::Iso do
   <eref bibitemid="ISO20483"/>
   </p>
     </foreword></preface>
-    <bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
+    <bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
           <bibitem type="international-standard" id="IEV">
   <title format="text/plain" language="en" script="Latn">Electropedia: 
   The World's Online Electrotechnical Vocabulary</title>

data/spec/isodoc/metadata_spec.rb

@@ -16,8 +16,9 @@ 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>
   <docidentifier type="iso-tc">17302</docidentifier>
   <docnumber>1730</docnumber>
@@ -59,6 +60,8 @@ RSpec.describe IsoDoc::Iso::Metadata do
       </organization>
     </owner>
   </copyright>
+  <keyword>kw2</keyword>
+  <keyword>kw1</keyword>
   <ext>
   <doctype>international-standard</doctype>
   <editorialgroup>
@@ -75,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)", :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=>"XXX", :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
 
@@ -97,8 +144,9 @@ 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>
   <contributor>
     <role type="author"/>
@@ -155,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)", :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", :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

@@ -292,25 +292,25 @@ RSpec.describe IsoDoc do
              <p class="zzSTDTitle1"></p>
              <div id="A">
                <h1 id="toc0">1&#xA0; Clause 4</h1>
-               <a rel="footnote" href="#fn:3" epub:type="footnote" id="fnref:1">
+               <a href="#fn:3" class="FootnoteRef" id="fnref:1">
                  <sup>1)</sup>
                </a>
                <div id="N">
 
-                <h2 id="toc1">1.1&#xA0; Introduction to this<a rel="footnote" href="#fn:2" epub:type="footnote" id="fnref:2"><sup>2)</sup></a></h2>
+                <h2 id="toc1">1.1&#xA0; Introduction to this<a href="#fn:2" class="FootnoteRef" id="fnref:2"><sup>2)</sup></a></h2>
               </div>
                <div id="O">
                 <h2 id="toc2">1.2&#xA0; Clause 4.2</h2>
-                <p>A<a rel="footnote" href="#fn:2" epub:type="footnote"><sup>2)</sup></a></p>
+                <p>A<a class="FootnoteRef" href="#fn:2"><sup>2)</sup></a></p>
               </div>
              </div>
              <aside id="fn:3" class="footnote">
-         <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a rel="footnote" href="#fn:3" epub:type="footnote">
+         <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a class="FootnoteRef" href="#fn:3">
                  <sup>1)</sup>
                </a>This is a footnote.</p>
        <a href="#fnref:1">&#x21A9;</a></aside>
              <aside id="fn:2" class="footnote">
-         <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a rel="footnote" href="#fn:2" epub:type="footnote"><sup>2)</sup></a>Formerly denoted as 15 % (m/m).</p>
+         <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a href="#fn:2" class="FootnoteRef"><sup>2)</sup></a>Formerly denoted as 15 % (m/m).</p>
        <a href="#fnref:2">&#x21A9;</a></aside>
 
            </main>
@@ -353,7 +353,7 @@ RSpec.describe IsoDoc do
                Clause 4
              </h1>
              <span style='mso-bookmark:_Ref'>
-               <a href='#_ftn1' epub:type='footnote' style='mso-footnote-id:ftn1' name='_ftnref1' title='' id='_ftnref1'>
+               <a href='#_ftn1' class='FootnoteRef' epub:type='footnote' style='mso-footnote-id:ftn1' name='_ftnref1' title='' id='_ftnref1'>
                  <span class='MsoFootnoteReference'>
                    <span style='mso-special-character:footnote'/>
                  </span>
@@ -367,7 +367,7 @@ RSpec.describe IsoDoc do
                  <span style='mso-tab-count:1'>&#xA0; </span>
                  Introduction to this
                  <span style='mso-bookmark:_Ref'>
-                   <a href='#_ftn2' epub:type='footnote' style='mso-footnote-id:ftn2' name='_ftnref2' title='' id='_ftnref2'>
+                   <a href='#_ftn2' epub:type='footnote' class='FootnoteRef' style='mso-footnote-id:ftn2' name='_ftnref2' title='' id='_ftnref2'>
                      <span class='MsoFootnoteReference'>
                        <span style='mso-special-character:footnote'/>
                      </span>
@@ -386,7 +386,7 @@ RSpec.describe IsoDoc do
                <p class='MsoNormal'>
                  A
                  <span style='mso-bookmark:_Ref'>
-                   <a href='#_ftn3' epub:type='footnote' style='mso-footnote-id:ftn3' name='_ftnref3' title='' id='_ftnref3'>
+                   <a href='#_ftn3' class='FootnoteRef' epub:type='footnote' style='mso-footnote-id:ftn3' name='_ftnref3' title='' id='_ftnref3'>
                      <span class='MsoFootnoteReference'>
                        <span style='mso-special-character:footnote'/>
                      </span>
@@ -678,8 +678,8 @@ documentation.
 </iso-standard>
     INPUT
     word = File.read("test.html", encoding: "UTF-8")
-    expect(xmlpp(word)).to include "<h1 class='IntroTitle'>Warning for Stuff</h1>"
-    expect(xmlpp(word)).to include "I am the Walrus."
+    expect((word)).to include '<h1 class="IntroTitle">Warning for Stuff</h1>'
+    expect((word)).to include "I am the Walrus."
 end
 
   it "processes boilerplate (Word)" do
@@ -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>
@@ -740,109 +740,4 @@ end
     expect(word).to include '<p class="zzWarning">I am the Walrus</p>'
 end
 
-    it "skips internal hyperlinks" do
-      FileUtils.rm_f "test.html"
-    FileUtils.rm_f "test.doc"
-    IsoDoc::Iso::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
-    <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <preface>
-    <foreword>
-    <p>
-    <xref target="scope"/>
-    <xref target="terms"/>
-    <xref target="_waxy_rice"/>
-    <xref target="N"/>
-    <xref target="N1"/>
-    <xref target="N2"/>
-    <xref target="N3"/>
-    <xref target="N4"/>
-    <xref target="N5"/>
-    <xref target="N6"/>
-    <xref target="N7"/>
-    <xref target="N8"/>
-    <xref target="N9"/>
-    <xref target="N10"/>
-      <eref bibitemid="ISO712"/>
-    </p>
-    </foreword>
-    </preface>
-    <sections>
-    <clause id="scope"><title>Scope</title>
-    <note id="N">
-  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
-</note>
-<figure id="N1">
-  <name>Split-it-right sample divider</name>
-  </figure>
-  <example id="N2">
-  <p>Hello</p>
-</example>
-<formula id="N3">
-  <stem type="AsciiMath">r = 1 %</stem>
-  </formula>
-  <table id="N4">
-    <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>
-    <ol id="N6">
-      <li id="N7"><p>A</p></li>
-</ol>
-<requirement id="N8">
-  <stem type="AsciiMath">r = 1 %</stem>
-  </requirement>
-<recommendation id="N9">
-  <stem type="AsciiMath">r = 1 %</stem>
-  </requirement>
-<permission id="N10">
-  <stem type="AsciiMath">r = 1 %</stem>
-  </requirement>
-    </clause>
-    <terms id="terms">
-<term id="_waxy_rice"><preferred>waxy rice</preferred>
-<termnote id="N5">
-  <p id="_b0cb3dfd-78fc-47dd-a339-84070d947463">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
-</termnote></term>
-</terms>
-</sections>
-<bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
-    <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
-<bibitem id="ISO712" type="standard">
-  <title format="text/plain">Cereals or cereal products</title>
-  <title type="main" format="text/plain">Cereals and cereal products</title>
-  <docidentifier type="ISO">ISO 712</docidentifier>
-  <contributor>
-    <role type="publisher"/>
-    <organization>
-      <name>International Organization for Standardization</name>
-    </organization>
-  </contributor>
-</bibitem>
-</references>
-</bibliography>
-</iso-standard>
-      INPUT
-expect(File.exist?("test.html")).to be true
- html = File.read("test.html", encoding: "UTF-8").sub(/^.*<main class="main-section">/m, '<main class="main-section">').
-   sub(%r{</main>.*$}m, "</main>").sub(%r{^.*?<div>}m, "<div>").sub(%r{</div>.*$}m, "</div>")
-    expect(xmlpp(html)).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      <div>
-    <h1 class='ForewordTitle' id="toc0">Foreword</h1>
-    <p>
-      <a href='#scope'>Clause 1</a>
-      <a href='#terms'>Clause 3</a>
-      <a href='#_waxy_rice'>3.1</a>
-       Clause 1, Note Figure 1 Clause 1, Example Clause 1, Formula (1) Table 1
-      3.1, Note 1 Clause 1, List Clause 1 a) Clause 1, Requirement 1 Clause 1,
-      Recommendation 1 Clause 1, Permission 1
-      <a href='#ISO712'>ISO 712</a>
-    </p>
-  </div>
-OUTPUT
-    end
 end