metanorma-iso 2.0.2 → 2.0.3

data/lib/metanorma/iso/basicdoc.rng

@@ -173,9 +173,11 @@
           <data type="dateTime"/>
         </attribute>
       </optional>
-      <attribute name="from">
-        <data type="IDREF"/>
-      </attribute>
+      <optional>
+        <attribute name="from">
+          <data type="IDREF"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="to">
           <data type="IDREF"/>

data/lib/metanorma/iso/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -828,6 +825,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>

data/lib/metanorma/iso/validate_section.rb

@@ -40,7 +40,8 @@ module Metanorma
       def symbols_validate(root)
         f = root.xpath("//definitions")
         f.empty? && return
-        (f.size == 1) || @log.add("Style", f.first, ONE_SYMBOLS_WARNING)
+        (f.size == 1 || @vocab) or
+          @log.add("Style", f.first, ONE_SYMBOLS_WARNING)
         f.first.elements.each do |e|
           unless %w(title dl).include? e.name
             @log.add("Style", f.first, NON_DL_SYMBOLS_WARNING)
@@ -100,7 +101,7 @@ module Metanorma
 
       def sections_sequence_validate(root)
         names, n = sections_sequence_validate_start(root)
-        if root&.at("//bibdata/ext/subdoctype")&.text == "vocabulary"
+        if @vocab
           names, n = sections_sequence_validate_body_vocab(names, n)
         else
           names, n = sections_sequence_validate_body(names, n)

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.0.2".freeze
+    VERSION = "2.0.3".freeze
   end
 end

data/spec/isodoc/xref_spec.rb

@@ -1373,7 +1373,7 @@ RSpec.describe IsoDoc do
             <title depth="1">1
               <tab/>
               Scope</title>
-            <ol id="N">
+            <ol id="N" type="alphabet">
               <li>
                 <p>A</p>
               </li>
@@ -1388,12 +1388,12 @@ RSpec.describe IsoDoc do
               Widgets</title>
             <clause id="widgets1" inline-header="true">
               <title>3.1</title>
-              <ol id="note1">
+              <ol id="note1" type="alphabet">
                 <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different
                           types of kernel.
                         </p>
               </ol>
-              <ol id="note2">
+              <ol id="note2" type="alphabet">
                 <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different
                           types of kernel.
                         </p>
@@ -1407,7 +1407,7 @@ RSpec.describe IsoDoc do
             <br/>(informative)</title>
           <clause id="annex1a" inline-header="true">
             <title>A.1</title>
-            <ol id="AN">
+            <ol id="AN" type="alphabet">
               <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different
                         types of kernel.
                       </p>
@@ -1415,12 +1415,12 @@ RSpec.describe IsoDoc do
           </clause>
           <clause id="annex1b" inline-header="true">
             <title>A.2</title>
-            <ol id="Anote1">
+            <ol id="Anote1" type="alphabet">
               <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different
                         types of kernel.
                       </p>
             </ol>
-            <ol id="Anote2">
+            <ol id="Anote2" type="alphabet">
               <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different
                         types of kernel.
                       </p>
@@ -1513,7 +1513,7 @@ RSpec.describe IsoDoc do
         <sections>
           <clause id='scope' type='scope' displayorder='2'>
             <title depth='1'>1<tab/>Scope</title>
-            <ol id='N1'>
+            <ol id='N1' type="alphabet">
               <li id='N'>
                 <p>A</p>
               </li>
@@ -1523,12 +1523,12 @@ RSpec.describe IsoDoc do
           <clause id='widgets' displayorder='4'>
           <title depth='1'>3<tab/>Widgets</title>
             <clause inline-header="true" id='widgets1'><title>3.1</title>
-              <ol id='note1l'>
+              <ol id='note1l' type="alphabet">
                 <li id='note1'>
                   <p>A</p>
                 </li>
               </ol>
-              <ol id='note2l'>
+              <ol id='note2l' type="alphabet">
                 <li id='note2'>
                   <p>A</p>
                 </li>
@@ -1538,19 +1538,19 @@ RSpec.describe IsoDoc do
         </sections>
         <annex id='annex1'  displayorder='5'><title><strong>Annex A</strong><br/>(informative)</title>
           <clause inline-header="true" id='annex1a'><title>A.1</title>
-            <ol id='ANl'>
+            <ol id='ANl' type="alphabet">
               <li id='AN'>
                 <p>A</p>
               </li>
             </ol>
           </clause>
           <clause inline-header="true" id='annex1b'><title>A.2</title>
-            <ol id='Anote1l'>
+            <ol id='Anote1l' type="alphabet">
               <li id='Anote1'>
                 <p>A</p>
               </li>
             </ol>
-            <ol id='Anote2l'>
+            <ol id='Anote2l' type="alphabet">
               <li id='Anote2'>
                 <p>A</p>
               </li>
@@ -1633,22 +1633,22 @@ RSpec.describe IsoDoc do
         <sections>
           <clause id='scope' type='scope' displayorder='2'>
             <title depth='1'>1<tab/>Scope</title>
-            <ol id='N1'>
+            <ol id='N1' type="alphabet">
               <li id='N'>
                 <p>A</p>
-                <ol>
+                <ol type="arabic">
                   <li id='note1'>
                     <p>A</p>
-                    <ol>
+                    <ol type="roman">
                       <li id='note2'>
                         <p>A</p>
-                        <ol>
+                        <ol type="alphabet_upper">
                           <li id='AN'>
                             <p>A</p>
-                            <ol>
+                            <ol type="roman_upper">
                               <li id='Anote1'>
                                 <p>A</p>
-                                <ol>
+                                <ol type="alphabet">
                                   <li id='Anote2'>
                                     <p>A</p>
                                   </li>

data/spec/metanorma/base_spec.rb

@@ -675,7 +675,7 @@ RSpec.describe Metanorma::ISO do
         :docfile: test.adoc
         :nodoc:
         :novalid:
-        :amends: ISO 123;ISO 125
+        :amends: ISO 123:2001;ISO 125
         :obsoletes: ABC 1
         :successor-of: ABC 2
         :manifestation-of: ABC 3
@@ -769,9 +769,10 @@ RSpec.describe Metanorma::ISO do
                 <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>
-                <docidentifier type='ISO'>ISO 123</docidentifier>
+                <docidentifier type='ISO'>ISO 123:2001</docidentifier>
                 <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:en,fr</docidentifier>
                 <docnumber>123</docnumber>
+                <date type='published'><on>2001-05</on></date>
                 <contributor>
                   <role type='publisher'/>
                   <organization>
@@ -784,6 +785,23 @@ RSpec.describe Metanorma::ISO do
                 <language>en</language>
                 <language>fr</language>
                 <script>Latn</script>
+        <abstract format='text/plain' language='en' script='Latn'>
+          This International Standard specifies procedures for sampling natural
+          rubber latex concentrate and for sampling synthetic rubber latices and
+          artificial latices. It is also suitable for sampling rubber latex
+          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>
                 <status>
                   <stage>90</stage>
                   <substage>93</substage>
@@ -801,74 +819,6 @@ RSpec.describe Metanorma::ISO do
                     <formattedref format='text/plain'>ISO 123:1985</formattedref>
                   </bibitem>
                 </relation>
-                <relation type='instance'>
-                  <bibitem type='standard'>
-                    <fetched/>
-                    <title type='title-intro' format='text/plain' language='en' script='Latn'>Rubber latex</title>
-                    <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>
-                    <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>
-                    <docidentifier type='ISO'>ISO 123:2001</docidentifier>
-                    <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:en,fr</docidentifier>
-                    <docnumber>123</docnumber>
-                    <date type='published'>
-                      <on>2001-05</on>
-                    </date>
-                    <contributor>
-                      <role type='publisher'/>
-                      <organization>
-                        <name>International Organization for Standardization</name>
-                        <abbreviation>ISO</abbreviation>
-                        <uri>www.iso.org</uri>
-                      </organization>
-                    </contributor>
-                    <edition>3</edition>
-                    <language>en</language>
-                    <language>fr</language>
-                    <script>Latn</script>
-                    <abstract format='text/plain' language='en' script='Latn'>
-                      This International Standard specifies procedures for sampling
-                      natural rubber latex concentrate and for sampling synthetic rubber
-                      latices and artificial latices. It is also suitable for sampling
-                      rubber latex 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>
-                    <status>
-                      <stage>90</stage>
-                      <substage>93</substage>
-                    </status>
-                    <copyright>
-                      <from>2001</from>
-                      <owner>
-                        <organization>
-                          <name>ISO</name>
-                        </organization>
-                      </owner>
-                    </copyright>
-                    <relation type='obsoletes'>
-                      <bibitem type='standard'>
-                        <formattedref format='text/plain'>ISO 123:1985</formattedref>
-                      </bibitem>
-                    </relation>
-                    <place>Geneva</place>
-                  </bibitem>
-                </relation>
                 <place>Geneva</place>
               </bibitem>
             </relation>

data/spec/metanorma/refs_spec.rb

@@ -364,10 +364,7 @@ RSpec.describe Metanorma::ISO do
 
   def mock_fdis
     expect(RelatonIso::IsoBibliography).to receive(:get)
-      .with("ISO/FDIS 17664-1", nil, code: "ISO/FDIS 17664-1",
-                                     lang: "en", match: anything, ord: anything,
-                                     process: 1, year: nil,
-                                     title: "Title", usrlbl: nil) do
+      .with("ISO/FDIS 17664-1", nil, anything) do
       RelatonIsoBib::XMLParser.from_xml(<<~"OUTPUT")
         <bibitem id="x" type="standard">
           <fetched>#{Date.today}</fetched>

data/spec/metanorma/validate_spec.rb

@@ -812,8 +812,7 @@ RSpec.describe Metanorma::ISO do
     INPUT
     expect(File.read("test.err"))
       .not_to include "Symbols and Abbreviated Terms can only contain "\
-                  "a definition list"
-
+                      "a definition list"
   end
 
   it "Warning if missing foreword" do
@@ -1204,6 +1203,32 @@ RSpec.describe Metanorma::ISO do
       .to include "Only annexes and references can follow terms and clauses"
   end
 
+  it "No warning if there are two Symbols sections in a Vocabulary document" do
+    Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :no-isobib:
+      :docsubtype: vocabulary
+
+      == Scope
+
+      == Terms and definitions
+
+      == A Clause
+
+      [heading=symbols and abbreviated terms]
+      == Terms related to clinical psychology
+
+      [heading=symbols and abbreviated terms]
+      == Symbols related to clinical psychology
+
+    INPUT
+    expect(File.read("test.err"))
+      .not_to include "Only one Symbols and Abbreviated Terms section "\
+                       "in the standard"
+  end
 
   it "Warning if final section is not named Bibliography" do
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-22 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -420,8 +420,6 @@ files:
 - spec/metanorma/table_spec.rb
 - spec/metanorma/validate_spec.rb
 - spec/spec_helper.rb
-- spec/vcr_cassettes/docrels.yml
-- spec/vcr_cassettes/sortrefs.yml
 homepage: https://github.com/metanorma/metanorma-iso
 licenses:
 - BSD-2-Clause