metanorma-iso 2.0.8.1 → 2.1.2

data/spec/metanorma/base_spec.rb

@@ -37,6 +37,25 @@ RSpec.describe Metanorma::ISO do
       :workgroup-number_2: 31
       :workgroup-type_2: C1
       :secretariat: SECRETARIAT
+      :approval-technical-committee: TCa
+      :approval-technical-committee-number: 1a
+      :approval-technical-committee-type: Aa
+      :approval-subcommittee: SCa
+      :approval-subcommittee-number: 2a
+      :approval-subcommittee-type: Ba
+      :approval-workgroup: WGa
+      :approval-workgroup-number: 3a
+      :approval-workgroup-type: Ca
+      :approval-technical-committee_2: TC1a
+      :approval-technical-committee-number_2: 11a
+      :approval-technical-committee-type_2: A1a
+      :approval-subcommittee_2: SC1a
+      :approval-subcommittee-number_2: 21a
+      :approval-subcommittee-type_2: B1a
+      :approval-workgroup_2: WG1a
+      :approval-workgroup-number_2: 31a
+      :approval-workgroup-type_2: C1a
+      :approval-agency: ISO/IEC
       :docstage: 20
       :docsubstage: 20
       :iteration: 3
@@ -105,9 +124,10 @@ RSpec.describe Metanorma::ISO do
               </owner>
             </copyright>
             <ext>
-              <doctype>article</doctype>
+              <doctype>standard</doctype>
               <horizontal>true</horizontal>
               <editorialgroup>
+               <agency>ISO</agency>
                 <technical-committee number="1" type="A">TC</technical-committee>
                 <technical-committee number="11" type="A1">TC1</technical-committee>
                 <subcommittee number="2" type="B">SC</subcommittee>
@@ -116,6 +136,16 @@ RSpec.describe Metanorma::ISO do
                 <workgroup number="31" type="C1">WG1</workgroup>
                 <secretariat>SECRETARIAT</secretariat>
               </editorialgroup>
+              <approvalgroup>
+                <agency>ISO</agency>
+                <agency>IEC</agency>
+                <technical-committee number="1a" type="Aa">TCa</technical-committee>
+                <technical-committee number="11a" type="A1a">TC1a</technical-committee>
+                <subcommittee number="2a" type="Ba">SCa</subcommittee>
+                <subcommittee number="21a" type="B1a">SC1a</subcommittee>
+                <workgroup number="3a" type="Ca">WGa</workgroup>
+                <workgroup number="31a" type="C1a">WG1a</workgroup>
+              </approvalgroup>
               <ics>
                 <code>1</code>
               </ics>
@@ -150,7 +180,7 @@ RSpec.describe Metanorma::ISO do
       :language: el
       :script: Grek
       :publisher: IEC;IETF;ISO
-      :copyright-holder: ISO;IETF
+      :copyright-holder: IETF;ISO
       :copyright-year: 2001
       :doctype: technical-report
       :pub-address: 1 Infinity Loop + \
@@ -161,16 +191,25 @@ RSpec.describe Metanorma::ISO do
       :pub-uri: http://www.example.com
       :docstage:
       :docsubstage:
+      :technical-committee: TC
+      :technical-committee-number: 1
+      :technical-committee-type: A
+      :subcommittee: SC
+      :subcommittee-number: 2
+      :subcommittee-type: B
+      :workgroup: WG
+      :workgroup-number: 3
+      :workgroup-type: C
     INPUT
     expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
       .to be_equivalent_to xmlpp(<<~"OUTPUT")
               <?xml version="1.0" encoding="UTF-8"?>
               <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
                 <bibdata type="standard">
-                  <docidentifier type="ISO">ISO/IEC/IETF/TR 1000-1-1:2001</docidentifier>
-                  <docidentifier type='iso-undated'>ISO/IEC/IETF/TR 1000-1-1</docidentifier>
-                  <docidentifier type="iso-with-lang">ISO/IEC/IETF/TR 1000-1-1:2001(X)</docidentifier>
-                  <docidentifier type="iso-reference">ISO/IEC/IETF/TR 1000-1-1:2001(X)</docidentifier>
+                  <docidentifier type='ISO'>IEC/IETF/ISO/TR 1000-1-1:2001</docidentifier>
+                  <docidentifier type='iso-undated'>IEC/IETF/ISO/TR 1000-1-1</docidentifier>
+                  <docidentifier type='iso-with-lang'>IEC/IETF/ISO/TR 1000-1-1:2001(X)</docidentifier>
+                  <docidentifier type='iso-reference'>IEC/IETF/ISO/TR 1000-1-1:2001(X)</docidentifier>
                   <docidentifier type="iso-tc">2000</docidentifier>
                   <docidentifier type="iso-tc">2003</docidentifier>
                   <docnumber>1000</docnumber>
@@ -245,8 +284,7 @@ RSpec.describe Metanorma::ISO do
                     <from>2001</from>
                     <owner>
                       <organization>
-                        <name>International Organization for Standardization</name>
-                        <abbreviation>ISO</abbreviation>
+                        <name>IETF</name>
                         <address>
           <formattedAddress>1 Infinity Loop + California</formattedAddress>
         </address>
@@ -257,11 +295,12 @@ RSpec.describe Metanorma::ISO do
                       </organization>
                     </owner>
                   </copyright>
-                  <copyright>
+                                    <copyright>
                     <from>2001</from>
                     <owner>
                       <organization>
-                        <name>IETF</name>
+                        <name>International Organization for Standardization</name>
+                        <abbreviation>ISO</abbreviation>
                         <address>
           <formattedAddress>1 Infinity Loop + California</formattedAddress>
         </address>
@@ -274,13 +313,22 @@ RSpec.describe Metanorma::ISO do
                   </copyright>
                   <ext>
                     <doctype>technical-report</doctype>
-                    <editorialgroup>
-                      <technical-committee/>
-                      <subcommittee/>
-                      <workgroup/>
-                    </editorialgroup>
+             <editorialgroup>
+              <agency>IEC</agency>
+              <agency>IETF</agency>
+              <agency>ISO</agency>
+               <technical-committee number='1' type='A'>TC</technical-committee>
+               <subcommittee number='2' type='B'>SC</subcommittee>
+               <workgroup number='3' type='C'>WG</workgroup>
+             </editorialgroup>
+             <approvalgroup>
+              <agency>ISO</agency>
+               <technical-committee number='1' type='A'>TC</technical-committee>
+               <subcommittee number='2' type='B'>SC</subcommittee>
+               <workgroup number='3' type='C'>WG</workgroup>
+             </approvalgroup>
                     <structuredidentifier>
-                      <project-number part="1" subpart="1">ISO/IEC/IETF 1000</project-number>
+                      <project-number part="1" subpart="1">IEC/IETF/ISO 1000</project-number>
                     </structuredidentifier>
                     <stagename>International standard</stagename>
                   </ext>
@@ -290,6 +338,84 @@ RSpec.describe Metanorma::ISO do
       OUTPUT
   end
 
+  it "processes tech specification identifier" do
+    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :no-isobib:
+      :docnumber: 1000
+      :partnumber: 1-1
+      :copyright-year: 2001
+      :doctype: technical-specification
+      :docstage: 50
+      :docsubstage:
+    INPUT
+    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
+      .to be_equivalent_to xmlpp(<<~"OUTPUT")
+           <iso-standard xmlns='https://www.metanorma.org/ns/iso' type='semantic' version="#{Metanorma::ISO::VERSION}">
+         <bibdata type='standard'>
+           <docidentifier type='ISO'>ISO/FDTS 1000-1-1</docidentifier>
+           <docidentifier type='iso-undated'>ISO/FDTS 1000-1-1</docidentifier>
+           <docidentifier type='iso-with-lang'>ISO/FDTS 1000-1-1(E)</docidentifier>
+           <docidentifier type='iso-reference'>ISO/FDTS 1000-1-1:2001(E)</docidentifier>
+           <docnumber>1000</docnumber>
+           <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='FDTS TS'>50</stage>
+             <substage>00</substage>
+           </status>
+           <copyright>
+             <from>2001</from>
+             <owner>
+               <organization>
+                 <name>International Organization for Standardization</name>
+                 <abbreviation>ISO</abbreviation>
+               </organization>
+             </owner>
+           </copyright>
+           <ext>
+             <doctype>technical-specification</doctype>
+             <editorialgroup>
+              <agency>ISO</agency>
+               <technical-committee/>
+               <subcommittee/>
+               <workgroup/>
+             </editorialgroup>
+             <approvalgroup>
+              <agency>ISO</agency>
+               <technical-committee/>
+               <subcommittee/>
+               <workgroup/>
+             </approvalgroup>
+             <structuredidentifier>
+               <project-number part='1' subpart='1'>ISO 1000</project-number>
+             </structuredidentifier>
+             <stagename>Final draft</stagename>
+           </ext>
+         </bibdata>
+         <sections> </sections>
+       </iso-standard>
+    OUTPUT
+  end
+
   it "processes Russian titles" do
     output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
@@ -381,13 +507,20 @@ RSpec.describe Metanorma::ISO do
               </owner>
             </copyright>
             <ext>
-              <doctype>article</doctype>
+              <doctype>standard</doctype>
               <horizontal>true</horizontal>
               <editorialgroup>
+               <agency>ISO</agency>
                 <technical-committee/>
                 <subcommittee/>
                 <workgroup/>
               </editorialgroup>
+              <approvalgroup>
+               <agency>ISO</agency>
+                <technical-committee/>
+                <subcommittee/>
+                <workgroup/>
+              </approvalgroup>
               <structuredidentifier>
                 <project-number part='1'>ISO 1000</project-number>
               </structuredidentifier>
@@ -491,10 +624,17 @@ RSpec.describe Metanorma::ISO do
             <ext>
               <doctype>this-is-a-doctype</doctype>
               <editorialgroup>
+               <agency>SD</agency>
                 <technical-committee/>
                 <subcommittee/>
                 <workgroup/>
               </editorialgroup>
+              <approvalgroup>
+               <agency>ISO</agency>
+                <technical-committee/>
+                <subcommittee/>
+                <workgroup/>
+              </approvalgroup>
               <structuredidentifier>
                 <project-number part="1" subpart="1">SD 1000</project-number>
               </structuredidentifier>
@@ -562,10 +702,17 @@ RSpec.describe Metanorma::ISO do
                   <ext>
                     <doctype>international-standard</doctype>
                     <editorialgroup>
+                     <agency>ISO</agency>
                       <technical-committee/>
                       <subcommittee/>
                       <workgroup/>
                     </editorialgroup>
+                    <approvalgroup>
+                     <agency>ISO</agency>
+                      <technical-committee/>
+                      <subcommittee/>
+                      <workgroup/>
+                    </approvalgroup>
                     <structuredidentifier>
                       <project-number>ISO 1000</project-number>
                     </structuredidentifier>
@@ -629,12 +776,19 @@ RSpec.describe Metanorma::ISO do
             </owner>
           </copyright>
           <ext>
-            <doctype>article</doctype>
+            <doctype>standard</doctype>
             <editorialgroup>
+             <agency>ISO</agency>
               <technical-committee/>
               <subcommittee/>
               <workgroup/>
             </editorialgroup>
+            <approvalgroup>
+             <agency>ISO</agency>
+              <technical-committee/>
+              <subcommittee/>
+              <workgroup/>
+            </approvalgroup>
             <structuredidentifier>
               <project-number>ISO 1000</project-number>
             </structuredidentifier>
@@ -698,12 +852,19 @@ RSpec.describe Metanorma::ISO do
               </owner>
             </copyright>
             <ext>
-              <doctype>article</doctype>
+              <doctype>standard</doctype>
               <editorialgroup>
+               <agency>ISO</agency>
                 <technical-committee/>
                 <subcommittee/>
                 <workgroup/>
               </editorialgroup>
+              <approvalgroup>
+               <agency>ISO</agency>
+                <technical-committee/>
+                <subcommittee/>
+                <workgroup/>
+              </approvalgroup>
               <structuredidentifier>
                 <project-number>ISO 1000</project-number>
               </structuredidentifier>
@@ -768,10 +929,17 @@ RSpec.describe Metanorma::ISO do
             <ext>
               <doctype>directive</doctype>
               <editorialgroup>
+               <agency>ISO</agency>
                 <technical-committee/>
                 <subcommittee/>
                 <workgroup/>
               </editorialgroup>
+              <approvalgroup>
+               <agency>ISO</agency>
+                <technical-committee/>
+                <subcommittee/>
+                <workgroup/>
+              </approvalgroup>
               <structuredidentifier>
                 <project-number>ISO 1000</project-number>
               </structuredidentifier>
@@ -1142,12 +1310,19 @@ RSpec.describe Metanorma::ISO do
                 </bibitem>
               </relation>
               <ext>
-                <doctype>article</doctype>
+                <doctype>standard</doctype>
                 <editorialgroup>
+                 <agency>ISO</agency>
                   <technical-committee/>
                   <subcommittee/>
                   <workgroup/>
                 </editorialgroup>
+                <approvalgroup>
+                 <agency>ISO</agency>
+                  <technical-committee/>
+                  <subcommittee/>
+                  <workgroup/>
+                </approvalgroup>
                 <stagename>International standard</stagename>
               </ext>
             </bibdata>

data/spec/metanorma/blocks_spec.rb

@@ -228,6 +228,27 @@ RSpec.describe Metanorma::ISO do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "processes editorial notes" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      [IMPORTANT,type=editorial]
+      ====
+      Editorial note
+      ====
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+        <sections>
+          <admonition id="_" type="editorial">
+            <p id="_">Editorial note</p>
+          </admonition>
+        </sections>
+      </iso-standard>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "processes complex admonitions with non-Asciidoc names" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -600,4 +621,37 @@ RSpec.describe Metanorma::ISO do
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
+
+  it "processes the macro for editorial notes" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      EDITOR: Note1
+
+      [EDITOR]
+      ====
+      Note2
+      ====
+
+      [EDITOR]
+      Note3
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+         <sections>
+           <admonition id='_' type='editorial'>
+             <p id='_'>Note1</p>
+           </admonition>
+           <admonition id='_' type='editorial'>
+             <p id='_'>Note2</p>
+           </admonition>
+           <admonition id='_' type='editorial'>
+             <p id='_'>Note3</p>
+           </admonition>
+         </sections>
+      </iso-standard>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
 end

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/spec_helper.rb

@@ -47,7 +47,10 @@ RSpec.configure do |config|
 end
 
 def strip_guid(xml)
-  xml.gsub(%r{ id="_[^"]+"}, ' id="_"').gsub(%r{ target="_[^"]+"}, ' target="_"')
+  xml.gsub(%r{ id=['"]_[^"']+['"]}, ' id="_"')
+    .gsub(%r{ target="_[^"]+"}, ' target="_"')
+    .gsub(%r{ src="cid:[^.]+.gif"}, ' src="_.gif"')
+    .gsub(%r{ src='cid:[^.]+.gif'}, ' src="_.gif"')
 end
 
 def metadata(hash)
@@ -57,6 +60,13 @@ def metadata(hash)
 end
 
 def xmlpp(xml)
+  c = HTMLEntities.new
+  xml &&= xml.split(/(&\S+?;)/).map do |n|
+    if /^&\S+?;$/.match?(n)
+      c.encode(c.decode(n), :hexadecimal)
+    else n
+    end
+  end.join
   s = ""
   f = REXML::Formatters::Pretty.new(2)
   f.compact = true
@@ -141,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})/, "’"),
   )
 
@@ -150,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})/, "’"),
   )
 
@@ -188,12 +200,19 @@ BLANK_HDR1 = <<~"HDR".freeze
         </owner>
       </copyright>
       <ext>
-        <doctype>article</doctype>
+        <doctype>standard</doctype>
         <editorialgroup>
+          <agency>ISO</agency>
           <technical-committee/>
           <subcommittee/>
           <workgroup/>
         </editorialgroup>
+        <approvalgroup>
+          <agency>ISO</agency>
+          <technical-committee/>
+          <subcommittee/>
+          <workgroup/>
+        </approvalgroup>
         <stagename>International standard</stagename>
       </ext>
     </bibdata>