metanorma-standoc 1.9.4 → 1.10.3

data/spec/asciidoctor/refs_spec.rb

@@ -264,7 +264,7 @@ RSpec.describe Asciidoctor::Standoc do
                       <script>Latn</script>
                       <status>
                         <stage>90</stage>
-                        <substage>60</substage>
+                        <substage>93</substage>
                       </status>
                       <copyright>
                         <from>2001</from>
@@ -289,7 +289,7 @@ RSpec.describe Asciidoctor::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'>ISO 123:2001</docidentifier>
-                          <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.60:ed-3:en</docidentifier>
+                          <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:en</docidentifier>
                           <docnumber>123</docnumber>
                           <date type='published'>
                             <on>2001-05</on>
@@ -314,7 +314,7 @@ RSpec.describe Asciidoctor::Standoc do
         </abstract>
                           <status>
                             <stage>90</stage>
-                            <substage>60</substage>
+                            <substage>93</substage>
                           </status>
                           <copyright>
                             <from>2001</from>
@@ -372,7 +372,7 @@ RSpec.describe Asciidoctor::Standoc do
                       <script>Latn</script>
                       <status>
                         <stage>90</stage>
-                        <substage>60</substage>
+                        <substage>93</substage>
                       </status>
                       <copyright>
                         <from>2001</from>
@@ -397,7 +397,7 @@ RSpec.describe Asciidoctor::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'>ISO 123:2001</docidentifier>
-                          <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.60:ed-3:en</docidentifier>
+                          <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:en</docidentifier>
                           <docnumber>123</docnumber>
                           <date type='published'>
                             <on>2001-05</on>
@@ -422,7 +422,7 @@ RSpec.describe Asciidoctor::Standoc do
         </abstract>
                           <status>
                             <stage>90</stage>
-                            <substage>60</substage>
+                            <substage>93</substage>
                           </status>
                           <copyright>
                             <from>2001</from>
@@ -516,7 +516,7 @@ RSpec.describe Asciidoctor::Standoc do
                        <script>Latn</script>
                        <status>
                          <stage>90</stage>
-                         <substage>60</substage>
+                         <substage>93</substage>
                        </status>
                        <copyright>
                          <from>2001</from>
@@ -541,7 +541,7 @@ RSpec.describe Asciidoctor::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'>ISO 123:2001</docidentifier>
-                           <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.60:ed-3:fr</docidentifier>
+                           <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:fr</docidentifier>
                            <docnumber>123</docnumber>
                            <date type='published'>
                              <on>2001-05</on>
@@ -569,7 +569,7 @@ RSpec.describe Asciidoctor::Standoc do
         </abstract>
                            <status>
                              <stage>90</stage>
-                             <substage>60</substage>
+                             <substage>93</substage>
                            </status>
                            <copyright>
                              <from>2001</from>
@@ -628,7 +628,7 @@ RSpec.describe Asciidoctor::Standoc do
                        <script>Latn</script>
                        <status>
                          <stage>90</stage>
-                         <substage>60</substage>
+                         <substage>93</substage>
                        </status>
                        <copyright>
                          <from>2001</from>
@@ -653,7 +653,7 @@ RSpec.describe Asciidoctor::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'>ISO 123:2001</docidentifier>
-                           <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.60:ed-3:fr</docidentifier>
+                           <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:fr</docidentifier>
                            <docnumber>123</docnumber>
                            <date type='published'>
                              <on>2001-05</on>
@@ -681,7 +681,7 @@ RSpec.describe Asciidoctor::Standoc do
         </abstract>
                            <status>
                              <stage>90</stage>
-                             <substage>60</substage>
+                             <substage>93</substage>
                            </status>
                            <copyright>
                              <from>2001</from>

data/spec/asciidoctor/validate_spec.rb

@@ -5,7 +5,11 @@ require "fileutils"
 RSpec.describe Asciidoctor::Standoc do
   it "generates error file" do
     FileUtils.rm_f "spec/assets/xref_error.err"
-    Asciidoctor.convert_file "spec/assets/xref_error.adoc", { attributes: { "backend" => "standoc" }, safe: 0, header_footer: true, requires: ["metanorma-standoc"], failure_level: 4, mkdirs: true, to_file: nil }
+    Asciidoctor.convert_file "spec/assets/xref_error.adoc",
+                             { attributes: { "backend" => "standoc" }, safe: 0,
+                               header_footer: true,
+                               requires: ["metanorma-standoc"],
+                               failure_level: 4, mkdirs: true, to_file: nil }
     expect(File.exist?("spec/assets/xref_error.err")).to be true
   end
 
@@ -13,7 +17,7 @@ RSpec.describe Asciidoctor::Standoc do
     FileUtils.rm_f "test.xml"
     FileUtils.rm_f "test.err"
     begin
-      expect { Asciidoctor.convert(<<~"INPUT", *OPTIONS) }.to raise_error(SystemExit)
+      input = <<~INPUT
         = Document title
         Author
         :docfile: test.adoc
@@ -25,10 +29,13 @@ RSpec.describe Asciidoctor::Standoc do
         [[abc]]
         == Clause 2
       INPUT
+      expect { Asciidoctor.convert(input, *OPTIONS) }.to raise_error(SystemExit)
     rescue SystemExit
     end
-    expect(File.read("test.err")).to include "Anchor abc has already been used at line"
-    expect(File.read("test.err")).to include %(\t<clause id="abc" inline-header="false" obligation="normative">)
+    expect(File.read("test.err"))
+      .to include "Anchor abc has already been used at line"
+    expect(File.read("test.err"))
+      .to include %(\t<clause id="abc" inline-header="false" obligation="normative">)
   end
 
   it "warns about missing fields in asciibib" do
@@ -64,7 +71,8 @@ RSpec.describe Asciidoctor::Standoc do
           completename::::: Jack
     INPUT
     errf = File.read("test.err")
-    expect(errf).to include "Reference iso123 is missing a document identifier (docid)"
+    expect(errf)
+      .to include "Reference iso123 is missing a document identifier (docid)"
   end
 
   it "warns about missing fields in asciibib" do
@@ -189,7 +197,8 @@ RSpec.describe Asciidoctor::Standoc do
       <1> This is one callout
       <2> This is another callout
     INPUT
-    expect(File.read("test.err")).to include "mismatch of callouts and annotations"
+    expect(File.read("test.err"))
+      .to include "mismatch of callouts and annotations"
   end
 
   it "warns that term source is not a real reference" do
@@ -200,7 +209,8 @@ RSpec.describe Asciidoctor::Standoc do
       [.source]
       <<iso123>>
     INPUT
-    expect(File.read("test.err")).to include "iso123 does not have a corresponding anchor ID in the bibliography"
+    expect(File.read("test.err"))
+      .to include "iso123 does not have a corresponding anchor ID in the bibliography"
   end
 
   it "warns of Non-reference in bibliography" do
@@ -234,12 +244,14 @@ RSpec.describe Asciidoctor::Standoc do
       [align=mid-air]
       Para
     INPUT
-    expect(File.read("test.err")).to include 'value of attribute "align" is invalid; must be equal to'
+    expect(File.read("test.err"))
+      .to include 'value of attribute "align" is invalid; must be equal to'
   end
 
   it "Warning if terms mismatches IEV" do
     FileUtils.rm_f "test.err"
-    FileUtils.mv File.expand_path("~/.iev/cache"), File.expand_path("~/.iev.pstore1"), force: true
+    FileUtils.mv File.expand_path("~/.iev/cache"),
+                 File.expand_path("~/.iev.pstore1"), force: true
     FileUtils.rm_f "test_iev/pstore"
     mock_open_uri("103-01-02")
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
@@ -257,13 +269,16 @@ RSpec.describe Asciidoctor::Standoc do
       [.source]
       <<iev,clause="103-01-02">>
     INPUT
-    expect(File.read("test.err")).to include 'Term "automation" does not match IEV 103-01-02 "functional"'
-    FileUtils.mv File.expand_path("~/.iev.pstore1"), File.expand_path("~/.iev/cache"), force: true
+    expect(File.read("test.err"))
+      .to include 'Term "automation" does not match IEV 103-01-02 "functional"'
+    FileUtils.mv File.expand_path("~/.iev.pstore1"),
+                 File.expand_path("~/.iev/cache"), force: true
   end
 
   it "No warning if English term matches IEV" do
     FileUtils.rm_f "test.err"
-    FileUtils.mv File.expand_path("~/.iev/cache"), File.expand_path("~/.iev.pstore1"), force: true
+    FileUtils.mv File.expand_path("~/.iev/cache"),
+                 File.expand_path("~/.iev.pstore1"), force: true
     FileUtils.rm_f "test_iev/cache"
     mock_open_uri("103-01-02")
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
@@ -282,12 +297,14 @@ RSpec.describe Asciidoctor::Standoc do
       <<iev,clause="103-01-02">>
     INPUT
     expect(File.read("test.err")).not_to include "does not match IEV 103-01-02"
-    FileUtils.mv File.expand_path("~/.iev.pstore1"), File.expand_path("~/.iev/cache"), force: true
+    FileUtils.mv File.expand_path("~/.iev.pstore1"),
+                 File.expand_path("~/.iev/cache"), force: true
   end
 
   it "No warning if French term matches IEV" do
     FileUtils.rm_f "test.err"
-    FileUtils.mv File.expand_path("~/.iev/cache"), File.expand_path("~/.iev.pstore1"), force: true
+    FileUtils.mv File.expand_path("~/.iev/cache"),
+                 File.expand_path("~/.iev.pstore1"), force: true
     FileUtils.rm_f "test_iev/cache"
     mock_open_uri("103-01-02")
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
@@ -307,7 +324,8 @@ RSpec.describe Asciidoctor::Standoc do
       [.source]
       <<iev,clause="103-01-02">>
     INPUT
-    expect(File.read("test.err")).not_to include "does not match IEV 103-01-02"
+    expect(File.read("test.err"))
+      .not_to include "does not match IEV 103-01-02"
     FileUtils.mv File.expand_path("~/.iev.pstore1"), File.expand_path("~/.iev/cache"), force: true
   end
 
@@ -319,11 +337,44 @@ RSpec.describe Asciidoctor::Standoc do
   # INPUT
   # end
 
+  it "warns and aborts if concept/xref does not point to term or definition" do
+    FileUtils.rm_f "test.xml"
+    FileUtils.rm_f "test.err"
+    begin
+      input = <<~INPUT
+        = Document title
+        Author
+        :docfile: test.adoc
+        :nodoc:
+
+        [[abc]]
+        == Clause 1
+        [[ghi]]A:: B
+
+        == Symbols and Abbreviated Terms
+        [[def]]DEF:: def
+
+        {{<<abc>>,term}}
+        {{<<def>>,term}}
+        {{<<ghi>>,term}}
+      INPUT
+      expect { Asciidoctor.convert(input, *OPTIONS) }.to raise_error(SystemExit)
+    rescue SystemExit
+    end
+    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"))
+      .not_to include "Concept term is pointing to def, which is not a term or symbol"
+    expect(File.read("test.err"))
+      .to include "Concept term is pointing to ghi, which is not a term or symbol"
+    expect(File.exist?("test.xml")).to be false
+  end
+
   it "warns and aborts if id used twice" do
     FileUtils.rm_f "test.xml"
     FileUtils.rm_f "test.err"
     begin
-      expect { Asciidoctor.convert(<<~"INPUT", *OPTIONS) }.to raise_error(SystemExit)
+      input = <<~INPUT
         = Document title
         Author
         :docfile: test.adoc
@@ -335,9 +386,11 @@ RSpec.describe Asciidoctor::Standoc do
         [[abc]]
         == Clause 2
       INPUT
+      expect { Asciidoctor.convert(input, *OPTIONS) }.to raise_error(SystemExit)
     rescue SystemExit
     end
-    expect(File.read("test.err")).to include "Anchor abc has already been used at line"
+    expect(File.read("test.err"))
+      .to include "Anchor abc has already been used at line"
     expect(File.exist?("test.xml")).to be false
   end
 
@@ -345,7 +398,7 @@ RSpec.describe Asciidoctor::Standoc do
     FileUtils.rm_f "test.xml"
     FileUtils.rm_f "test.err"
     begin
-      expect { Asciidoctor.convert(<<~"INPUT", *OPTIONS) }.to raise_error(SystemExit)
+      input = <<~INPUT
         = Document title
         Author
         :docfile: test.adoc
@@ -355,9 +408,11 @@ RSpec.describe Asciidoctor::Standoc do
         == Normative references
         * [[[A,1]]]
       INPUT
+      expect { Asciidoctor.convert(input, *OPTIONS) }.to raise_error(SystemExit)
     rescue SystemExit
     end
-    expect(File.read("test.err")).to include "Numeric reference in normative references"
+    expect(File.read("test.err"))
+      .to include "Numeric reference in normative references"
     expect(File.exist?("test.xml")).to be false
   end
 
@@ -405,6 +460,7 @@ RSpec.describe Asciidoctor::Standoc do
       * C
       --
     INPUT
-    expect(File.read("test.err")).to include "Could not resolve footnoteblock:[id1]"
+    expect(File.read("test.err"))
+      .to include "Could not resolve footnoteblock:[id1]"
   end
 end

data/spec/support/shared_examples/structured_data_2_text_preprocessor.rb

@@ -59,9 +59,9 @@ RSpec.shared_examples "structured data 2 text preprocessor" do
             strip_guid(
               Asciidoctor.convert(input,
                                   backend: :standoc,
-                                  header_footer: true)
-            )
-          )
+                                  header_footer: true),
+            ),
+          ),
         ).to(be_equivalent_to(xmlpp(output)))
       end
     end
@@ -118,9 +118,9 @@ RSpec.shared_examples "structured data 2 text preprocessor" do
             strip_guid(
               Asciidoctor.convert(input,
                                   backend: :standoc,
-                                  header_footer: true)
-            )
-          )
+                                  header_footer: true),
+            ),
+          ),
         ).to(be_equivalent_to(xmlpp(output)))
       end
     end
@@ -166,9 +166,9 @@ RSpec.shared_examples "structured data 2 text preprocessor" do
             strip_guid(
               Asciidoctor.convert(input,
                                   backend: :standoc,
-                                  header_footer: true)
-            )
-          )
+                                  header_footer: true),
+            ),
+          ),
         ).to(be_equivalent_to(xmlpp(output)))
       end
     end
@@ -221,9 +221,9 @@ RSpec.shared_examples "structured data 2 text preprocessor" do
             strip_guid(
               Asciidoctor.convert(input,
                                   backend: :standoc,
-                                  header_footer: true)
-            )
-          )
+                                  header_footer: true),
+            ),
+          ),
         ).to(be_equivalent_to(xmlpp(output)))
       end
     end
@@ -303,9 +303,9 @@ RSpec.shared_examples "structured data 2 text preprocessor" do
             strip_guid(
               Asciidoctor.convert(input,
                                   backend: :standoc,
-                                  header_footer: true)
-            )
-          )
+                                  header_footer: true),
+            ),
+          ),
         ).to(be_equivalent_to(xmlpp(output)))
       end
     end
@@ -375,9 +375,9 @@ RSpec.shared_examples "structured data 2 text preprocessor" do
             strip_guid(
               Asciidoctor.convert(input,
                                   backend: :standoc,
-                                  header_footer: true)
-            )
-          )
+                                  header_footer: true),
+            ),
+          ),
         ).to(be_equivalent_to(xmlpp(output)))
       end
     end
@@ -385,7 +385,7 @@ RSpec.shared_examples "structured data 2 text preprocessor" do
     context "Array of language codes" do
       let(:example_content) do
         YAML.safe_load(
-          File.read(File.expand_path("../../assets/codes.yml", __dir__))
+          File.read(File.expand_path("../../assets/codes.yml", __dir__)),
         )
       end
       let(:input) do
@@ -429,9 +429,9 @@ RSpec.shared_examples "structured data 2 text preprocessor" do
             strip_guid(
               Asciidoctor.convert(input,
                                   backend: :standoc,
-                                  header_footer: true)
-            )
-          )
+                                  header_footer: true),
+            ),
+          ),
         ).to(be_equivalent_to(xmlpp(output)))
       end
     end
@@ -525,9 +525,9 @@ RSpec.shared_examples "structured data 2 text preprocessor" do
             strip_guid(
               Asciidoctor.convert(input,
                                   backend: :standoc,
-                                  header_footer: true)
-            )
-          )
+                                  header_footer: true),
+            ),
+          ),
         ).to(be_equivalent_to(xmlpp(output)))
       end
     end
@@ -576,9 +576,9 @@ RSpec.shared_examples "structured data 2 text preprocessor" do
             strip_guid(
               Asciidoctor.convert(input,
                                   backend: :standoc,
-                                  header_footer: true)
-            )
-          )
+                                  header_footer: true),
+            ),
+          ),
         ).to(be_equivalent_to(xmlpp(output)))
       end
     end
@@ -625,9 +625,9 @@ RSpec.shared_examples "structured data 2 text preprocessor" do
             strip_guid(
               Asciidoctor.convert(input,
                                   backend: :standoc,
-                                  header_footer: true)
-            )
-          )
+                                  header_footer: true),
+            ),
+          ),
         ).to(be_equivalent_to(xmlpp(output)))
       end
     end
@@ -771,9 +771,9 @@ RSpec.shared_examples "structured data 2 text preprocessor" do
             strip_guid(
               Asciidoctor.convert(input,
                                   backend: :standoc,
-                                  header_footer: true)
-            )
-          )
+                                  header_footer: true),
+            ),
+          ),
         ).to(be_equivalent_to(xmlpp(output)))
       end
     end