metanorma-iso 2.1.2 → 2.1.5

data/spec/isodoc/postproc_spec.rb

@@ -126,66 +126,6 @@ RSpec.describe IsoDoc do
     expect(File.exist?("spec/assets/iso.pdf")).to be true
   end
 
-  it "converts annex subheadings to h2Annex class for Word" do
-    IsoDoc::Iso::WordConvert
-      .new(WORD_HTML_CSS.dup)
-      .convert("test", <<~"INPUT", false)
-        <iso-standard xmlns="http://riboseinc.com/isoxml">
-          <annex id="P" inline-header="false" obligation="normative">
-            <title>Annex</title>
-            <clause id="Q" inline-header="false" obligation="normative">
-              <title>A.1
-                <tab/>
-                Annex A.1</title>
-            </clause>
-            <appendix id="Q2" inline-header="false" obligation="normative">
-              <title>Appendix 1
-                <tab/>
-                An Appendix</title>
-            </appendix>
-          </annex>
-          <bibliography>
-            <references id="R" normative="false"><title>Bibliography</title></references>
-          </bibliography>
-        </iso-standard>
-      INPUT
-
-    word = File.read("test.doc", encoding: "UTF-8")
-      .sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">')
-      .sub(%r{<br[^>]*>\s*<div class="colophon".*$}m, "")
-
-    expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      <div class="WordSection3">
-        <p class="zzSTDTitle1"/>
-        <p class="MsoNormal">
-          <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
-        </p>
-        <div class="Section3">
-          <a id="P" name="P"/>
-          <p class="ANNEX">Annex</p>
-          <div>
-            <a id="Q" name="Q"/>
-            <p class="h2Annex">A.1
-              <span style="mso-tab-count:1">  </span>
-              Annex A.1</p>
-          </div>
-          <div>
-            <a id="Q2" name="Q2"/>
-            <p class="h2Annex">Appendix 1
-              <span style="mso-tab-count:1">  </span>
-              An Appendix</p>
-          </div>
-        </div>
-        <p class='MsoNormal'>
-          <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
-        </p>
-        <div>
-          <p class='BiblioTitle'>Bibliography</p>
-        </div>
-      </div>
-    OUTPUT
-  end
-
   it "populates Word template with terms reference labels" do
     IsoDoc::Iso::WordConvert
       .new(WORD_HTML_CSS.dup)
@@ -817,7 +757,7 @@ RSpec.describe IsoDoc do
         </p>
         <div class="Section3">
           <a id="P" name="P"/>
-          <div class="figure">
+          <div class="MsoNormal" style='text-align:center;'>
             <a id="samplecode" name="samplecode"/>
             <p class="MsoNormal">Hello</p>
             <p class="MsoNormal">Key</p>
@@ -864,7 +804,7 @@ RSpec.describe IsoDoc do
       .sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">')
       .sub(%r{<br[^>]*>\s*<div class="colophon".*$}m, "")
     expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"OUTPUT")
-           <div class='WordSection3'>
+      <div class='WordSection3'>
          <p class='zzSTDTitle1'/>
          <p class='MsoNormal'>
            <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>

data/spec/isodoc/section_spec.rb

@@ -576,17 +576,11 @@ RSpec.describe IsoDoc do
              <ext>
                <doctype>standard</doctype>
                <subdoctype>vocabulary</subdoctype>
-               <editorialgroup identifier='ISO/ / / '>
+               <editorialgroup identifier='ISO'>
                <agency>ISO</agency>
-                 <technical-committee/>
-                 <subcommittee/>
-                 <workgroup/>
                </editorialgroup>
-               <approvalgroup identifier='ISO/ / / '>
+               <approvalgroup identifier='ISO'>
                <agency>ISO</agency>
-                 <technical-committee/>
-                 <subcommittee/>
-                 <workgroup/>
                </approvalgroup>
                <stagename>International standard</stagename>
              </ext>

data/spec/isodoc/terms_spec.rb

@@ -249,4 +249,66 @@ RSpec.describe IsoDoc do
       .sub(%r{</div>\s*<br.*$}m, "")))
       .to be_equivalent_to xmlpp(word)
   end
+
+  it "processes related terms" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <sections>
+      <terms id='A' obligation='normative'>
+            <title>Terms and definitions</title>
+            <term id='second'>
+        <preferred>
+          <expression>
+            <name>Second Term</name>
+          </expression>
+        <field-of-application>Field</field-of-application>
+        <usage-info>Usage Info 1</usage-info>
+        </preferred>
+        <definition><verbal-definition>Definition 1</verbal-definition></definition>
+      </term>
+      <term id="C">
+      <preferred language='fr' script='Latn' type='prefix'>
+                <expression>
+                  <name>First Designation</name>
+                  </expression></preferred>
+        <related type='contrast'>
+          <preferred>
+            <expression>
+              <name>Fifth Designation</name>
+              <grammar>
+                <gender>neuter</gender>
+              </grammar>
+            </expression>
+          </preferred>
+          <xref target='second'/>
+        </related>
+        <definition><verbal-definition>Definition 2</verbal-definition></definition>
+      </term>
+          </terms>
+        </sections>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+       <?xml version='1.0'?>
+          <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <sections>
+          <terms id='A' obligation='normative' displayorder='1'>
+            <title depth='1'>1<tab/>Terms and definitions</title>
+            <term id='second'>
+              <name>1.1</name>
+              <preferred><strong>Second Term</strong>, &#x3c;Field, Usage Info 1&#x3e;</preferred>
+              <definition>Definition 1</definition>
+            </term>
+            <term id='C'>
+              <name>1.2</name>
+              <preferred language='fr' script='Latn' type='prefix'><strong>First Designation</strong></preferred>
+              <definition>Definition 2</definition>
+            </term>
+          </terms>
+        </sections>
+      </iso-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
+       .convert("test", input, true))).to be_equivalent_to xmlpp(output)
+  end
 end

data/spec/isodoc/word_dis_spec.rb

@@ -673,6 +673,66 @@ RSpec.describe IsoDoc do
       .to be_equivalent_to xmlpp(word)
   end
 
+  it "deals with lists and paragraphs" do
+    input = <<~INPUT
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <bibdata>
+        <status><stage>50</stage></status>
+      </bibdata>
+      <sections>
+      <clause id="A">
+      <p id="_eb2fd8cd-5cbe-1f1f-7bdb-282868a25828">ISO and IEC maintain terminological databases for use in
+      standardization at the following addresses:</p>
+
+      <ul id="_6f8dbb84-61d9-f774-264e-b7e249cf44d1">
+      <li> <p id="_9f56356a-3a58-64c4-e59e-a23ca3da7e88">ISO Online browsing platform: available at
+        <link target="https://www.iso.org/obp"/></p></li>
+      <li> <p id="_5dc6886f-a99c-e420-a29d-2aa6ca9f376e">IEC Electropedia: available at
+      <link target="https://www.electropedia.org"/>
+      </p> </li> </ul>
+      </clause>
+      </sections>
+      </iso-standard>
+    INPUT
+    word = <<~OUTPUT
+      <div class='WordSection3'>
+         <p class='zzSTDTitle'/>
+         <div>
+           <a name='A' id='A'/>
+           <h1>1</h1>
+           <p class='MsoBodyText'>
+             <a name='_eb2fd8cd-5cbe-1f1f-7bdb-282868a25828' id='_eb2fd8cd-5cbe-1f1f-7bdb-282868a25828'/>
+             ISO and IEC maintain terminological databases for use in standardization
+             at the following addresses:
+           </p>
+           <p class='ListContinue1'>
+             —
+             <span style='mso-tab-count:1'> </span>
+               ISO Online browsing platform: available at
+               <a href='https://www.iso.org/obp'>https://www.iso.org/obp</a>
+           </p>
+           <p class='ListContinue1'>
+             —
+             <span style='mso-tab-count:1'> </span>
+               IEC Electropedia: available at
+               <a href='https://www.electropedia.org'>https://www.electropedia.org</a>
+           </p>
+         </div>
+       </div>
+    OUTPUT
+    FileUtils.rm_f "test.doc"
+    presxml = IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true)
+    IsoDoc::Iso::WordConvert.new({}).convert("test", presxml, false)
+    expect(File.exist?("test.doc")).to be true
+    output = File.read("test.doc", encoding: "UTF-8")
+      .sub(/^.*<html/m, "<html")
+      .sub(/<\/html>.*$/m, "</html>")
+    expect(xmlpp(Nokogiri::XML(output)
+      .at("//xmlns:div[@class = 'WordSection3']").to_xml))
+      .to be_equivalent_to xmlpp(word)
+  end
+
   it "deals with ordered list start" do
     input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -950,9 +1010,9 @@ RSpec.describe IsoDoc do
                 Note
               </p>
             </div>
-            <div style='page-break-after:avoid;'>
+            <div class="Figureexample" style='page-break-after:avoid;'>
               <a name='D' id='D'/>
-              <p class='Example'>
+              <p class='Figureexample'>
                 <span style='mso-tab-count:1'>  </span>
                 Example
               </p>
@@ -1627,7 +1687,7 @@ RSpec.describe IsoDoc do
                  <span style='mso-tab-count:1'>  </span>
                  Example start
                </p>
-              <p class='Code--'>X</p>
+              <p class='Code--' style='margin-bottom:12pt;'>X</p>
                <p class='Exampleindentcontinued'>Example continued</p>
              </div>
               <p class='Code-'>X</p>
@@ -1883,4 +1943,126 @@ RSpec.describe IsoDoc do
         </div>
       OUTPUT
   end
+
+  it "deals with Simple Template styles" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <bibdata>
+          <status><stage>20</stage></status>
+        </bibdata>
+         <sections>
+        <clause id="A"><title>Clause Title</title>
+        <ul><li>List</li></ul>
+        <note id="B"><p>Note</p>
+        <ul><li>Note List</li></ul>
+        </note>
+        <example id="C"><p>Example</p>
+        <ul><li>Example List</li></ul>
+        </example>
+        <figure id="D"><name>Figure Title</name></figure>
+        <sourcecode id="E">XYZ</sourcecode>
+        <table id="F"><name>Table</name></table>
+        </clause>
+        </sections>
+        <annex id="G"><title>Annex Title</title>
+        <table id="H"><name>Annex Table</name></table>
+        <clause id="I"><title>Annex Clause Title</title>
+        </clause>
+        </annex>
+        <bibliography>
+        <references id="_normative_references" normative="false" obligation="informative">
+            <title>Bibliography</title>
+            <bibitem id="ISO712" type="standard">
+            <formattedref>ALUFFI, Paolo, ed. (2022). <em><span class="std_class">Facets of Algebraic Geometry: A Collection in Honor of William Fulton's 80th Birthday</span></em>, 1st edition. Cambridge, UK: CUP.</formattedref>
+            <docidentifier type="ISO">ISO/IEC 712-3:2022</docidentifier>
+            </bibitem>
+        </references>
+        </bibliography>
+      </iso-standard>
+    INPUT
+    word = <<~WORD
+       <div class='WordSection3'>
+         <p class='zzSTDTitle1'/>
+         <div>
+           <a name='A' id='A'/>
+           <h1>Clause Title</h1>
+           <p style='mso-list:l3 level1 lfo1;' class='MsoListParagraphCxSpFirst'>List</p>
+           <div class='Note'>
+             <a name='B' id='B'/>
+             <p class='Note'>
+               <span class='note_label'/>
+               <span style='mso-tab-count:1'>  </span>
+               Note
+             </p>
+             <p style='font-size:10.0pt;;mso-list:l3 level1 lfo2;' class='MsoListParagraphCxSpFirst'>Note List</p>
+           </div>
+           <div class='Example'>
+             <a name='C' id='C'/>
+             <p class='Example'>
+               <span style='mso-tab-count:1'>  </span>
+             Example
+             </p>
+             <p style='font-size:10.0pt;;mso-list:l3 level1 lfo3;' class='MsoListParagraphCxSpFirst'>Example List</p>
+           </div>
+           <div class='MsoNormal'  style='text-align:center;'>
+             <a name='D' id='D'/>
+             <p class='FigureTitle' style='text-align:center;'>Figure Title</p>
+           </div>
+           <p class='Code'>
+             <a name='E' id='E'/>
+             XYZ
+           </p>
+           <p class='Tabletitle' style='text-align:center;'>Table</p>
+           <div align='center' class='table_container'>
+             <table class='MsoISOTable' style='mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
+               <a name='F' id='F'/>
+             </table>
+           </div>
+         </div>
+         <p class='MsoNormal'>
+           <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+         </p>
+         <div class='Section3'>
+           <a name='G' id='G'/>
+           <p class='ANNEX'>Annex Title</p>
+           <p class='AnnexTableTitle' style='text-align:center;'>Annex Table</p>
+           <div align='center' class='table_container'>
+             <table class='MsoISOTable' style='mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
+               <a name='H' id='H'/>
+             </table>
+           </div>
+           <div>
+             <a name='I' id='I'/>
+             <p class='a2'>Annex Clause Title</p>
+           </div>
+         </div>
+         <p class='MsoNormal'>
+           <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+         </p>
+         <div>
+           <p class='BiblioTitle'>Bibliography</p>
+           <p class='MsoNormal'>
+             <a name='ISO712' id='ISO712'/>
+             [1]
+             <span style='mso-tab-count:1'>  </span>
+             ISO/IEC 712-3:2022, ALUFFI, Paolo, ed. (2022). 
+             <i>
+               Facets of Algebraic Geometry: A Collection in Honor of William Fulton's
+               80th Birthday
+             </i>
+             , 1st edition. Cambridge, UK: CUP.
+           </p>
+         </div>
+       </div>
+    WORD
+    FileUtils.rm_f "test.doc"
+    IsoDoc::Iso::WordConvert.new({}).convert("test", input, false)
+    expect(File.exist?("test.doc")).to be true
+    output = File.read("test.doc", encoding: "UTF-8")
+      .sub(/^.*<html/m, "<html")
+      .sub(/<\/html>.*$/m, "</html>")
+    expect(strip_guid(xmlpp(Nokogiri::XML(output)
+      .at("//xmlns:div[@class = 'WordSection3']").to_xml)))
+      .to be_equivalent_to xmlpp(word)
+  end
 end

data/spec/metanorma/amd_spec.rb

@@ -352,15 +352,9 @@ RSpec.describe Metanorma::ISO do
             <doctype>amendment</doctype>
             <editorialgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </editorialgroup>
             <approvalgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </approvalgroup>
             <structuredidentifier>
               <project-number amendment="1" part="1">17301</project-number>
@@ -431,15 +425,9 @@ RSpec.describe Metanorma::ISO do
             <doctype>amendment</doctype>
             <editorialgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </editorialgroup>
             <approvalgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </approvalgroup>
             <structuredidentifier>
               <project-number amendment="1" part="1">17301</project-number>
@@ -507,17 +495,11 @@ RSpec.describe Metanorma::ISO do
           </copyright>
           <ext>
             <doctype>amendment</doctype>
-            <editorialgroup>
+             <editorialgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </editorialgroup>
             <approvalgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </approvalgroup>
             <structuredidentifier>
               <project-number amendment="1" part="1">17301</project-number>
@@ -586,17 +568,11 @@ RSpec.describe Metanorma::ISO do
           </copyright>
           <ext>
             <doctype>technical-corrigendum</doctype>
-            <editorialgroup>
+             <editorialgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </editorialgroup>
             <approvalgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </approvalgroup>
             <structuredidentifier>
               <project-number corrigendum="3" part="1">17301</project-number>
@@ -665,17 +641,11 @@ RSpec.describe Metanorma::ISO do
           </copyright>
           <ext>
             <doctype>technical-corrigendum</doctype>
-            <editorialgroup>
+                        <editorialgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </editorialgroup>
             <approvalgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </approvalgroup>
             <structuredidentifier>
               <project-number part='1' corrigendum='3'>17301</project-number>
@@ -743,17 +713,11 @@ RSpec.describe Metanorma::ISO do
           </copyright>
           <ext>
             <doctype>technical-corrigendum</doctype>
-            <editorialgroup>
+                        <editorialgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </editorialgroup>
             <approvalgroup>
              <agency>ISO</agency>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
             </approvalgroup>
             <structuredidentifier>
               <project-number corrigendum="3" part="1">17301</project-number>