metanorma-iso 1.3.23 → 1.3.24

data/lib/isodoc/iso/metadata.rb

@@ -52,6 +52,8 @@ module IsoDoc
         set(:tc_docnumber, tcdn.map { |n| n.text })
         dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'iso-with-lang']"))
         set(:docnumber_lang, dn&.text)
+        dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'iso-reference']"))
+        set(:docnumber_reference, dn&.text)
       end
 
       # we don't leave this to i18n.rb, because we have both English and

data/lib/metanorma/iso/processor.rb

@@ -2,8 +2,8 @@ require "metanorma/processor"
 
 module Metanorma
   module Iso
-    def self.pdf_fonts
-      ["Cambria", "Times New Roman", "Cambria Math", "HanSans", "Courier"]
+    def self.fonts_used
+      ["Cambria", "Times New Roman", "Cambria Math", "HanSans", "Courier New"]
     end
 
     class Processor < Metanorma::Processor

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.3.23".freeze
+    VERSION = "1.3.24".freeze
   end
 end

data/spec/asciidoctor-iso/base_spec.rb

@@ -88,6 +88,7 @@ RSpec.describe Asciidoctor::ISO do
       :title-main-fr: Titre Principal
       :title-part-fr: Part du Titre
       :library-ics: 1,2,3
+      :copyright-year: 2000
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
        <iso-standard xmlns="https://www.metanorma.org/ns/iso">
@@ -101,7 +102,8 @@ RSpec.describe Asciidoctor::ISO do
    <title language="fr" format="text/plain" type="title-main">Titre Principal</title>
    <title language="fr" format="text/plain" type="title-part">Part du Titre</title>
          <docidentifier type="iso">ISO/PreNWIP3 1000-1</docidentifier>
-         <docidentifier type='iso-with-lang'>ISO/PreNWIP3 1000-1 (E)</docidentifier>
+         <docidentifier type='iso-with-lang'>ISO/PreNWIP3 1000-1(E)</docidentifier>
+         <docidentifier type='iso-reference'>ISO/PreNWIP3 1000-1:2000(E)</docidentifier>
 <docnumber>1000</docnumber>
          <contributor>
            <role type="author"/>
@@ -130,7 +132,7 @@ RSpec.describe Asciidoctor::ISO do
            <iteration>3</iteration>
          </status>
          <copyright>
-           <from>#{Date.today.year}</from>
+           <from>2000</from>
            <owner>
              <organization>
              <name>International Organization for Standardization</name>
@@ -171,7 +173,7 @@ RSpec.describe Asciidoctor::ISO do
 
 
   it "processes complex metadata" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to <<~'OUTPUT'
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~'OUTPUT')
       = Document title
       Author
       :docfile: test.adoc
@@ -190,7 +192,8 @@ RSpec.describe Asciidoctor::ISO do
        <iso-standard xmlns="https://www.metanorma.org/ns/iso">
        <bibdata type="standard">
          <docidentifier type="iso">ISO/IEC/IETF 1000-1-1:2001</docidentifier>
-         <docidentifier type='iso-with-lang'>ISO/IEC/IETF 1000-1-1:2001 (X)</docidentifier>
+         <docidentifier type='iso-with-lang'>ISO/IEC/IETF 1000-1-1:2001(X)</docidentifier>
+         <docidentifier type='iso-reference'>ISO/IEC/IETF 1000-1-1:2001(X)</docidentifier>
          <docidentifier type="iso-tc">2000</docidentifier>
          <docidentifier type="iso-tc">2003</docidentifier>
          <docnumber>1000</docnumber>
@@ -299,7 +302,8 @@ RSpec.describe Asciidoctor::ISO do
     <iso-standard xmlns="https://www.metanorma.org/ns/iso">
 <bibdata type="standard">
   <docidentifier type="iso">ISO/FDIS 1000</docidentifier>
-  <docidentifier type='iso-with-lang'>ISO/FDIS 1000 (F)</docidentifier>
+  <docidentifier type='iso-with-lang'>ISO/FDIS 1000(F)</docidentifier>
+  <docidentifier type='iso-reference'>ISO/FDIS 1000(F)</docidentifier>
   <docnumber>1000</docnumber>
   <contributor>
     <role type="author"/>
@@ -363,7 +367,8 @@ OUTPUT
 <iso-standard xmlns="https://www.metanorma.org/ns/iso">
 <bibdata type="standard">
   <docidentifier type="iso">ISO 1000</docidentifier>
-  <docidentifier type='iso-with-lang'>ISO 1000 (E)</docidentifier>
+  <docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>
+  <docidentifier type='iso-reference'>ISO 1000(E)</docidentifier>
   <docnumber>1000</docnumber>
   <contributor>
     <role type="author"/>
@@ -428,7 +433,8 @@ OUTPUT
 <iso-standard xmlns="https://www.metanorma.org/ns/iso">
 <bibdata type="standard">
   <docidentifier type="iso">ISO 1000</docidentifier>
-  <docidentifier type='iso-with-lang'>ISO 1000 (E)</docidentifier>
+  <docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>
+  <docidentifier type='iso-reference'>ISO 1000(E)</docidentifier>
   <docnumber>1000</docnumber>
   <contributor>
     <role type="author"/>

data/spec/asciidoctor-iso/blocks_spec.rb

@@ -25,8 +25,8 @@ RSpec.describe Asciidoctor::ISO do
       #{ASCIIDOC_BLANK_HDR}
       [stem]
       ++++
-      r = 1 % 
-      r = 1 % 
+      r = 1 %
+      r = 1 %
       ++++
 
       [stem]
@@ -113,7 +113,7 @@ RSpec.describe Asciidoctor::ISO do
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
          #{TERM_BOILERPLATE}
-         <term id="_">
+         <term id="term-term1">
          <preferred>Term1</preferred>
          <termnote id="_">
          <p id="_">This is a note</p>
@@ -223,7 +223,7 @@ RSpec.describe Asciidoctor::ISO do
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
          #{TERM_BOILERPLATE}
-         <term id="_">
+         <term id="term-term1">
          <preferred>Term1</preferred>
          <termexample id="_">
          <p id="_">This is an example</p>
@@ -428,7 +428,7 @@ RSpec.describe Asciidoctor::ISO do
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
          #{TERM_BOILERPLATE}
-         <term id="_">
+         <term id="term-term1">
          <preferred>Term1</preferred>
          <termsource status="identical">
          <origin bibitemid="ISO2191" type="inline" citeas="">
@@ -459,7 +459,7 @@ RSpec.describe Asciidoctor::ISO do
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
          #{TERM_BOILERPLATE}
-         <term id="_">
+         <term id="term-term1">
          <preferred>Term1</preferred>
          <termsource status="modified">
          <origin bibitemid="ISO2191" type="inline" citeas="">

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe Asciidoctor::ISO do
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
          #{TERM_BOILERPLATE}
-         <term id="_"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>90</mn></msub></math></stem></preferred><admitted><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>91</mn></msub></math></stem></admitted>
+         <term id="term-t90"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>90</mn></msub></math></stem></preferred><admitted><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>91</mn></msub></math></stem></admitted>
        <definition><p id="_">Time</p></definition></term>
        </terms>
        </sections>
@@ -54,7 +54,7 @@ RSpec.describe Asciidoctor::ISO do
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
          #{TERM_BOILERPLATE}
-         <term id="_">
+         <term id="term-tempus">
          <preferred>Tempus</preferred>
          <domain>relativity</domain><definition><p id="_"> Time</p></definition>
        </term>
@@ -90,7 +90,7 @@ RSpec.describe Asciidoctor::ISO do
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
          #{TERM_BOILERPLATE}
-         <term id="_"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>90</mn></msub></math></stem></preferred><definition><formula id="_">
+         <term id="term-t90"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>90</mn></msub></math></stem></preferred><definition><formula id="_">
          <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mi>A</mi></msub></math></stem>
        </formula><p id="_">This paragraph is extraneous</p></definition>
        </term>
@@ -118,7 +118,7 @@ RSpec.describe Asciidoctor::ISO do
          <terms id="_" obligation="normative"><title>Terms and definitions</title>
 
          #{TERM_BOILERPLATE}
-       <term id="_">
+       <term id="term-time">
        <preferred>Time</preferred>
          <definition><p id="_">This paragraph is extraneous</p></definition>
        </term></terms>
@@ -189,7 +189,7 @@ RSpec.describe Asciidoctor::ISO do
         <eref type="inline" bibitemid="iso216" citeas="ISO 216:2001"/>
       </p>
       </foreword></preface><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="iso216" type="standard">
@@ -232,7 +232,7 @@ RSpec.describe Asciidoctor::ISO do
         </localityStack>the reference</eref>
         </p>
       </foreword></preface><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="iso216" type="standard">
@@ -271,7 +271,7 @@ RSpec.describe Asciidoctor::ISO do
          <eref type="inline" bibitemid="iso216" citeas="ISO 216"/>
        </p>
        </foreword></preface><sections>
-       </sections><bibliography><references id="_" obligation="informative">
+       </sections><bibliography><references id="_" obligation="informative" normative="false">
   <title>Bibliography</title>
   <bibitem id="iso216" type="standard">
   <title format="text/plain">Reference</title>
@@ -305,7 +305,7 @@ RSpec.describe Asciidoctor::ISO do
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
          #{TERM_BOILERPLATE}
-         <term id="_">
+         <term id="term-term1">
          <preferred>Term1</preferred>
          <termsource status="identical">
          <origin bibitemid="ISO2191" type="inline" citeas="">
@@ -333,7 +333,7 @@ RSpec.describe Asciidoctor::ISO do
     INPUT
       #{BLANK_HDR}
       <sections></sections>
-      <bibliography><references id="_" obligation="informative"><title>Normative References</title>
+      <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="iso216" type="standard">
          <title format="text/plain">Reference</title>
@@ -637,7 +637,7 @@ RSpec.describe Asciidoctor::ISO do
         <p id="_">Footnote2</p>
       </fn>
       </p>
-      </clause></sections><bibliography><references id="_" obligation="informative">
+      </clause></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">
@@ -753,7 +753,7 @@ RSpec.describe Asciidoctor::ISO do
   it "reorders references in bibliography, and renumbers citations accordingly" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     #{ASCIIDOC_BLANK_HDR}
-    
+
     == Clause 1
     <<ref1>>
     <<ref1a>>
@@ -816,7 +816,7 @@ RSpec.describe Asciidoctor::ISO do
          <bibliography>
            <clause id='_' obligation='informative'>
              <title>Bibliography</title>
-             <references id='_' obligation='informative'>
+             <references id='_' obligation='informative' normative="false">
                <title>Clause 1</title>
                <bibitem id='ref1' type='standard'>
                  <title format='text/plain'>Standard ISO 123</title>
@@ -917,7 +917,7 @@ RSpec.describe Asciidoctor::ISO do
                  <docnumber>123</docnumber>
                </bibitem>
              </references>
-             <references id='_' obligation='informative'>
+             <references id='_' obligation='informative' normative="false">
                <bibitem id='ref11' type='standard'>
                  <title format='text/plain'>Standard ISO 123</title>
                  <docidentifier>ISO 123</docidentifier>

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">

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