RubyGems - metanorma-standoc - Versions diffs - 2.2.3.1 → 2.2.5 - Mend

metanorma-standoc 2.2.3.1 → 2.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (43) hide show

checksums.yaml +4 -4
data/lib/metanorma/standoc/base.rb +2 -1
data/lib/metanorma/standoc/biblio.rng +32 -1
data/lib/metanorma/standoc/blocks.rb +2 -1
data/lib/metanorma/standoc/cleanup_biblio.rb +111 -23
data/lib/metanorma/standoc/cleanup_boilerplate.rb +2 -2
data/lib/metanorma/standoc/front.rb +1 -0
data/lib/metanorma/standoc/isodoc.rng +9 -0
data/lib/metanorma/standoc/macros_plantuml.rb +23 -10
data/lib/metanorma/standoc/render.rb +1 -0
data/lib/metanorma/standoc/term_lookup_cleanup.rb +32 -13
data/lib/metanorma/standoc/utils.rb +3 -3
data/lib/metanorma/standoc/validate.rb +12 -3
data/lib/metanorma/standoc/version.rb +1 -1
data/metanorma-standoc.gemspec +2 -2
data/spec/metanorma/base_spec.rb +10 -1
data/spec/metanorma/biblio_spec.rb +47 -17
data/spec/metanorma/blocks_spec.rb +2 -2
data/spec/metanorma/cleanup_sections_spec.rb +2 -1
data/spec/metanorma/inline_spec.rb +10 -9
data/spec/metanorma/isobib_cache_spec.rb +2 -2
data/spec/metanorma/macros_concept_spec.rb +1 -1
data/spec/metanorma/macros_spec.rb +2 -2
data/spec/metanorma/refs_spec.rb +25 -25
data/spec/metanorma/validate_spec.rb +33 -0
data/spec/vcr_cassettes/bsi16341.yml +38 -38
data/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec.yml +64 -64
data/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec1.yml +13 -13
data/spec/vcr_cassettes/hide_refs.yml +53 -53
data/spec/vcr_cassettes/isobib_get_123.yml +11 -11
data/spec/vcr_cassettes/isobib_get_123_1.yml +22 -22
data/spec/vcr_cassettes/isobib_get_123_1_fr.yml +54 -54
data/spec/vcr_cassettes/isobib_get_123_2.yml +24 -24
data/spec/vcr_cassettes/isobib_get_123_2001.yml +12 -12
data/spec/vcr_cassettes/isobib_get_124.yml +11 -11
data/spec/vcr_cassettes/rfcbib_get_rfc8341.yml +22 -24
data/spec/vcr_cassettes/separates_iev_citations_by_top_level_clause.yml +55 -55
data/spec/vcr_cassettes/std-link.yml +13 -13
metadata +6 -10
data/spec/requirements/default/blocks_spec.rb +0 -250
data/spec/requirements/default/cleanup_spec.rb +0 -173
data/spec/requirements/modspec/cleanup_spec.rb +0 -333
data/spec/requirements/modspec/validate_spec.rb +0 -330

data/spec/metanorma/biblio_spec.rb CHANGED Viewed

@@ -896,12 +896,12 @@ RSpec.describe Metanorma::Standoc do
       [bibliography]
       === Normative References
-      * [[[A, B]]], span:surname[Wozniak], span:initials[S.] & span:givenname[Steve] span:surname[Jobs]. span:pubyear[1996]. span:title[_Work_]. In span:surname.editor[Gates], span:initials.editor[W. H], Collected Essays. span:docid.ISO[ISO 1234]. span:pubplace[Geneva]: span:publisher[International Standardization Organization]. span:uri.citation[http://www.example.com]. span:type[inbook]
+      * [[[A, B]]], span:surname[Wozniak], span:initials[S.] & span:givenname[Steve] span:surname[Jobs]. span:date.issued[1991]. span:date[1996]. span:title[_Work_]. span:in_surname.editor[Gates], span:in_initials.editor[W. H] & span:in_organization[UNICEF], span:in_title[Collected Essays]. _span:series[Bibliographers Anonymous]_. span:docid.ISO[ISO 1234]. span:pubplace[Geneva]: span:publisher[International Standardization Organization]. span:uri.citation[http://www.example.com]. span:volume[4] span:issue[2–3] span:pages[12-13] span:pages[19]. span:type[inbook]
     INPUT
     output = <<~OUTPUT
       #{BLANK_HDR}
          <sections> </sections>
-         <bibliography>
+                  <bibliography>
            <references id='_' normative='true' obligation='informative'>
              <title>Normative references</title>
              <p id='_'>
@@ -911,14 +911,15 @@ RSpec.describe Metanorma::Standoc do
                references, the latest edition of the referenced document (including any
                amendments) applies.
              </p>
-             <bibitem id='A' type="inbook">
+             <bibitem id='A' type='inbook'>
                <formattedref format='application/x-isodoc+xml'>
-                 Wozniak, S. &amp; Steve Jobs. 1996.
+                 Wozniak, S. &amp; Steve Jobs. 1991. 1996.
                  <em>Work</em>
-                 . In Gates, W. H, Collected Essays. ISO 1234. Geneva: International
-                 Standardization Organization.
+                 . Gates, W. H &amp; UNICEF, Collected Essays.
+                 <em>Bibliographers Anonymous</em>
+                 . ISO 1234. Geneva: International Standardization Organization.
                  <link target='http://www.example.com'/>
-                 .
+                 . 4 2–3 12-13 19.
                </formattedref>
                <title>
                  <em>Work</em>
@@ -928,6 +929,7 @@ RSpec.describe Metanorma::Standoc do
                </uri>
                <docidentifier>B</docidentifier>
                <docidentifier type='ISO'>ISO 1234</docidentifier>
+               <date type='issued'>1991</date>
                <date type='published'>1996</date>
                <contributor>
                  <role type='author'/>
@@ -947,22 +949,50 @@ RSpec.describe Metanorma::Standoc do
                    </name>
                  </person>
                </contributor>
-               <contributor>
-                 <role type='editor'/>
-                 <person>
-                   <name>
-                     <formatted-initials>W. H</formatted-initials>
-                     <surname>Gates</surname>
-                   </name>
-                 </person>
-               </contributor>
                <contributor>
                  <role type='publisher'/>
                  <organization>
                    <name>International Standardization Organization</name>
                  </organization>
                </contributor>
-               <place/>
+               <place>Geneva</place>
+               <relation type='includedIn'>
+                 <bibitem type='book'>
+                   <title>Collected Essays</title>
+                   <contributor>
+                     <role type='editor'/>
+                     <person>
+                       <name>
+                         <formatted-initials>W. H</formatted-initials>
+                         <surname>Gates</surname>
+                       </name>
+                     </person>
+                   </contributor>
+                   <contributor>
+                     <role type='author'/>
+                     <organization>
+                       <name>UNICEF</name>
+                     </organization>
+                   </contributor>
+                   <series>
+                     <title>Bibliographers Anonymous</title>
+                   </series>
+                 </bibitem>
+               </relation>
+               <extent type='volume'>
+                 <referenceFrom>4</referenceFrom>
+               </extent>
+               <extent type='issue'>
+                 <referenceFrom>2</referenceFrom>
+                 <referenceTo>3</referenceTo>
+               </extent>
+               <extent type='page'>
+                 <referenceFrom>12</referenceFrom>
+                 <referenceTo>13</referenceTo>
+               </extent>
+               <extent type='page'>
+                 <referenceFrom>19</referenceFrom>
+               </extent>
              </bibitem>
            </references>
          </bibliography>

data/spec/metanorma/blocks_spec.rb CHANGED Viewed

@@ -1135,7 +1135,7 @@ RSpec.describe Metanorma::Standoc do
       #{ASCIIDOC_BLANK_HDR}
       [[ABC]]
-      [%unnumbered,number=3]
+      [%unnumbered,number=3,class=plate]
       .Split-it-right sample divider
       image::spec/examples/rice_images/rice_image1.png[alttext]
@@ -1143,7 +1143,7 @@ RSpec.describe Metanorma::Standoc do
     output = <<~OUTPUT
       #{BLANK_HDR}
               <sections>
-         <figure id="ABC" unnumbered="true" number="3">
+         <figure id="ABC" unnumbered="true" number="3" class="plate">
          <name>Split-it-right sample divider</name>
                   <image src="spec/examples/rice_images/rice_image1.png" id="_" mimetype="image/png" height="auto" width="auto" alt="alttext"/>
        </figure>

data/spec/metanorma/cleanup_sections_spec.rb CHANGED Viewed

@@ -3,6 +3,7 @@ require "relaton_iec"
 require "fileutils"
 RSpec.describe Metanorma::Standoc do
+=begin
   it "appends any initial user-supplied text to boilerplate in terms and definitions" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -1354,7 +1355,7 @@ RSpec.describe Metanorma::Standoc do
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
+=end
   it "processes section names, internationalisation file" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR.sub(/:nodoc:/, ":no-pdf:\n:i18nyaml: spec/assets/i18n.yaml")}

data/spec/metanorma/inline_spec.rb CHANGED Viewed

@@ -1,6 +1,7 @@
 require "spec_helper"
 RSpec.describe Metanorma::Standoc do
+=begin
   it "handles spacing around markup" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -336,7 +337,7 @@ RSpec.describe Metanorma::Standoc do
     expect((strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to(output)
   end
+=end
   it "processes crossreferences" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -389,8 +390,8 @@ RSpec.describe Metanorma::Standoc do
              </sections>
              </standard-document>
     OUTPUT
-    expect((strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to(output)
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to(xmlpp(output))
   end
   it "processes formatting within crossreferences" do
@@ -417,8 +418,8 @@ RSpec.describe Metanorma::Standoc do
        </sections>
       </standard-document>
     OUTPUT
-    expect((strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to(output)
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to(xmlpp(output))
   end
   it "processes formatting within crossreferences to non-existent anchor" do
@@ -444,8 +445,8 @@ RSpec.describe Metanorma::Standoc do
        </sections>
        </standard-document>
     OUTPUT
-    expect((strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to(output)
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to(xmlpp(output))
   end
   it "processes combinations of crossreferences" do
@@ -475,8 +476,8 @@ RSpec.describe Metanorma::Standoc do
        </sections>
        </standard-document>
     OUTPUT
-    expect((strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to(output)
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to(xmlpp(output))
   end
   it "processes bibliographic anchors" do

data/spec/metanorma/isobib_cache_spec.rb CHANGED Viewed

@@ -50,7 +50,7 @@ ISO_124_DATED = <<~XML.freeze
          <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
          <uri type="rss">https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
          <docidentifier type="ISO" primary="true">ISO 124:2014</docidentifier>
-         <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7</docidentifier>
+         <docidentifier type='URN'>urn:iso:std:iso:124:ed-7</docidentifier>
          <docnumber>124</docnumber>
          <date type="published">
            <on>2014-03</on>
@@ -210,7 +210,7 @@ ISO_123_DATED = <<~XML.freeze
            <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
            <uri type="rss">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
            <docidentifier type="ISO" primary="true">ISO 123:2001</docidentifier>
-           <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
+           <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
            <docnumber>123</docnumber>
            <date type="published">
              <on>2001-05</on>

data/spec/metanorma/macros_concept_spec.rb CHANGED Viewed

@@ -847,7 +847,7 @@ RSpec.describe Metanorma::Standoc do
       end
     end
-    context "multiply exising ids in document" do
+    context "multiply existing ids in document" do
       let(:input) do
         <<~XML
           #{ASCIIDOC_BLANK_HDR}

data/spec/metanorma/macros_spec.rb CHANGED Viewed

@@ -975,7 +975,7 @@ RSpec.describe Metanorma::Standoc do
                 <uri type='src'>https://www.iso.org/standard/3944.html</uri>
                 <uri type='rss'>https://www.iso.org/contents/data/standard/00/39/3944.detail.rss</uri>
                 <docidentifier type='ISO' primary='true'>ISO 131</docidentifier>
-                <docidentifier type='URN'>urn:iso:std:iso:131:stage-95.99:ed-1</docidentifier>
+                <docidentifier type='URN'>urn:iso:std:iso:131:ed-1</docidentifier>
                 <docnumber>131</docnumber>
                 <contributor>
                   <role type='publisher'/>
@@ -1018,7 +1018,7 @@ RSpec.describe Metanorma::Standoc do
                     <uri type='src'>https://www.iso.org/standard/3944.html</uri>
                     <uri type='rss'>https://www.iso.org/contents/data/standard/00/39/3944.detail.rss</uri>
                     <docidentifier type='ISO' primary='true'>ISO 131:1979</docidentifier>
-                    <docidentifier type='URN'>urn:iso:std:iso:131:stage-95.99:ed-1</docidentifier>
+                    <docidentifier type='URN'>urn:iso:std:iso:131:ed-1</docidentifier>
                     <docnumber>131</docnumber>
                     <date type='published'>
                       <on>1979-11</on>

data/spec/metanorma/refs_spec.rb CHANGED Viewed

@@ -285,7 +285,7 @@ RSpec.describe Metanorma::Standoc do
                 <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
                 <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
                 <docidentifier type='ISO' primary="true">ISO 123</docidentifier>
-                <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
+                <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
                 <docnumber>123</docnumber>
                 <contributor>
                   <role type='publisher'/>
@@ -326,7 +326,7 @@ RSpec.describe Metanorma::Standoc do
                     <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
                     <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
                     <docidentifier type='ISO' primary="true">ISO 123:2001</docidentifier>
-                    <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
+                    <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
                     <docnumber>123</docnumber>
                     <date type='published'>
                       <on>2001-05</on>
@@ -382,7 +382,7 @@ RSpec.describe Metanorma::Standoc do
                 <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
                 <docidentifier type='ISO' primary="true">ISO 123</docidentifier>
                 <docidentifier type='metanorma'>[1]</docidentifier>
-                <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
+                <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
                 <docnumber>123</docnumber>
                 <contributor>
                   <role type='publisher'/>
@@ -423,7 +423,7 @@ RSpec.describe Metanorma::Standoc do
                     <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
                     <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
                     <docidentifier type='ISO' primary="true">ISO 123:2001</docidentifier>
-                    <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
+                    <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
                     <docnumber>123</docnumber>
                     <date type='published'>
                       <on>2001-05</on>
@@ -519,7 +519,7 @@ RSpec.describe Metanorma::Standoc do
                 <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
                 <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
                 <docidentifier type='ISO' primary="true">ISO 123</docidentifier>
-                <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
+                <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
                 <docnumber>123</docnumber>
                 <contributor>
                   <role type='publisher'/>
@@ -561,7 +561,7 @@ RSpec.describe Metanorma::Standoc do
                     <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
                     <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
                     <docidentifier type='ISO' primary="true">ISO 123:2001</docidentifier>
-                    <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
+                    <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
                     <docnumber>123</docnumber>
                     <date type='published'>
                       <on>2001-05</on>
@@ -622,7 +622,7 @@ RSpec.describe Metanorma::Standoc do
                 <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
                 <docidentifier type='ISO' primary="true">ISO 123</docidentifier>
                 <docidentifier type='metanorma'>[1]</docidentifier>
-                <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
+                <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
                 <docnumber>123</docnumber>
                 <contributor>
                   <role type='publisher'/>
@@ -664,7 +664,7 @@ RSpec.describe Metanorma::Standoc do
                     <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
                     <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
                     <docidentifier type='ISO' primary="true">ISO 123:2001</docidentifier>
-                    <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
+                    <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
                     <docnumber>123</docnumber>
                     <date type='published'>
                       <on>2001-05</on>
@@ -798,7 +798,7 @@ RSpec.describe Metanorma::Standoc do
           <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:21071:en</uri>
           <uri type="rss">https://www.iso.org/contents/data/standard/02/10/21071.detail.rss</uri>
           <docidentifier type="ISO" primary="true">ISO/IEC TR 12382:1992</docidentifier>
-          <docidentifier type='URN'>urn:iso:std:iso-iec:tr:12382:stage-90.93:ed-2</docidentifier>
+          <docidentifier type='URN'>urn:iso:std:iso-iec:tr:12382:ed-2</docidentifier>
           <docnumber>12382</docnumber>
           <date type="published">
             <on>1992-12</on>
@@ -846,7 +846,7 @@ RSpec.describe Metanorma::Standoc do
           <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
           <uri type="rss">https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
           <docidentifier type="ISO" primary="true">ISO 124:2014</docidentifier>
-          <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7</docidentifier>
+          <docidentifier type='URN'>urn:iso:std:iso:124:ed-7</docidentifier>
           <docnumber>124</docnumber>
           <date type="published">
             <on>2014-03</on>
@@ -892,7 +892,7 @@ RSpec.describe Metanorma::Standoc do
           <uri type="rss">https://www.iso.org/contents/data/standard/02/10/21071.detail.rss</uri>
           <docidentifier type="ISO" primary="true">ISO/IEC TR 12382:1992</docidentifier>
           <docidentifier type='metanorma'>[1]</docidentifier>
-          <docidentifier type='URN'>urn:iso:std:iso-iec:tr:12382:stage-90.93:ed-2</docidentifier>
+          <docidentifier type='URN'>urn:iso:std:iso-iec:tr:12382:ed-2</docidentifier>
           <docnumber>12382</docnumber>
           <date type="published">
             <on>1992-12</on>
@@ -941,7 +941,7 @@ RSpec.describe Metanorma::Standoc do
           <uri type="rss">https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
           <docidentifier type="ISO" primary="true">ISO 124:2014</docidentifier>
           <docidentifier type='metanorma'>[1]</docidentifier>
-          <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7</docidentifier>
+          <docidentifier type='URN'>urn:iso:std:iso:124:ed-7</docidentifier>
           <docnumber>124</docnumber>
           <date type="published">
             <on>2014-03</on>
@@ -1021,7 +1021,7 @@ RSpec.describe Metanorma::Standoc do
                <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
                <uri type='rss'>https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
                <docidentifier type='ISO' primary="true">ISO 124:2014</docidentifier>
-               <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7</docidentifier>
+               <docidentifier type='URN'>urn:iso:std:iso:124:ed-7</docidentifier>
                <docnumber>124</docnumber>
                <date type='published'>
                  <on>2014-03</on>
@@ -1118,7 +1118,7 @@ RSpec.describe Metanorma::Standoc do
                   <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
                   <uri type='rss'>https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
                   <docidentifier type='ISO' primary="true">ISO 124</docidentifier>
-                  <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7</docidentifier>
+                  <docidentifier type='URN'>urn:iso:std:iso:124:ed-7</docidentifier>
                   <docnumber>124</docnumber>
                   <contributor>
                     <role type='publisher'/>
@@ -1159,7 +1159,7 @@ RSpec.describe Metanorma::Standoc do
                       <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
                       <uri type='rss'>https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
                       <docidentifier type='ISO' primary="true">ISO 124:2014</docidentifier>
-                      <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7</docidentifier>
+                      <docidentifier type='URN'>urn:iso:std:iso:124:ed-7</docidentifier>
                       <docnumber>124</docnumber>
                       <date type='published'>
                         <on>2014-03</on>
@@ -1218,7 +1218,7 @@ RSpec.describe Metanorma::Standoc do
                   <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:72849:en</uri>
                   <uri type='rss'>https://www.iso.org/contents/data/standard/07/28/72849.detail.rss</uri>
                   <docidentifier type='ISO' primary="true">ISO 125</docidentifier>
-                  <docidentifier type='URN'>urn:iso:std:iso:125:stage-60.60:ed-7</docidentifier>
+                  <docidentifier type='URN'>urn:iso:std:iso:125:ed-7</docidentifier>
                   <docnumber>125</docnumber>
                   <contributor>
                     <role type='publisher'/>
@@ -1262,7 +1262,7 @@ RSpec.describe Metanorma::Standoc do
                       <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:72849:en</uri>
                       <uri type='rss'>https://www.iso.org/contents/data/standard/07/28/72849.detail.rss</uri>
                       <docidentifier type='ISO' primary="true">ISO 125:2020</docidentifier>
-                      <docidentifier type='URN'>urn:iso:std:iso:125:stage-60.60:ed-7</docidentifier>
+                      <docidentifier type='URN'>urn:iso:std:iso:125:ed-7</docidentifier>
                       <docnumber>125</docnumber>
                       <date type='published'>
                         <on>2020-02</on>
@@ -1325,7 +1325,7 @@ RSpec.describe Metanorma::Standoc do
           <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:72849:en</uri>
           <uri type='rss'>https://www.iso.org/contents/data/standard/07/28/72849.detail.rss</uri>
           <docidentifier type='ISO' primary="true">ISO 125</docidentifier>
-          <docidentifier type='URN'>urn:iso:std:iso:125:stage-60.60:ed-7</docidentifier>
+          <docidentifier type='URN'>urn:iso:std:iso:125:ed-7</docidentifier>
           <docnumber>125</docnumber>
           <contributor>
             <role type='publisher'/>
@@ -1369,7 +1369,7 @@ RSpec.describe Metanorma::Standoc do
               <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:72849:en</uri>
               <uri type='rss'>https://www.iso.org/contents/data/standard/07/28/72849.detail.rss</uri>
               <docidentifier type='ISO' primary="true">ISO 125:2020</docidentifier>
-              <docidentifier type='URN'>urn:iso:std:iso:125:stage-60.60:ed-7</docidentifier>
+              <docidentifier type='URN'>urn:iso:std:iso:125:ed-7</docidentifier>
               <docnumber>125</docnumber>
               <date type='published'>
                 <on>2020-02</on>
@@ -1432,7 +1432,7 @@ RSpec.describe Metanorma::Standoc do
                   <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
                   <uri type='rss'>https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
                   <docidentifier type='ISO' primary="true">ISO 124</docidentifier>
-                  <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7</docidentifier>
+                  <docidentifier type='URN'>urn:iso:std:iso:124:ed-7</docidentifier>
                   <docnumber>124</docnumber>
                   <contributor>
                     <role type='publisher'/>
@@ -1473,7 +1473,7 @@ RSpec.describe Metanorma::Standoc do
                       <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
                       <uri type='rss'>https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
                       <docidentifier type='ISO' primary="true">ISO 124:2014</docidentifier>
-                      <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7</docidentifier>
+                      <docidentifier type='URN'>urn:iso:std:iso:124:ed-7</docidentifier>
                       <docnumber>124</docnumber>
                       <date type='published'>
                         <on>2014-03</on>
@@ -2307,7 +2307,7 @@ RSpec.describe Metanorma::Standoc do
                 <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
                 <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
                 <docidentifier type='ISO' primary="true">ISO 123</docidentifier>
-                <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
+                <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
                 <docnumber>123</docnumber>
                 <contributor>
                   <role type='publisher'/>
@@ -2348,7 +2348,7 @@ RSpec.describe Metanorma::Standoc do
                     <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
                     <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
                     <docidentifier type='ISO' primary="true">ISO 123:2001</docidentifier>
-                    <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
+                    <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
                     <docnumber>123</docnumber>
                     <date type='published'>
                       <on>2001-05</on>
@@ -2414,7 +2414,7 @@ RSpec.describe Metanorma::Standoc do
                 <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
                 <docidentifier type='ISO' primary="true">ISO 123</docidentifier>
                 <docidentifier type='metanorma'>[1]</docidentifier>
-                <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
+                <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
                 <docnumber>123</docnumber>
                 <contributor>
                   <role type='publisher'/>
@@ -2455,7 +2455,7 @@ RSpec.describe Metanorma::Standoc do
                     <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
                     <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
                     <docidentifier type='ISO' primary="true">ISO 123:2001</docidentifier>
-                    <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
+                    <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
                     <docnumber>123</docnumber>
                     <date type='published'>
                       <on>2001-05</on>

data/spec/metanorma/validate_spec.rb CHANGED Viewed

@@ -381,18 +381,31 @@ RSpec.describe Metanorma::Standoc do
         == Clause 1
         [[ghi]]A:: B
+        == Terms and Definitions
+        [[jkl]]
+        === Term1
+        ==== Term2
         == Symbols and Abbreviated Terms
         [[def]]DEF:: def
+        {{<<jkl>>,term1}}
         {{<<abc>>,term}}
         {{<<def>>,term}}
         {{<<ghi>>,term}}
+        {{Terms and Definitions}}
       INPUT
       expect do
         Asciidoctor.convert(input, *OPTIONS)
       end.to raise_error(SystemExit)
     rescue SystemExit
     end
+    expect(File.read("test.err"))
+      .to include %(Term reference to `Terms-and-Definitions` missing: "Terms-and-Definitions" is not defined in document. Did you mean to point to a subterm?)
+    expect(File.read("test.err"))
+      .to include "Concept term1 is pointing to jkl, which is not a term or symbol. Did you mean to point to a subterm?"
     expect(File.read("test.err"))
       .to include "Concept term is pointing to abc, which is not a term or symbol"
     expect(File.read("test.err"))
@@ -741,6 +754,26 @@ RSpec.describe Metanorma::Standoc do
     INPUT
     expect(File.read("test.err"))
       .to include "Error: Term reference to `xyz` missing:"
+    expect(File.read("test.err"))
+      .not_to include "Did you mean to point to a subterm?"
+    Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+      #{VALIDATING_BLANK_HDR}
+      [[xyz]]
+      == Terms and definitions
+      === Term 1
+      related:see[xyz]
+      Definition
+    INPUT
+    expect(File.read("test.err"))
+      .to include "Error: Term reference to `xyz` missing:"
+    expect(File.read("test.err"))
+      .to include "Did you mean to point to a subterm?"
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       #{VALIDATING_BLANK_HDR}