metanorma-iso 2.0.7 → 2.1.0

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">
@@ -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">
@@ -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">
@@ -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'>

data/spec/metanorma/amd_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe Metanorma::ISO do
   it "processes amendment sections" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{AMD_BLANK_HDR}
       == Foreword
 
@@ -54,6 +54,7 @@ RSpec.describe Metanorma::ISO do
 
       === Bibliography Subsection
     INPUT
+    output = <<~OUTPUT
       #{BLANK_HDR.sub(%r{<doctype>article</doctype>}, '<doctype>amendment</doctype>')}
         <sections>
           <clause id="_" obligation="normative">
@@ -127,10 +128,12 @@ RSpec.describe Metanorma::ISO do
         </annex>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes default metadata, amendment" do
-    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+    input = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
       :docfile: test.adoc
@@ -182,7 +185,7 @@ RSpec.describe Metanorma::ISO do
       :updates-document-type: international-standard
     INPUT
 
-    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    output = <<~OUTPUT
       <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
         <bibdata type="standard">
           <title format="text/plain" language="en" type="main">Introduction — Main Title — Title — Title Part — Mass fraction of
@@ -207,6 +210,7 @@ RSpec.describe Metanorma::ISO do
         de transport
       </title>
           <docidentifier type="ISO">ISO 17301-1:2016/PreNP Amd 1</docidentifier>
+          <docidentifier type='iso-undated'>ISO 17301-1/PreNP Amd 1</docidentifier>
           <docidentifier type="iso-with-lang">ISO 17301-1:2016/PreNP Amd 1(E)</docidentifier>
           <docidentifier type="iso-reference">ISO 17301-1:2016/PreNP Amd 1:2017(E)</docidentifier>
           <docnumber>17301</docnumber>
@@ -278,10 +282,12 @@ RSpec.describe Metanorma::ISO do
         <sections/>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(input.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes metadata, amendment, stage 30" do
-    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+    input = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
       :docfile: test.adoc
@@ -295,11 +301,11 @@ RSpec.describe Metanorma::ISO do
       :updates: ISO 17301-1:2030
       :amendment-number: 1
     INPUT
-    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-
+    output = <<~OUTPUT
       <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
         <bibdata type="standard">
           <docidentifier type="ISO">ISO 17301-1:2030/CD Amd 1</docidentifier>
+          <docidentifier type='iso-undated'>ISO 17301-1/CD Amd 1</docidentifier>
           <docidentifier type="iso-with-lang">ISO 17301-1:2030/CD Amd 1(E)</docidentifier>
           <docidentifier type="iso-reference">ISO 17301-1:2030/CD Amd 1(E)</docidentifier>
           <docnumber>17301</docnumber>
@@ -348,10 +354,12 @@ RSpec.describe Metanorma::ISO do
         <sections/>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(input.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes metadata, amendment, stage 40" do
-    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+    input = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
       :docfile: test.adoc
@@ -365,10 +373,11 @@ RSpec.describe Metanorma::ISO do
       :updates: ISO 17301-1:2030
       :amendment-number: 1
     INPUT
-    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    output = <<~OUTPUT
       <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
         <bibdata type="standard">
           <docidentifier type="ISO">ISO 17301-1:2030/DAmd 1</docidentifier>
+          <docidentifier type='iso-undated'>ISO 17301-1/DAmd 1</docidentifier>
           <docidentifier type="iso-with-lang">ISO 17301-1:2030/DAmd 1(E)</docidentifier>
           <docidentifier type="iso-reference">ISO 17301-1:2030/DAmd 1(E)</docidentifier>
           <docnumber>17301</docnumber>
@@ -417,10 +426,12 @@ RSpec.describe Metanorma::ISO do
         <sections/>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(input.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes metadata, amendment, published" do
-    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+    input = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
       :docfile: test.adoc
@@ -433,10 +444,11 @@ RSpec.describe Metanorma::ISO do
       :updates: ISO 17301-1:2030
       :amendment-number: 1
     INPUT
-    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    output = <<~OUTPUT
       <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
         <bibdata type="standard">
           <docidentifier type="ISO">ISO 17301-1:2030/Amd 1</docidentifier>
+          <docidentifier type='iso-undated'>ISO 17301-1/Amd 1</docidentifier>
           <docidentifier type="iso-with-lang">ISO 17301-1:2030/Amd 1(E)</docidentifier>
           <docidentifier type="iso-reference">ISO 17301-1:2030/Amd 1(E)</docidentifier>
           <docnumber>17301</docnumber>
@@ -485,10 +497,12 @@ RSpec.describe Metanorma::ISO do
         <sections/>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(input.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes metadata, corrigendum, stage 30" do
-    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+    input = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
       :docfile: test.adoc
@@ -502,10 +516,11 @@ RSpec.describe Metanorma::ISO do
       :updates: ISO 17301-1:2030
       :corrigendum-number: 3
     INPUT
-    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    output = <<~OUTPUT
       <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
         <bibdata type="standard">
           <docidentifier type="ISO">ISO 17301-1:2030/CD Cor.3</docidentifier>
+          <docidentifier type='iso-undated'>ISO 17301-1/CD Cor.3</docidentifier>
           <docidentifier type="iso-with-lang">ISO 17301-1:2030/CD Cor.3(E)</docidentifier>
           <docidentifier type="iso-reference">ISO 17301-1:2030/CD Cor.3(E)</docidentifier>
           <docnumber>17301</docnumber>
@@ -554,10 +569,12 @@ RSpec.describe Metanorma::ISO do
         <sections/>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(input.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes metadata, corrigendum, stage 50" do
-    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+    input = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
       :docfile: test.adoc
@@ -571,10 +588,11 @@ RSpec.describe Metanorma::ISO do
       :updates: ISO 17301-1:2030
       :corrigendum-number: 3
     INPUT
-    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    output = <<~OUTPUT
       <iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
         <bibdata type='standard'>
           <docidentifier type='ISO'>ISO 17301-1:2030/FDCor.3</docidentifier>
+          <docidentifier type='iso-undated'>ISO 17301-1/FDCor.3</docidentifier>
           <docidentifier type='iso-with-lang'>ISO 17301-1:2030/FDCor.3(E)</docidentifier>
           <docidentifier type='iso-reference'>ISO 17301-1:2030/FDCor.3(E)</docidentifier>
           <docnumber>17301</docnumber>
@@ -623,10 +641,12 @@ RSpec.describe Metanorma::ISO do
         <sections/>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(input.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes metadata, corrigendum, published" do
-    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+    input = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
       :docfile: test.adoc
@@ -639,10 +659,11 @@ RSpec.describe Metanorma::ISO do
       :updates: ISO 17301-1:2030
       :corrigendum-number: 3
     INPUT
-    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    output = <<~OUTPUT
       <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
         <bibdata type="standard">
           <docidentifier type="ISO">ISO 17301-1:2030/Cor.3</docidentifier>
+          <docidentifier type='iso-undated'>ISO 17301-1/Cor.3</docidentifier>
           <docidentifier type="iso-with-lang">ISO 17301-1:2030/Cor.3(E)</docidentifier>
           <docidentifier type="iso-reference">ISO 17301-1:2030/Cor.3(E)</docidentifier>
           <docnumber>17301</docnumber>
@@ -691,5 +712,7 @@ RSpec.describe Metanorma::ISO do
         <sections/>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(input.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
+      .to be_equivalent_to xmlpp(output)
   end
 end

data/spec/metanorma/base_spec.rb

@@ -65,6 +65,7 @@ RSpec.describe Metanorma::ISO do
             <title format="text/plain" language="fr" type="title-main">Titre Principal</title>
             <title format="text/plain" language="fr" type="title-part">Part du Titre</title>
             <docidentifier type="ISO">ISO/PreWD3 1000-1</docidentifier>
+            <docidentifier type='iso-undated'>ISO/PreWD3 1000-1</docidentifier>
             <docidentifier type="iso-with-lang">ISO/PreWD3 1000-1(E)</docidentifier>
             <docidentifier type="iso-reference">ISO/PreWD3 1000-1:2000(E)</docidentifier>
             <docnumber>1000</docnumber>
@@ -149,7 +150,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 + \
@@ -166,9 +167,10 @@ RSpec.describe Metanorma::ISO do
               <?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-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>
@@ -243,8 +245,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>
@@ -255,11 +256,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>
@@ -278,7 +280,7 @@ RSpec.describe Metanorma::ISO do
                       <workgroup/>
                     </editorialgroup>
                     <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>
@@ -340,6 +342,7 @@ RSpec.describe Metanorma::ISO do
             <title language='fr' format='text/plain' type='title-main'>Titre Principal</title>
             <title language='fr' format='text/plain' type='title-part'>Part du Titre</title>
             <docidentifier type='ISO'>ISO 1000-1:2000</docidentifier>
+            <docidentifier type='iso-undated'>ISO 1000-1</docidentifier>
             <docidentifier type='iso-with-lang'>ISO 1000-1:2000(R)</docidentifier>
             <docidentifier type='iso-reference'>ISO 1000-1:2000(R)</docidentifier>
             <docnumber>1000</docnumber>
@@ -426,6 +429,7 @@ RSpec.describe Metanorma::ISO do
         <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
           <bibdata type='standard'>
             <docidentifier type='ISO'>SD 1000-1-1</docidentifier>
+            <docidentifier type='iso-undated'>SD 1000-1-1</docidentifier>
             <docidentifier type='iso-with-lang'>SD 1000-1-1(X)</docidentifier>
             <docidentifier type='iso-reference'>SD 1000-1-1(X)</docidentifier>
             <docidentifier type='iso-tc'>2000</docidentifier>
@@ -521,6 +525,7 @@ RSpec.describe Metanorma::ISO do
               <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
                 <bibdata type="standard">
                 <docidentifier type='ISO'>ISO/FDIS 1000.2</docidentifier>
+                <docidentifier type='iso-undated'>ISO/FDIS 1000.2</docidentifier>
         <docidentifier type='iso-with-lang'>ISO/FDIS 1000.2(F)</docidentifier>
         <docidentifier type='iso-reference'>ISO/FDIS 1000.2(F)</docidentifier>
                   <docnumber>1000</docnumber>
@@ -589,6 +594,7 @@ RSpec.describe Metanorma::ISO do
         <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
         <bibdata type="standard">
           <docidentifier type="ISO">ISO 1000</docidentifier>
+          <docidentifier type='iso-undated'>ISO 1000</docidentifier>
           <docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>
           <docidentifier type='iso-reference'>ISO 1000(E)</docidentifier>
           <docnumber>1000</docnumber>
@@ -657,6 +663,7 @@ RSpec.describe Metanorma::ISO do
         <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
           <bibdata type="standard">
             <docidentifier type="ISO">ISO 1000</docidentifier>
+            <docidentifier type='iso-undated'>ISO 1000</docidentifier>
             <docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>
             <docidentifier type='iso-reference'>ISO 1000(E)</docidentifier>
             <docnumber>1000</docnumber>
@@ -725,6 +732,7 @@ RSpec.describe Metanorma::ISO do
         <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
           <bibdata type='standard'>
             <docidentifier type='ISO'>ISO DIR 1000</docidentifier>
+            <docidentifier type='iso-undated'>ISO DIR 1000</docidentifier>
             <docidentifier type='iso-with-lang'>ISO DIR 1000(E)</docidentifier>
             <docidentifier type='iso-reference'>ISO DIR 1000(E)</docidentifier>
             <docnumber>1000</docnumber>

data/spec/metanorma/blocks_spec.rb

@@ -159,7 +159,7 @@ RSpec.describe Metanorma::ISO do
           <terms id="_" obligation="normative">
             <title>Terms and definitions</title>
             #{TERM_BOILERPLATE}
-            <term id="term-term1">
+            <term id="term-Term1">
               <preferred><expression><name>Term1</name></expression></preferred>
               <termnote id="_">
                 <p id="_">This is a note</p></termnote>
@@ -282,7 +282,7 @@ RSpec.describe Metanorma::ISO do
           <terms id="_" obligation="normative">
             <title>Terms and definitions</title>
             #{TERM_BOILERPLATE}
-            <term id="term-term1">
+            <term id="term-Term1">
               <preferred><expression><name>Term1</name></expression></preferred>
               <termexample id="_">
                 <p id="_">This is an example</p></termexample>
@@ -532,7 +532,7 @@ RSpec.describe Metanorma::ISO do
           <terms id="_" obligation="normative">
             <title>Terms and definitions</title>
             #{TERM_BOILERPLATE}
-            <term id="term-term1">
+            <term id="term-Term1">
               <preferred><expression><name>Term1</name></expression></preferred>
                       <definition>
           <verbal-definition>
@@ -574,7 +574,7 @@ RSpec.describe Metanorma::ISO do
           <terms id="_" obligation="normative">
             <title>Terms and definitions</title>
             #{TERM_BOILERPLATE}
-            <term id="term-term1">
+            <term id="term-Term1">
               <preferred><expression><name>Term1</name></expression></preferred>
                       <definition>
           <verbal-definition>