metanorma-standoc 1.10.5 → 1.11.0

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'>
@@ -1610,7 +1610,7 @@ RSpec.describe Asciidoctor::Standoc do
       == Clause
 
       [.variant-title,type=toc]
-      Clause _A_ stem:[x]
+      Clause _A_ stem:[y]
 
       Text
     INPUT
@@ -1622,8 +1622,8 @@ RSpec.describe Asciidoctor::Standoc do
              <p id='_'>Text</p>
              <clause id='_' inline-header='false' obligation='normative'>
                <title>Subclause</title>
-               <variant-title variant_title='true' type='sub'>&#8220;A&#8221; &#8216;B&#8217;</variant-title>
-               <variant-title variant_title='true' type='toc'>
+               <variant-title type='sub'>&#8220;A&#8221; &#8216;B&#8217;</variant-title>
+               <variant-title type='toc'>
                  Clause
                  <em>A</em>
                  <stem type='MathML'>
@@ -1638,12 +1638,153 @@ RSpec.describe Asciidoctor::Standoc do
          </sections>
          <annex id='_' inline-header='false' obligation='normative'>
            <title>Clause</title>
-           <variant-title variant_title='true' type='toc'>
+           <variant-title type='toc'>
              Clause
              <em>A</em>
              <stem type='MathML'>
                <math xmlns='http://www.w3.org/1998/Math/MathML'>
-                 <mi>x</mi>
+                 <mi>y</mi>
+               </math>
+             </stem>
+           </variant-title>
+           <p id='_'>Text</p>
+         </annex>
+       </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "processes TOC clause" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      == Clause
+      Text
+
+      [type=toc]
+      === Table of contents
+
+      Text at the start
+
+      ==== Toc 1
+
+      * <<cl2>>
+      ** <<a1>>
+
+      ==== Toc 2
+
+      * <<cl2,some text>>
+      ** <<a1,some more text>>
+
+      [[cl2]]
+      == Clause2
+
+      [.variant-title,type=toc]
+      Clause _A_ stem:[x]
+
+      [.variant-title,type=sub]
+      "A" 'B'
+
+      Text
+
+      [[a1]]
+      [appendix]
+      == Clause
+
+      [.variant-title,type=toc]
+      Clause _A_ stem:[y]
+
+      Text
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+         <sections>
+           <clause id='_' inline-header='false' obligation='normative'>
+             <title>Clause</title>
+             <p id='_'>Text</p>
+             <clause id='_' type='toc' inline-header='false' obligation='normative'>
+               <title>Table of contents</title>
+               <p id='_'>Text at the start</p>
+               <clause id='_' inline-header='false' obligation='normative'>
+                 <title>Toc 1</title>
+                 <toc>
+                   <ul id='_'>
+                     <li>
+                       <p id='_'>
+                         <xref target='cl2'>
+                           Clause 
+                           <em>A</em>
+                           <stem type='MathML'>
+                             <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                               <mi>x</mi>
+                             </math>
+                           </stem>
+                         </xref>
+                       </p>
+                       <ul id='_'>
+                         <li>
+                           <p id='_'>
+                             <xref target='a1'>
+                               Clause 
+                               <em>A</em>
+                               <stem type='MathML'>
+                                 <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                                   <mi>y</mi>
+                                 </math>
+                               </stem>
+                             </xref>
+                           </p>
+                         </li>
+                       </ul>
+                     </li>
+                   </ul>
+                 </toc>
+               </clause>
+               <clause id='_' inline-header='false' obligation='normative'>
+                 <title>Toc 2</title>
+                 <toc>
+                   <ul id='_'>
+                     <li>
+                       <p id='_'>
+                         <xref target='cl2'>some text</xref>
+                       </p>
+                       <ul id='_'>
+                         <li>
+                           <p id='_'>
+                             <xref target='a1'>some more text</xref>
+                           </p>
+                         </li>
+                       </ul>
+                     </li>
+                   </ul>
+                 </toc>
+               </clause>
+             </clause>
+           </clause>
+           <clause id='cl2' inline-header='false' obligation='normative'>
+             <title>Clause2</title>
+             <variant-title type='sub'>&#8220;A&#8221; &#8216;B&#8217;</variant-title>
+             <variant-title type='toc'>
+               Clause 
+               <em>A</em>
+               <stem type='MathML'>
+                 <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                   <mi>x</mi>
+                 </math>
+               </stem>
+             </variant-title>
+             <p id='_'>Text</p>
+           </clause>
+         </sections>
+         <annex id='a1' inline-header='false' obligation='normative'>
+           <title>Clause</title>
+           <variant-title type='toc'>
+             Clause 
+             <em>A</em>
+             <stem type='MathML'>
+               <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                 <mi>y</mi>
                </math>
              </stem>
            </variant-title>