metanorma-iso 1.10.3 → 2.0.0

data/spec/isodoc/postproc_spec.rb

@@ -48,7 +48,7 @@ RSpec.describe IsoDoc do
     expect(File.exist?("test.html")).to be true
     html = File.read("test.html", encoding: "UTF-8")
     expect(html).to include "<title>Cereals and pulses&#xA0;&#x2014; "\
-      "Specifications and test methods&#xA0;&#x2014; Rice</title>"
+                            "Specifications and test methods&#xA0;&#x2014; Rice</title>"
     expect(html).to match(%r{cdnjs\.cloudflare\.com/ajax/libs/mathjax/})
     expect(html).to match(/delimiters: \[\['\(#\(', '\)#\)'\]\]/)
   end
@@ -77,7 +77,7 @@ RSpec.describe IsoDoc do
     expect(File.exist?("test.html")).to be true
     html = File.read("test.html", encoding: "UTF-8")
     expect(html).to include "title>Cereals and pulses&#xA0;&#x2014; "\
-      "Specifications and test methods&#xA0;&#x2014; Rice</title>"
+                            "Specifications and test methods&#xA0;&#x2014; Rice</title>"
     expect(html).to match(%r{cdnjs\.cloudflare\.com/ajax/libs/mathjax/})
     expect(html).to match(/delimiters: \[\['\(#\(', '\)#\)'\]\]/)
   end
@@ -206,14 +206,10 @@ RSpec.describe IsoDoc do
                 <definition>
                   <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
                 </definition>
-                <termsource status="modified">
-                  <origin bibitemid="ISO7301" citeas="ISO 7301:2011" type="inline">
-                    <locality type="clause">
-                      <referenceFrom>3.1</referenceFrom>
-                    </locality>ISO 7301:2011, 3.1</origin>
-                  <modification>
-                    <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term &quot;cargo rice&quot; is shown as deprecated, and Note 1 to entry is not included here</p>
-                  </modification>
+                <termsource status="modified">[SOURCE:
+                  <origin bibitemid="ISO7301" citeas="ISO 7301:2011" type="inline"><locality type="clause">
+                      <referenceFrom>3.1</referenceFrom></locality>ISO 7301:2011, 3.1</origin>, modified &#x2013;
+                    The term &quot;cargo rice&quot; is shown as deprecated, and Note 1 to entry is not included here]
                 </termsource>
               </term>
             </terms>
@@ -226,23 +222,32 @@ RSpec.describe IsoDoc do
       .sub(%r{<br[^>]*>\s*<div class="colophon".*$}m, "")
 
     expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      <div class="WordSection3">
-        <p class="zzSTDTitle1"/>
-        <div>
-          <a id="_terms_and_definitions" name="_terms_and_definitions"/>
-          <h1>1
-            <span style="mso-tab-count:1">  </span>
-            Terms and Definitions</h1>
-          <p class="TermNum">
-            <a id="paddy1" name="paddy1"/>1.1</p>
-          <p class="Terms" style="text-align:left;">paddy</p>
-          <p class="Definition">
-            <a id="_eb29b35e-123e-4d1c-b50b-2714d41e747f" name="_eb29b35e-123e-4d1c-b50b-2714d41e747f"/>rice retaining its husk after threshing</p>
-          <p class="Source">[SOURCE:
-            <a href="#ISO7301">ISO 7301:2011, 3.1</a>
-            , modified — The term &quot;cargo rice&quot; is shown as deprecated, and Note 1 to entry is not included here]</p>
-        </div>
-      </div>
+           <div class='WordSection3'>
+         <p class='zzSTDTitle1'/>
+         <div>
+           <a name='_terms_and_definitions' id='_terms_and_definitions'/>
+           <h1>
+             1
+             <span style='mso-tab-count:1'>&#xA0; </span>
+              Terms and Definitions
+           </h1>
+           <p class='TermNum'>
+             <a name='paddy1' id='paddy1'/>
+             1.1
+           </p>
+           <p class='Terms' style='text-align:left;'>paddy</p>
+           <p class='Definition'>
+             <a name='_eb29b35e-123e-4d1c-b50b-2714d41e747f' id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'/>
+             rice retaining its husk after threshing
+           </p>
+           <p class='Source'>
+             [SOURCE:
+             <a href='#ISO7301'>ISO 7301:2011, 3.1</a>
+             , modified &#x2013; The term "cargo rice" is shown as deprecated, and Note
+             1 to entry is not included here]
+           </p>
+         </div>
+       </div>
     OUTPUT
   end
 
@@ -262,6 +267,84 @@ RSpec.describe IsoDoc do
     expect(word).to include('Content-Disposition: inline; filename="header.html"')
   end
 
+  it "populates HTML ToC" do
+    IsoDoc::Iso::HtmlConvert
+      .new(WORD_HTML_CSS.dup)
+      .convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <sections>
+            <clause id="A" inline-header="false" obligation="normative">
+              <title>1
+                <tab/>
+                Clause 4</title>
+              <clause id="N" inline-header="false" obligation="normative">
+                <title>1.1
+                  <tab/>
+                  Introduction
+                  <bookmark id="Q"/>
+                  to this
+                  <fn reference="1">
+                    <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p></fn>
+                </title>
+              </clause>
+              <clause id="O" inline-header="false" obligation="normative">
+                <title>1.2
+                  <tab/>
+                  Clause 4.2</title>
+                <p>A
+                  <fn reference="1">
+                    <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p></fn>
+                </p>
+              </clause>
+            </clause>
+            <clause id="P"><title>2<tab/>Clause 5</title>
+            <clause id="P1"><title>2.1<tab/>Clause 5.1</title></clause>
+            </clause>
+            <clause id="Q"><title>3<tab/>Clause 6</title></clause>
+          </sections>
+        </iso-standard>
+      INPUT
+
+    html = Nokogiri::XML(File.read("test.html", encoding: "UTF-8"))
+      .at("//div[@id = 'toc']").to_xml
+
+    expect(xmlpp(html))
+      .to be_equivalent_to xmlpp(<<~'OUTPUT')
+        <div id='toc'>
+          <ul>
+            <li class='h1'>
+              <div class='collapse-group'>
+                <a href='#toc0'>1 &#xA0; Clause 4</a>
+                <div class='collapse-button'/>
+              </div>
+              <ul class='content collapse'>
+                <li class='h2'>
+                  <a href='#toc1'> 1.1 &#xA0; Introduction to this </a>
+                </li>
+                <li class='h2'>
+                  <a href='#toc2'> 1.2 &#xA0; Clause 4.2</a>
+                </li>
+              </ul>
+            </li>
+            <li class='h1'>
+              <div class='collapse-group'>
+                <a href='#toc3'>2&#xA0; Clause 5</a>
+                <div class='collapse-button'/>
+              </div>
+              <ul class='content collapse'>
+                <li class='h2'>
+                  <a href='#toc4'> 2.1&#xA0; Clause 5.1</a>
+                </li>
+              </ul>
+            </li>
+            <li class='h1'>
+              <a href='#toc5'> 3&#xA0; Clause 6</a>
+            </li>
+          </ul>
+        </div>
+      OUTPUT
+  end
+
   it "populates Word ToC" do
     IsoDoc::Iso::WordConvert
       .new(WORD_HTML_CSS_WORDINTRO.dup)
@@ -886,7 +969,7 @@ RSpec.describe IsoDoc do
         </div>
       OUTPUT
     expect(word).to include '<p class="zzWarning">This document is not '\
-      "an ISO International Standard"
+                            "an ISO International Standard"
   end
 
   it "populates Word ToC" do

data/spec/isodoc/ref_spec.rb

@@ -272,6 +272,7 @@ RSpec.describe IsoDoc do
             </note>
             <bibitem id="ISO3696" type="standard">
               <title format="text/plain">Water for analytical laboratory use</title>
+              <docidentifier type='metanorma-ordinal'>[1]</docidentifier>
               <docidentifier type="ISO">ISO 3696</docidentifier>
               <contributor>
                 <role type="publisher"/>
@@ -294,6 +295,7 @@ RSpec.describe IsoDoc do
             </bibitem>
             <bibitem id="ref11">
               <title>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</title>
+              <docidentifier type='metanorma-ordinal'>[2]</docidentifier>
               <docidentifier type="IETF">IETF RFC 10</docidentifier>
             </bibitem>
             <bibitem id="ref12">
@@ -361,7 +363,7 @@ RSpec.describe IsoDoc do
                 <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,
+              <p class="Biblio" id="ISO3696">[1]&#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>
                  .
@@ -369,7 +371,7 @@ RSpec.describe IsoDoc do
                 (see
                 <a href="http://www.icc.or.at">http://www.icc.or.at</a>
                 )</p>
-              <p class="Biblio" id="ref11">[5]&#160; IETF RFC 10,
+              <p class="Biblio" id="ref11">[2]&#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>

data/spec/isodoc/section_spec.rb

@@ -565,7 +565,7 @@ RSpec.describe IsoDoc do
              <substage language=''>60</substage>
            </status>
            <copyright>
-             <from>2021</from>
+             <from>#{Time.new.year}</from>
              <owner>
                <organization>
                  <name>International Organization for Standardization</name>

data/spec/isodoc/terms_spec.rb

@@ -39,15 +39,15 @@ RSpec.describe IsoDoc do
               <termnote id="_671a1994-4783-40d0-bc81-987d06ffb74e">
                 <p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
               </termnote>
-              <termnote id="_671a1994-4783-40d0-bc81-987d06ffb74f">
-              <ul><li>A</li></ul>
-                <p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
-              </termnote>
               <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f893">
                 <ul>
                 <li>A</li>
                 </ul>
               </termexample>
+              <termnote id="_671a1994-4783-40d0-bc81-987d06ffb74f">
+              <ul><li>A</li></ul>
+                <p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
+              </termnote>
               <termsource status="identical">
                 <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
               </termsource>
@@ -74,7 +74,7 @@ RSpec.describe IsoDoc do
             <term id='paddy1'><name>1.1</name>
               <preferred><strong>paddy</strong></preferred>
               <definition>
-                <p id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'>&lt;rice&gt; rice retaining its husk after threshing</p>
+                <p id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'>&#x3c;rice&#x3e; rice retaining its husk after threshing</p>
               </definition>
               <termexample id='_bd57bbf1-f948-4bae-b0ce-73c00431f892'>
                 <name>EXAMPLE 1</name>
@@ -89,11 +89,8 @@ RSpec.describe IsoDoc do
                   <li>A</li>
                 </ul>
               </termexample>
-              <termsource status='modified'>
-                <origin bibitemid='ISO7301' type='inline' citeas='ISO 7301:2011'><locality type='clause'><referenceFrom>3.1</referenceFrom></locality>ISO 7301:2011, 3.1</origin>
-                <modification>
-                  <p id='_e73a417d-ad39-417d-a4c8-20e4e2529489'>The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</p>
-                </modification>
+              <termsource status='modified'>[SOURCE:
+                <origin bibitemid='ISO7301' type='inline' citeas='ISO 7301:2011'><locality type='clause'><referenceFrom>3.1</referenceFrom></locality>ISO 7301:2011, 3.1</origin>, modified &#x2013; The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]
               </termsource>
             </term>
             <term id='paddy'><name>1.2</name>
@@ -123,8 +120,8 @@ RSpec.describe IsoDoc do
                   <li>A</li>
                 </ul>
               </termexample>
-              <termsource status='identical'>
-                <origin bibitemid='ISO7301' type='inline' citeas='ISO 7301:2011'><locality type='clause'><referenceFrom>3.1</referenceFrom></locality>ISO 7301:2011, 3.1</origin>
+              <termsource status='identical'>[SOURCE:
+                <origin bibitemid='ISO7301' type='inline' citeas='ISO 7301:2011'><locality type='clause'><referenceFrom>3.1</referenceFrom></locality>ISO 7301:2011, 3.1</origin>]
               </termsource>
             </term>
             <term id='A'>
@@ -163,10 +160,9 @@ RSpec.describe IsoDoc do
                   <li>A</li>
                 </ul>
               </div>
-              <p>[TERMREF]
-                <a href="#ISO7301">ISO 7301:2011, 3.1</a>
-                  [MODIFICATION]The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
-              [/TERMREF]</p>
+              <p>[SOURCE:
+                <a href="#ISO7301">ISO 7301:2011, 3.1</a>, modified &#8211;
+                  The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p>
               <p class="TermNum" id="paddy">1.2</p>
               <p class="Terms" style="text-align:left;"><b>paddy</b></p>
               <p class="AltTerms" style="text-align:left;">paddy rice</p>
@@ -191,8 +187,7 @@ RSpec.describe IsoDoc do
                   <p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
                 </p>
               </div>
-              <p>[TERMREF]<a href="#ISO7301">ISO 7301:2011, 3.1</a>
-              [/TERMREF]</p>
+              <p>[SOURCE: <a href="#ISO7301">ISO 7301:2011, 3.1</a>]</p>
               <p class='TermNum' id='A'>1.3</p>
               <p class='Terms' style='text-align:left;'><b>term1</b></p>
                term1 definition
@@ -217,10 +212,9 @@ RSpec.describe IsoDoc do
           <li>A</li>
           </ul></div>
 
-        <p class="Source">[TERMREF]
-          <a href="#ISO7301">ISO 7301:2011, 3.1</a>
-            [MODIFICATION]The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
-        [/TERMREF]</p>
+        <p class="Source">[SOURCE:
+          <a href="#ISO7301">ISO 7301:2011, 3.1</a>, modified &#8211;
+            The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p>
         <p class="TermNum" id="paddy">1.2</p>
         <p class="Terms" style="text-align:left;"><b>paddy</b></p>
         <p class="AltTerms" style="text-align:left;">paddy rice</p>
@@ -234,8 +228,7 @@ RSpec.describe IsoDoc do
         </div>
         <div id='_671a1994-4783-40d0-bc81-987d06ffb74e' class="Note"><p class="Note">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>
         <div id='_671a1994-4783-40d0-bc81-987d06ffb74f' class="Note"><p class="Note">Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
-        <p class="Source">[TERMREF]<a href="#ISO7301">ISO 7301:2011, 3.1</a>
-        [/TERMREF]</p>
+        <p class="Source">[SOURCE: <a href="#ISO7301">ISO 7301:2011, 3.1</a>]</p>
         <p class='TermNum' id='A'>1.3</p>
         <p class='Terms' style='text-align:left;'><b>term1</b></p>
          term1 definition

data/spec/{asciidoctor → metanorma}/amd_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe Asciidoctor::ISO do
+RSpec.describe Metanorma::ISO do
   it "processes amendment sections" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{AMD_BLANK_HDR}