metanorma-iso 1.10.0 → 1.10.4

data/spec/asciidoctor/blocks_spec.rb

@@ -535,9 +535,9 @@ RSpec.describe Asciidoctor::ISO do
             <term id="term-term1">
               <preferred><expression><name>Term1</name></expression></preferred>
                       <definition>
-          <verbaldefinition>
+          <verbal-definition>
             <p id='_'>Definition</p>
-          </verbaldefinition>
+          </verbal-definition>
         </definition>
         <termsource status='identical' type='authoritative'>
                 <origin bibitemid="ISO2191" citeas="" type="inline">
@@ -577,9 +577,9 @@ RSpec.describe Asciidoctor::ISO do
             <term id="term-term1">
               <preferred><expression><name>Term1</name></expression></preferred>
                       <definition>
-          <verbaldefinition>
+          <verbal-definition>
             <p id='_'>Definition</p>
-          </verbaldefinition>
+          </verbal-definition>
         </definition>
         <termsource status='modified' type='authoritative'>
                 <origin bibitemid="ISO2191" citeas="" type="inline">
@@ -600,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><expression><name>Term1</name></expression></preferred>
-               <definition><verbaldefinition>
-                 <p id='_'>definition</p>
-               </verbaldefinition></definition>
-               <term id='term-term11'>
-                 <preferred><expression><name>Term11</name></expression></preferred>
-                 <definition><verbaldefinition>
-                   <p id='_'>definition2</p>
-                 </verbaldefinition></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

@@ -66,9 +66,9 @@ RSpec.describe Asciidoctor::ISO do
                 </stem>
                 </name></letter-symbol>
               </admitted>
-              <definition><verbaldefinition>
+              <definition><verbal-definition>
                 <p id="_">Time</p>
-              </verbaldefinition></definition>
+              </verbal-definition></definition>
             </term>
           </terms>
         </sections>
@@ -96,8 +96,8 @@ RSpec.describe Asciidoctor::ISO do
             <term id="term-tempus">
               <preferred><expression><name>Tempus</name></expression></preferred>
               <domain>relativity</domain>
-              <definition><verbaldefinition>
-                <p id="_">Time</p></verbaldefinition></definition>
+              <definition><verbal-definition>
+                <p id="_">Time</p></verbal-definition></definition>
             </term>
           </terms>
         </sections>
@@ -121,12 +121,15 @@ RSpec.describe Asciidoctor::ISO do
 
       === stem:[t_90]
 
+      [.definition]
+      --
       [stem]
       ++++
       t_A
       ++++
 
       This paragraph is extraneous
+      --
     INPUT
     output = <<~OUTPUT
       #{BLANK_HDR}
@@ -134,7 +137,7 @@ 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">
@@ -151,8 +154,7 @@ RSpec.describe Asciidoctor::ISO do
                 </name></letter-symbol>
               </preferred>
               <definition>
-                <verbaldefinition><p id="_">This paragraph is extraneous</p></verbaldefinition>
-                <nonverbalrepresentation>
+                <verbal-definition>
                 <formula id="_">
                   <stem type="MathML">
                     <math xmlns="http://www.w3.org/1998/Math/MathML">
@@ -167,7 +169,8 @@ RSpec.describe Asciidoctor::ISO do
                     </math>
                   </stem>
                 </formula>
-              </nonverbalrepresentation></definition>
+                <p id="_">This paragraph is extraneous</p></verbal-definition>
+              </definition>
             </term>
           </terms>
         </sections>
@@ -203,9 +206,9 @@ RSpec.describe Asciidoctor::ISO do
             </ul>
             <term id="term-time">
               <preferred><expression><name>Time</name></expression></preferred>
-              <definition><verbaldefinition>
+              <definition><verbal-definition>
                 <p id="_">This paragraph is extraneous</p>
-              </verbaldefinition></definition>
+              </verbal-definition></definition>
             </term>
           </terms>
         </sections>
@@ -454,9 +457,9 @@ RSpec.describe Asciidoctor::ISO do
             <term id="term-term1">
               <preferred><expression><name>Term1</name></expression></preferred>
                       <definition>
-          <verbaldefinition>
+          <verbal-definition>
             <p id='_'>Definition</p>
-          </verbaldefinition>
+          </verbal-definition>
         </definition>
         <termsource status='identical' type='authoritative'>
                 <origin bibitemid="ISO2191" citeas="" type="inline">

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,101 +285,177 @@ 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
 
   def mock_fdis
     expect(RelatonIso::IsoBibliography).to receive(:get)
-      .with("ISO/FDIS 17664-1", nil, lang: "en", title: "Title", usrlbl: nil) do
-        RelatonIsoBib::XMLParser.from_xml(<<~"OUTPUT")
-          <bibitem id="x" type="standard">
-            <fetched>#{Date.today}</fetched>
-            <title format="text/plain" language="fr" script="Latn" type="title-intro">Traitement de produits de soins de santé</title>
-            <title format="text/plain" language="fr" script="Latn" type="title-main">Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif</title>
-            <title format="text/plain" language="fr" script="Latn" type="title-part">Partie 1: Titre manque</title>
-            <title format="text/plain" language="fr" script="Latn" type="main">Traitement de produits de soins de santé — Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif — Partie 1: Titre manque</title>
-            <uri type="src">https://www.iso.org/standard/81720.html</uri>
-            <uri type="rss">https://www.iso.org/contents/data/standard/08/17/81720.detail.rss</uri>
-            <docidentifier type="ISO">ISO/FDIS 17664-1</docidentifier>
-            <docidentifier type="URN">urn:iso:std:iso-fdis:17664:-1:stage-50.00:ed-1:fr</docidentifier>
-            <docnumber>17664</docnumber>
-            <contributor>
-              <role type="publisher"/>
+      .with("ISO/FDIS 17664-1", nil, code: "ISO/FDIS 17664-1",
+                                     lang: "en", match: anything, ord: anything,
+                                     process: 1, year: nil,
+                                     title: "Title", usrlbl: nil) do
+      RelatonIsoBib::XMLParser.from_xml(<<~"OUTPUT")
+        <bibitem id="x" type="standard">
+          <fetched>#{Date.today}</fetched>
+          <title format="text/plain" language="fr" script="Latn" type="title-intro">Traitement de produits de soins de santé</title>
+          <title format="text/plain" language="fr" script="Latn" type="title-main">Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif</title>
+          <title format="text/plain" language="fr" script="Latn" type="title-part">Partie 1: Titre manque</title>
+          <title format="text/plain" language="fr" script="Latn" type="main">Traitement de produits de soins de santé — Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif — Partie 1: Titre manque</title>
+          <uri type="src">https://www.iso.org/standard/81720.html</uri>
+          <uri type="rss">https://www.iso.org/contents/data/standard/08/17/81720.detail.rss</uri>
+          <docidentifier type="ISO">ISO/FDIS 17664-1</docidentifier>
+          <docidentifier type="URN">urn:iso:std:iso-fdis:17664:-1:stage-50.00:ed-1:fr</docidentifier>
+          <docnumber>17664</docnumber>
+          <contributor>
+            <role type="publisher"/>
+            <organization>
+              <name>International Organization for Standardization</name>
+              <abbreviation>ISO</abbreviation>
+              <uri>www.iso.org</uri>
+            </organization>
+          </contributor>
+          <edition>1</edition>
+          <language>en</language>
+          <language>fr</language>
+          <script>Latn</script>
+          <status>
+            <stage>50</stage>
+            <substage>00</substage>
+          </status>
+          <copyright>
+            <from>unknown</from>
+            <owner>
               <organization>
-                <name>International Organization for Standardization</name>
-                <abbreviation>ISO</abbreviation>
-                <uri>www.iso.org</uri>
+                <name>ISO/FDIS</name>
               </organization>
-            </contributor>
-            <edition>1</edition>
-            <language>en</language>
-            <language>fr</language>
-            <script>Latn</script>
-            <status>
-              <stage>50</stage>
-              <substage>00</substage>
-            </status>
-            <copyright>
-              <from>unknown</from>
-              <owner>
+            </owner>
+          </copyright>
+          <relation type="obsoletes">
+            <bibitem type="standard">
+              <formattedref format="text/plain">ISO 17664:2017</formattedref>
+            </bibitem>
+          </relation>
+          <relation type="instance">
+            <bibitem type="standard">
+              <fetched>2020-11-03</fetched>
+              <title format="text/plain" language="fr" script="Latn" type="title-intro">Traitement de produits de soins de santé</title>
+              <title format="text/plain" language="fr" script="Latn" type="title-main">Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif</title>
+              <title format="text/plain" language="fr" script="Latn" type="title-part">Partie 1: Titre manque</title>
+              <title format="text/plain" language="fr" script="Latn" type="main">Traitement de produits de soins de santé — Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif — Partie 1: Titre manque</title>
+              <uri type="src">https://www.iso.org/standard/81720.html</uri>
+              <uri type="rss">https://www.iso.org/contents/data/standard/08/17/81720.detail.rss</uri>
+              <docidentifier type="ISO">ISO/FDIS 17664-1</docidentifier>
+              <docidentifier type="URN">urn:iso:std:iso-fdis:17664:-1:stage-50.00:ed-1:fr</docidentifier>
+              <docnumber>17664</docnumber>
+              <contributor>
+                <role type="publisher"/>
                 <organization>
-                  <name>ISO/FDIS</name>
+                  <name>International Organization for Standardization</name>
+                  <abbreviation>ISO</abbreviation>
+                  <uri>www.iso.org</uri>
                 </organization>
-              </owner>
-            </copyright>
-            <relation type="obsoletes">
-              <bibitem type="standard">
-                <formattedref format="text/plain">ISO 17664:2017</formattedref>
-              </bibitem>
-            </relation>
-            <relation type="instance">
-              <bibitem type="standard">
-                <fetched>2020-11-03</fetched>
-                <title format="text/plain" language="fr" script="Latn" type="title-intro">Traitement de produits de soins de santé</title>
-                <title format="text/plain" language="fr" script="Latn" type="title-main">Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif</title>
-                <title format="text/plain" language="fr" script="Latn" type="title-part">Partie 1: Titre manque</title>
-                <title format="text/plain" language="fr" script="Latn" type="main">Traitement de produits de soins de santé — Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif — Partie 1: Titre manque</title>
-                <uri type="src">https://www.iso.org/standard/81720.html</uri>
-                <uri type="rss">https://www.iso.org/contents/data/standard/08/17/81720.detail.rss</uri>
-                <docidentifier type="ISO">ISO/FDIS 17664-1</docidentifier>
-                <docidentifier type="URN">urn:iso:std:iso-fdis:17664:-1:stage-50.00:ed-1:fr</docidentifier>
-                <docnumber>17664</docnumber>
-                <contributor>
-                  <role type="publisher"/>
+              </contributor>
+              <edition>1</edition>
+              <language>en</language>
+              <language>fr</language>
+              <script>Latn</script>
+              <status>
+                <stage>50</stage>
+                <substage>00</substage>
+              </status>
+              <copyright>
+                <from>unknown</from>
+                <owner>
                   <organization>
-                    <name>International Organization for Standardization</name>
-                    <abbreviation>ISO</abbreviation>
-                    <uri>www.iso.org</uri>
+                    <name>ISO/FDIS</name>
                   </organization>
-                </contributor>
-                <edition>1</edition>
-                <language>en</language>
-                <language>fr</language>
-                <script>Latn</script>
-                <status>
-                  <stage>50</stage>
-                  <substage>00</substage>
-                </status>
-                <copyright>
-                  <from>unknown</from>
-                  <owner>
-                    <organization>
-                      <name>ISO/FDIS</name>
-                    </organization>
-                  </owner>
-                </copyright>
-                <relation type="obsoletes">
-                  <bibitem type="standard">
-                    <formattedref format="text/plain">ISO 17664:2017</formattedref>
-                  </bibitem>
-                </relation>
-                <place>Geneva</place>
-              </bibitem>
-            </relation>
-            <place>Geneva</place>
-          </bibitem>
-        OUTPUT
-      end
+                </owner>
+              </copyright>
+              <relation type="obsoletes">
+                <bibitem type="standard">
+                  <formattedref format="text/plain">ISO 17664:2017</formattedref>
+                </bibitem>
+              </relation>
+              <place>Geneva</place>
+            </bibitem>
+          </relation>
+          <place>Geneva</place>
+        </bibitem>
+      OUTPUT
+    end
   end
 end

data/spec/isodoc/i18n_spec.rb

@@ -111,7 +111,7 @@ RSpec.describe IsoDoc do
               <title depth="2">3.1<tab/>Normal Terms</title>
               <term id="J">
                 <name>3.1.1</name>
-                <preferred>Term2</preferred>
+                <preferred><strong>Term2</strong></preferred>
               </term>
             </terms>
             <definitions id="K" inline-header="true">
@@ -199,7 +199,7 @@ RSpec.describe IsoDoc do
                 <h2>3.1&#160; Normal Terms</h2>
 
                 <p class="TermNum" id="J">3.1.1</p>
-                <p class="Terms" style="text-align:left;">Term2</p>
+                <p class="Terms" style="text-align:left;"><b>Term2</b></p>
               </div>
               <div id="K">
                 <span class="zzMoveToFollowing">
@@ -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>
@@ -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>
@@ -368,7 +374,7 @@ RSpec.describe IsoDoc do
                 <title depth="2">3.1<tab/>Normal Terms</title>
                 <term id="J">
                   <name>3.1.1</name>
-                  <preferred>Term2</preferred>
+                  <preferred><strong>Term2</strong></preferred>
                 </term>
               </terms>
               <definitions id="K" inline-header="true">
@@ -538,7 +544,7 @@ RSpec.describe IsoDoc do
               <title depth="2">3.1<tab/>Normal Terms</title>
               <term id="J">
                 <name>3.1.1</name>
-                <preferred>Term2</preferred>
+                <preferred><strong>Term2</strong></preferred>
               </term>
             </terms>
             <definitions id="K" inline-header="true">
@@ -625,7 +631,7 @@ RSpec.describe IsoDoc do
               <div id="I">
                 <h2>3.1&#160; Normal Terms</h2>
                 <p class="TermNum" id="J">3.1.1</p>
-                <p class="Terms" style="text-align:left;">Term2</p>
+                <p class="Terms" style="text-align:left;"><b>Term2</b></p>
               </div>
               <div id="K">
                 <span class="zzMoveToFollowing">
@@ -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
@@ -831,7 +841,7 @@ RSpec.describe IsoDoc do
                 Normal Terms</title>
               <term id="J">
                 <name>3.1.1</name>
-                <preferred>Term2</preferred>
+                <preferred><strong>Term2</strong></preferred>
               </term>
             </terms>
             <definitions id="K" inline-header="true">
@@ -942,7 +952,7 @@ RSpec.describe IsoDoc do
               <h1>3 &#12288; Terms, definitions, symbols and abbreviated terms</h1>
               <div id="I"><h2>3.1 &#12288; Normal Terms</h2>
                 <p class="TermNum" id="J">3.1.1</p>
-                <p class="Terms" style="text-align:left;">Term2</p>
+                <p class="Terms" style="text-align:left;"><b>Term2</b></p>
               </div><div id="K">
               <span class='zzMoveToFollowing'>
                 <b>3.2&#12288;</b>
@@ -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