metanorma-iso 1.3.20 → 1.3.25

data/spec/isodoc/ref_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe IsoDoc do
   <eref bibitemid="ref12"/>
   </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>
     <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>
@@ -65,7 +65,7 @@ RSpec.describe IsoDoc do
 </bibitem>
 <note><p>This is an annotation of ISO 20483:2013-2014</p></note>
 
-</references><references id="_bibliography" obligation="informative">
+</references><references id="_bibliography" obligation="informative" normative="false">
   <title>Bibliography</title>
 <bibitem id="ISBN" type="ISBN">
   <title format="text/plain">Chemicals for analytical laboratory use</title>
@@ -131,7 +131,7 @@ RSpec.describe IsoDoc do
          <a href="#ISO16634">ISO 16634:--</a>
          <a href="#ref1">ICC 167</a>
          <a href="#ref10">[10]</a>
-         <a href="#ref12">[Citn]</a>
+         <a href="#ref12">Citn</a>
          </p>
              </div>
              <p class="zzSTDTitle1"/>
@@ -160,7 +160,7 @@ RSpec.describe IsoDoc do
                <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, CitationWorks. 2019. <i>How to cite a reference</i>.</p>
+               <p id="ref12" class="Biblio">[6]&#160; Citn, 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/section_spec.rb

@@ -12,9 +12,7 @@ RSpec.describe IsoDoc do
         <introduction id="B" obligation="informative"><title>Introduction</title><clause id="C" inline-header="false" obligation="informative">
          <title>Introduction Subsection</title>
        </clause>
-       <patent-notice>
        <p>This is patent boilerplate</p>
-       </patent-notice>
        </introduction></preface><sections>
        <clause id="D" obligation="normative">
          <title>Scope</title>
@@ -58,12 +56,12 @@ RSpec.describe IsoDoc do
               <appendix id="Q2" inline-header="false" obligation="normative">
          <title>An Appendix</title>
        </appendix>
-       <references id="Q3"><title>Annex Bibliography</title></references>
-       </annex><bibliography><references id="R" obligation="informative">
+       <references id="Q3" normative="false"><title>Annex Bibliography</title></references>
+       </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>
@@ -92,7 +90,7 @@ RSpec.describe IsoDoc do
                 <div>
                   <h1>2&#160; Normative references</h1>
                 </div>
-                <div id="H"><h1>3&#160; Terms, definitions, symbols and abbreviated terms</h1>
+                <div id="H"><h1>3&#160; Terms, Definitions, Symbols and Abbreviated Terms</h1>
         <div id="I">
            <h2>3.1&#160; Normal Terms</h2>
            <p class="TermNum" id="J">3.1.1</p>
@@ -160,9 +158,7 @@ OUTPUT
         <introduction id="B" obligation="informative"><title>Introduction</title><clause id="C" inline-header="false" obligation="informative">
          <title>Introduction Subsection</title>
        </clause>
-       <patent-notice>
        <p>This is patent boilerplate</p>
-       </patent-notice>
        </introduction></preface><sections>
        <clause id="D" obligation="normative">
          <title>Scope</title>
@@ -206,11 +202,11 @@ OUTPUT
               <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>
@@ -248,7 +244,7 @@ OUTPUT
                <div>
                  <h1>2<span style="mso-tab-count:1">&#160; </span>Normative references</h1>
                </div>
-               <div id="H"><h1>3<span style="mso-tab-count:1">&#160; </span>Terms, definitions, symbols and abbreviated terms</h1>
+               <div id="H"><h1>3<span style="mso-tab-count:1">&#160; </span>Terms, Definitions, Symbols and Abbreviated Terms</h1>
        <div id="I">
           <h2>3.1<span style="mso-tab-count:1">&#160; </span>Normal Terms</h2>
           <p class="TermNum" id="J">3.1.1</p>
@@ -363,7 +359,7 @@ OUTPUT
     INPUT
     #{HTML_HDR}
                <p class="zzSTDTitle1"/>
-               <div id="H"><h1>1&#160; Terms and definitions</h1>
+               <div id="H"><h1>1&#160; Terms, Definitions, Symbols and Abbreviated Terms</h1>
        <p class="TermNum" id="J">1.1</p>
          <p class="Terms" style="text-align:left;">Term2</p>
        </div>

data/spec/isodoc/table_spec.rb

@@ -68,7 +68,7 @@ RSpec.describe IsoDoc do
   <button onclick='topFunction()' id='myBtn' title='Go to top'>Top</button>
   <br/>
   <div>
-    <h1 class='ForewordTitle'>Foreword</h1>
+    <h1 class='ForewordTitle' id="toc0">Foreword</h1>
     <p class='TableTitle' style='text-align:center;'>
       Table 1&#xA0;&#x2014; Repeatability and reproducibility of
       <i>husked</i>
@@ -80,51 +80,51 @@ RSpec.describe IsoDoc do
       </caption>
       <thead>
         <tr>
-          <td rowspan='2' style='text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;;text-align:center;vertical-align:middle;' scope='col'>Description</td>
-          <td colspan='4' style='text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;padding:0;;text-align:center;vertical-align:middle;' scope='colgroup'>Rice sample</td>
+          <td rowspan='2' style='text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;;text-align:center;vertical-align:middle;' scope='col'>Description</td>
+          <td colspan='4' style='text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;;text-align:center;vertical-align:middle;' scope='colgroup'>Rice sample</td>
         </tr>
         <tr>
-          <td style='text-align:left;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;;text-align:center;vertical-align:middle;' scope='col'>Arborio</td>
-          <td style='text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;;text-align:center;vertical-align:middle;' scope='col'>
+          <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>
           </td>
-          <td style='text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;;text-align:center;vertical-align:middle;' scope='col'>
+          <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>
           </td>
-          <td style='text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;;text-align:center;vertical-align:middle;' scope='col'>Thaibonnet</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>
       </thead>
       <tbody>
         <tr>
-          <th style='font-weight:bold;text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;padding:0;' scope='row'>Number of laboratories retained after eliminating outliers</th>
-          <td style='text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;padding:0;'>13</td>
-          <td style='text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;padding:0;'>11</td>
-          <td style='text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;padding:0;'>13</td>
-          <td style='text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;padding:0;'>13</td>
+          <th style='font-weight:bold;text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;' scope='row'>Number of laboratories retained after eliminating outliers</th>
+          <td style='text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>13</td>
+          <td style='text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>11</td>
+          <td style='text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>13</td>
+          <td style='text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>13</td>
         </tr>
         <tr>
-          <td style='text-align:left;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;'>Mean value, g/100 g</td>
-          <td style='text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;'>81,2</td>
-          <td style='text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;'>82,0</td>
-          <td style='text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;'>81,8</td>
-          <td style='text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;'>77,7</td>
+          <td style='text-align:left;border-top:none;border-bottom:solid windowtext 1.5pt;'>Mean value, g/100 g</td>
+          <td style='text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;'>81,2</td>
+          <td style='text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;'>82,0</td>
+          <td style='text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;'>81,8</td>
+          <td style='text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;'>77,7</td>
         </tr>
       </tbody>
       <tfoot>
         <tr>
-          <td style='text-align:left;border-top:solid windowtext 1.5pt;border-bottom:0pt;padding:0;'>
+          <td style='text-align:left;border-top:solid windowtext 1.5pt;border-bottom:0pt;'>
             Reproducibility limit,
             <span class='stem'>(#(R)#)</span>
              (= 2,83
             <span class='stem'>(#(s_R)#)</span>
             )
           </td>
-          <td style='text-align:center;border-top:solid windowtext 1.5pt;border-bottom:0pt;padding:0;'>2,89</td>
-          <td style='text-align:center;border-top:solid windowtext 1.5pt;border-bottom:0pt;padding:0;'>0,57</td>
-          <td style='text-align:center;border-top:solid windowtext 1.5pt;border-bottom:0pt;padding:0;'>2,26</td>
-          <td style='text-align:center;border-top:solid windowtext 1.5pt;border-bottom:0pt;padding:0;'>6,06</td>
+          <td style='text-align:center;border-top:solid windowtext 1.5pt;border-bottom:0pt;'>2,89</td>
+          <td style='text-align:center;border-top:solid windowtext 1.5pt;border-bottom:0pt;'>0,57</td>
+          <td style='text-align:center;border-top:solid windowtext 1.5pt;border-bottom:0pt;'>2,26</td>
+          <td style='text-align:center;border-top:solid windowtext 1.5pt;border-bottom:0pt;'>6,06</td>
         </tr>
         <tr>
           <td colspan='5' style='border-top:0pt;border-bottom:solid windowtext 1.5pt;'>
@@ -224,8 +224,8 @@ OUTPUT
 
        expect(File.exist?("test.doc")).to be true
        html = File.read("test.doc").sub(/^.+?<table /m, '<table xmlns:m="m" ').sub(%r{</div>\s*<p class="MsoNormal">.*$}m, "")
-       expect(("<div>#{html}")).to be_equivalent_to xmlpp(<<~"OUTPUT")
-       <div><table xmlns:m="m" class="MsoISOTable" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;" title="tool tip" summary="long desc"><a name="tableD-1" id="tableD-1"></a>
+       expect(xmlpp("<div>#{html}")).to be_equivalent_to xmlpp(<<~"OUTPUT")
+       <div><table xmlns:m="m" class="MsoISOTable" style="mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;" title="tool tip" summary="long desc"><a name="tableD-1" id="tableD-1"></a>
                    <thead>
                      <tr>
                        <td rowspan="2" align="center" style="border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;" valign="middle">Description</td>

data/spec/isodoc/terms_spec.rb

@@ -54,7 +54,7 @@ RSpec.describe IsoDoc do
     INPUT
     #{HTML_HDR}
              <p class="zzSTDTitle1"/>
-             <div id="_terms_and_definitions"><h1>1&#160; Terms and definitions</h1>
+             <div id="_terms_and_definitions"><h1>1&#160; Terms and Definitions</h1>
        <p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
 
        <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">&lt;rice&gt; rice retaining its husk after threshing</p>
@@ -141,7 +141,7 @@ OUTPUT
 </sections>
 </iso-standard>
     INPUT
-                 <div id="_terms_and_definitions"><h1>1<span style="mso-tab-count:1">&#160; </span>Terms and definitions</h1>
+                 <div id="_terms_and_definitions"><h1>1<span style="mso-tab-count:1">&#160; </span>Terms and Definitions</h1>
        <p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
 
        <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">&lt;rice&gt; rice retaining its husk after threshing</p>

data/spec/isodoc/xref_spec.rb

@@ -78,7 +78,7 @@ RSpec.describe IsoDoc do
                    <a href="#N">Note</a>
                  </p>
                </div>
-               <div id="terms"><h1>2&#160; Terms and definitions</h1>
+               <div id="terms"><h1>2&#160; </h1>
        </div>
                <div id="widgets">
                  <h1>3&#160; Widgets</h1>
@@ -195,7 +195,7 @@ RSpec.describe IsoDoc do
                    <a href="#N">Figure 1</a>
                  </p>
                </div>
-               <div id="terms"><h1>2&#160; Terms and definitions</h1>
+               <div id="terms"><h1>2&#160; </h1>
        </div>
                <div id="widgets">
                  <h1>3&#160; Widgets</h1>
@@ -314,7 +314,7 @@ RSpec.describe IsoDoc do
                <div id="scope">
                  <h1>1&#160; Scope</h1>
                </div>
-               <div id="terms"><h1>2&#160; Terms and definitions</h1>
+               <div id="terms"><h1>2&#160; </h1>
        </div>
                <div id="widgets">
                  <h1>3&#160; Widgets</h1>
@@ -438,7 +438,7 @@ RSpec.describe IsoDoc do
           <a href="#N">Example</a>
         </p>
       </div>
-      <div id="terms"><h1>2&#160; Terms and definitions</h1>
+      <div id="terms"><h1>2&#160; </h1>
 </div>
       <div id="widgets">
         <h1>3&#160; Widgets</h1>
@@ -560,7 +560,7 @@ RSpec.describe IsoDoc do
                    <a href="#N">Formula (1)</a>
                  </p>
                </div>
-               <div id="terms"><h1>2&#160; Terms and definitions</h1>
+               <div id="terms"><h1>2&#160; </h1>
        </div>
                <div id="widgets">
                  <h1>3&#160; Widgets</h1>
@@ -710,9 +710,9 @@ RSpec.describe IsoDoc do
                  <table id="N" class="MsoISOTable" style="border-width:1px;border-spacing:0;">
                    <tbody>
                      <tr>
-                       <td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">Number of laboratories retained after eliminating outliers</td>
-                       <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">13</td>
-                       <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">11</td>
+                       <td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td>
+                       <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td>
+                       <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td>
                      </tr>
                    </tbody>
                  </table>
@@ -720,13 +720,13 @@ RSpec.describe IsoDoc do
                    <a href="#N">Table 1</a>
                  </p>
                </div>
-               <div id="terms"><h1>2&#160; Terms and definitions</h1>
+               <div id="terms"><h1>2&#160; </h1>
        </div>
                <div id="widgets">
                  <h1>3&#160; Widgets</h1>
                  <div id="widgets1"><span class='zzMoveToFollowing'><b>3.1&#160; </b></span>
-           <p class="TableTitle" style="text-align:center;">Table 2&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="note1" class="MsoISOTable" style="border-width:1px;border-spacing:0;"><tbody><tr><td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">Number of laboratories retained after eliminating outliers</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">11</td></tr></tbody></table>
-           <p class="TableTitle" style="text-align:center;">Table 3&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="note2" class="MsoISOTable" style="border-width:1px;border-spacing:0;"><tbody><tr><td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">Number of laboratories retained after eliminating outliers</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">11</td></tr></tbody></table>
+           <p class="TableTitle" style="text-align:center;">Table 2&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="note1" class="MsoISOTable" style="border-width:1px;border-spacing:0;"><tbody><tr><td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
+           <p class="TableTitle" style="text-align:center;">Table 3&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="note2" class="MsoISOTable" style="border-width:1px;border-spacing:0;"><tbody><tr><td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
        <p>    <a href="#note1">Table 2</a> <a href="#note2">Table 3</a> </p>
        </div>
                </div>
@@ -741,11 +741,11 @@ RSpec.describe IsoDoc do
   <b/>
 </h1>
                  <div id="annex1a"><span class='zzMoveToFollowing'><b>A.1&#160; </b></span>
-           <p class="TableTitle" style="text-align:center;">Table A.1&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="AN" class="MsoISOTable" style="border-width:1px;border-spacing:0;"><tbody><tr><td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">Number of laboratories retained after eliminating outliers</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">11</td></tr></tbody></table>
+           <p class="TableTitle" style="text-align:center;">Table A.1&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="AN" class="MsoISOTable" style="border-width:1px;border-spacing:0;"><tbody><tr><td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
        </div>
                  <div id="annex1b"><span class='zzMoveToFollowing'><b>A.2&#160; </b></span>
-           <p class="TableTitle" style="text-align:center;">Table A.2&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="Anote1" class="MsoISOTable" style="border-width:1px;border-spacing:0;"><tbody><tr><td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">Number of laboratories retained after eliminating outliers</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">11</td></tr></tbody></table>
-           <p class="TableTitle" style="text-align:center;">Table A.3&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="Anote2" class="MsoISOTable" style="border-width:1px;border-spacing:0;"><tbody><tr><td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">Number of laboratories retained after eliminating outliers</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">11</td></tr></tbody></table>
+           <p class="TableTitle" style="text-align:center;">Table A.2&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="Anote1" class="MsoISOTable" style="border-width:1px;border-spacing:0;"><tbody><tr><td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
+           <p class="TableTitle" style="text-align:center;">Table A.3&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="Anote2" class="MsoISOTable" style="border-width:1px;border-spacing:0;"><tbody><tr><td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
        </div>
                </div>
              </div>
@@ -799,7 +799,7 @@ RSpec.describe IsoDoc do
                <div id="scope">
                  <h1>1&#160; Scope</h1>
                </div>
-               <div id="terms"><h1>2&#160; Terms and definitions</h1>
+               <div id="terms"><h1>2&#160; </h1>
        <p class="TermNum" id="_waxy_rice">2.1</p><p class="Terms" style="text-align:left;">waxy rice</p>
        <div class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div><p class="TermNum" id="_nonwaxy_rice">2.2</p><p class="Terms" style="text-align:left;">nonwaxy rice</p>
        <div class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
@@ -882,11 +882,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>
@@ -1058,7 +1058,7 @@ Text
          <li><p>A</p></li>
        </ol>
              </div>
-             <div id="terms"><h1>2&#160; Terms and definitions</h1>
+             <div id="terms"><h1>2&#160; </h1>
        </div>
              <div id="widgets">
                <h1>3&#160; Widgets</h1>
@@ -1172,7 +1172,7 @@ Text
          <li id="N"><p>A</p></li>
        </ol>
              </div>
-             <div id="terms"><h1>2&#160; Terms and definitions</h1>
+             <div id="terms"><h1>2&#160; </h1>
        </div>
              <div id="widgets">
                <h1>3&#160; Widgets</h1>

data/spec/metanorma/processor_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe Metanorma::Iso::Processor do
 
   it "registers output formats against metanorma" do
     expect(processor.output_formats.sort.to_s).to be_equivalent_to <<~"OUTPUT"
-    [[:doc, "doc"], [:html, "html"], [:html_alt, "alt.html"], [:rxl, "rxl"], [:xml, "xml"]]
+    [[:doc, "doc"], [:html, "html"], [:html_alt, "alt.html"], [:pdf, "pdf"], [:rxl, "rxl"], [:xml, "xml"]]
     OUTPUT
   end
 
@@ -49,7 +49,7 @@ RSpec.describe Metanorma::Iso::Processor do
     expect(xmlpp(File.read("test.html", encoding: "utf-8").gsub(%r{^.*<main}m, "<main").gsub(%r{</main>.*}m, "</main>"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
            <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
              <p class="zzSTDTitle1"></p>
-             <div id="H"><h1>1&#xA0; Terms and definitions</h1>
+             <div id="H"><h1 id="toc0">1&#xA0; Terms, Definitions, Symbols and Abbreviated Terms</h1>
        <h2 class="TermNum" id="J">1.1</h2>
          <p class="Terms" style="text-align:left;">Term2</p>
        </div>

data/spec/spec_helper.rb

@@ -47,6 +47,17 @@ ASCIIDOC_BLANK_HDR = <<~"HDR"
 
 HDR
 
+AMD_BLANK_HDR = <<~"HDR"
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :no-isobib:
+      :doctype: amendment
+
+HDR
+
 ISOBIB_BLANK_HDR = <<~"HDR"
       = Document title
       Author
@@ -125,7 +136,7 @@ BLANK_HDR = <<~"HDR"
   <language>en</language>
   <script>Latn</script>
   <status>
-    <stage>60</stage>
+    <stage abbreviation="IS">60</stage>
     <substage>60</substage>
   </status>
   <copyright>
@@ -144,6 +155,7 @@ BLANK_HDR = <<~"HDR"
     <subcommittee/>
     <workgroup/>
   </editorialgroup>
+  <stagename>International standard</stagename>
   </ext>
 </bibdata>
 #{BOILERPLATE}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.3.20
+  version: 1.3.25
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing
@@ -220,7 +220,6 @@ files:
 - Makefile
 - README.adoc
 - Rakefile
-- asciidoctor-iso.gemspec.old
 - bin/rspec
 - docs/asciiiso-syntax.adoc
 - docs/guidance.adoc
@@ -237,10 +236,13 @@ files:
 - lib/asciidoctor/iso/i18n-fr.yaml
 - lib/asciidoctor/iso/i18n-zh-Hans.yaml
 - lib/asciidoctor/iso/isodoc.rng
+- lib/asciidoctor/iso/isostandard-amd.rng
 - lib/asciidoctor/iso/isostandard.rnc
 - lib/asciidoctor/iso/isostandard.rng
+- lib/asciidoctor/iso/macros.rb
 - lib/asciidoctor/iso/reqt.rng
 - lib/asciidoctor/iso/section.rb
+- lib/asciidoctor/iso/term_lookup_cleanup.rb
 - lib/asciidoctor/iso/validate.rb
 - lib/asciidoctor/iso/validate_requirements.rb
 - lib/asciidoctor/iso/validate_section.rb
@@ -259,13 +261,16 @@ files:
 - lib/isodoc/iso/html/word_iso_titlepage.html
 - lib/isodoc/iso/html/wordstyle.scss
 - lib/isodoc/iso/html_convert.rb
+- lib/isodoc/iso/iso.international-standard.xsl
 - lib/isodoc/iso/metadata.rb
+- lib/isodoc/iso/pdf_convert.rb
 - lib/isodoc/iso/word_convert.rb
 - lib/metanorma-iso.rb
 - lib/metanorma/iso.rb
 - lib/metanorma/iso/processor.rb
 - lib/metanorma/iso/version.rb
 - metanorma-iso.gemspec
+- spec/asciidoctor-iso/amd_spec.rb
 - spec/asciidoctor-iso/base_spec.rb
 - spec/asciidoctor-iso/blocks_spec.rb
 - spec/asciidoctor-iso/cleanup_spec.rb
@@ -305,6 +310,7 @@ files:
 - spec/examples/rice_img/rice_image3_1.png
 - spec/examples/rice_img/rice_image3_2.png
 - spec/examples/rice_img/rice_image3_3.png
+- spec/isodoc/blocks_spec.rb
 - spec/isodoc/i18n_spec.rb
 - spec/isodoc/inline_spec.rb
 - spec/isodoc/iso_spec.rb