metanorma-iec 2.0.8 → 2.1.0

data/spec/isodoc/i18n_spec.rb

@@ -84,7 +84,7 @@ RSpec.describe IsoDoc do
       <language current="true">en</language>
       <ext>
       <doctype language="">international-standard</doctype><doctype language="fr">Norme internationale</doctype><doctype language="en">International Standard</doctype>
-      <horizontal language="">true</horizontal><horizontal language="fr">Norme horizontale</horizontal><horizontal language="en">Horizontal Standard</horizontal>
+      <horizontal language=''>true</horizontal><horizontal language="fr">Norme horizontale</horizontal><horizontal language="en">Horizontal Standard</horizontal>
       <function language="">emc</function><function language="fr">Publication fondamentale en CEM</function><function language="en">Basic EMC Publication</function>
       </ext>
       </bibdata>
@@ -224,12 +224,17 @@ RSpec.describe IsoDoc do
         </body>
       </html>
     OUTPUT
-    expect((IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
-    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({})
+      .convert("test", input, true)
+      .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
+      .to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({})
+      .convert("test", presxml, true)))
+      .to be_equivalent_to xmlpp(html)
   end
 
   it "defaults to English" do
-    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
       <language>tlh</language>
@@ -297,6 +302,7 @@ RSpec.describe IsoDoc do
        </bibliography>
        </iso-standard>
     INPUT
+    output = <<~OUTPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
       <bibdata>
       <language current="true">tlh</language>
@@ -362,6 +368,10 @@ RSpec.describe IsoDoc do
        </bibliography>
        </iso-standard>
     OUTPUT
+    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({})
+      .convert("test", input, true)
+      .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes French" do
@@ -445,7 +455,7 @@ RSpec.describe IsoDoc do
       <language current="true">fr</language>
       <ext>
       <doctype language="">international-standard</doctype><doctype language="fr">Norme internationale</doctype><doctype language="en">International Standard</doctype>
-      <horizontal language="">false</horizontal>
+      <horizontal>false</horizontal>
       <function language="">emc</function><function language="fr">Publication fondamentale en CEM</function><function language="en">Basic EMC Publication</function>
       </ext>
       </bibdata>
@@ -586,7 +596,12 @@ RSpec.describe IsoDoc do
            </body>
          </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
-    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({})
+      .convert("test", input, true)
+      .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
+      .to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({})
+      .convert("test", presxml, true)))
+      .to be_equivalent_to xmlpp(html)
   end
 end

data/spec/isodoc/iev_spec.rb

@@ -171,7 +171,7 @@ RSpec.describe IsoDoc do
             <stage language="">60</stage>
                   <stage language='fr'>Norme internationale</stage>
                   <stage language='en'>International standard</stage>
-            <substage language="">60</substage>
+            <substage>60</substage>
           </status>
           <copyright>
             <from>2020</from>
@@ -183,7 +183,7 @@ RSpec.describe IsoDoc do
             </owner>
           </copyright>
           <ext>
-            <doctype language="">article</doctype>
+            <doctype>article</doctype>
             <editorialgroup>
               <technical-committee/>
               <subcommittee/>
@@ -598,7 +598,7 @@ RSpec.describe IsoDoc do
             <doctype language=''>international-standard</doctype>
             <doctype language='fr'>Norme internationale</doctype>
             <doctype language='en'>International Standard</doctype>
-            <horizontal language=''>false</horizontal>
+            <horizontal>false</horizontal>
             <structuredidentifier>
               <project-number part='192'>IEC 60050</project-number>
             </structuredidentifier>
@@ -621,7 +621,7 @@ RSpec.describe IsoDoc do
                 <termnote id='_5f49cfad-e57e-5029-78cf-5b7e3e10a3b3'>
                   <name>Note 1 to entry</name>
                   <p id='_8c830e60-8f09-73a2-6393-2a27d9c5b1ce'>Dependability includes availability (<em>192-01-02</em>
-                     (<xref target='term-sub-item'>192-01-02</xref>),
+                     (<xref target='term-sub-item'><span class='citesec'>192-01-02</span></xref>),
                     <em>191-01-02</em>
                      [term defined in
                     <termref base='IEV' target='191-01-02'/>])</p>
@@ -740,7 +740,7 @@ RSpec.describe IsoDoc do
                    CONTRAST: 
                    <strong>Fifth Designation</strong>
                     (
-                   <xref target='paddy1'>192-01-02</xref>
+                   <xref target='paddy1'><span class='citesec'>192-01-02</span></xref>
                    )
                  </p>
                  <termexample id='_671a1994-4783-40d0-bc81-987d06ffb740'>
@@ -786,14 +786,14 @@ RSpec.describe IsoDoc do
                    CONTRASTEZ: 
                    <strong>Designation cinqui&#xE8;me</strong>
                     (
-                   <xref target='paddy1'>192-01-02</xref>
+                   <xref target='paddy1'><span class='citesec'>192-01-02</span></xref>
                    )
                  </p>
                  <p>
                    VOIR: 
                    <strong>Designation sixi&#xE8;me</strong>
                     (
-                   <xref target='paddy1'>192-01-02</xref>
+                   <xref target='paddy1'><span class='citesec'>192-01-02</span></xref>
                    )
                  </p>
                  <termexample id='_671a1994-4783-40d0-bc81-987d06ffb741'>