metanorma-iso 2.1.1 → 2.1.4

data/spec/metanorma/cleanup_spec.rb

@@ -1023,202 +1023,202 @@ RSpec.describe Metanorma::ISO do
     INPUT
     output = <<~OUTPUT
       #{BLANK_HDR}
-        <sections>
-          <clause id="_" inline-header="false" obligation="normative">
-            <title>Clause 1</title>
-            <p id="_">
-              <eref bibitemid="ref1" citeas="ISO 123" type="inline"/>
-              <eref bibitemid="ref1a" citeas="ISO 123-100" type="inline"/>
-              <eref bibitemid="ref1b" citeas="ISO/TS 123-1" type="inline"/>
-              <eref bibitemid="ref2" citeas="ISO/IEC 123" type="inline"/>
-              <eref bibitemid="ref3" citeas="IEC 123" type="inline"/>
-              <eref bibitemid="ref4" citeas="GB 123" type="inline"/>
-              <eref bibitemid="ref5" citeas="[6]" type="inline"/>
-              <eref bibitemid="ref6" citeas="[B]" type="inline"/>
-              <eref bibitemid="ref7" citeas="[A]" type="inline"/>
-              <xref target="ref8"/>
-              <xref target="ref9"/>
-              <eref bibitemid="ref10" citeas="ISO/IEC 123" type="inline"/>
-            </p>
-          </clause>
-        </sections>
-        <bibliography>
-          <clause id="_" obligation="informative">
-            <title>Bibliography</title>
-            <references id="_" normative="false" obligation="informative">
-              <title>Clause 1</title>
-              <bibitem id="ref1" type="standard">
-                <title format="text/plain">Standard ISO 123</title>
-                <docidentifier>ISO 123</docidentifier>
-                <docnumber>123</docnumber>
-                <contributor>
-                  <role type="publisher"/>
-                  <organization>
-                    <name>International Organization for Standardization</name>
-                    <abbreviation>ISO</abbreviation>
-                  </organization>
-                </contributor>
-              </bibitem>
-              <bibitem id="ref2" type="standard">
-                <title format="text/plain">Standard ISO/IEC 123</title>
-                <docidentifier>ISO/IEC 123</docidentifier>
-                <docnumber>123</docnumber>
-                <contributor>
-                  <role type="publisher"/>
-                  <organization>
-                    <name>International Organization for Standardization</name>
-                    <abbreviation>ISO</abbreviation>
-                  </organization>
-                </contributor>
-                <contributor>
-                  <role type="publisher"/>
-                  <organization>
-                    <name>International Electrotechnical Commission</name>
-                    <abbreviation>IEC</abbreviation>
-                  </organization>
-                </contributor>
-              </bibitem>
-              <bibitem id="ref1b" type="standard">
-                <title format="text/plain">Standard ISO 123</title>
-                <docidentifier>ISO/TS 123-1</docidentifier>
-                <docnumber>123-1</docnumber>
-                <contributor>
-                  <role type="publisher"/>
-                  <organization>
-                    <name>International Organization for Standardization</name>
-                    <abbreviation>ISO</abbreviation>
-                  </organization>
-                </contributor>
-                <contributor>
-                  <role type="publisher"/>
-                  <organization>
-                    <name>TS</name>
-                  </organization>
-                </contributor>
-              </bibitem>
-              <bibitem id="ref1a" type="standard">
-                <title format="text/plain">Standard ISO 123</title>
-                <docidentifier>ISO 123-100</docidentifier>
-                <docnumber>123-100</docnumber>
-                <contributor>
-                  <role type="publisher"/>
-                  <organization>
-                    <name>International Organization for Standardization</name>
-                    <abbreviation>ISO</abbreviation>
-                  </organization>
-                </contributor>
-              </bibitem>
-              <bibitem id="ref3" type="standard">
-                <title format="text/plain">Standard IEC 123</title>
-                <docidentifier>IEC 123</docidentifier>
-                <docnumber>123</docnumber>
-                <contributor>
-                  <role type="publisher"/>
-                  <organization>
-                    <name>International Electrotechnical Commission</name>
-                    <abbreviation>IEC</abbreviation>
-                  </organization>
-                </contributor>
-              </bibitem>
-              <bibitem id="ref5">
-                <formattedref format="application/x-isodoc+xml">
-                  <em>Standard 10</em>
-                </formattedref>
-                <docidentifier type="metanorma">[6]</docidentifier>
-              </bibitem>
-              <bibitem id="ref6">
-                <formattedref format="application/x-isodoc+xml">
-                  <em>Standard 20</em>
-                </formattedref>
-                <docidentifier type="metanorma">[B]</docidentifier>
-              </bibitem>
-              <bibitem id="ref7">
-                <formattedref format="application/x-isodoc+xml">
-                  <em>Standard 30</em>
-                </formattedref>
-                <docidentifier type="metanorma">[A]</docidentifier>
-              </bibitem>
-              <bibitem id="ref4">
-                <formattedref format="application/x-isodoc+xml">
-                  <em>Standard GB 123</em>
-                </formattedref>
-                <docidentifier>GB 123</docidentifier>
-                <docnumber>123</docnumber>
-              </bibitem>
-            </references>
-            <references id="_" normative="false" obligation="informative">
-              <bibitem id="ref11" type="standard">
-                <title format="text/plain">Standard ISO 123</title>
-                <docidentifier>ISO 123</docidentifier>
-                <docnumber>123</docnumber>
-                <contributor>
-                  <role type="publisher"/>
-                  <organization>
-                    <name>International Organization for Standardization</name>
-                    <abbreviation>ISO</abbreviation>
-                  </organization>
-                </contributor>
-              </bibitem>
-              <bibitem id="ref10" type="standard">
-                <title format="text/plain">Standard ISO/IEC 123</title>
-                <docidentifier>ISO/IEC 123</docidentifier>
-                <docnumber>123</docnumber>
-                <contributor>
-                  <role type="publisher"/>
-                  <organization>
-                    <name>International Organization for Standardization</name>
-                    <abbreviation>ISO</abbreviation>
-                  </organization>
-                </contributor>
-                <contributor>
-                  <role type="publisher"/>
-                  <organization>
-                    <name>International Electrotechnical Commission</name>
-                    <abbreviation>IEC</abbreviation>
-                  </organization>
-                </contributor>
-              </bibitem>
-              <bibitem id="ref13" type="standard">
-                <title format="text/plain">Standard IEC 123</title>
-                <docidentifier>IEC 123</docidentifier>
-                <docnumber>123</docnumber>
-                <contributor>
-                  <role type="publisher"/>
-                  <organization>
-                    <name>International Electrotechnical Commission</name>
-                    <abbreviation>IEC</abbreviation>
-                  </organization>
-                </contributor>
-              </bibitem>
-              <bibitem id="ref15">
-                <formattedref format="application/x-isodoc+xml">
-                  <em>Standard 10</em>
-                </formattedref>
-                <docidentifier type="metanorma">[13]</docidentifier>
-              </bibitem>
-              <bibitem id="ref16">
-                <formattedref format="application/x-isodoc+xml">
-                  <em>Standard 20</em>
-                </formattedref>
-                <docidentifier type="metanorma">[B]</docidentifier>
-              </bibitem>
-              <bibitem id="ref17">
-                <formattedref format="application/x-isodoc+xml">
-                  <em>Standard 30</em>
-                </formattedref>
-                <docidentifier type="metanorma">[A]</docidentifier>
-              </bibitem>
-              <bibitem id="ref14">
-                <formattedref format="application/x-isodoc+xml">
-                  <em>Standard GB 123</em>
-                </formattedref>
-                <docidentifier>GB 123</docidentifier>
-                <docnumber>123</docnumber>
-              </bibitem>
-            </references>
-          </clause>
-        </bibliography>
-      </iso-standard>
+               <sections>
+           <clause id='_' inline-header='false' obligation='normative'>
+             <title>Clause 1</title>
+             <p id='_'>
+               <eref type='inline' bibitemid='ref1' citeas='ISO 123'/>
+               <eref type='inline' bibitemid='ref1a' citeas='ISO 123-100'/>
+               <eref type='inline' bibitemid='ref1b' citeas='ISO/TS 123-1'/>
+               <eref type='inline' bibitemid='ref2' citeas='ISO/IEC 123'/>
+               <eref type='inline' bibitemid='ref3' citeas='IEC 123'/>
+               <eref type='inline' bibitemid='ref4' citeas='GB 123'/>
+               <eref type='inline' bibitemid='ref5' citeas='[7]'/>
+               <eref type='inline' bibitemid='ref6' citeas='[B]'/>
+               <eref type='inline' bibitemid='ref7' citeas='[A]'/>
+               <xref target='ref8'/>
+               <xref target='ref9'/>
+               <eref type='inline' bibitemid='ref10' citeas='ISO/IEC 123'/>
+             </p>
+           </clause>
+         </sections>
+         <bibliography>
+           <clause id='_' obligation='informative'>
+             <title>Bibliography</title>
+             <references id='_' normative='false' obligation='informative'>
+               <title>Clause 1</title>
+               <bibitem id='ref1' type='standard'>
+                 <title format='text/plain'>Standard ISO 123</title>
+                 <docidentifier>ISO 123</docidentifier>
+                 <docnumber>123</docnumber>
+                 <contributor>
+                   <role type='publisher'/>
+                   <organization>
+                     <name>International Organization for Standardization</name>
+                     <abbreviation>ISO</abbreviation>
+                   </organization>
+                 </contributor>
+               </bibitem>
+               <bibitem id='ref2' type='standard'>
+                 <title format='text/plain'>Standard ISO/IEC 123</title>
+                 <docidentifier>ISO/IEC 123</docidentifier>
+                 <docnumber>123</docnumber>
+                 <contributor>
+                   <role type='publisher'/>
+                   <organization>
+                     <name>International Organization for Standardization</name>
+                     <abbreviation>ISO</abbreviation>
+                   </organization>
+                 </contributor>
+                 <contributor>
+                   <role type='publisher'/>
+                   <organization>
+                     <name>International Electrotechnical Commission</name>
+                     <abbreviation>IEC</abbreviation>
+                   </organization>
+                 </contributor>
+               </bibitem>
+               <bibitem id='ref1b' type='standard'>
+                 <title format='text/plain'>Standard ISO 123</title>
+                 <docidentifier>ISO/TS 123-1</docidentifier>
+                 <docnumber>123-1</docnumber>
+                 <contributor>
+                   <role type='publisher'/>
+                   <organization>
+                     <name>International Organization for Standardization</name>
+                     <abbreviation>ISO</abbreviation>
+                   </organization>
+                 </contributor>
+                 <contributor>
+                   <role type='publisher'/>
+                   <organization>
+                     <name>TS</name>
+                   </organization>
+                 </contributor>
+               </bibitem>
+               <bibitem id='ref1a' type='standard'>
+                 <title format='text/plain'>Standard ISO 123</title>
+                 <docidentifier>ISO 123-100</docidentifier>
+                 <docnumber>123-100</docnumber>
+                 <contributor>
+                   <role type='publisher'/>
+                   <organization>
+                     <name>International Organization for Standardization</name>
+                     <abbreviation>ISO</abbreviation>
+                   </organization>
+                 </contributor>
+               </bibitem>
+               <bibitem id='ref3' type='standard'>
+                 <title format='text/plain'>Standard IEC 123</title>
+                 <docidentifier>IEC 123</docidentifier>
+                 <docnumber>123</docnumber>
+                 <contributor>
+                   <role type='publisher'/>
+                   <organization>
+                     <name>International Electrotechnical Commission</name>
+                     <abbreviation>IEC</abbreviation>
+                   </organization>
+                 </contributor>
+               </bibitem>
+               <bibitem id='ref4'>
+                 <formattedref format='application/x-isodoc+xml'>
+                   <em>Standard GB 123</em>
+                 </formattedref>
+                 <docidentifier>GB 123</docidentifier>
+                 <docnumber>123</docnumber>
+               </bibitem>
+               <bibitem id='ref5'>
+                 <formattedref format='application/x-isodoc+xml'>
+                   <em>Standard 10</em>
+                 </formattedref>
+                 <docidentifier type='metanorma'>[7]</docidentifier>
+               </bibitem>
+               <bibitem id='ref7'>
+                 <formattedref format='application/x-isodoc+xml'>
+                   <em>Standard 30</em>
+                 </formattedref>
+                 <docidentifier type='metanorma'>[A]</docidentifier>
+               </bibitem>
+               <bibitem id='ref6'>
+                 <formattedref format='application/x-isodoc+xml'>
+                   <em>Standard 20</em>
+                 </formattedref>
+                 <docidentifier type='metanorma'>[B]</docidentifier>
+               </bibitem>
+             </references>
+             <references id='_' normative='false' obligation='informative'>
+               <bibitem id='ref11' type='standard'>
+                 <title format='text/plain'>Standard ISO 123</title>
+                 <docidentifier>ISO 123</docidentifier>
+                 <docnumber>123</docnumber>
+                 <contributor>
+                   <role type='publisher'/>
+                   <organization>
+                     <name>International Organization for Standardization</name>
+                     <abbreviation>ISO</abbreviation>
+                   </organization>
+                 </contributor>
+               </bibitem>
+               <bibitem id='ref10' type='standard'>
+                 <title format='text/plain'>Standard ISO/IEC 123</title>
+                 <docidentifier>ISO/IEC 123</docidentifier>
+                 <docnumber>123</docnumber>
+                 <contributor>
+                   <role type='publisher'/>
+                   <organization>
+                     <name>International Organization for Standardization</name>
+                     <abbreviation>ISO</abbreviation>
+                   </organization>
+                 </contributor>
+                 <contributor>
+                   <role type='publisher'/>
+                   <organization>
+                     <name>International Electrotechnical Commission</name>
+                     <abbreviation>IEC</abbreviation>
+                   </organization>
+                 </contributor>
+               </bibitem>
+               <bibitem id='ref13' type='standard'>
+                 <title format='text/plain'>Standard IEC 123</title>
+                 <docidentifier>IEC 123</docidentifier>
+                 <docnumber>123</docnumber>
+                 <contributor>
+                   <role type='publisher'/>
+                   <organization>
+                     <name>International Electrotechnical Commission</name>
+                     <abbreviation>IEC</abbreviation>
+                   </organization>
+                 </contributor>
+               </bibitem>
+               <bibitem id='ref14'>
+                 <formattedref format='application/x-isodoc+xml'>
+                   <em>Standard GB 123</em>
+                 </formattedref>
+                 <docidentifier>GB 123</docidentifier>
+                 <docnumber>123</docnumber>
+               </bibitem>
+               <bibitem id='ref15'>
+                 <formattedref format='application/x-isodoc+xml'>
+                   <em>Standard 10</em>
+                 </formattedref>
+                 <docidentifier type='metanorma'>[14]</docidentifier>
+               </bibitem>
+               <bibitem id='ref17'>
+                 <formattedref format='application/x-isodoc+xml'>
+                   <em>Standard 30</em>
+                 </formattedref>
+                 <docidentifier type='metanorma'>[A]</docidentifier>
+               </bibitem>
+               <bibitem id='ref16'>
+                 <formattedref format='application/x-isodoc+xml'>
+                   <em>Standard 20</em>
+                 </formattedref>
+                 <docidentifier type='metanorma'>[B]</docidentifier>
+               </bibitem>
+             </references>
+           </clause>
+         </bibliography>
+       </iso-standard>
     OUTPUT
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)

data/spec/metanorma/lists_spec.rb

@@ -73,7 +73,7 @@ RSpec.describe Metanorma::ISO do
       [loweralpha]
       . First
       . Second
-      [upperalpha]
+      [upperalpha,start=4]
       .. Third
       .. Fourth
       . Fifth
@@ -117,7 +117,7 @@ RSpec.describe Metanorma::ISO do
             </li>
             <li>
               <p id="_">Second</p>
-              <ol id="_">
+              <ol id='_' start='4'>
                 <li>
                   <p id="_">Third</p>
                 </li>

data/spec/metanorma/section_spec.rb

@@ -455,8 +455,8 @@ RSpec.describe Metanorma::ISO do
 
     INPUT
     output = <<~OUTPUT
-      #{BLANK_HDR.sub(%r{<doctype>article</doctype>},
-                      '<doctype>article</doctype><subdoctype>vocabulary</subdoctype>')}
+      #{BLANK_HDR.sub(%r{<doctype>standard</doctype>},
+                      '<doctype>standard</doctype><subdoctype>vocabulary</subdoctype>')}
                <sections>
            <terms id='_' obligation='normative'>
              <title>Terms and Definitions</title>

data/spec/metanorma/validate_spec.rb

@@ -150,7 +150,7 @@ RSpec.describe Metanorma::ISO do
       expect(File.read("test.err")).to include "Scope clause missing"
     end
 
-    it "Scope clause not missing 1" do
+    it "Scope clause not missing if supplied" do
       Asciidoctor.convert(<<~"INPUT", *OPTIONS)
         = Document title
         Author
@@ -164,7 +164,7 @@ RSpec.describe Metanorma::ISO do
       expect(File.read("test.err")).not_to include "Scope clause missing"
     end
 
-    it "Scope clause not missing 2" do
+    it "Scope clause not missing in amendments" do
       FileUtils.rm_f "test.err"
       Asciidoctor.convert(<<~"INPUT", *OPTIONS)
         = Document title
@@ -196,7 +196,7 @@ RSpec.describe Metanorma::ISO do
       expect(File.read("test.err")).to include "Normative references missing"
     end
 
-    it "Normative references not missing 1" do
+    it "Normative references not missing if supplied" do
       Asciidoctor.convert(<<~"INPUT", *OPTIONS)
         = Document title
         Author
@@ -212,7 +212,7 @@ RSpec.describe Metanorma::ISO do
         .not_to include "Normative references missing"
     end
 
-    it "Normative references not missing 2" do
+    it "Normative references not missing in amendments" do
       Asciidoctor.convert(<<~"INPUT", *OPTIONS)
         = Document title
         Author
@@ -243,7 +243,7 @@ RSpec.describe Metanorma::ISO do
       expect(File.read("test.err")).to include "Terms & definitions missing"
     end
 
-    it "Terms & definitions not missing 1" do
+    it "Terms & definitions not missing if supplied" do
       Asciidoctor.convert(<<~"INPUT", *OPTIONS)
         = Document title
         Author
@@ -258,7 +258,7 @@ RSpec.describe Metanorma::ISO do
       expect(File.read("test.err")).not_to include "Terms & definitions missing"
     end
 
-    it "Terms & definitions not missing 2" do
+    it "Terms & definitions not missing in amendment" do
       Asciidoctor.convert(<<~"INPUT", *OPTIONS)
         = Document title
         Author
@@ -1699,6 +1699,7 @@ RSpec.describe Metanorma::ISO do
       :docfile: test.adoc
       :nodoc:
       :technical-committee-type: X
+      :technical-committee-number: X
       :no-isobib:
 
     INPUT
@@ -1712,19 +1713,7 @@ RSpec.describe Metanorma::ISO do
       :docfile: test.adoc
       :nodoc:
       :subcommittee-type: X
-      :no-isobib:
-
-    INPUT
-    expect(File.read("test.err")).to include "invalid subcommittee type"
-  end
-
-  it "Warning if invalid subcommittee type" do
-    Asciidoctor.convert(<<~"INPUT", *OPTIONS)
-      = Document title
-      Author
-      :docfile: test.adoc
-      :nodoc:
-      :subcommittee-type: X
+      :subcommittee-number: X
       :no-isobib:
 
     INPUT

data/spec/spec_helper.rb

@@ -47,7 +47,7 @@ RSpec.configure do |config|
 end
 
 def strip_guid(xml)
-  xml.gsub(%r{ id="_[^"]+"}, ' id="_"')
+  xml.gsub(%r{ id=['"]_[^"']+['"]}, ' id="_"')
     .gsub(%r{ target="_[^"]+"}, ' target="_"')
     .gsub(%r{ src="cid:[^.]+.gif"}, ' src="_.gif"')
     .gsub(%r{ src='cid:[^.]+.gif'}, ' src="_.gif"')
@@ -151,7 +151,8 @@ BOILERPLATE =
     File.read(ASCIIDOCTOR_ISO_DIR / "boilerplate.xml", encoding: "utf-8")
       .gsub(/\{\{ agency \}\}/, "ISO")
   .gsub(/\{\{ docyear \}\}/, Date.today.year.to_s)
-      .gsub(/\{% if unpublished %\}.*\{% endif %\}/m, "")
+      .gsub(/\{% if unpublished %\}.*?\{% endif %\}/m, "")
+      .gsub(/\{% if stage_int >= 40 %\}(.*?)\{% endif %\}/m, "\\1")
       .gsub(/(?<=\p{Alnum})'(?=\p{Alpha})/, "’"),
   )
 
@@ -160,7 +161,8 @@ BOILERPLATE_FR =
     File.read(ASCIIDOCTOR_ISO_DIR / "boilerplate-fr.xml", encoding: "utf-8")
     .gsub(/\{\{ agency \}\}/, "ISO")
     .gsub(/\{\{ docyear \}\}/, Date.today.year.to_s)
-    .gsub(/\{% if unpublished %\}.*\{% endif %\}/m, "")
+    .gsub(/\{% if unpublished %\}.*?\{% endif %\}/m, "")
+      .gsub(/\{% if stage_int >= 40 %\}(.*?)\{% endif %\}/m, "\\1")
     .gsub(/(?<=\p{Alnum})'(?=\p{Alpha})/, "’"),
   )
 
@@ -198,12 +200,13 @@ BLANK_HDR1 = <<~"HDR".freeze
         </owner>
       </copyright>
       <ext>
-        <doctype>article</doctype>
+        <doctype>standard</doctype>
         <editorialgroup>
-          <technical-committee/>
-          <subcommittee/>
-          <workgroup/>
+          <agency>ISO</agency>
         </editorialgroup>
+        <approvalgroup>
+          <agency>ISO</agency>
+        </approvalgroup>
         <stagename>International standard</stagename>
       </ext>
     </bibdata>