metanorma-iso 2.0.8.1 → 2.1.2

data/spec/isodoc/xref_spec.rb

@@ -121,7 +121,7 @@ RSpec.describe IsoDoc do
         <annex id="annex1" displayorder='5'>
           <title>
             <strong>Annex A</strong>
-            <br/>(informative)</title>
+            <br/><span class="obligation">(informative)</span></title>
           <clause id="annex1a" inline-header="true">
             <title>A.1</title>
             <note id="AN">
@@ -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>
@@ -224,12 +224,12 @@ RSpec.describe IsoDoc do
         <preface>
           <foreword id="fwd" displayorder='1'>
             <p>
-              <xref target="N">Figure 1</xref>
-              <xref target="note1">Figure 2</xref>
-              <xref target="note2">Figure 3</xref>
-              <xref target="AN">Figure A.1</xref>
-              <xref target="Anote1">Figure A.2</xref>
-              <xref target="Anote2">Figure A.3</xref>
+              <xref target="N"><span class='citefig'>Figure 1</span></xref>
+              <xref target="note1"><span class='citefig'>Figure 2</span></xref>
+              <xref target="note2"><span class='citefig'>Figure 3</span></xref>
+              <xref target="AN"><span class='citefig'>Figure A.1</span></xref>
+              <xref target="Anote1"><span class='citefig'>Figure A.2</span></xref>
+              <xref target="Anote2"><span class='citefig'>Figure A.3</span></xref>
             </p>
           </foreword>
         </preface>
@@ -243,7 +243,7 @@ RSpec.describe IsoDoc do
               <image id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png" src="rice_images/rice_image1.png"/>
             </figure>
             <p>
-              <xref target="N">Figure 1</xref>
+              <xref target="N"><span class='citefig'>Figure 1</span></xref>
             </p>
           </clause>
           <terms id="terms" displayorder='3'>
@@ -264,8 +264,8 @@ RSpec.describe IsoDoc do
                 <image id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png" src="rice_images/rice_image1.png"/>
               </figure>
               <p>
-                <xref target="note1">Figure 2</xref>
-                <xref target="note2">Figure 3</xref>
+                <xref target="note1"><span class='citefig'>Figure 2</span></xref>
+                <xref target="note2"><span class='citefig'>Figure 3</span></xref>
               </p>
             </clause>
           </clause>
@@ -273,7 +273,7 @@ RSpec.describe IsoDoc do
         <annex id="annex1" displayorder='5'>
           <title>
             <strong>Annex A</strong>
-            <br/>(informative)</title>
+            <br/><span class="obligation">(informative)</span></title>
           <clause id="annex1a" inline-header="true">
             <title>A.1</title>
             <figure id="AN">
@@ -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>
@@ -362,12 +362,12 @@ RSpec.describe IsoDoc do
         <preface>
           <foreword id="fwd" displayorder='1'>
             <p>
-              <xref target="N">Figure 1</xref>
-              <xref target="note1">Figure 1 a)</xref>
-              <xref target="note2">Figure 1 b)</xref>
-              <xref target="AN">Figure A.1</xref>
-              <xref target="Anote1">Figure A.1 a)</xref>
-              <xref target="Anote2">Figure A.1 b)</xref>
+              <xref target="N"><span class='citefig'>Figure 1</span></xref>
+              <xref target="note1"><span class='citefig'>Figure 1 a)</span></xref>
+              <xref target="note2"><span class='citefig'>Figure 1 b)</span></xref>
+              <xref target="AN"><span class='citefig'>Figure A.1</span></xref>
+              <xref target="Anote1"><span class='citefig'>Figure A.1 a)</span></xref>
+              <xref target="Anote2"><span class='citefig'>Figure A.1 b)</span></xref>
             </p>
           </foreword>
         </preface>
@@ -398,8 +398,8 @@ RSpec.describe IsoDoc do
                 </figure>
               </figure>
               <p>
-                <xref target="note1">Figure 1 a)</xref>
-                <xref target="note2">Figure 1 b)</xref>
+                <xref target="note1"><span class='citefig'>Figure 1 a)</span></xref>
+                <xref target="note2"><span class='citefig'>Figure 1 b)</span></xref>
               </p>
             </clause>
           </clause>
@@ -407,7 +407,7 @@ RSpec.describe IsoDoc do
         <annex id="annex1" displayorder='5'>
           <title>
             <strong>Annex A</strong>
-            <br/>(informative)</title>
+            <br/><span class="obligation">(informative)</span></title>
           <clause id="annex1a" inline-header="true">
             <title>A.1</title>
           </clause>
@@ -546,7 +546,7 @@ RSpec.describe IsoDoc do
         <annex id="annex1" displayorder='5'>
           <title>
             <strong>Annex A</strong>
-            <br/>(informative)</title>
+            <br/><span class="obligation">(informative)</span></title>
           <clause id="annex1a" inline-header="true">
             <title>A.1</title>
             <example id="AN">
@@ -700,7 +700,7 @@ RSpec.describe IsoDoc do
         <annex id="annex1" displayorder='5'>
           <title>
             <strong>Annex A</strong>
-            <br/>(informative)</title>
+            <br/><span class="obligation">(informative)</span></title>
           <clause id="annex1a" inline-header="true">
             <title>A.1</title>
             <formula id="AN">
@@ -833,12 +833,12 @@ RSpec.describe IsoDoc do
         <preface>
           <foreword displayorder='1'>
             <p>
-              <xref target="N">Table 1</xref>
-              <xref target="note1">Table 2</xref>
-              <xref target="note2">Table 3</xref>
-              <xref target="AN">Table A.1</xref>
-              <xref target="Anote1">Table A.2</xref>
-              <xref target="Anote2">Table A.3</xref>
+              <xref target="N"><span class='citetbl'>Table 1</span></xref>
+              <xref target="note1"><span class='citetbl'>Table 2</span></xref>
+              <xref target="note2"><span class='citetbl'>Table 3</span></xref>
+              <xref target="AN"><span class='citetbl'>Table A.1</span></xref>
+              <xref target="Anote1"><span class='citetbl'>Table A.2</span></xref>
+              <xref target="Anote2"><span class='citetbl'>Table A.3</span></xref>
             </p>
           </foreword>
         </preface>
@@ -858,7 +858,7 @@ RSpec.describe IsoDoc do
               </tbody>
             </table>
             <p>
-              <xref target="N">Table 1</xref>
+              <xref target="N"><span class='citetbl'>Table 1</span></xref>
             </p>
           </clause>
           <terms id="terms" displayorder='3'>
@@ -891,8 +891,8 @@ RSpec.describe IsoDoc do
                 </tbody>
               </table>
               <p>
-                <xref target="note1">Table 2</xref>
-                <xref target="note2">Table 3</xref>
+                <xref target="note1"><span class='citetbl'>Table 2</span></xref>
+                <xref target="note2"><span class='citetbl'>Table 3</span></xref>
               </p>
             </clause>
           </clause>
@@ -900,7 +900,7 @@ RSpec.describe IsoDoc do
         <annex id="annex1" displayorder='5'>
           <title>
             <strong>Annex A</strong>
-            <br/>(informative)</title>
+            <br/><span class="obligation">(informative)</span></title>
           <clause id="annex1a" inline-header="true">
             <title>A.1</title>
             <table id="AN">
@@ -1138,23 +1138,23 @@ RSpec.describe IsoDoc do
             <title>Foreword</title>
             <p id='A'>
               This is a preamble
-              <xref target='C'>0.1</xref>
-              <xref target='C1'>0.2</xref>
-              <xref target='D'>Clause 1</xref>
-              <xref target='H'>Clause 3</xref>
-              <xref target='I'>3.1</xref>
-              <xref target='J'>3.1.1</xref>
-              <xref target='K'>3.2</xref>
-              <xref target='L'>Clause 4</xref>
-              <xref target='M'>Clause 5</xref>
-              <xref target='N'>5.1</xref>
-              <xref target='O'>5.2</xref>
-              <xref target='P'>Annex A</xref>
-              <xref target='Q'>A.1</xref>
-              <xref target='Q1'>A.1.1</xref>
-              <xref target='Q2'>Annex A, Appendix 1</xref>
+              <xref target='C'><span class='citesec'>0.1</span></xref>
+              <xref target='C1'><span class='citesec'>0.2</span></xref>
+              <xref target='D'><span class='citesec'>Clause 1</span></xref>
+              <xref target='H'><span class='citesec'>Clause 3</span></xref>
+              <xref target='I'><span class='citesec'>3.1</span></xref>
+              <xref target='J'><span class='citesec'>3.1.1</span></xref>
+              <xref target='K'><span class='citesec'>3.2</span></xref>
+              <xref target='L'><span class='citesec'>Clause 4</span></xref>
+              <xref target='M'><span class='citesec'>Clause 5</span></xref>
+              <xref target='N'><span class='citesec'>5.1</span></xref>
+              <xref target='O'><span class='citesec'>5.2</span></xref>
+              <xref target='P'><span class='citeapp'>Annex A</span></xref>
+              <xref target='Q'><span class='citeapp'>A.1</span></xref>
+              <xref target='Q1'><span class='citeapp'>A.1.1</span></xref>
+              <xref target='Q2'><span class='citeapp'>Annex A, Appendix 1</span></xref>
               <xref target='Q3'>Annex A, Appendix 1.1</xref>
-              <xref target='R'>Clause 2</xref>
+              <xref target='R'><span class='citesec'>Clause 2</span></xref>
             </p>
           </foreword>
           <introduction id='B' obligation='informative' displayorder='2'>
@@ -1243,7 +1243,7 @@ RSpec.describe IsoDoc do
           <title>
             <strong>Annex A</strong>
             <br/>
-            (normative)
+            <span class="obligation">(normative)</span>
             <br/>
             <br/>
             <strong>Annex</strong>
@@ -1404,7 +1404,7 @@ RSpec.describe IsoDoc do
         <annex id="annex1" displayorder='5'>
           <title>
             <strong>Annex A</strong>
-            <br/>(informative)</title>
+            <br/><span class="obligation">(informative)</span></title>
           <clause id="annex1a" inline-header="true">
             <title>A.1</title>
             <ol id="AN" type="alphabet">
@@ -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>
@@ -1536,7 +1536,7 @@ RSpec.describe IsoDoc do
             </clause>
           </clause>
         </sections>
-        <annex id='annex1'  displayorder='5'><title><strong>Annex A</strong><br/>(informative)</title>
+        <annex id='annex1'  displayorder='5'><title><strong>Annex A</strong><br/><span class="obligation">(informative)</span></title>
           <clause inline-header="true" id='annex1a'><title>A.1</title>
             <ol id='ANl' type="alphabet">
               <li id='AN'>
@@ -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>