metanorma-standoc 1.10.5 → 1.11.0

data/spec/asciidoctor/refs_spec.rb

@@ -999,6 +999,7 @@ RSpec.describe Asciidoctor::Standoc do
                      <docidentifier type='IETF'>RFC 8341</docidentifier>
                      <docidentifier type='rfc-anchor'>RFC8341</docidentifier>
                      <docidentifier type='DOI'>10.17487/RFC8341</docidentifier>
+                     <docnumber>RFC8341</docnumber>
                      <date type='published'>
                        <on>2018-03</on>
                      </date>
@@ -1008,12 +1009,6 @@ RSpec.describe Asciidoctor::Standoc do
                          <name>
                            <completename language='en'>A. Bierman</completename>
                          </name>
-                         <affiliation>
-                           <organization>
-                             <name>Internet Engineering Task Force</name>
-                             <abbreviation>IETF</abbreviation>
-                           </organization>
-                         </affiliation>
                        </person>
                      </contributor>
                      <contributor>
@@ -1022,12 +1017,6 @@ RSpec.describe Asciidoctor::Standoc do
                          <name>
                            <completename language='en'>M. Bjorklund</completename>
                          </name>
-                         <affiliation>
-                           <organization>
-                             <name>Internet Engineering Task Force</name>
-                             <abbreviation>IETF</abbreviation>
-                           </organization>
-                         </affiliation>
                        </person>
                      </contributor>
                      <contributor>
@@ -1070,6 +1059,7 @@ RSpec.describe Asciidoctor::Standoc do
                      <docidentifier type='metanorma'>[1]</docidentifier>
                      <docidentifier type='rfc-anchor'>RFC8341</docidentifier>
                      <docidentifier type='DOI'>10.17487/RFC8341</docidentifier>
+                     <docnumber>RFC8341</docnumber>
                      <date type='published'>
                        <on>2018-03</on>
                      </date>
@@ -1079,12 +1069,6 @@ RSpec.describe Asciidoctor::Standoc do
                          <name>
                            <completename language='en'>A. Bierman</completename>
                          </name>
-                         <affiliation>
-                           <organization>
-                             <name>Internet Engineering Task Force</name>
-                             <abbreviation>IETF</abbreviation>
-                           </organization>
-                         </affiliation>
                        </person>
                      </contributor>
                      <contributor>
@@ -1093,12 +1077,6 @@ RSpec.describe Asciidoctor::Standoc do
                          <name>
                            <completename language='en'>M. Bjorklund</completename>
                          </name>
-                         <affiliation>
-                           <organization>
-                             <name>Internet Engineering Task Force</name>
-                             <abbreviation>IETF</abbreviation>
-                           </organization>
-                         </affiliation>
                        </person>
                      </contributor>
                      <contributor>
@@ -1684,7 +1662,7 @@ RSpec.describe Asciidoctor::Standoc do
   def mock_isobib_get_123_no_docid(n)
     expect(RelatonIso::IsoBibliography).to receive(:get).with("ISO 123", nil, { lang: "en", title: "<em>Standard</em>", usrlbl: nil }) do
       RelatonBib::XMLParser.from_xml(<<~"OUTPUT")
-        <bibitem type=\"standard\" id=\"ISO123\">\n  <uri type=\"src\">https://www.iso.org/standard/23281.html</uri>\n  <uri type=\"obp\">https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>\n  <uri type=\"rss\">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>\n  <date type=\"published\">\n    <on>2001</on>\n  </date>\n  <contributor>\n    <role type=\"publisher\"/>\n    <organization>\n      <name>International Organization for Standardization</name>\n      <abbreviation>ISO</abbreviation>\n      <uri>www.iso.org</uri>\n    </organization>\n  </contributor>\n  <edition>3</edition>\n  <language>en</language>\n  <language>fr</language>\n  <script>Latn</script>\n  <status><stage>Published</stage></status>\n  <copyright>\n    <from>2001</from>\n    <owner>\n      <organization>\n        <name>ISO</name>\n        <abbreviation></abbreviation>\n      </organization>\n    </owner>\n  </copyright>\n  <relation type=\"obsoletes\">\n    <bibitem type="standard">\n      <formattedref format="text/plain">ISO 123:1985</formattedref>\n      </bibitem>\n  </relation>\n  <relation type=\"updates\">\n    <bibitem type="standard">\n      <formattedref format="text/plain">ISO 123:2001</formattedref>\n      </bibitem>\n  </relation>\n</bibitem>
+        <bibitem type=\"standard\" id=\"ISO123\">\n  <uri type=\"src\">https://www.iso.org/standard/23281.html</uri>\n  <uri type=\"obp\">https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>\n  <uri type=\"rss\">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>\n  <date type=\"published\">\n    <on>2001</on>\n  </date>\n  <contributor>\n    <role type=\"publisher\"/>\n    <organization>\n      <name>International Organization for Standardization</name>\n      <abbreviation>ISO</abbreviation>\n      <uri>www.iso.org</uri>\n    </organization>\n  </contributor>\n  <edition>3</edition>\n  <language>en</language>\n  <language>fr</language>\n  <script>Latn</script>\n  <status><stage>Published</stage></status>\n  <copyright>\n    <from>2001</from>\n    <owner>\n      <organization>\n        <name>ISO</name>\n        <abbreviation></abbreviation>\n      </organization>\n    </owner>\n  </copyright>\n  <relation type=\"obsoletes\">\n    <bibitem type="standard">\n      <formattedref format="text/plain">ISO 123:1985</formattedref>\n      </bibitem>\n  </relation>\n  <relation type=\"updates\">\n    <bibitem type="standard">\n      <formattedref format="text/plain">ISO 123:2001</formattedref>\n      </bibitem>\n  </relation>\n<ext></fred></ext></bibitem>
       OUTPUT
     end.exactly(n).times
   end
@@ -1692,7 +1670,7 @@ RSpec.describe Asciidoctor::Standoc do
   def mock_isobib_get_123_no_docid_lbl(n)
     expect(RelatonIso::IsoBibliography).to receive(:get).with("ISO 123", nil, { lang: "en", title: "<em>Standard</em>", usrlbl: "(1)" }) do
       RelatonBib::XMLParser.from_xml(<<~"OUTPUT")
-        <bibitem type=\"standard\" id=\"ISO123\">\n  <uri type=\"src\">https://www.iso.org/standard/23281.html</uri>\n  <uri type=\"obp\">https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>\n  <uri type=\"rss\">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>\n  <date type=\"published\">\n    <on>2001</on>\n  </date>\n  <contributor>\n    <role type=\"publisher\"/>\n    <organization>\n      <name>International Organization for Standardization</name>\n      <abbreviation>ISO</abbreviation>\n      <uri>www.iso.org</uri>\n    </organization>\n  </contributor>\n  <edition>3</edition>\n  <language>en</language>\n  <language>fr</language>\n  <script>Latn</script>\n  <status><stage>Published</stage></status>\n  <copyright>\n    <from>2001</from>\n    <owner>\n      <organization>\n        <name>ISO</name>\n        <abbreviation></abbreviation>\n      </organization>\n    </owner>\n  </copyright>\n  <relation type=\"obsoletes\">\n    <bibitem type="standard">\n      <formattedref format="text/plain">ISO 123:1985</formattedref>\n      </bibitem>\n  </relation>\n  <relation type=\"updates\">\n    <bibitem type="standard">\n      <formattedref format="text/plain">ISO 123:2001</formattedref>\n      </bibitem>\n  </relation>\n</bibitem>
+        <bibitem type=\"standard\" id=\"ISO123\">\n  <uri type=\"src\">https://www.iso.org/standard/23281.html</uri>\n  <uri type=\"obp\">https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>\n  <uri type=\"rss\">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>\n  <date type=\"published\">\n    <on>2001</on>\n  </date>\n  <contributor>\n    <role type=\"publisher\"/>\n    <organization>\n      <name>International Organization for Standardization</name>\n      <abbreviation>ISO</abbreviation>\n      <uri>www.iso.org</uri>\n    </organization>\n  </contributor>\n  <edition>3</edition>\n  <language>en</language>\n  <language>fr</language>\n  <script>Latn</script>\n  <status><stage>Published</stage></status>\n  <copyright>\n    <from>2001</from>\n    <owner>\n      <organization>\n        <name>ISO</name>\n        <abbreviation></abbreviation>\n      </organization>\n    </owner>\n  </copyright>\n  <relation type=\"obsoletes\">\n    <bibitem type="standard">\n      <formattedref format="text/plain">ISO 123:1985</formattedref>\n      </bibitem>\n  </relation>\n  <relation type=\"updates\">\n    <bibitem type="standard">\n      <formattedref format="text/plain">ISO 123:2001</formattedref>\n      </bibitem>\n  </relation>\n<ext></fred></ext></bibitem>
       OUTPUT
     end.exactly(n).times
   end

data/spec/asciidoctor/section_spec.rb

@@ -125,7 +125,7 @@ RSpec.describe Asciidoctor::Standoc do
         <p id="_">For the purposes of this document,
              the following terms and definitions apply.</p>
         <term id="term-term1">
-        <preferred>Term1</preferred>
+        <preferred><expression><name>Term1</name></expression></preferred>
       </term>
       </terms>
       <clause id="_" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title>
@@ -147,14 +147,14 @@ RSpec.describe Asciidoctor::Standoc do
         <terms id="_" obligation="normative">
         <title>Intro 5</title>
         <term id="term-term1-1">
-        <preferred>Term1</preferred>
+        <preferred><expression><name>Term1</name></expression></preferred>
       </term>
       </terms>
       </clause>
       <terms id="_" obligation="normative">
         <title>Normal Terms</title>
         <term id="term-term2">
-        <preferred>Term2</preferred>
+        <preferred><expression><name>Term2</name></expression></preferred>
       </term>
       </terms>
       <definitions id="_" obligation="normative"><title>Symbols and abbreviated terms</title><clause id="_" inline-header="false" obligation="normative">
@@ -278,7 +278,7 @@ RSpec.describe Asciidoctor::Standoc do
                <title>Terms and definitions</title>
                <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
                <term id='term-term1' number='4bis'>
-                 <preferred>Term1</preferred>
+                 <preferred><expression><name>Term1</name></expression></preferred>
                </term>
              </terms>
              <terms id='_' number='5bis' obligation='normative'>
@@ -291,7 +291,7 @@ RSpec.describe Asciidoctor::Standoc do
                  </clause>
                </clause>
                <term id='term-intro-2' number='8bis'>
-                 <preferred>Intro 2</preferred>
+                 <preferred><expression><name>Intro 2</name></expression></preferred>
                </term>
                <definitions id='_' number='9bis' obligation='normative'>
                  <title>Symbols and abbreviated terms</title>
@@ -478,7 +478,7 @@ RSpec.describe Asciidoctor::Standoc do
                <p id="_">For the purposes of this document,
              the following terms and definitions apply.</p>
                <term id="term-term1" language="en" script="Latn">
-               <preferred>Term1</preferred>
+               <preferred><expression><name>Term1</name></expression></preferred>
              </term>
              </terms>
              <clause id="_" language="en" script="Latn" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title>
@@ -500,14 +500,14 @@ RSpec.describe Asciidoctor::Standoc do
                <terms id="_" language="en" script="Latn" obligation="normative">
                <title>Intro 5</title>
                <term id="term-term1-1">
-               <preferred>Term1</preferred>
+               <preferred><expression><name>Term1</name></expression></preferred>
              </term>
              </terms>
              </clause>
              <terms id="_" language="en" script="Latn" obligation="normative">
                <title>Normal Terms</title>
                <term id="term-term2">
-               <preferred>Term2</preferred>
+               <preferred><expression><name>Term2</name></expression></preferred>
              </term>
              </terms>
              <definitions id="_" language="en" script="Latn" obligation="normative"><title>Symbols and abbreviated terms</title><clause id="_" language="en" script="Latn" inline-header="false" obligation="normative">
@@ -633,7 +633,7 @@ RSpec.describe Asciidoctor::Standoc do
             <title>Terms and definitions</title>
             <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
             <term id='term-term1'>
-              <preferred>Term1</preferred>
+              <preferred><expression><name>Term1</name></expression></preferred>
             </term>
           </terms>
           <clause id='_' obligation='normative'>
@@ -642,7 +642,7 @@ RSpec.describe Asciidoctor::Standoc do
             <terms id='_' obligation='normative'>
               <title>Normal Terms</title>
               <term id='term-term2'>
-                <preferred>Term2</preferred>
+                <preferred><expression><name>Term2</name></expression></preferred>
               </term>
             </terms>
             <definitions id='_' obligation="normative" type="symbols">
@@ -704,7 +704,7 @@ RSpec.describe Asciidoctor::Standoc do
             <title>Terms, definitions and symbols</title>
             <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
             <term id='term-term'>
-              <preferred>Term</preferred>
+              <preferred><expression><name>Term</name></expression></preferred>
             </term>
             <definitions id='_' obligation="normative" type="symbols">
               <title>Symbols</title>
@@ -736,7 +736,7 @@ RSpec.describe Asciidoctor::Standoc do
             <title>Terms, definitions and abbreviated terms</title>
             <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
             <term id='term-term'>
-              <preferred>Term</preferred>
+              <preferred><expression><name>Term</name></expression></preferred>
             </term>
             <definitions id='_' obligation="normative" type="abbreviated_terms">
               <title>Abbreviated terms</title>
@@ -769,7 +769,7 @@ RSpec.describe Asciidoctor::Standoc do
             <title>Terms, definitions, symbols and abbreviated terms</title>
             <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
             <term id='term-term'>
-              <preferred>Term</preferred>
+              <preferred><expression><name>Term</name></expression></preferred>
             </term>
             <definitions id='_' type='abbreviated_terms' obligation='normative'>
                 <title>Abbreviated terms</title>
@@ -930,7 +930,7 @@ RSpec.describe Asciidoctor::Standoc do
                 <title>Terms and definitions</title><p id="_">For the purposes of this document, the terms and definitions
         given in <eref bibitemid="iso1234"/> and <eref bibitemid="iso5678"/> and the following apply.</p>
         <term id="term-term1">
-        <preferred>Term1</preferred>
+        <preferred><expression><name>Term1</name></expression></preferred>
       </term>
              </terms></sections>
              </standard-document>
@@ -1136,8 +1136,8 @@ RSpec.describe Asciidoctor::Standoc do
              <terms id='terms-concepts' obligation='normative'>
                <title>Basic concepts</title>
                <term id='term-date'>
-                 <preferred>date</preferred>
-                 <definition>
+                 <preferred><expression><name>date</name></expression></preferred>
+                 <definition><verbaldefinition>
                    <p id='_'>
                      <em>time</em>
                       (
@@ -1152,7 +1152,7 @@ RSpec.describe Asciidoctor::Standoc do
                      <xref target='term-time-scale'/>
                      )
                    </p>
-                 </definition>
+                 </verbaldefinition></definition>
                </term>
              </terms>
            </clause>
@@ -1190,7 +1190,7 @@ RSpec.describe Asciidoctor::Standoc do
           <terms id='t1' obligation='normative'>
             <title>Terms and definitions</title>
             <term id='t2'>
-              <preferred>Term1</preferred>
+              <preferred><expression><name>Term1</name></expression></preferred>
             </term>
           </terms>
         </preface>

data/spec/asciidoctor/validate_spec.rb

@@ -329,7 +329,8 @@ RSpec.describe Asciidoctor::Standoc do
     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 attributes on formatted strong or stem extraneous to Metanomra XML" do
@@ -340,6 +341,31 @@ RSpec.describe Asciidoctor::Standoc do
   # INPUT
   # end
 
+  it "warns and aborts if concept attributes are malformed" do
+    FileUtils.rm_f "test.xml"
+    FileUtils.rm_f "test.err"
+    begin
+      input = <<~INPUT
+        = Document title
+        Author
+        :docfile: test.adoc
+        :nodoc:
+
+        == Symbols and Abbreviated Terms
+        [[def]]DEF:: def
+
+        {{<<def>>,term,option="noital"}}
+      INPUT
+      expect do
+        Asciidoctor.convert(input, *OPTIONS)
+      end.to raise_error(RuntimeError)
+    rescue SystemExit, RuntimeError
+    end
+    expect(File.read("test.err"))
+      .to include 'processing {{&lt;&lt;def&gt;&gt;,term,option="noital"}}: error processing ,term,option="noital" as CSV'
+    expect(File.exist?("test.xml")).to be false
+  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"
@@ -373,6 +399,39 @@ RSpec.describe Asciidoctor::Standoc do
     expect(File.exist?("test.xml")).to be false
   end
 
+  it "warns and aborts if related/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
+
+        related:see[<<abc>>,term]
+        related:see[<<def>>,term]
+        related:see[<<ghi>>,term]
+      INPUT
+      expect { Asciidoctor.convert(input, *OPTIONS) }.to raise_error(SystemExit)
+    rescue SystemExit
+    end
+    expect(File.read("test.err"))
+      .to include "Related term is pointing to abc, which is not a term or symbol"
+    expect(File.read("test.err"))
+      .not_to include "Related term is pointing to def, which is not a term or symbol"
+    expect(File.read("test.err"))
+      .to include "Related 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"
@@ -467,4 +526,53 @@ RSpec.describe Asciidoctor::Standoc do
     expect(File.read("test.err"))
       .to include "Could not resolve footnoteblock:[id1]"
   end
+
+  it "Warning if xref/@target does not point to a real identifier" do
+    FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :no-pdf:
+
+      <<id1>>
+
+      [[id2]]
+      [NOTE]
+      --
+      |===
+      |a |b
+
+      |c |d
+      |===
+
+      * A
+      * B
+      * C
+      --
+    INPUT
+    expect(File.read("test.err"))
+      .to include "Crossreference target id1 is undefined"
+  end
+
+  it "Warning if metadata deflist not after a designation" do
+    FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :no-pdf:
+
+      == Terms and definitions
+
+      === Term 1
+
+      Definition
+
+      [%metadata]
+      language:: fr
+    INPUT
+    expect(File.read("test.err"))
+      .to include "Metadata definition list does not follow a term designation"
+  end
 end

data/spec/assets/xref_error.adoc

@@ -1,5 +1,6 @@
 = X
 A
+:no-pdf:
 
 == Clause