metanorma-standoc 1.11.2 → 1.11.3

data/spec/asciidoctor/cleanup_terms_spec.rb

@@ -88,8 +88,8 @@ 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-first-designation'>
-              <preferred language='fr' script='Latn' type='prefix' isInternational="true">
-                <expression>
+              <preferred>
+                <expression language='fr' script='Latn' type='prefix' isInternational="true">
                   <name>First Designation</name>
             <abbreviation-type>acronym</abbreviation-type>
             <pronunciation>f&#601;&#633;st</pronunciation>
@@ -106,14 +106,14 @@ RSpec.describe Asciidoctor::Standoc do
           </origin>
         </termsource>
               </preferred>
-              <admitted language='he' script='Hebr' type='suffix' absent="true">
-                <expression>
+              <admitted absent="true">
+                <expression language='he' script='Hebr' type='suffix'>
                   <name>Third Designation</name>
                 </expression>
                 <usage-info>This is usage 1.</usage-info>
               </admitted>
-              <deprecates language='jp' script='Japn' type='full' geographic-area="AUS">
-                <expression>
+              <deprecates geographic-area="AUS">
+                <expression language='jp' script='Japn' type='full'>
                   <name>Fourth Designation</name>
             <grammar>
               <gender>masculine</gender>
@@ -127,9 +127,9 @@ RSpec.describe Asciidoctor::Standoc do
                 </expression>
                 <field-of-application>Field</field-of-application>
               </deprecates>
-                      <related type='abbreviation'>
+                      <related type='see'>
           <preferred geographic-area="GRC">
-            <expression>
+            <expression type="abbreviation">
               <name>Fifth Designation</name>
               <grammar>
                 <gender>neuter</gender>
@@ -409,8 +409,8 @@ 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='second'>
-              <preferred isInternational='true'>
-                <expression>
+              <preferred>
+                <expression isInternational='true'>
                   <name/>
                 </expression>
               </preferred>
@@ -502,8 +502,8 @@ 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='second'>
-               <preferred isInternational='true'>
-                 <graphical-symbol>
+               <preferred>
+                 <graphical-symbol isInternational='true'>
                    <figure id='_'>
                      <pre id='_'>&lt;LITERAL&gt; FIGURATIVE</pre>
                    </figure>
@@ -556,6 +556,7 @@ RSpec.describe Asciidoctor::Standoc do
       #{ASCIIDOC_BLANK_HDR}
       == Terms and Definitions
 
+      [[des1]]
       === First Designation
 
       [%metadata]
@@ -569,7 +570,7 @@ RSpec.describe Asciidoctor::Standoc do
       subject:: pipes
       usage-info:: This is usage.
 
-      related:see[Fifth Designation]
+      related:see[<<des1>>,Fifth Designation]
 
       [%metadata]
       grammar::
@@ -612,28 +613,28 @@ 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-first-designation'>
-              <preferred language='fr' script='Latn' type='prefix' isInternational="true">
-                <expression>
+            <term id='des1'>
+              <preferred>
+                <expression language='fr' script='Latn' type='prefix' isInternational="true">
                   <name>First Designation</name>
                   <abbreviation-type>acronym</abbreviation-type>
                   <pronunciation>f&#601;&#633;st</pronunciation>
                 </expression>
                 <usage-info>This is usage.</usage-info>
               </preferred>
-              <preferred type='abbreviation'>
-                <expression>
+              <preferred>
+                <expression type='abbreviation'>
                   <name>Second Designation</name>
                 </expression>
               </preferred>
-              <admitted language='he' script='Hebr' type='suffix'>
-                <expression>
+              <admitted>
+                <expression language='he' script='Hebr' type='suffix'>
                   <name>Third Designation</name>
                 </expression>
                 <usage-info>This is usage 1.</usage-info>
               </admitted>
-              <deprecates language='jp' script='Japn' type='full'>
-                <expression>
+              <deprecates>
+                <expression language='jp' script='Japn' type='full'>
                   <name>Fourth Designation</name>
                   <grammar>
                     <gender>masculine</gender>
@@ -645,12 +646,8 @@ RSpec.describe Asciidoctor::Standoc do
                 </expression>
               </deprecates>
               <related type='see'>
-                <strong>
-                  term
-                  <tt>Fifth Designation</tt>
-                   not resolved via ID
-                  <tt>fifth-designation</tt>
-                </strong>
+              <preferred><expression><name>Fifth Designation</name><grammar><gender>neuter</gender></grammar></expression>
+              </preferred><xref target='des1'/>
               </related>
               <domain>Hydraulics</domain>
               <subject>pipes</subject>
@@ -1202,4 +1199,151 @@ RSpec.describe Asciidoctor::Standoc do
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
+
+  it "automatically indexes term indexes" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR.sub(/:nodoc:\n/, ":nodoc:\n:index-terms:\n")}
+
+      == Terms and definitions
+
+      === Term
+
+      [stem]
+      ++++
+      lambda
+      ++++
+
+      admitted:[x]
+
+      === Term2
+
+      preferred:[stem:[mu_0 // 2]]
+
+      == Symbols and Abbreviated Terms
+
+      x^2^:: Definition
+    INPUT
+    output = <<~OUTPUT
+           <standard-document xmlns='https://www.metanorma.org/ns/standoc' type='semantic' version='1.11.2'>
+         <bibdata type='standard'>
+           <title language='en' format='text/plain'>Document title</title>
+           <language>en</language>
+           <script>Latn</script>
+           <status>
+             <stage>published</stage>
+           </status>
+           <copyright>
+             <from>2021</from>
+           </copyright>
+           <ext>
+             <doctype>article</doctype>
+           </ext>
+         </bibdata>
+         <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>
+                 <expression>
+                   <name>
+                     Term
+                     <index>
+                       <primary>Term</primary>
+                     </index>
+                   </name>
+                 </expression>
+               </preferred>
+               <admitted>
+                 <letter-symbol>
+                   <name>
+                     <stem type='MathML'>
+                       <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                         <mi>&#955;</mi>
+                       </math>
+                     </stem>
+                   </name>
+                 </letter-symbol>
+               </admitted>
+               <definition>
+                 <verbal-definition>
+                   <p id='_'>admitted:[x]</p>
+                 </verbal-definition>
+               </definition>
+             </term>
+             <term id='term-term2'>
+               <preferred>
+                 <expression>
+                   <name>
+                     Term2
+                     <index>
+                       <primary>Term2</primary>
+                     </index>
+                   </name>
+                 </expression>
+               </preferred>
+               <preferred>
+                 <letter-symbol>
+                   <name>
+                     <stem type='MathML'>
+                       <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                         <msub>
+                           <mrow>
+                             <mi>&#956;</mi>
+                           </mrow>
+                           <mrow>
+                             <mn>0</mn>
+                           </mrow>
+                         </msub>
+                         <mo>/</mo>
+                         <mn>2</mn>
+                       </math>
+                     </stem>
+                     <index>
+                       <primary>
+                         <stem type='MathML'>
+                           <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                             <msub>
+                               <mrow>
+                                 <mi>&#956;</mi>
+                               </mrow>
+                               <mrow>
+                                 <mn>0</mn>
+                               </mrow>
+                             </msub>
+                             <mo>/</mo>
+                             <mn>2</mn>
+                           </math>
+                         </stem>
+                       </primary>
+                     </index>
+                   </name>
+                 </letter-symbol>
+               </preferred>
+             </term>
+           </terms>
+           <definitions id='_' obligation='normative'>
+             <title>Symbols and abbreviated terms</title>
+             <dl id='_'>
+               <dt id='symbol-x2'>
+                 x
+                 <sup>2</sup>
+                 <index>
+                   <primary>
+                     x
+                     <sup>2</sup>
+                   </primary>
+                 </index>
+               </dt>
+               <dd>
+                 <p id='_'>Definition</p>
+               </dd>
+             </dl>
+           </definitions>
+         </sections>
+       </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
 end

data/spec/asciidoctor/section_spec.rb

@@ -686,6 +686,36 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "tag and multilingual processing attributes on term" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      [heading="terms, definitions, symbols and abbreviated terms"]
+      == Terms, Definitions, Symbols Section
+
+      [language=en,tag=x123,multilingual-rendering=all-columns]
+      === Term
+    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' language='en' tag='x123' multilingual-rendering='all-columns'>
+               <preferred>
+                 <expression>
+                   <name>Term</name>
+                 </expression>
+               </preferred>
+             </term>
+           </terms>
+         </sections>
+       </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "varies terms & symbols title" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -1229,5 +1259,4 @@ RSpec.describe Asciidoctor::Standoc do
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
-
 end