metanorma-standoc 1.10.8 → 1.11.0

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
@@ -355,7 +356,9 @@ RSpec.describe Asciidoctor::Standoc do
 
         {{<<def>>,term,option="noital"}}
       INPUT
-      expect { Asciidoctor.convert(input, *OPTIONS) }.to raise_error(RuntimeError)
+      expect do
+        Asciidoctor.convert(input, *OPTIONS)
+      end.to raise_error(RuntimeError)
     rescue SystemExit, RuntimeError
     end
     expect(File.read("test.err"))
@@ -396,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"
@@ -518,4 +554,25 @@ RSpec.describe Asciidoctor::Standoc do
     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/spec_helper.rb

@@ -72,6 +72,7 @@ ASCIIDOC_BLANK_HDR = <<~"HDR".freeze
   :nodoc:
   :novalid:
   :no-isobib:
+  :data-uri-image: false
 
 HDR