metanorma-iso 2.1.1 → 2.1.2

data/spec/isodoc/xref_spec.rb

@@ -153,7 +153,7 @@ RSpec.describe IsoDoc do
       .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
 
-  it "cross-references figures (Presentation XML)" do
+  it "cross-references figures" do
     input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
         <preface>
@@ -299,7 +299,7 @@ RSpec.describe IsoDoc do
       .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
 
-  it "cross-references subfigures (Presentation XML)" do
+  it "cross-references subfigures" do
     input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
         <preface>
@@ -1501,12 +1501,12 @@ RSpec.describe IsoDoc do
         <preface>
           <foreword displayorder='1'>
             <p>
-              <xref target='N'>Clause 1 a)</xref>
-              <xref target='note1'>3.1 List 1 a)</xref>
-              <xref target='note2'>3.1 List 2 a)</xref>
+              <xref target='N'>1 a)</xref>
+              <xref target='note1'>3.1, List 1 a)</xref>
+              <xref target='note2'>3.1, List 2 a)</xref>
               <xref target='AN'>A.1 a)</xref>
-              <xref target='Anote1'>A.2 List 1 a)</xref>
-              <xref target='Anote2'>A.2 List 2 a)</xref>
+              <xref target='Anote1'>A.2, List 1 a)</xref>
+              <xref target='Anote2'>A.2, List 2 a)</xref>
             </p>
           </foreword>
         </preface>
@@ -1621,12 +1621,12 @@ RSpec.describe IsoDoc do
         <preface>
           <foreword displayorder='1'>
             <p>
-              <xref target='N'>Clause 1 a)</xref>
-              <xref target='note1'>Clause 1 a.1)</xref>
-              <xref target='note2'>Clause 1 a.1.i)</xref>
-              <xref target='AN'>Clause 1 a.1.i.A)</xref>
-              <xref target='Anote1'>Clause 1 a.1.i.A.I)</xref>
-              <xref target='Anote2'>Clause 1 a.1.i.A.I.a)</xref>
+              <xref target='N'>1 a)</xref>
+              <xref target='note1'>1 a) 1)</xref>
+              <xref target='note2'>1 a) 1) i)</xref>
+              <xref target='AN'>1 a) 1) i) A)</xref>
+              <xref target='Anote1'>1 a) 1) i) A) I)</xref>
+              <xref target='Anote2'>1 a) 1) i) A) I) a)</xref>
             </p>
           </foreword>
         </preface>
@@ -1670,4 +1670,78 @@ RSpec.describe IsoDoc do
     expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
       .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
+
+  it "conflates cross-references to a split list" do
+    input = <<~INPUT
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <preface>
+          <foreword>
+            <p><xref target="Na"/></p>
+          </foreword>
+        </preface>
+        <sections>
+          <clause id="scope" type="scope">
+            <title>Scope</title>
+            <ol id="N1">
+              <li id="Na"><p>A</p></li>
+              <li id="Na1"><p>A</p></li>
+            </ol>
+            <ol id="N2" start="3">
+              <li id="Nb"><p>A</p></li>
+              <li id="Nb1"><p>A</p></li>
+            </ol>
+            <ol id="N3" start="5">
+              <li id="Nc"><p>A</p></li>
+              <li id="Nc1"><p>A</p></li>
+            </ol>
+          </clause>
+        </sections>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      <foreword displayorder='1'>
+        <p><xref target='Na'>1 a)</xref></p>
+      </foreword>
+    OUTPUT
+    expect(xmlpp(Nokogiri::XML(IsoDoc::Iso::PresentationXMLConvert.new({})
+    .convert("test", input, true))
+    .at("//xmlns:foreword").to_xml))
+      .to be_equivalent_to xmlpp(output)
+
+    input = <<~INPUT
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <preface>
+          <foreword>
+            <p><xref target="Na"/></p>
+          </foreword>
+        </preface>
+        <sections>
+          <clause id="scope" type="scope">
+            <title>Scope</title>
+            <ol id="N1">
+              <li id="Na"><p>A</p></li>
+              <li id="Na1"><p>A</p></li>
+            </ol>
+            <ol id="N2" start="3">
+              <li id="Nb"><p>A</p></li>
+              <li id="Nb1"><p>A</p></li>
+            </ol>
+            <ol id="N3" start="6">
+              <li id="Nc"><p>A</p></li>
+              <li id="Nc1"><p>A</p></li>
+            </ol>
+          </clause>
+        </sections>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      <foreword displayorder='1'>
+        <p><xref target='Na'>Clause 1, List 1 a)</xref></p>
+      </foreword>
+    OUTPUT
+    expect(xmlpp(Nokogiri::XML(IsoDoc::Iso::PresentationXMLConvert.new({})
+    .convert("test", input, true))
+    .at("//xmlns:foreword").to_xml))
+      .to be_equivalent_to xmlpp(output)
+  end
 end

data/spec/metanorma/amd_spec.rb

@@ -55,7 +55,7 @@ RSpec.describe Metanorma::ISO do
       === Bibliography Subsection
     INPUT
     output = <<~OUTPUT
-      #{BLANK_HDR.sub(%r{<doctype>article</doctype>}, '<doctype>amendment</doctype>')}
+      #{BLANK_HDR.sub(%r{<doctype>standard</doctype>}, '<doctype>amendment</doctype>')}
         <sections>
           <clause id="_" obligation="normative">
             <title>Foreword</title>
@@ -255,6 +255,7 @@ RSpec.describe Metanorma::ISO do
           <ext>
             <doctype>amendment</doctype>
             <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>
@@ -263,6 +264,15 @@ RSpec.describe Metanorma::ISO do
               <workgroup number="31" type="C1">WG1</workgroup>
               <secretariat>SECRETARIAT</secretariat>
             </editorialgroup>
+            <approvalgroup>
+             <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>
+              <subcommittee number="21" type="B1">SC1</subcommittee>
+              <workgroup number="3" type="C">WG</workgroup>
+              <workgroup number="31" type="C1">WG1</workgroup>
+            </approvalgroup>
             <ics>
               <code>1</code>
             </ics>
@@ -341,10 +351,17 @@ RSpec.describe Metanorma::ISO do
           <ext>
             <doctype>amendment</doctype>
             <editorialgroup>
+             <agency>ISO</agency>
               <technical-committee/>
               <subcommittee/>
               <workgroup/>
             </editorialgroup>
+            <approvalgroup>
+             <agency>ISO</agency>
+              <technical-committee/>
+              <subcommittee/>
+              <workgroup/>
+            </approvalgroup>
             <structuredidentifier>
               <project-number amendment="1" part="1">17301</project-number>
             </structuredidentifier>
@@ -413,10 +430,17 @@ RSpec.describe Metanorma::ISO do
           <ext>
             <doctype>amendment</doctype>
             <editorialgroup>
+             <agency>ISO</agency>
               <technical-committee/>
               <subcommittee/>
               <workgroup/>
             </editorialgroup>
+            <approvalgroup>
+             <agency>ISO</agency>
+              <technical-committee/>
+              <subcommittee/>
+              <workgroup/>
+            </approvalgroup>
             <structuredidentifier>
               <project-number amendment="1" part="1">17301</project-number>
             </structuredidentifier>
@@ -484,10 +508,17 @@ RSpec.describe Metanorma::ISO do
           <ext>
             <doctype>amendment</doctype>
             <editorialgroup>
+             <agency>ISO</agency>
               <technical-committee/>
               <subcommittee/>
               <workgroup/>
             </editorialgroup>
+            <approvalgroup>
+             <agency>ISO</agency>
+              <technical-committee/>
+              <subcommittee/>
+              <workgroup/>
+            </approvalgroup>
             <structuredidentifier>
               <project-number amendment="1" part="1">17301</project-number>
             </structuredidentifier>
@@ -556,10 +587,17 @@ RSpec.describe Metanorma::ISO do
           <ext>
             <doctype>technical-corrigendum</doctype>
             <editorialgroup>
+             <agency>ISO</agency>
               <technical-committee/>
               <subcommittee/>
               <workgroup/>
             </editorialgroup>
+            <approvalgroup>
+             <agency>ISO</agency>
+              <technical-committee/>
+              <subcommittee/>
+              <workgroup/>
+            </approvalgroup>
             <structuredidentifier>
               <project-number corrigendum="3" part="1">17301</project-number>
             </structuredidentifier>
@@ -628,10 +666,17 @@ RSpec.describe Metanorma::ISO do
           <ext>
             <doctype>technical-corrigendum</doctype>
             <editorialgroup>
+             <agency>ISO</agency>
               <technical-committee/>
               <subcommittee/>
               <workgroup/>
             </editorialgroup>
+            <approvalgroup>
+             <agency>ISO</agency>
+              <technical-committee/>
+              <subcommittee/>
+              <workgroup/>
+            </approvalgroup>
             <structuredidentifier>
               <project-number part='1' corrigendum='3'>17301</project-number>
             </structuredidentifier>
@@ -699,10 +744,17 @@ RSpec.describe Metanorma::ISO do
           <ext>
             <doctype>technical-corrigendum</doctype>
             <editorialgroup>
+             <agency>ISO</agency>
               <technical-committee/>
               <subcommittee/>
               <workgroup/>
             </editorialgroup>
+            <approvalgroup>
+             <agency>ISO</agency>
+              <technical-committee/>
+              <subcommittee/>
+              <workgroup/>
+            </approvalgroup>
             <structuredidentifier>
               <project-number corrigendum="3" part="1">17301</project-number>
             </structuredidentifier>

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>
@@ -161,6 +191,15 @@ 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")
@@ -274,11 +313,20 @@ 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">IEC/IETF/ISO 1000</project-number>
                     </structuredidentifier>
@@ -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>