metanorma-iso 1.3.20 → 1.3.25

data/spec/asciidoctor-iso/inline_spec.rb

@@ -127,7 +127,7 @@ RSpec.describe Asciidoctor::ISO do
             #{BLANK_HDR}
        <sections>
 
-       </sections><bibliography><references id="_" obligation="informative">
+       </sections><bibliography><references id="_" obligation="informative" normative="true">
          <title>Normative References</title>
          <p id="_">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">
@@ -137,6 +137,7 @@ RSpec.describe Asciidoctor::ISO do
          <bibitem id="ISO713">
          <formattedref format="application/x-isodoc+xml">Reference</formattedref>
          <docidentifier>ISO713</docidentifier>
+         <docnumber>713</docnumber>
        </bibitem>
        </references>
        </bibliography>

data/spec/asciidoctor-iso/macros_spec.rb

@@ -18,4 +18,277 @@ RSpec.describe Asciidoctor::ISO do
     OUTPUT
   end
 
+  describe 'term inline macros' do
+    subject(:convert) do
+      xmlpp(
+        strip_guid(
+          Asciidoctor.convert(
+            input, backend: :iso, header_footer: true)))
+    end
+    let(:input) do
+      <<~XML
+        #{ASCIIDOC_BLANK_HDR}
+        == Terms and Definitions
+
+        === name2
+
+        == Main
+
+        term:[name,name2]
+      XML
+    end
+    let(:output) do
+      <<~XML
+        #{BLANK_HDR}
+        <sections>
+          <terms 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 terminological databases for use in standardization
+              at the following addresses:
+            </p>
+            <ul id='_'>
+              <li>
+                <p id='_'>
+                  ISO Online browsing platform: available at
+                  <link target='http://www.iso.org/obp'/>
+                </p>
+              </li>
+              <li>
+                <p id='_'>
+                  IEC Electropedia: available at
+                  <link target='http://www.electropedia.org'/>
+                </p>
+              </li>
+            </ul>
+            <term id='term-name2'>
+              <preferred>name2</preferred>
+            </term>
+          </terms>
+          <clause id='_' inline-header='false' obligation='normative'>
+            <title>Main</title>
+            <p id='_'>
+              <em>name</em>
+              (
+              <xref target='term-name2'/>
+              )
+            </p>
+          </clause>
+        </sections>
+        </iso-standard>
+      XML
+    end
+
+    it 'converts macro into the correct xml' do
+      expect(convert).to(be_equivalent_to(xmlpp(output)))
+    end
+
+    context 'default params' do
+      let(:input) do
+        <<~XML
+          #{ASCIIDOC_BLANK_HDR}
+
+          == Terms and Definitions
+
+          === name
+
+          == Main
+
+          term:[name]
+        XML
+      end
+      let(:output) do
+        <<~XML
+          #{BLANK_HDR}
+          <sections>
+            <terms 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 terminological databases for use in standardization
+                at the following addresses:
+              </p>
+              <ul id='_'>
+                <li>
+                  <p id='_'>
+                    ISO Online browsing platform: available at
+                    <link target='http://www.iso.org/obp' />
+                  </p>
+                </li>
+                <li>
+                  <p id='_'>
+                    IEC Electropedia: available at
+                    <link target='http://www.electropedia.org' />
+                  </p>
+                </li>
+              </ul>
+              <term id='term-name'>
+                <preferred>name</preferred>
+              </term>
+            </terms>
+            <clause id='_' inline-header='false' obligation='normative'>
+              <title>Main</title>
+              <p id='_'>
+                <em>name</em>
+                (
+                <xref target='term-name' />
+                )
+              </p>
+            </clause>
+          </sections>
+          </iso-standard>
+        XML
+      end
+
+      it 'uses `name` as termref name' do
+        expect(convert).to(be_equivalent_to(xmlpp(output)))
+      end
+    end
+
+    context 'multiply exising ids in document' do
+      let(:input) do
+        <<~XML
+          #{ASCIIDOC_BLANK_HDR}
+
+          == Terms and Definitions
+
+          === name
+          === name2
+
+          [[term-name]]
+          == Main
+
+          paragraph
+
+          [[term-name2]]
+          == Second
+
+          term:[name]
+          term:[name2]
+        XML
+      end
+      let(:output) do
+        <<~XML
+          #{BLANK_HDR}
+          <sections>
+            <terms 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 terminological databases for use in standardization
+                at the following addresses:
+              </p>
+              <ul id='_'>
+                <li>
+                  <p id='_'>
+                    ISO Online browsing platform: available at
+                    <link target='http://www.iso.org/obp' />
+                  </p>
+                </li>
+                <li>
+                  <p id='_'>
+                    IEC Electropedia: available at
+                    <link target='http://www.electropedia.org' />
+                  </p>
+                </li>
+              </ul>
+              <term id='term-name-1'>
+                <preferred>name</preferred>
+              </term>
+              <term id='term-name2-1'>
+                <preferred>name2</preferred>
+              </term>
+            </terms>
+            <clause id='term-name' inline-header='false' obligation='normative'>
+              <title>Main</title>
+              <p id='_'>paragraph</p>
+            </clause>
+            <clause id='term-name2' inline-header='false' obligation='normative'>
+              <title>Second</title>
+              <p id='_'>
+                <em>name</em>
+                (
+                <xref target='term-name-1' />
+                )
+                <em>name2</em>
+                  (
+                <xref target='term-name2-1' />
+                )
+              </p>
+            </clause>
+          </sections>
+          </iso-standard>
+        XML
+      end
+
+      it 'generates unique ids which dont match existing ids' do
+        expect(convert).to(be_equivalent_to(xmlpp(output)))
+      end
+    end
+
+    context 'when missing actual ref' do
+      let(:input) do
+        <<~XML
+          #{ASCIIDOC_BLANK_HDR}
+
+          == Terms and Definitions
+
+          === name
+
+          paragraph
+
+          term:[name]
+          term:[missing]
+        XML
+      end
+      let(:output) do
+        <<~XML
+          #{BLANK_HDR}
+            <sections>
+              <terms 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 terminological databases for use in standardization
+                  at the following addresses:
+                </p>
+                <ul id='_'>
+                  <li>
+                    <p id='_'>
+                      ISO Online browsing platform: available at
+                      <link target='http://www.iso.org/obp'/>
+                    </p>
+                  </li>
+                  <li>
+                    <p id='_'>
+                      IEC Electropedia: available at
+                      <link target='http://www.electropedia.org'/>
+                    </p>
+                  </li>
+                </ul>
+                <term id='term-name'>
+                  <preferred>name</preferred>
+                  <definition>
+                    <p id='_'>paragraph</p>
+                    <p id='_'>
+                      <em>name</em>
+                       (
+                      <xref target='term-name'/>
+                      )
+                      missing
+                    </p>
+                  </definition>
+                </term>
+              </terms>
+            </sections>
+          </iso-standard>
+        XML
+      end
+
+      it 'generates unique ids which dont match existing ids' do
+        expect(convert).to(be_equivalent_to(xmlpp(output)))
+      end
+    end
+  end
 end

data/spec/asciidoctor-iso/refs_spec.rb

@@ -15,12 +15,13 @@ RSpec.describe Asciidoctor::ISO do
     INPUT
        #{BLANK_HDR}
        <sections>
-              </sections><bibliography><references id="_" obligation="informative">
+              </sections><bibliography><references id="_" obligation="informative" normative="true">
          <title>Normative References</title>
          <p id="_">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="iso123" type="standard">
          <title format="text/plain">Standard</title>
          <docidentifier>ISO 123:—</docidentifier>
+         <docnumber>123</docnumber>
          <date type="published">
            <on>–</on>
          </date>
@@ -63,12 +64,13 @@ RSpec.describe Asciidoctor::ISO do
     </p>
   </clause>
 </sections>
-      <bibliography><references id="_" obligation="informative">
+      <bibliography><references id="_" obligation="informative" normative="true">
         <title>Normative References</title>
         <p id="_">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="iso123" type="standard">
          <title format="text/plain">Standard</title>
          <docidentifier>ISO 123:1066 (all parts)</docidentifier>
+         <docnumber>123</docnumber>
          <date type="published">
            <on>1066</on>
          </date>
@@ -98,7 +100,7 @@ RSpec.describe Asciidoctor::ISO do
        #{BLANK_HDR}
               <sections>
 
-       </sections><bibliography><references id="_" obligation="informative">
+       </sections><bibliography><references id="_" obligation="informative" normative="true">
          <title>Normative References</title>
          <p id="_">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="iso123">
@@ -106,6 +108,7 @@ RSpec.describe Asciidoctor::ISO do
            <em>Standard</em>
          </formattedref>
          <docidentifier>XYZ 123:1066 (all parts)</docidentifier>
+         <docnumber>123:1066 (all parts)</docnumber>
        </bibitem>
        </references>
        </bibliography>
@@ -124,7 +127,7 @@ RSpec.describe Asciidoctor::ISO do
        #{BLANK_HDR}
               <sections>
 
-       </sections><bibliography><references id="_" obligation="informative">
+       </sections><bibliography><references id="_" obligation="informative" normative="false">
          <title>Bibliography</title>
          <bibitem id="iso123">
          <formattedref format="application/x-isodoc+xml">

data/spec/asciidoctor-iso/section_spec.rb

@@ -84,7 +84,7 @@ standardization at the following addresses:
 <link target="http://www.electropedia.org"/>
 </p> </li> </ul>
 
-         <term id="_">
+         <term id="term-term1">
          <preferred>Term1</preferred>
        </term>
        </terms>
@@ -109,7 +109,7 @@ standardization at the following addresses:
   </li>
 </ul>
          <title>Normal Terms</title>
-         <term id="_">
+         <term id="term-term2">
          <preferred>Term2</preferred>
        </term>
        </terms>
@@ -133,12 +133,12 @@ standardization at the following addresses:
        </clause>
        <appendix id="_" inline-header="false" obligation="normative">
           <title>Appendix 1</title>
-       </appendix></annex><bibliography><references id="_" obligation="informative">
+       </appendix></annex><bibliography><references id="_" obligation="informative" normative="true">
          <title>Normative References</title>
          <p id="_">There are no normative references in this document.</p>
        </references><clause id="_" obligation="informative">
          <title>Bibliography</title>
-         <references id="_" obligation="informative">
+         <references id="_" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>
@@ -247,7 +247,7 @@ standardization at the following addresses:
          <p id="_">Foreword</p>
        </foreword></preface><sections>
        <terms id="_" obligation="normative">
-          <title>Terms and definitions</title><p id="_">For the purposes of this document, the terms and definitions 
+          <title>Terms and definitions</title><p id="_">For the purposes of this document, the terms and definitions
   given in <eref bibitemid="iso1234"/> and <eref bibitemid="iso5678"/> and the following apply.</p>
   <p id="_">ISO and IEC maintain terminological databases for use in
 standardization at the following addresses:</p>
@@ -259,7 +259,7 @@ standardization at the following addresses:
 <link target="http://www.electropedia.org"/>
 </p> </li> </ul>
 
-  <term id="_">
+  <term id="term-term1">
   <preferred>Term1</preferred>
 </term>
        </terms></sections>
@@ -296,13 +296,13 @@ standardization at the following addresses:
               <ul id='_'>
                 <li>
                   <p id='_'>
-                    ISO Online browsing platform: available at 
+                    ISO Online browsing platform: available at
                     <link target='http://www.iso.org/obp'/>
                   </p>
                 </li>
                 <li>
                   <p id='_'>
-                    IEC Electropedia: available at 
+                    IEC Electropedia: available at
                     <link target='http://www.electropedia.org'/>
                   </p>
                 </li>

data/spec/asciidoctor-iso/validate_spec.rb

@@ -238,7 +238,7 @@ it "warns that term source is not a real reference" do
   [.source]
   <<iso123>>
   INPUT
-    expect(File.read("test.err")).to include "iso123 is not a real reference"
+    expect(File.read("test.err")).to include "iso123 does not have a corresponding anchor ID in the bibliography"
 end
 
 it "warns that undated reference has locality" do

data/spec/assets/iso.xml

@@ -1,4 +1,67 @@
-        <iso-standard xmlns="http://riboseinc.com/isoxml">
+<iso-standard xmlns="https://www.metanorma.org/ns/iso">
+  <bibdata type="standard">
+    <title type="title-intro" language="en" format="text/plain">Cereals and pulses</title>
+    <title type="title-main" language="en" format="text/plain">Specifications and test methods</title>
+    <title type="main" language="en" format="text/plain">Specifications and test methods</title>
+    <title type="title-part" language="en" format="text/plain">Rice</title>
+    <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-tc">17301</docidentifier>
+  <docnumber>1730</docnumber>
+  <date type="published"><on>2011</on></date>
+  <date type="accessed"><on>2012</on></date>
+  <date type="created"><from>2010</from><to>2011</to></date>
+  <date type="activated"><on>2013</on></date>
+  <date type="obsoleted"><on>2014</on></date>
+  <edition>2</edition>
+  <version>
+  <revision-date>2016-05-01</revision-date>
+  <draft>0.4</draft>
+</version>
+  <contributor>
+    <role type="author"/>
+    <organization>
+      <name>International Organization for Standardization</name>
+      <abbreviation>ISO</abbreviation>
+    </organization>
+  </contributor>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>International Organization for Standardization</name>
+      <abbreviation>ISO</abbreviation>
+    </organization>
+  </contributor>
+  <language>en</language>
+  <script>Latn</script>
+  <status>
+    <stage abbreviation="CD">35</stage>
+    <substage abbreviation="3CD">20</substage>
+    <iteration>3</iteration>
+  </status>
+  <copyright>
+    <from>2016</from>
+    <owner>
+      <organization>
+        <abbreviation>ISO</abbreviation>
+      </organization>
+    </owner>
+  </copyright>
+  <ext>
+  <doctype>international-standard</doctype>
+  <editorialgroup>
+    <technical-committee number="34">Food products</technical-committee>
+    <subcommittee number="4">Cereals and pulses</subcommittee>
+    <workgroup number="3">Rice Group</workgroup>
+    <secretariat>GB</secretariat>
+  </editorialgroup>
+  <structuredidentifier>
+    <project-number part="1">ISO/PreCD3 17301</project-number>
+  </structuredidentifier>
+  </ext>
+</bibdata>
     <foreword>
     <note>
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>