metanorma-standoc 1.10.7 → 1.11.1

data/spec/asciidoctor/blocks_spec.rb

@@ -72,7 +72,7 @@ RSpec.describe Asciidoctor::Standoc do
       #{ASCIIDOC_BLANK_HDR}
 
       [[ABC]]
-      [stem%inequality,number=3,keep-with-next=true,keep-lines-together=true]
+      [stem%inequality,number=3,keep-with-next=true,keep-lines-together=true,tag=X,multilingual-rendering=common]
       ++++
       r = 1 %
       r = 1 %
@@ -97,7 +97,7 @@ RSpec.describe Asciidoctor::Standoc do
     output = <<~OUTPUT
            #{BLANK_HDR}
            <sections>
-          <formula id='ABC' number='3' keep-with-next='true' keep-lines-together='true' inequality='true'>
+          <formula id='ABC' number='3' keep-with-next='true' keep-lines-together='true' inequality='true' tag='X' multilingual-rendering='common'>
             <stem type='MathML'>
               <math xmlns='http://www.w3.org/1998/Math/MathML'>
                 <mi>r</mi>
@@ -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'>
@@ -408,7 +412,7 @@ RSpec.describe Asciidoctor::Standoc do
 
       NOTE: This is a note
 
-      [NOTE,keep-separate=true]
+      [NOTE,keep-separate=true,tag=X,multilingual-rendering=common]
       ====
       XYZ
       ====
@@ -420,11 +424,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>
               <termnote id="_">
               <p id="_">This is a note</p>
             </termnote>
-             <termnote id='_'>
+             <termnote id='_' tag='X' multilingual-rendering='common'>
         <p id='_'>XYZ</p>
       </termnote>
             </term>
@@ -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>
@@ -510,6 +514,59 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "processes nested terms" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      == Terms and Definitions
+
+      [.term]
+      === Term1
+
+      definition
+
+      NOTE: Note 1
+
+      ==== Term11
+      definition2
+
+      NOTE: Note 2
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+                <sections>
+           <clause id='_' obligation='normative'>
+             <title>Terms and definitions</title>
+             <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
+             <terms id='_' obligation='normative'>
+               <title>Term1</title>
+               <p id='_'>definition</p>
+               <note id='_'>
+                 <p id='_'>Note 1</p>
+               </note>
+               <term id='term-term11'>
+                 <preferred>
+                   <expression>
+                     <name>Term11</name>
+                   </expression>
+                 </preferred>
+                 <definition>
+                   <verbaldefinition>
+                     <p id='_'>definition2</p>
+                   </verbaldefinition>
+                 </definition>
+                 <termnote id='_'>
+                   <p id='_'>Note 2</p>
+                 </termnote>
+               </term>
+             </terms>
+           </clause>
+         </sections>
+       </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "processes notes" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -520,7 +577,7 @@ RSpec.describe Asciidoctor::Standoc do
       [[ABC]]
       NOTE: This is a note
 
-      [NOTE,keep-separate=true,number=7,subsequence=A,beforeclauses=true,keep-with-next=true,keep-lines-together=true,type=classified]
+      [NOTE,keep-separate=true,number=7,subsequence=A,beforeclauses=true,keep-with-next=true,keep-lines-together=true,type=classified,tag=X,multilingual-rendering=common]
       ====
       XYZ
       ====
@@ -533,7 +590,7 @@ RSpec.describe Asciidoctor::Standoc do
              <p id="_">This is a note</p>
            </note>
            </foreword></preface><sections>
-             <note id='_' number="7" subsequence="A" keep-with-next="true" keep-lines-together="true" type="classified">
+             <note id='_' number="7" subsequence="A" keep-with-next="true" keep-lines-together="true" type="classified" tag='X' multilingual-rendering='common'>
         <p id='_'>XYZ</p>
       </note>
            <clause id="_" inline-header="false" obligation="normative">
@@ -555,7 +612,7 @@ RSpec.describe Asciidoctor::Standoc do
       #{ASCIIDOC_BLANK_HDR}
 
       [[ABC]]
-      [alt=Literal,keep-with-next=true,keep-lines-together=true]
+      [alt=Literal,keep-with-next=true,keep-lines-together=true,tag=X,multilingual-rendering=common]
       ....
       <LITERAL>
       FIGURATIVE
@@ -564,7 +621,7 @@ RSpec.describe Asciidoctor::Standoc do
     output = <<~OUTPUT
       #{BLANK_HDR}
        <sections>
-           <figure id="ABC" keep-with-next="true" keep-lines-together="true">
+           <figure id="ABC" keep-with-next="true" keep-lines-together="true" tag='X' multilingual-rendering='common'>
         <pre alt="Literal" id="_">&lt;LITERAL&gt;
         FIGURATIVE
         </pre>
@@ -601,7 +658,7 @@ RSpec.describe Asciidoctor::Standoc do
       #{ASCIIDOC_BLANK_HDR}
 
       [[ABC]]
-      [CAUTION,type=Safety Precautions,keep-with-next="true",keep-lines-together="true"]
+      [CAUTION,type=Safety Precautions,keep-with-next="true",keep-lines-together="true",tag=X,multilingual-rendering=common]
       .Precautions
       ====
       While werewolves are hardy community members, keep in mind the following dietary concerns:
@@ -614,7 +671,7 @@ RSpec.describe Asciidoctor::Standoc do
     output = <<~OUTPUT
       #{BLANK_HDR}
       <sections>
-         <admonition id="ABC" type="safety precautions" keep-with-next="true" keep-lines-together="true">
+         <admonition id="ABC" type="safety precautions" keep-with-next="true" keep-lines-together="true" tag='X' multilingual-rendering='common'>
         <name>Precautions</name><p id="_">While werewolves are hardy community members, keep in mind the following dietary concerns:</p>
        <ol id="_" type="arabic">
          <li>
@@ -643,7 +700,7 @@ RSpec.describe Asciidoctor::Standoc do
       === Term1
 
       [[ABC]]
-      [example]
+      [example,tag=X,multilingual-rendering=common]
       This is an example
     INPUT
     output = <<~OUTPUT
@@ -653,8 +710,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-term1">
-        <preferred>Term1</preferred>
-      <termexample id="ABC">
+        <preferred><expression><name>Term1</name></expression></preferred>
+      <termexample id="ABC" tag='X' multilingual-rendering='common'>
         <p id="_">This is an example</p>
       </termexample></term>
       </terms>
@@ -713,7 +770,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>
@@ -733,7 +790,7 @@ RSpec.describe Asciidoctor::Standoc do
       #{ASCIIDOC_BLANK_HDR}
 
       [[ABC]]
-      [example,subsequence=A,keep-with-next=true,keep-lines-together=next]
+      [example,subsequence=A,keep-with-next=true,keep-lines-together=next,tag=X,multilingual-rendering=common]
       .Title
       ====
       This is an example
@@ -754,7 +811,7 @@ RSpec.describe Asciidoctor::Standoc do
     output = <<~OUTPUT
       #{BLANK_HDR}
        <sections>
-         <example id="ABC" subsequence="A"  keep-with-next='true' keep-lines-together='next'>
+         <example id="ABC" subsequence="A"  keep-with-next='true' keep-lines-together='next' tag='X' multilingual-rendering='common'>
          <name>Title</name>
         <p id="_">This is an example</p>
        <p id="_">Amen</p></example>
@@ -940,7 +997,7 @@ RSpec.describe Asciidoctor::Standoc do
   it "accepts attributes on images" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
-      [height=4,width=3,alt="IMAGE",filename="riceimg1.png",titleattr="TITLE"]
+      [height=4,width=3,alt="IMAGE",filename="riceimg1.png",titleattr="TITLE",tag=X,multilingual-rendering=common]
       .Caption
       image::spec/examples/rice_images/rice_image1.png[]
 
@@ -948,7 +1005,7 @@ RSpec.describe Asciidoctor::Standoc do
     output = <<~OUTPUT
       #{BLANK_HDR}
               <sections>
-         <figure id="_"><name>Caption</name>
+         <figure id="_" tag='X' multilingual-rendering='common'><name>Caption</name>
          <image src="spec/examples/rice_images/rice_image1.png" id="_" mimetype="image/png" height="4" width="3" title="TITLE" alt="IMAGE" filename="riceimg1.png"/>
        </figure>
        </sections>
@@ -1010,18 +1067,62 @@ 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
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
-      [align=right,keep-with-next=true,keep-lines-together=true]
+      [align=right,keep-with-next=true,keep-lines-together=true,tag=X,multilingual-rendering=common]
       This para is right-aligned.
     INPUT
     output = <<~OUTPUT
       #{BLANK_HDR}
       <sections>
-         <p align="right" id="_" keep-with-next="true" keep-lines-together="true">This para is right-aligned.</p>
+         <p align="right" id="_" keep-with-next="true" keep-lines-together="true" tag='X' multilingual-rendering='common'>This para is right-aligned.</p>
        </sections>
       </standard-document>
     OUTPUT
@@ -1034,7 +1135,7 @@ RSpec.describe Asciidoctor::Standoc do
       #{ASCIIDOC_BLANK_HDR}
 
       [[ABC]]
-      [quote, ISO, "ISO7301,section 1",align="right",keep-with-next=true,keep-lines-together=true]
+      [quote, ISO, "ISO7301,section 1",align="right",keep-with-next=true,keep-lines-together=true,tag=X,multilingual-rendering=common]
       ____
       Block quotation
       ____
@@ -1042,7 +1143,7 @@ RSpec.describe Asciidoctor::Standoc do
     output = <<~OUTPUT
       #{BLANK_HDR}
        <sections>
-         <quote id="ABC" align="right" keep-with-next="true" keep-lines-together="true">
+         <quote id="ABC" align="right" keep-with-next="true" keep-lines-together="true" tag='X' multilingual-rendering='common'>
          <source type="inline" bibitemid="ISO7301" citeas="">
          <localityStack>
         <locality type="section"><referenceFrom>1</referenceFrom></locality>
@@ -1064,7 +1165,7 @@ RSpec.describe Asciidoctor::Standoc do
 
       [[ABC]]
       .Caption
-      [source%unnumbered,ruby,number=3,filename=sourcecode1.rb,keep-with-next=true,keep-lines-together=true]
+      [source%unnumbered,ruby,number=3,filename=sourcecode1.rb,keep-with-next=true,keep-lines-together=true,tag=X,multilingual-rendering=common]
       --
       puts "Hello, world."
       %w{a b c}.each do |x|
@@ -1075,7 +1176,7 @@ RSpec.describe Asciidoctor::Standoc do
     output = <<~OUTPUT
       #{BLANK_HDR}
        <sections>
-         <sourcecode id="ABC" lang="ruby" filename="sourcecode1.rb" unnumbered="true" number="3" keep-with-next="true" keep-lines-together="true">
+         <sourcecode id="ABC" lang="ruby" filename="sourcecode1.rb" unnumbered="true" number="3" keep-with-next="true" keep-lines-together="true" tag='X' multilingual-rendering='common'>
         <name>Caption</name>puts "Hello, world."
        %w{a b c}.each do |x|
          puts x
@@ -1124,6 +1225,8 @@ RSpec.describe Asciidoctor::Standoc do
 
       === Term1
 
+      Definition 0
+
       [.source]
       <<ISO2191,section=1>>
 
@@ -1150,15 +1253,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 +1271,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 +1308,8 @@ RSpec.describe Asciidoctor::Standoc do
 
       === Term1
 
+      Definition 0
+
       [.source]
       <<ISO2191,section=1>>, with adjustments
 
@@ -1220,8 +1328,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 +1342,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,10 +1363,82 @@ 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}
-      [.recommendation,label="/ogc/recommendation/wfs/2",subject="user;developer, implementer",inherit="/ss/584/2015/level/1; /ss/584/2015/level/2",options="unnumbered",type=verification,model=ogc]
+      [.recommendation,label="/ogc/recommendation/wfs/2",subject="user;developer, implementer",inherit="/ss/584/2015/level/1; /ss/584/2015/level/2",options="unnumbered",type=verification,model=ogc,tag=X,multilingual-rendering=common]
       ====
       I recommend this
       ====
@@ -1265,7 +1446,7 @@ RSpec.describe Asciidoctor::Standoc do
     output = <<~"OUTPUT"
                   #{BLANK_HDR}
              <sections>
-        <recommendation id="_" unnumbered="true" type="verification" model="ogc">
+        <recommendation id="_" unnumbered="true" type="verification" model="ogc" tag='X' multilingual-rendering='common'>
         <label>/ogc/recommendation/wfs/2</label>
       <subject>user</subject>
       <subject>developer, implementer</subject>
@@ -1285,7 +1466,7 @@ RSpec.describe Asciidoctor::Standoc do
     input = <<~"INPUT"
       #{ASCIIDOC_BLANK_HDR}
       [[ABC]]
-      [.requirement,subsequence="A",inherit="/ss/584/2015/level/1 &amp; /ss/584/2015/level/2",number=3,keep-with-next=true,keep-lines-together=true]
+      [.requirement,subsequence="A",inherit="/ss/584/2015/level/1 &amp; /ss/584/2015/level/2",number=3,keep-with-next=true,keep-lines-together=true,tag=X,multilingual-rendering=common]
       .Title
       ====
       I recommend this
@@ -1294,7 +1475,7 @@ RSpec.describe Asciidoctor::Standoc do
     output = <<~OUTPUT
       #{BLANK_HDR}
              <sections>
-        <requirement id="ABC" subsequence="A" number="3" keep-with-next="true" keep-lines-together="true">
+        <requirement id="ABC" subsequence="A" number="3" keep-with-next="true" keep-lines-together="true" tag='X' multilingual-rendering='common'>
               <title>Title</title>
         <inherit>/ss/584/2015/level/1 &amp; /ss/584/2015/level/2</inherit>
         <description><p id="_">I recommend this</p></description>
@@ -1312,7 +1493,7 @@ RSpec.describe Asciidoctor::Standoc do
       #{ASCIIDOC_BLANK_HDR}
 
       [[ABC]]
-      [.permission]
+      [.permission,tag=X,multilingual-rendering=common]
       ====
       I recommend this
       ====
@@ -1320,7 +1501,7 @@ RSpec.describe Asciidoctor::Standoc do
     output = <<~"OUTPUT"
                   #{BLANK_HDR}
              <sections>
-        <permission id="ABC">
+        <permission id="ABC" tag='X' multilingual-rendering='common'>
         <description><p id="_">I recommend this</p></description>
       </permission>
              </sections>

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'>