metanorma-iso 2.1.5 → 2.1.8

data/spec/isodoc/ref_spec.rb

@@ -162,7 +162,7 @@ RSpec.describe IsoDoc do
               <eref bibitemid="ISSN">[2]</eref>
               <eref bibitemid="ISO16634">ISO 16634:--</eref>
               <eref bibitemid="ref1">ICC 167</eref>
-              <eref bibitemid="ref10">[10]</eref>
+              <eref bibitemid="ref10">[4]</eref>
               <eref bibitemid="ref12">Citn</eref>
             </p>
           </foreword>
@@ -197,7 +197,7 @@ RSpec.describe IsoDoc do
                            for food and animal feeding stuffs according to the Dumas combustion
                            method</em> (see
 
-                <link target="http://www.icc.or.at"/> )
+                <link target="http://www.icc.or.at"/> ) [ICC 167]
                 </formattedref>
               <docidentifier type="ICC">ICC 167</docidentifier>
             </bibitem>
@@ -209,14 +209,14 @@ RSpec.describe IsoDoc do
           <references id="_bibliography" normative="false" obligation="informative" displayorder="3">
             <title depth="1">Bibliography</title>
             <bibitem id="ISBN" type="book">
-              <formattedref><em>Chemicals for analytical laboratory use</em>. ISBN.</formattedref>
+              <formattedref><em>Chemicals for analytical laboratory use</em>. n.p.: n.d. ISBN.</formattedref>
+              <docidentifier type="metanorma-ordinal">[1]</docidentifier>
               <docidentifier type="ISBN">ISBN</docidentifier>
-              <docidentifier type="metanorma">[1]</docidentifier>
             </bibitem>
             <bibitem id="ISSN" type="journal">
-              <formattedref><em>Instruments for analytical laboratory use</em>. ISSN.</formattedref>
+              <formattedref><em>Instruments for analytical laboratory use</em>. n.d. ISSN.</formattedref>
+              <docidentifier type="metanorma-ordinal">[2]</docidentifier>
               <docidentifier type="ISSN">ISSN</docidentifier>
-              <docidentifier type="metanorma">[2]</docidentifier>
             </bibitem>
             <note>
               <name>NOTE</name>
@@ -241,16 +241,16 @@ RSpec.describe IsoDoc do
 
                 <link target="http://www.icc.or.at"/>
                 )</formattedref>
-              <docidentifier type="metanorma">[10]</docidentifier>
+              <docidentifier type="metanorma-ordinal">[4]</docidentifier>
             </bibitem>
             <bibitem id="ref11">
-               <formattedref><em>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</em>.</formattedref>
-              <docidentifier type='metanorma-ordinal'>[4]</docidentifier>
+               <formattedref><em><span class="stddocTitle">Internet Calendaring and Scheduling Core Object Specification (iCalendar)</span></em></formattedref>
+              <docidentifier type='metanorma-ordinal'>[5]</docidentifier>
               <docidentifier type="IETF">IETF RFC 10</docidentifier>
             </bibitem>
             <bibitem id="ref12">
               <formattedref format="application/x-isodoc+xml">CitationWorks. 2019.
-                <em>How to cite a reference</em>.</formattedref>
+                <em>How to cite a reference</em>. [IETF RFC 20]</formattedref>
               <docidentifier type="metanorma">[Citn]</docidentifier>
               <docidentifier type="IETF">IETF RFC 20</docidentifier>
             </bibitem>
@@ -261,76 +261,123 @@ RSpec.describe IsoDoc do
 
     html = <<~OUTPUT
       #{HTML_HDR}
-            <br/>
-            <div>
-              <h1 class="ForewordTitle">Foreword</h1>
-              <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">
-                <a href="#ISO712">ISO 712</a>
-                <a href="#ISBN">[1]</a>
-                <a href="#ISSN">[2]</a>
-                <a href="#ISO16634">ISO 16634:--</a>
-                <a href="#ref1">ICC 167</a>
-                <a href="#ref10">[10]</a>
-                <a href="#ref12">Citn</a>
-              </p>
-            </div>
-            <p class="zzSTDTitle1"/>
-            <div>
-              <h1>1&#160; Normative References</h1>
-              <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>
-              <p class="NormRef" id="ISO712">ISO 712,
-                <i>Cereals and cereal products</i></p>
-              <p class="NormRef" id="ISO16634">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 class="NormRef" id="ISO20483">ISO 20483:2013-2014,
-                <i>Cereals and pulses</i></p>
-              <p class="NormRef" id="ref1">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 class="Note">
-                <p>
-                  <span class="note_label">NOTE</span>&#160; This is an annotation of ISO 20483:2013-2014</p>
-              </div>
-            </div>
-            <br/>
-            <div>
-              <h1 class="Section3">Bibliography</h1>
-              <p class="Biblio" id="ISBN">[1]&#160; <i>Chemicals for analytical laboratory use</i>. ISBN.</p>
-              <p class="Biblio" id="ISSN">[2]&#160; <i>Instruments for analytical laboratory use</i>. ISSN.</p>
-              <div class="Note">
-                <p>
-                  <span class="note_label">NOTE</span>&#160; This is an annotation of document ISSN.</p>
-              </div>
-              <div class="Note">
-                <p>
-                  <span class="note_label">NOTE</span>&#160; This is another annotation of document ISSN.</p>
-              </div>
-              <p class="Biblio" id="ISO3696">[3]&#160; ISO 3696,
-                <i>Water for analytical laboratory use</i></p>
-              <p class="Biblio" id="ref10">[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 class="Biblio" id="ref11">[4]&#160; IETF RFC 10,
-                <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>.</p>
-              <p class="Biblio" id="ref12">Citn&#160; IETF RFC 20, CitationWorks. 2019.
-                <i>How to cite a reference</i>
-                .</p>
-            </div>
-            <aside class="footnote" id="fn:1">
-              <p>Under preparation. (Stage at the time of publication ISO/DIS 16634)</p>
-            </aside>
-          </div>
-        </body>
-      </html>
+                  <br/>
+             <div>
+               <h1 class='ForewordTitle'>Foreword</h1>
+               <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
+                 <a href='#ISO712'>ISO 712</a>
+                 <a href='#ISBN'>[1]</a>
+                 <a href='#ISSN'>[2]</a>
+                 <a href='#ISO16634'>ISO 16634:--</a>
+                 <a href='#ref1'>ICC 167</a>
+                 <a href='#ref10'>[4]</a>
+                 <a href='#ref12'>Citn</a>
+               </p>
+             </div>
+             <p class='zzSTDTitle1'/>
+             <div>
+               <h1>1  Normative References</h1>
+               <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>
+               <p id='ISO712' class='NormRef'>
+                 ISO 712, 
+                 <i>Cereals and cereal products</i>
+               </p>
+               <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>
+                  ) [ICC 167] 
+               </p>
+               <div class='Note'>
+                 <p>
+                   <span class='note_label'>NOTE</span>
+                     This is an annotation of ISO 20483:2013-2014
+                 </p>
+               </div>
+             </div>
+             <br/>
+             <div>
+               <h1 class='Section3'>Bibliography</h1>
+               <p id='ISBN' class='Biblio'>
+                 [1]  
+                 <i>Chemicals for analytical laboratory use</i>
+                 . n.p.: n.d. ISBN.
+               </p>
+               <p id='ISSN' class='Biblio'>
+                 [2]  
+                 <i>Instruments for analytical laboratory use</i>
+                 . n.d. ISSN.
+               </p>
+               <div class='Note'>
+                 <p>
+                   <span class='note_label'>NOTE</span>
+                     This is an annotation of document ISSN.
+                 </p>
+               </div>
+               <div class='Note'>
+                 <p>
+                   <span class='note_label'>NOTE</span>
+                     This is another annotation of document ISSN.
+                 </p>
+               </div>
+               <p id='ISO3696' class='Biblio'>
+                 [3]  ISO 3696, 
+                 <i>Water for analytical laboratory use</i>
+               </p>
+               <p id='ref10' class='Biblio'>
+                 [4]  
+                 <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]  IETF RFC 10, 
+                 <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>
+               </p>
+               <p id='ref12' class='Biblio'>
+                 Citn  IETF RFC 20, CitationWorks. 2019. 
+                 <i>How to cite a reference</i>
+                 . [IETF RFC 20]
+               </p>
+             </div>
+             <aside id='fn:1' class='footnote'>
+               <p>Under preparation. (Stage at the time of publication ISO/DIS 16634)</p>
+             </aside>
+           </div>
+         </body>
+       </html>
     OUTPUT
     expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
       .convert("test", input, true))
@@ -372,14 +419,14 @@ RSpec.describe IsoDoc do
                <em>
                  <span class='stddocTitle'>IGNF. (IGN France) Registry</span>
                </em>
-                [website]. Available from:
+                [website]. n.d. Available from:
                <span class='biburl'>
                  <link target='https://registre.ign.fr/ign/IGNF/'>https://registre.ign.fr/ign/IGNF/</link>
                </span>
                .
              </formattedref>
              <uri>https://registre.ign.fr/ign/IGNF/</uri>
-             <docidentifier type='metanorma'>2</docidentifier>
+             <docidentifier type='metanorma-ordinal'>[1]</docidentifier>
            </bibitem>
          </references>
        </iso-standard>

data/spec/isodoc/word_dis_spec.rb

@@ -1728,7 +1728,7 @@ RSpec.describe IsoDoc do
         <div class='WordSection3'>
                    <p class='zzSTDTitle'>
                  Date and time — Representations for information interchange —
-      <span style='font-weight:normal'>Part 1</span>
+      <span style='font-weight:normal'>Part 1:</span>
        Basic rules
           </p>
           <div>
@@ -1799,7 +1799,7 @@ RSpec.describe IsoDoc do
         <div class='WordSection3'>
                    <p class='zzSTDTitle'>
                        Date and time — Representations for information interchange —
-      <span style='font-weight:normal'>Part 1</span>
+      <span style='font-weight:normal'>Part 1:</span>
        Basic rules
       <span style='font-weight:normal'> AMENDMENT 1: Technical corrections</span>
           </p>
@@ -1842,11 +1842,9 @@ RSpec.describe IsoDoc do
                 <br/>
                 CH-1214 Vernier, Geneva, Switzerland
                 <br/>
-                Tel. + 41 22 749 01 11
+                Phone: +41 22 749 01 11
                 <br/>
-                Fax + 41 22 749 09 47
-                <br/>
-                copyright@iso.org
+                Email: copyright@iso.org
                 <br/>
                 www.iso.org</p>
             </clause>
@@ -1896,9 +1894,8 @@ RSpec.describe IsoDoc do
             </p>
             <p class='zzCopyright'> Ch. de Blandonnet 8 ?~@? CP 401 </p>
             <p class='zzCopyright'> CH-1214 Vernier, Geneva, Switzerland </p>
-            <p class='zzCopyright'> Tel. + 41 22 749 01 11 </p>
-            <p class='zzCopyright'> Fax + 41 22 749 09 47 </p>
-            <p class='zzCopyright'> copyright@iso.org </p>
+            <p class='zzCopyright'> Phone: +41 22 749 01 11 </p>
+            <p class='zzCopyright'> Email: copyright@iso.org </p>
             <p class='zzCopyright'> www.iso.org</p>
           </div>
         </div>
@@ -1935,9 +1932,8 @@ RSpec.describe IsoDoc do
             </p>
             <p class='zzCopyright' style='text-indent:20.15pt;'> Ch. de Blandonnet 8 ?~@? CP 401 </p>
             <p class='zzCopyright' style='text-indent:20.15pt;'> CH-1214 Vernier, Geneva, Switzerland </p>
-            <p class='zzCopyright' style='text-indent:20.15pt;'> Tel. + 41 22 749 01 11 </p>
-            <p class='zzCopyright' style='text-indent:20.15pt;'> Fax + 41 22 749 09 47 </p>
-            <p class='zzCopyright' style='text-indent:20.15pt;'> copyright@iso.org </p>
+            <p class='zzCopyright' style='text-indent:20.15pt;'> Phone: +41 22 749 01 11 </p>
+            <p class='zzCopyright' style='text-indent:20.15pt;'> Email: copyright@iso.org </p>
             <p class='zzCopyright' style='text-indent:20.15pt;'> www.iso.org</p>
           </div>
         </div>
@@ -2045,7 +2041,7 @@ RSpec.describe IsoDoc do
              <a name='ISO712' id='ISO712'/>
              [1]
              <span style='mso-tab-count:1'>  </span>
-             ISO/IEC 712-3:2022, ALUFFI, Paolo, ed. (2022). 
+             ISO/IEC 712-3:2022, ALUFFI, Paolo, ed. (2022).
              <i>
                Facets of Algebraic Geometry: A Collection in Honor of William Fulton's
                80th Birthday

data/spec/metanorma/amd_spec.rb

@@ -174,7 +174,6 @@ RSpec.describe Metanorma::ISO do
       :title-intro-fr: Introduction Française
       :title-main-fr: Titre Principal
       :title-part-fr: Part du Titre
-      :library-ics: 1,2,3
       :copyright-year: 2017
       :updates: ISO 17301-1:2016
       :created-date: 2016-05-01
@@ -273,15 +272,6 @@ RSpec.describe Metanorma::ISO do
               <workgroup number="3" type="C">WG</workgroup>
               <workgroup number="31" type="C1">WG1</workgroup>
             </approvalgroup>
-            <ics>
-              <code>1</code>
-            </ics>
-            <ics>
-              <code>2</code>
-            </ics>
-            <ics>
-              <code>3</code>
-            </ics>
             <structuredidentifier>
               <project-number amendment="1" origyr="2016-05-01" part="1">17301</project-number>
             </structuredidentifier>

data/spec/metanorma/base_spec.rb

@@ -66,7 +66,6 @@ RSpec.describe Metanorma::ISO do
       :title-intro-fr: Introduction Française
       :title-main-fr: Titre Principal
       :title-part-fr: Part du Titre
-      :library-ics: 1,2,3
       :copyright-year: 2000
       :horizontal: true
     INPUT
@@ -146,15 +145,6 @@ RSpec.describe Metanorma::ISO do
                 <workgroup number="3a" type="Ca">WGa</workgroup>
                 <workgroup number="31a" type="C1a">WG1a</workgroup>
               </approvalgroup>
-              <ics>
-                <code>1</code>
-              </ics>
-              <ics>
-                <code>2</code>
-              </ics>
-              <ics>
-                <code>3</code>
-              </ics>
               <structuredidentifier>
                 <project-number part="1">ISO 1000</project-number>
               </structuredidentifier>
@@ -940,8 +930,8 @@ RSpec.describe Metanorma::ISO do
       INPUT
       expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
         .to be_equivalent_to xmlpp(<<~"OUTPUT")
-                  <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
-                           <bibdata type='standard'>
+          <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
+              <bibdata type='standard'>
               <contributor>
                 <role type='author'/>
                 <organization>
@@ -1009,8 +999,8 @@ RSpec.describe Metanorma::ISO do
                   <title type='title-main' format='text/plain' language='en' script='Latn'>Sampling</title>
                   <title type='main' format='text/plain' language='en' script='Latn'>Rubber latex&#8201;&#8212;&#8201;Sampling</title>
                   <title type='title-intro' format='text/plain' language='fr' script='Latn'>Latex de caoutchouc</title>
-                  <title type='title-main' format='text/plain' language='fr' script='Latn'>&#201;chantillonnage</title>
-                  <title type='main' format='text/plain' language='fr' script='Latn'>Latex de caoutchouc&#8201;&#8212;&#8201;&#201;chantillonnage</title>
+                  <title type='title-main' format='text/plain' language='fr' script='Latn'>Échantillonnage</title>
+                  <title type='main' format='text/plain' language='fr' script='Latn'>Latex de caoutchouc — Échantillonnage</title>
                   <uri type='src'>https://www.iso.org/standard/23281.html</uri>
                   <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
                   <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
@@ -1037,16 +1027,15 @@ RSpec.describe Metanorma::ISO do
             contained in drums, tank cars or tanks. The procedures may also be
             used for sampling plastics dispersions.
           </abstract>
-          <abstract format='text/plain' language='fr' script='Latn'>
-            La pr&#233;sente Norme internationale sp&#233;cifie des m&#233;thodes
-            d&#8217;&#233;chantillonnage pour des concentr&#233;s de latex de
-            caoutchouc naturel et pour &#233;chantillonner des latex de caoutchouc
-            synth&#233;tique et des latex artificiels. Elle s&#8217;applique
-            &#233;galement &#224; l&#8217;&#233;chantillonnage de latex de
-            caoutchouc contenus dans des f&#251;ts, citernes routi&#232;res ou de
-            stockage. Le mode op&#233;ratoire peut aussi &#234;tre utilis&#233;
-            pour l&#8217;&#233;chantillonnage de dispersions de plastiques.
-          </abstract>
+                  <abstract format='text/plain' language='fr' script='Latn'>
+          La présente Norme internationale spécifie des méthodes
+          d’échantillonnage pour des concentrés de latex de caoutchouc naturel
+          et pour échantillonner des latex de caoutchouc synthétique et des
+          latex artificiels. Elle s’applique également à l’échantillonnage de
+          latex de caoutchouc contenus dans des fûts, citernes routières ou de
+          stockage. Le mode opératoire peut aussi être utilisé pour
+          l’échantillonnage de dispersions de plastiques.
+        </abstract>
                   <status>
                     <stage>90</stage>
                     <substage>93</substage>

data/spec/metanorma/cleanup_spec.rb

@@ -1505,5 +1505,141 @@ RSpec.describe Metanorma::ISO do
       expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
         .to be_equivalent_to xmlpp(output)
     end
+
+    it "does not allows subterms outside of vocabulary document" do
+      input = <<~INPUT
+        = Document title
+        Author
+        :docfile: test.adoc
+        :nodoc:
+        :novalid:
+        :no-isobib:
+
+        == Terms and definitions
+
+        === Term1
+
+        === Term2
+
+        ==== Term2a
+      INPUT
+      output = <<~OUTPUT
+        #{BLANK_HDR}
+        <sections>
+           <clause id='_' obligation='normative'>
+             <title>Terms and definitions</title>
+             <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
+             <p id='_'>
+               ISO and IEC maintain terminology databases for use in standardization at
+               the following addresses:
+             </p>
+             <ul id='_'>
+               <li>
+                 <p id='_'>
+                   ISO Online browsing platform: available at
+                   <link target='https://www.iso.org/obp'/>
+                 </p>
+               </li>
+               <li>
+                 <p id='_'>
+                   IEC Electropedia: available at
+                   <link target='https://www.electropedia.org'/>
+                 </p>
+               </li>
+             </ul>
+             <term id='term-Term1'>
+               <preferred>
+                 <expression>
+                   <name>Term1</name>
+                 </expression>
+               </preferred>
+             </term>
+             <terms id='_' obligation='normative'>
+               <title>Term2</title>
+               <term id='term-Term2a'>
+                 <preferred>
+                   <expression>
+                     <name>Term2a</name>
+                   </expression>
+                 </preferred>
+               </term>
+             </terms>
+           </clause>
+         </sections>
+       </iso-standard>
+      OUTPUT
+      expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+        .to be_equivalent_to xmlpp(output)
+    end
+    
+    it "allows subterms in vocabulary document" do
+      input = <<~INPUT
+        = Document title
+        Author
+        :docfile: test.adoc
+        :nodoc:
+        :novalid:
+        :no-isobib:
+        :docsubtype: vocabulary
+
+        == Terms and definitions
+
+        === Term1
+
+        === Term2
+
+        ==== Term2a
+      INPUT
+      output = <<~OUTPUT
+        #{BLANK_HDR.sub(%r{</doctype>}, '</doctype><subdoctype>vocabulary</subdoctype>')}
+                 <sections>
+           <terms id='_' obligation='normative'>
+             <title>Terms and definitions</title>
+             <p id='_'>
+               ISO and IEC maintain terminology databases for use in standardization at
+               the following addresses:
+             </p>
+             <ul id='_'>
+               <li>
+                 <p id='_'>
+                   ISO Online browsing platform: available at 
+                   <link target='https://www.iso.org/obp'/>
+                 </p>
+               </li>
+               <li>
+                 <p id='_'>
+                   IEC Electropedia: available at 
+                   <link target='https://www.electropedia.org'/>
+                 </p>
+               </li>
+             </ul>
+             <term id='term-Term1'>
+               <preferred>
+                 <expression>
+                   <name>Term1</name>
+                 </expression>
+               </preferred>
+             </term>
+             <term id='term-Term2'>
+               <preferred>
+                 <expression>
+                   <name>Term2</name>
+                 </expression>
+               </preferred>
+               <term id='term-Term2a'>
+                 <preferred>
+                   <expression>
+                     <name>Term2a</name>
+                   </expression>
+                 </preferred>
+               </term>
+             </term>
+           </terms>
+         </sections>
+         </iso-standard>
+      OUTPUT
+      expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+        .to be_equivalent_to xmlpp(output)
+    end
   end
 end