metanorma-iso 1.9.6 → 1.10.3

data/spec/asciidoctor/blocks_spec.rb

@@ -133,7 +133,7 @@ RSpec.describe Asciidoctor::ISO do
           <p id="foreword">Foreword</p>
           <review date="20170101T00:00:00Z" from="foreword" id="_" reviewer="ISO" to="foreword">
             <p id="_">A Foreword shall appear in each document. The generic text is shown here. It does not contain requirements, recommendations or permissions.</p>
-            <p id="_">For further information on the Foreword, see#{' '}
+            <p id="_">For further information on the Foreword, see
               <strong>ISO/IEC Directives, Part 2, 2016, Clause 12.</strong></p>
           </review>
         </sections>
@@ -158,9 +158,9 @@ RSpec.describe Asciidoctor::ISO do
         <sections>
           <terms id="_" obligation="normative">
             <title>Terms and definitions</title>
-            #{TERM_BOILERPLATE}#{'     '}
+            #{TERM_BOILERPLATE}
             <term id="term-term1">
-              <preferred>Term1</preferred>
+              <preferred><expression><name>Term1</name></expression></preferred>
               <termnote id="_">
                 <p id="_">This is a note</p></termnote>
             </term>
@@ -283,7 +283,7 @@ RSpec.describe Asciidoctor::ISO do
             <title>Terms and definitions</title>
             #{TERM_BOILERPLATE}
             <term id="term-term1">
-              <preferred>Term1</preferred>
+              <preferred><expression><name>Term1</name></expression></preferred>
               <termexample id="_">
                 <p id="_">This is an example</p></termexample>
             </term>
@@ -521,6 +521,8 @@ RSpec.describe Asciidoctor::ISO do
 
       === Term1
 
+      Definition
+
       [.source]
       <<ISO2191,section=1>>
     INPUT
@@ -531,8 +533,13 @@ RSpec.describe Asciidoctor::ISO do
             <title>Terms and definitions</title>
             #{TERM_BOILERPLATE}
             <term id="term-term1">
-              <preferred>Term1</preferred>
-              <termsource status="identical">
+              <preferred><expression><name>Term1</name></expression></preferred>
+                      <definition>
+          <verbal-definition>
+            <p id='_'>Definition</p>
+          </verbal-definition>
+        </definition>
+        <termsource status='identical' type='authoritative'>
                 <origin bibitemid="ISO2191" citeas="" type="inline">
                   <localityStack>
                     <locality type="section">
@@ -556,6 +563,8 @@ RSpec.describe Asciidoctor::ISO do
 
       === Term1
 
+      Definition
+
       [.source]
       <<ISO2191,section=1>>, with adjustments
     INPUT
@@ -566,8 +575,13 @@ RSpec.describe Asciidoctor::ISO do
             <title>Terms and definitions</title>
             #{TERM_BOILERPLATE}
             <term id="term-term1">
-              <preferred>Term1</preferred>
-              <termsource status="modified">
+              <preferred><expression><name>Term1</name></expression></preferred>
+                      <definition>
+          <verbal-definition>
+            <p id='_'>Definition</p>
+          </verbal-definition>
+        </definition>
+        <termsource status='modified' type='authoritative'>
                 <origin bibitemid="ISO2191" citeas="" type="inline">
                   <localityStack>
                     <locality type="section">
@@ -586,43 +600,4 @@ RSpec.describe Asciidoctor::ISO do
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
-
-  it "processes nested terms" do
-    input = <<~INPUT
-      #{ASCIIDOC_BLANK_HDR}
-      == Terms and Definitions
-
-      [.term]
-      === Term1
-
-      definition
-
-      ==== Term11
-      definition2
-    INPUT
-    output = <<~OUTPUT
-      #{BLANK_HDR}
-      <sections>
-           <terms id='_' obligation='normative'>
-             <title>Terms and definitions</title>
-             #{TERM_BOILERPLATE}
-             <term id='term-term1'>
-               <preferred>Term1</preferred>
-               <definition>
-                 <p id='_'>definition</p>
-               </definition>
-               <term id='term-term11'>
-                 <preferred>Term11</preferred>
-                 <definition>
-                   <p id='_'>definition2</p>
-                 </definition>
-               </term>
-             </term>
-           </terms>
-         </sections>
-       </iso-standard>
-    OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to xmlpp(output)
-  end
 end

data/spec/asciidoctor/cleanup_spec.rb

@@ -36,6 +36,7 @@ RSpec.describe Asciidoctor::ISO do
             #{TERM_BOILERPLATE}
             <term id="term-t90">
               <preferred>
+                <letter-symbol><name>
                 <stem type="MathML">
                   <math xmlns="http://www.w3.org/1998/Math/MathML">
                     <msub>
@@ -47,8 +48,10 @@ RSpec.describe Asciidoctor::ISO do
                     </msub>
                   </math>
                 </stem>
+                </name></letter-symbol>
               </preferred>
               <admitted>
+                <letter-symbol><name>
                 <stem type="MathML">
                   <math xmlns="http://www.w3.org/1998/Math/MathML">
                     <msub>
@@ -61,10 +64,11 @@ RSpec.describe Asciidoctor::ISO do
                     </msub>
                   </math>
                 </stem>
+                </name></letter-symbol>
               </admitted>
-              <definition>
+              <definition><verbal-definition>
                 <p id="_">Time</p>
-              </definition>
+              </verbal-definition></definition>
             </term>
           </terms>
         </sections>
@@ -90,10 +94,10 @@ RSpec.describe Asciidoctor::ISO do
             <title>Terms and definitions</title>#{TERM_BOILERPLATE}
 
             <term id="term-tempus">
-              <preferred>Tempus</preferred>
+              <preferred><expression><name>Tempus</name></expression></preferred>
               <domain>relativity</domain>
-              <definition>
-                <p id="_">Time</p></definition>
+              <definition><verbal-definition>
+                <p id="_">Time</p></verbal-definition></definition>
             </term>
           </terms>
         </sections>
@@ -117,12 +121,15 @@ RSpec.describe Asciidoctor::ISO do
 
       === stem:[t_90]
 
+      [.definition]
+      --
       [stem]
       ++++
       t_A
       ++++
 
       This paragraph is extraneous
+      --
     INPUT
     output = <<~OUTPUT
       #{BLANK_HDR}
@@ -130,8 +137,9 @@ RSpec.describe Asciidoctor::ISO do
           <terms id="_" obligation="normative">
             <title>Terms and definitions</title>
             #{TERM_BOILERPLATE}
-            <term id="term-t90">
+            <term id="term-_-t90-">
               <preferred>
+                <letter-symbol><name>
                 <stem type="MathML">
                   <math xmlns="http://www.w3.org/1998/Math/MathML">
                     <msub>
@@ -143,8 +151,10 @@ RSpec.describe Asciidoctor::ISO do
                     </msub>
                   </math>
                 </stem>
+                </name></letter-symbol>
               </preferred>
               <definition>
+                <verbal-definition>
                 <formula id="_">
                   <stem type="MathML">
                     <math xmlns="http://www.w3.org/1998/Math/MathML">
@@ -159,7 +169,7 @@ RSpec.describe Asciidoctor::ISO do
                     </math>
                   </stem>
                 </formula>
-                <p id="_">This paragraph is extraneous</p>
+                <p id="_">This paragraph is extraneous</p></verbal-definition>
               </definition>
             </term>
           </terms>
@@ -195,10 +205,10 @@ RSpec.describe Asciidoctor::ISO do
                 <p id="_">So am I</p></li>
             </ul>
             <term id="term-time">
-              <preferred>Time</preferred>
-              <definition>
+              <preferred><expression><name>Time</name></expression></preferred>
+              <definition><verbal-definition>
                 <p id="_">This paragraph is extraneous</p>
-              </definition>
+              </verbal-definition></definition>
             </term>
           </terms>
         </sections>
@@ -433,6 +443,8 @@ RSpec.describe Asciidoctor::ISO do
 
       === Term1
 
+      Definition
+
       [.source]
       <<ISO2191,section=1>>
     INPUT
@@ -443,8 +455,13 @@ RSpec.describe Asciidoctor::ISO do
             <title>Terms and definitions</title>
             #{TERM_BOILERPLATE}
             <term id="term-term1">
-              <preferred>Term1</preferred>
-              <termsource status="identical">
+              <preferred><expression><name>Term1</name></expression></preferred>
+                      <definition>
+          <verbal-definition>
+            <p id='_'>Definition</p>
+          </verbal-definition>
+        </definition>
+        <termsource status='identical' type='authoritative'>
                 <origin bibitemid="ISO2191" citeas="" type="inline">
                   <localityStack>
                     <locality type="section">
@@ -1241,7 +1258,7 @@ RSpec.describe Asciidoctor::ISO do
               </li>
             </ul>
             <term id='term-term1'>
-              <preferred>Term1</preferred>
+              <preferred><expression><name>Term1</name></expression></preferred>
             </term>
           </terms>
         </sections>
@@ -1292,13 +1309,13 @@ RSpec.describe Asciidoctor::ISO do
               <terms id='_' obligation='normative'>
                 <title>Normal Terms</title>
                 <term id='term-term1'>
-                  <preferred>Term1</preferred>
+                  <preferred><expression><name>Term1</name></expression></preferred>
                 </term>
               </terms>
               <terms id='_' obligation='normative'>
                 <title>Abnormal terms</title>
                 <term id='term-term-2'>
-                  <preferred>Term 2</preferred>
+                  <preferred><expression><name>Term 2</name></expression></preferred>
                 </term>
               </terms>
             </clause>
@@ -1356,13 +1373,13 @@ RSpec.describe Asciidoctor::ISO do
                 <terms id='_' obligation='normative'>
                   <title>Normal Terms</title>
                   <term id='term-term1'>
-                    <preferred>Term1</preferred>
+                    <preferred><expression><name>Term1</name></expression></preferred>
                   </term>
                 </terms>
                 <terms id='_' obligation='normative'>
                   <title>Abnormal terms</title>
                   <term id='term-term-2'>
-                    <preferred>Term 2</preferred>
+                    <preferred><expression><name>Term 2</name></expression></preferred>
                   </term>
                 </terms>
               </clause>
@@ -1421,13 +1438,13 @@ RSpec.describe Asciidoctor::ISO do
                   </li>
                 </ul>
                 <term id='term-term1'>
-                  <preferred>Term1</preferred>
+                  <preferred><expression><name>Term1</name></expression></preferred>
                 </term>
               </terms>
               <terms id='_' obligation='normative'>
                 <title>Other Terms</title>
                 <term id='term-term-2'>
-                  <preferred>Term 2</preferred>
+                  <preferred><expression><name>Term 2</name></expression></preferred>
                 </term>
               </terms>
               <definitions id='_' obligation='normative'>
@@ -1479,7 +1496,7 @@ RSpec.describe Asciidoctor::ISO do
               </li>
             </ul>
             <term id='term-term1'>
-              <preferred>Term1</preferred>
+              <preferred><expression><name>Term1</name></expression></preferred>
             </term>
           </terms>
         </sections>

data/spec/asciidoctor/inline_spec.rb

@@ -56,8 +56,16 @@ RSpec.describe Asciidoctor::ISO do
               </msub>
             </math>
           </stem>
-          <admitted>alt</admitted>
-          <deprecates>deprecated</deprecates>
+          <admitted>
+            <expression>
+              <name>alt</name>
+            </expression>
+          </admitted>
+          <deprecates>
+            <expression>
+              <name>deprecated</name>
+            </expression>
+          </deprecates>
           <domain>domain</domain>
           <strike>strike</strike>
           <smallcap>smallcap</smallcap>