metanorma-iso 1.9.5 → 1.10.2

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>
+          <verbaldefinition>
+            <p id='_'>Definition</p>
+          </verbaldefinition>
+        </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>
+          <verbaldefinition>
+            <p id='_'>Definition</p>
+          </verbaldefinition>
+        </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><verbaldefinition>
                 <p id="_">Time</p>
-              </definition>
+              </verbaldefinition></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><verbaldefinition>
+                <p id="_">Time</p></verbaldefinition></definition>
             </term>
           </terms>
         </sections>
@@ -132,6 +136,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>
@@ -143,8 +148,11 @@ RSpec.describe Asciidoctor::ISO do
                     </msub>
                   </math>
                 </stem>
+                </name></letter-symbol>
               </preferred>
               <definition>
+                <verbaldefinition><p id="_">This paragraph is extraneous</p></verbaldefinition>
+                <nonverbalrepresentation>
                 <formula id="_">
                   <stem type="MathML">
                     <math xmlns="http://www.w3.org/1998/Math/MathML">
@@ -159,8 +167,7 @@ RSpec.describe Asciidoctor::ISO do
                     </math>
                   </stem>
                 </formula>
-                <p id="_">This paragraph is extraneous</p>
-              </definition>
+              </nonverbalrepresentation></definition>
             </term>
           </terms>
         </sections>
@@ -195,10 +202,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><verbaldefinition>
                 <p id="_">This paragraph is extraneous</p>
-              </definition>
+              </verbaldefinition></definition>
             </term>
           </terms>
         </sections>
@@ -433,6 +440,8 @@ RSpec.describe Asciidoctor::ISO do
 
       === Term1
 
+      Definition
+
       [.source]
       <<ISO2191,section=1>>
     INPUT
@@ -443,8 +452,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>
+          <verbaldefinition>
+            <p id='_'>Definition</p>
+          </verbaldefinition>
+        </definition>
+        <termsource status='identical' type='authoritative'>
                 <origin bibitemid="ISO2191" citeas="" type="inline">
                   <localityStack>
                     <locality type="section">
@@ -1241,7 +1255,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 +1306,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 +1370,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 +1435,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 +1493,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>

data/spec/asciidoctor/refs_spec.rb

@@ -5,7 +5,7 @@ require "relaton_ietf"
 RSpec.describe Asciidoctor::ISO do
   it "processes draft ISO reference" do
     mock_fdis
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ISOBIB_BLANK_HDR}
       == Clause
       <<iso123>>
@@ -20,6 +20,7 @@ RSpec.describe Asciidoctor::ISO do
       * [[[iso123,ISO 123:--]]] footnote:[The standard is in press] _Standard_
       * [[[fdis,ISO/FDIS 17664-1]]] Title
     INPUT
+    output = <<~OUTPUT
       #{BLANK_HDR}
         <sections>
           <clause id="_" inline-header="false" obligation="normative">
@@ -169,10 +170,12 @@ RSpec.describe Asciidoctor::ISO do
         </bibliography>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes all-parts ISO reference" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       == Clause
@@ -184,6 +187,7 @@ RSpec.describe Asciidoctor::ISO do
 
       * [[[iso123,ISO 123:1066 (all parts)]]] _Standard_
     INPUT
+    output = <<~OUTPUT
       #{BLANK_HDR}
         <sections>
           <clause id="_" inline-header="false" obligation="normative">
@@ -219,16 +223,19 @@ RSpec.describe Asciidoctor::ISO do
         </bibliography>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes non-ISO reference in Normative References" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       [bibliography]
       == Normative References
 
       * [[[iso123,XYZ 123:1066 (all parts)]]] _Standard_
     INPUT
+    output = <<~OUTPUT
       #{BLANK_HDR}
         <sections>
 
@@ -248,16 +255,19 @@ RSpec.describe Asciidoctor::ISO do
         </bibliography>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes non-ISO reference in Bibliography" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       [bibliography]
       == Bibliography
 
       * [[[iso123,1]]] _Standard_
     INPUT
+    output = <<~OUTPUT
       #{BLANK_HDR}
         <sections>
 
@@ -275,6 +285,79 @@ RSpec.describe Asciidoctor::ISO do
         </bibliography>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "sort ISO references in Bibliography" do
+    VCR.use_cassette "sortrefs" do
+      input = <<~INPUT
+        #{ASCIIDOC_BLANK_HDR}
+        [bibliography]
+        == Bibliography
+
+        * [[[iso1,ISO 8000-110]]]
+        * [[[iso2,ISO 8000-61]]]
+        * [[[iso3,ISO 8000-8]]]
+        * [[[iso4,ISO 9]]]
+      INPUT
+      output = <<~OUTPUT
+              #{BLANK_HDR}
+                <sections> </sections>
+          <bibliography>
+            <references id='_' normative='false' obligation='informative'>
+              <title>Bibliography</title>
+              <bibitem id='iso4' type='standard'>
+                <docidentifier>ISO 9</docidentifier>
+                <docnumber>9</docnumber>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <name>International Organization for Standardization</name>
+                    <abbreviation>ISO</abbreviation>
+                  </organization>
+                </contributor>
+              </bibitem>
+              <bibitem id='iso3' type='standard'>
+                <docidentifier>ISO 8000-8</docidentifier>
+                <docnumber>8000-8</docnumber>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <name>International Organization for Standardization</name>
+                    <abbreviation>ISO</abbreviation>
+                  </organization>
+                </contributor>
+              </bibitem>
+              <bibitem id='iso2' type='standard'>
+                <docidentifier>ISO 8000-61</docidentifier>
+                <docnumber>8000-61</docnumber>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <name>International Organization for Standardization</name>
+                    <abbreviation>ISO</abbreviation>
+                  </organization>
+                </contributor>
+              </bibitem>
+              <bibitem id='iso1' type='standard'>
+                <docidentifier>ISO 8000-110</docidentifier>
+                <docnumber>8000-110</docnumber>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <name>International Organization for Standardization</name>
+                    <abbreviation>ISO</abbreviation>
+                  </organization>
+                </contributor>
+              </bibitem>
+            </references>
+          </bibliography>
+        </iso-standard>
+      OUTPUT
+      expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+        .to be_equivalent_to xmlpp(output)
+    end
   end
 
   private

data/spec/asciidoctor/section_spec.rb

@@ -95,7 +95,7 @@ RSpec.describe Asciidoctor::ISO do
               </li>
             </ul>
             <term id="term-term1">
-              <preferred>Term1</preferred>
+              <preferred><expression><name>Term1</name></expression></preferred>
             </term>
           </terms>
           <clause id="_" obligation="normative">
@@ -103,7 +103,7 @@ RSpec.describe Asciidoctor::ISO do
             <terms id="_" obligation="normative">
               <title>Normal Terms</title>
               <term id="term-term2">
-                <preferred>Term2</preferred>
+                <preferred><expression><name>Term2</name></expression></preferred>
               </term>
             </terms>
             <definitions id="_" obligation="normative">
@@ -292,7 +292,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/isodoc/i18n_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe IsoDoc do
             <terms id="I" obligation="normative">
               <title>Normal Terms</title>
               <term id="J">
-                <preferred>Term2</preferred>
+                <preferred><expression><name>Term2</name></expression></preferred>
               </term>
             </terms>
             <definitions id="K">
@@ -249,13 +249,18 @@ RSpec.describe IsoDoc do
         </body>
       </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true))
-      .sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(presxml)
-    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .sub(%r{<localized-strings>.*</localized-strings>}m, ""))
+      .to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", presxml, true)))
+      .to be_equivalent_to xmlpp(html)
   end
 
   it "defaults to English" do
-    output = IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true)
+    output = IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", <<~"INPUT", true)
       <iso-standard xmlns="http://riboseinc.com/isoxml">
         <bibdata>
           <language>tlh</language>
@@ -283,7 +288,7 @@ RSpec.describe IsoDoc do
             <terms id="I" obligation="normative">
               <title>Normal Terms</title>
               <term id="J">
-                <preferred>Term2</preferred>
+                <preferred><expression><name>Term2</name></expression></preferred>
               </term>
             </terms>
             <definitions id="K">
@@ -334,7 +339,8 @@ RSpec.describe IsoDoc do
         </bibliography>
       </iso-standard>
     INPUT
-    expect(xmlpp(output).sub(%r{<localized-strings>.*</localized-strings>}m, ""))
+    expect(xmlpp(output)
+      .sub(%r{<localized-strings>.*</localized-strings>}m, ""))
       .to be_equivalent_to xmlpp(<<~"OUTPUT")
         <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
           <bibdata>
@@ -457,7 +463,7 @@ RSpec.describe IsoDoc do
             <terms id="I" obligation="normative">
               <title>Normal Terms</title>
               <term id="J">
-                <preferred>Term2</preferred>
+                <preferred><expression><name>Term2</name></expression></preferred>
               </term>
             </terms>
             <definitions id="K">
@@ -686,9 +692,13 @@ RSpec.describe IsoDoc do
         </body>
       </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true))
-      .sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(presxml)
-    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .sub(%r{<localized-strings>.*</localized-strings>}m, ""))
+      .to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", presxml, true)))
+      .to be_equivalent_to xmlpp(html)
   end
 
   it "processes Simplified Chinese" do
@@ -728,7 +738,7 @@ RSpec.describe IsoDoc do
             <terms id="I" obligation="normative">
               <title>Normal Terms</title>
               <term id="J">
-                <preferred>Term2</preferred>
+                <preferred><expression><name>Term2</name></expression></preferred>
               </term>
             </terms>
             <definitions id="K">
@@ -989,8 +999,12 @@ RSpec.describe IsoDoc do
         </body>
       </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true))
-      .sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(presxml)
-    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .sub(%r{<localized-strings>.*</localized-strings>}m, ""))
+      .to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", presxml, true)))
+      .to be_equivalent_to xmlpp(html)
   end
 end

data/spec/isodoc/inline_spec.rb

@@ -399,7 +399,7 @@ RSpec.describe IsoDoc do
           <iso-standard xmlns="http://riboseinc.com/isoxml">
           <sections>
           <terms id="Terms">
-          <term id="B"><preferred>B</preferred>
+          <term id="B"><preferred><expression><name>B</name></expression></preferred>
           <p>
           <ul>
             <li><concept><refterm>term0</refterm>
@@ -774,7 +774,7 @@ RSpec.describe IsoDoc do
        <sections>
        <clause id="clause1"><title>Clause 1</title></clause>
        <terms id="A">
-       <term id="B"><preferred>B</preferred<
+       <term id="B"><preferred><expression><name>B</name></expression></preferred<
        <p>
        <ul>
        <li>

data/spec/isodoc/section_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe IsoDoc do
             <terms id="I" obligation="normative">
               <title>Normal Terms</title>
               <term id="J">
-                <preferred>Term2</preferred>
+                <preferred><expression><name>Term2</name></expression></preferred>
               </term>
             </terms>
             <definitions id="K">

data/spec/isodoc/table_spec.rb

@@ -368,14 +368,12 @@ RSpec.describe IsoDoc do
               </td>
             </tr>
           </tfoot>
-        </table>
-        <table class="dl">
-          <tr>
-            <td align="left" valign="top">
-              <p align="left" class="MsoNormal" style="margin-left:0pt;text-align:left;">Drago</p>
-            </td>
-            <td valign="top">A type of rice</td>
-          </tr>
+          <dl>
+        <dt>
+          <p align='left' style='margin-left:0pt;text-align:left;' class='MsoNormal'>Drago</p>
+        </dt>
+        <dd>A type of rice</dd>
+        </dl>
         </table>
       </div>
     OUTPUT