metanorma-standoc 1.10.8 → 1.11.0

data/spec/asciidoctor/blocks_spec.rb

@@ -353,10 +353,11 @@ 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>
                <definition>
+                 <verbaldefinition>
                  <p id='_'>first definition</p>
-                 <termsource status='identical'>
+                 <termsource status='identical' type="authoritative">
                    <origin bibitemid='ISO2191' type='inline' citeas=''>
                      <localityStack>
                        <locality type='section'>
@@ -365,10 +366,12 @@ RSpec.describe Asciidoctor::Standoc do
                      </localityStack>
                    </origin>
                  </termsource>
+                 </verbaldefinition>
                </definition>
                <definition>
+               <verbaldefinition>
                  <p id='_'>second definition</p>
-                 <termsource status='identical'>
+                 <termsource status='identical' type="authoritative">
                    <origin bibitemid='ISO2191' type='inline' citeas=''>
                      <localityStack>
                        <locality type='section'>
@@ -377,11 +380,12 @@ RSpec.describe Asciidoctor::Standoc do
                      </localityStack>
                    </origin>
                  </termsource>
+                 </verbaldefinition>
                </definition>
                <termnote id='_'>
                  <p id='_'>This is a note</p>
                </termnote>
-               <termsource status='identical'>
+               <termsource status='identical' type="authoritative">
                  <origin bibitemid='ISO2191' type='inline' citeas=''>
                    <localityStack>
                      <locality type='section'>
@@ -420,7 +424,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>
               <termnote id="_">
               <p id="_">This is a note</p>
             </termnote>
@@ -495,7 +499,7 @@ RSpec.describe Asciidoctor::Standoc do
         <terms id="_" obligation="normative"><title>Terms, definitions and symbols</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>
       <definitions id="_" obligation="normative" type="symbols">
         <title>Symbols</title>
@@ -653,7 +657,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>
       <termexample id="ABC" tag='X' multilingual-rendering='common'>
         <p id="_">This is an example</p>
       </termexample></term>
@@ -713,7 +717,7 @@ RSpec.describe Asciidoctor::Standoc do
       <sections>
         <terms id="_" obligation="normative"><title>Terms, definitions and symbols</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>
       <definitions id="_" obligation="normative" type="symbols">
         <title>Symbols</title>
@@ -1010,6 +1014,50 @@ RSpec.describe Asciidoctor::Standoc do
     INPUT
     expect(strip_guid(Asciidoctor.convert(input, *OPTIONS)))
       .to include '<image src="data:image/png;base64'
+
+    input = <<~INPUT
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :no-isobib:
+      :data-uri-image: true
+
+      .Split-it-right sample divider
+      image::spec/examples/rice_images/rice_image1.png[]
+    INPUT
+    expect(strip_guid(Asciidoctor.convert(input, *OPTIONS)))
+      .to include '<image src="data:image/png;base64'
+
+    input = <<~INPUT
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :no-isobib:
+      :data-uri-image: false
+
+      .Split-it-right sample divider
+      image::spec/examples/rice_images/rice_image1.png[]
+    INPUT
+    expect(strip_guid(Asciidoctor.convert(input, *OPTIONS)))
+      .not_to include '<image src="data:image/png;base64'
+
+    input = <<~INPUT
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :no-isobib:
+
+      .Split-it-right sample divider
+      image::spec/examples/rice_images/rice_image1.png[]
+    INPUT
+    expect(strip_guid(Asciidoctor.convert(input, *OPTIONS)))
+      .to include '<image src="data:image/png;base64'
   end
 
   it "accepts attributes on paragraphs" do
@@ -1124,6 +1172,8 @@ RSpec.describe Asciidoctor::Standoc do
 
       === Term1
 
+      Definition 0
+
       [.source]
       <<ISO2191,section=1>>
 
@@ -1150,15 +1200,16 @@ 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>
-               <termsource status="identical">
+               <preferred><expression><name>Term1</name></expression></preferred>
+               <definition><verbaldefinition><p id='_'>Definition 0</p></verbaldefinition></definition>
+               <termsource status="identical" type="authoritative">
                <origin bibitemid="ISO2191" type="inline" citeas="">
                <localityStack>
               <locality type="section"><referenceFrom>1</referenceFrom></locality>
               </localityStack>
               </origin>
              </termsource>
-             <termsource status="identical">
+             <termsource status="identical" type="authoritative">
                <origin bibitemid="ISO2191" type="inline" citeas="" case='capital' droploc='true'>
                <localityStack>
               <locality type="section"><referenceFrom>1</referenceFrom></locality>
@@ -1167,21 +1218,23 @@ RSpec.describe Asciidoctor::Standoc do
              </termsource>
              </term>
              <term id='term-term2'>
-        <preferred>Term2</preferred>
+        <preferred><expression><name>Term2</name></expression></preferred>
         <definition>
+        <verbaldefinition>
           <p id='_'>Definition</p>
+          </verbaldefinition>
         </definition>
-        <termsource status='identical'>
+        <termsource status='identical' type="authoritative">
           <origin citeas=''>
             <termref base='IEV' target='xyz'/>
           </origin>
         </termsource>
-        <termsource status='identical'>
+        <termsource status='identical' type="authoritative">
           <origin citeas=''>
             <termref base='IEV' target='xyz'/>
           </origin>
         </termsource>
-        <termsource status='identical'>
+        <termsource status='identical' type="authoritative">
           <origin citeas=''>
             <termref base='IEV' target='xyz'/>
           </origin>
@@ -1202,6 +1255,8 @@ RSpec.describe Asciidoctor::Standoc do
 
       === Term1
 
+      Definition 0
+
       [.source]
       <<ISO2191,section=1>>, with adjustments
 
@@ -1220,8 +1275,9 @@ 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>
-               <termsource status="modified">
+               <preferred><expression><name>Term1</name></expression></preferred>
+               <definition><verbaldefinition><p id='_'>Definition 0</p></verbaldefinition></definition>
+               <termsource status="modified" type="authoritative">
                <origin bibitemid="ISO2191" type="inline" citeas="">
                <localityStack>
               <locality type="section"><referenceFrom>1</referenceFrom></locality>
@@ -1233,11 +1289,11 @@ RSpec.describe Asciidoctor::Standoc do
              </termsource>
              </term>
              <term id='term-term2'>
-        <preferred>Term2</preferred>
-        <definition>
+        <preferred><expression><name>Term2</name></expression></preferred>
+        <definition><verbaldefinition>
           <p id='_'>Definition</p>
-        </definition>
-        <termsource status='modified'>
+        </verbaldefinition></definition>
+        <termsource status='modified' type="authoritative">
           <origin citeas=''>
             <termref base='IEV' target='xyz'/>
           </origin>
@@ -1254,6 +1310,78 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+
+    it "processes term source attributes" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      == Terms and Definitions
+
+      === Term1
+
+      Definition 0
+
+      [.source,status=generalisation]
+      <<ISO2191,section=1>>, with adjustments
+
+      === Term2
+
+      Definition
+
+      [.source,type=lineage]
+      {{<<IEV:xyz>>}}, with adjustments
+    INPUT
+    output = <<~OUTPUT
+            #{BLANK_HDR}
+              <sections>
+    <terms id='_' obligation='normative'>
+      <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>
+          <expression>
+            <name>Term1</name>
+          </expression>
+        </preferred>
+        <definition><verbaldefinition><p id='_'>Definition 0</p></verbaldefinition></definition>
+        <termsource status='generalisation' type='authoritative'>
+          <origin bibitemid='ISO2191' type='inline' citeas=''>
+            <localityStack>
+              <locality type='section'>
+                <referenceFrom>1</referenceFrom>
+              </locality>
+            </localityStack>
+          </origin>
+          <modification>
+            <p id='_'>with adjustments</p>
+          </modification>
+        </termsource>
+      </term>
+      <term id='term-term2'>
+        <preferred>
+          <expression>
+            <name>Term2</name>
+          </expression>
+        </preferred>
+        <definition><verbaldefinition>
+          <p id='_'>Definition</p>
+        </verbaldefinition></definition>
+        <termsource status='modified' type='lineage'>
+          <origin citeas=''>
+            <termref base='IEV' target='xyz'/>
+          </origin>
+          <modification>
+            <p id='_'>with adjustments</p>
+          </modification>
+        </termsource>
+      </term>
+    </terms>
+  </sections>
+            </standard-document>
+OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "processes recommendation" do
     input = <<~"INPUT"
       #{ASCIIDOC_BLANK_HDR}

data/spec/asciidoctor/cleanup_sections_spec.rb

@@ -28,8 +28,8 @@ RSpec.describe Asciidoctor::Standoc do
         </li>
       </ul>
              <term id="term-time">
-             <preferred>Time</preferred>
-               <definition><p id="_">This paragraph is extraneous</p></definition>
+             <preferred><expression><name>Time</name></expression></preferred>
+               <definition><verbaldefinition><p id="_">This paragraph is extraneous</p></verbaldefinition></definition>
              </term></terms>
              </sections>
              </standard-document>
@@ -521,7 +521,7 @@ RSpec.describe Asciidoctor::Standoc do
                    </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='_' inline-header='false' obligation='normative'>
@@ -796,7 +796,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='_' inline-header='false' obligation='normative'>
@@ -1033,7 +1033,7 @@ RSpec.describe Asciidoctor::Standoc do
                       s’appliquent.
                     </p>
                     <term id='term-term1'>
-                      <preferred>Term1</preferred>
+                      <preferred><expression><name>Term1</name></expression></preferred>
                     </term>
                   </terms>
                   <clause id='_' inline-header='false' obligation='normative'>
@@ -1267,7 +1267,7 @@ RSpec.describe Asciidoctor::Standoc do
                     <title>术语和定义</title>
                     <p id='_'>下列术语和定义适用于本文件。</p>
                     <term id='term-term1'>
-                      <preferred>Term1</preferred>
+                      <preferred><expression><name>Term1</name></expression></preferred>
                     </term>
                   </terms>
                   <clause id='_' inline-header='false' obligation='normative'>
@@ -1501,7 +1501,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='_' inline-header='false' obligation='normative'>

data/spec/asciidoctor/cleanup_spec.rb

@@ -213,141 +213,6 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
-  it "processes stem-only terms as admitted" do
-    input = <<~INPUT
-      #{ASCIIDOC_BLANK_HDR}
-      == Terms and Definitions
-
-      === stem:[t_90]
-
-      stem:[t_91]
-
-      Time
-    INPUT
-    output = <<~OUTPUT
-             #{BLANK_HDR}
-                    <sections>
-               <terms id="_" obligation="normative">
-               <title>Terms and definitions</title>
-               <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-               <term id="term-t90"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub>
-               <mrow>
-        <mi>t</mi>
-      </mrow>
-      <mrow>
-        <mn>90</mn>
-      </mrow>
-      </msub></math></stem></preferred><admitted><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub>
-      <mrow>
-        <mi>t</mi>
-      </mrow>
-      <mrow>
-        <mn>91</mn>
-      </mrow>
-      </msub></math></stem></admitted>
-             <definition><p id="_">Time</p></definition></term>
-             </terms>
-             </sections>
-             </standard-document>
-    OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to xmlpp(output)
-  end
-
-  it "moves term domains out of the term definition paragraph" do
-    input = <<~INPUT
-      #{ASCIIDOC_BLANK_HDR}
-      == Terms and Definitions
-
-      === Tempus
-
-      domain:[relativity] Time
-
-      === Tempus1
-
-      Time2
-
-      domain:[relativity2]
-    INPUT
-    output = <<~OUTPUT
-             #{BLANK_HDR}
-                    <sections>
-               <terms id="_" obligation="normative">
-               <title>Terms and definitions</title>
-               <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-               <term id="term-tempus">
-               <preferred>Tempus</preferred>
-               <domain>relativity</domain><definition><p id="_"> Time</p></definition>
-             </term>
-             <term id='term-tempus1'>
-        <preferred>Tempus1</preferred>
-        <domain>relativity2</domain>
-        <definition>
-          <p id='_'>Time2</p>
-          <p id='_'> </p>
-        </definition>
-      </term>
-             </terms>
-             </sections>
-             </standard-document>
-    OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to xmlpp(output)
-  end
-
-  it "permits multiple blocks in term definition paragraph" do
-    input = <<~INPUT
-      = Document title
-      Author
-      :docfile: test.adoc
-      :nodoc:
-      :novalid:
-      :stem:
-
-      == Terms and Definitions
-
-      === stem:[t_90]
-
-      [stem]
-      ++++
-      t_A
-      ++++
-
-      This paragraph is extraneous
-    INPUT
-    output = <<~OUTPUT
-             #{BLANK_HDR}
-                    <sections>
-               <terms id="_" obligation="normative">
-               <title>Terms and definitions</title>
-               <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-               <term id="term-t90"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub>
-                <mrow>
-         <mi>t</mi>
-       </mrow>
-       <mrow>
-         <mn>90</mn>
-       </mrow>
-      </msub></math></stem></preferred><definition><formula id="_">
-               <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub>
-               <mrow>
-        <mi>t</mi>
-      </mrow>
-      <mrow>
-        <mi>A</mi>
-      </mrow>
-      </msub></math></stem>
-             </formula>
-             <p id="_">This paragraph is extraneous</p></definition>
-             </term>
-             </terms>
-             </sections>
-             </standard-document>
-    OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to xmlpp(output)
-  end
-
   it "converts xrefs to references into erefs" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -548,6 +413,8 @@ RSpec.describe Asciidoctor::Standoc do
 
       === Term1
 
+      Definition 0
+
       [.source]
       <<ISO2191,section=1>>
     INPUT
@@ -558,8 +425,9 @@ 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>
-        <termsource status="identical">
+        <preferred><expression><name>Term1</name></expression></preferred>
+        <definition><verbaldefinition><p id='_'>Definition 0</p></verbaldefinition></definition>
+        <termsource status="identical" type="authoritative">
         <origin bibitemid="ISO2191" type="inline" citeas="">
         <localityStack>
        <locality type="section"><referenceFrom>1</referenceFrom></locality>
@@ -630,57 +498,6 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
-  it "rearranges term note, term example, term source" do
-    input = <<~INPUT
-      #{ASCIIDOC_BLANK_HDR}
-
-      == Terms and definitions
-
-      === Term
-
-      [.source]
-      <<ISO2191,section=1>>
-
-      NOTE: Note
-
-      [example]
-      Example 1
-
-      NOTE: Note 2
-
-      [example]
-      Example 2
-    INPUT
-    output = <<~OUTPUT
-      #{BLANK_HDR}
-      <sections>
-      <terms id="_" obligation="normative">
-        <title>Terms and definitions</title>
-        <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-        <term id="term-term"><preferred>Term</preferred>
-      <termnote id="_">
-        <p id="_">Note</p>
-      </termnote><termnote id="_">
-        <p id="_">Note 2</p>
-      </termnote><termexample id="_">
-        <p id="_">Example 1</p>
-      </termexample><termexample id="_">
-        <p id="_">Example 2</p>
-      </termexample><termsource status="identical">
-        <origin bibitemid="ISO2191" type="inline" citeas="">
-        <localityStack>
-       <locality type="section"><referenceFrom>1</referenceFrom></locality>
-        </localityStack>
-       </origin>
-      </termsource></term>
-      </terms>
-      </sections>
-      </standard-document>
-    OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to xmlpp(output)
-  end
-
   it "separates IEV citations by top-level clause" do
     FileUtils.rm_rf File.expand_path("~/.relaton-bib.pstore1")
     FileUtils.mv File.expand_path("~/.relaton/cache"),
@@ -702,16 +519,22 @@ RSpec.describe Asciidoctor::Standoc do
         == Terms and definitions
         === Automation1
 
+        Definition 1
+
         [.source]
         <<iev,clause="103-01-02">>
 
         === Automation2
 
+        Definition 2
+
         [.source]
         <<iev,clause="102-01-02">>
 
         === Automation3
 
+        Definition 3
+
         [.source]
         <<iev,clause="103-01-02">>
       INPUT
@@ -721,8 +544,9 @@ RSpec.describe Asciidoctor::Standoc do
         <terms id="_" obligation="normative"><title>Terms and definitions</title>
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
          <term id="term-automation1">
-          <preferred>Automation1</preferred>
-          <termsource status="identical">
+          <preferred><expression><name>Automation1</name></expression></preferred>
+          <definition><verbaldefinition><p id='_'>Definition 1</p></verbaldefinition></definition>
+          <termsource status="identical" type="authoritative">
           <origin bibitemid="IEC60050-103" type="inline" citeas="IEC 60050-103:2009">
           <localityStack>
         <locality type="clause"><referenceFrom>103-01-02</referenceFrom></locality>
@@ -731,8 +555,9 @@ RSpec.describe Asciidoctor::Standoc do
         </termsource>
         </term>
         <term id="term-automation2">
-          <preferred>Automation2</preferred>
-          <termsource status="identical">
+          <preferred><expression><name>Automation2</name></expression></preferred>
+          <definition><verbaldefinition><p id='_'>Definition 2</p></verbaldefinition></definition>
+          <termsource status="identical" type="authoritative">
           <origin bibitemid="IEC60050-102" type="inline" citeas="IEC 60050-102:2007">
           <localityStack>
         <locality type="clause"><referenceFrom>102-01-02</referenceFrom></locality>
@@ -741,8 +566,9 @@ RSpec.describe Asciidoctor::Standoc do
         </termsource>
         </term>
         <term id="term-automation3">
-          <preferred>Automation3</preferred>
-          <termsource status="identical">
+          <preferred><expression><name>Automation3</name></expression></preferred>
+          <definition><verbaldefinition><p id='_'>Definition 3</p></verbaldefinition></definition>
+          <termsource status="identical" type="authoritative">
           <origin bibitemid="IEC60050-103" type="inline" citeas="IEC 60050-103:2009">
           <localityStack>
         <locality type="clause"><referenceFrom>103-01-02</referenceFrom></locality>
@@ -1987,7 +1813,7 @@ RSpec.describe Asciidoctor::Standoc do
       ====
     INPUT
     output = <<~OUTPUT
-      <standard-document xmlns='https://www.metanorma.org/ns/standoc' type='semantic' version='1.10.7'>
+      <standard-document xmlns='https://www.metanorma.org/ns/standoc' type='semantic' version="#{Metanorma::Standoc::VERSION}">
          <bibdata type='standard'>
            <title language='en' format='text/plain'>Document title</title>
            <language>en</language>