metanorma-iso 2.1.3 → 2.1.6

data/spec/isodoc/word_dis_spec.rb

@@ -1010,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>
@@ -1687,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>
@@ -1728,7 +1728,7 @@ RSpec.describe IsoDoc do
         <div class='WordSection3'>
                    <p class='zzSTDTitle'>
                  Date and time — Representations for information interchange —
-      <span style='font-weight:normal'>Part 1</span>
+      <span style='font-weight:normal'>Part 1:</span>
        Basic rules
           </p>
           <div>
@@ -1799,7 +1799,7 @@ RSpec.describe IsoDoc do
         <div class='WordSection3'>
                    <p class='zzSTDTitle'>
                        Date and time — Representations for information interchange —
-      <span style='font-weight:normal'>Part 1</span>
+      <span style='font-weight:normal'>Part 1:</span>
        Basic rules
       <span style='font-weight:normal'> AMENDMENT 1: Technical corrections</span>
           </p>
@@ -1842,11 +1842,9 @@ RSpec.describe IsoDoc do
                 <br/>
                 CH-1214 Vernier, Geneva, Switzerland
                 <br/>
-                Tel. + 41 22 749 01 11
+                Phone: +41 22 749 01 11
                 <br/>
-                Fax + 41 22 749 09 47
-                <br/>
-                copyright@iso.org
+                Email: copyright@iso.org
                 <br/>
                 www.iso.org</p>
             </clause>
@@ -1896,9 +1894,8 @@ RSpec.describe IsoDoc do
             </p>
             <p class='zzCopyright'> Ch. de Blandonnet 8 ?~@? CP 401 </p>
             <p class='zzCopyright'> CH-1214 Vernier, Geneva, Switzerland </p>
-            <p class='zzCopyright'> Tel. + 41 22 749 01 11 </p>
-            <p class='zzCopyright'> Fax + 41 22 749 09 47 </p>
-            <p class='zzCopyright'> copyright@iso.org </p>
+            <p class='zzCopyright'> Phone: +41 22 749 01 11 </p>
+            <p class='zzCopyright'> Email: copyright@iso.org </p>
             <p class='zzCopyright'> www.iso.org</p>
           </div>
         </div>
@@ -1935,12 +1932,133 @@ RSpec.describe IsoDoc do
             </p>
             <p class='zzCopyright' style='text-indent:20.15pt;'> Ch. de Blandonnet 8 ?~@? CP 401 </p>
             <p class='zzCopyright' style='text-indent:20.15pt;'> CH-1214 Vernier, Geneva, Switzerland </p>
-            <p class='zzCopyright' style='text-indent:20.15pt;'> Tel. + 41 22 749 01 11 </p>
-            <p class='zzCopyright' style='text-indent:20.15pt;'> Fax + 41 22 749 09 47 </p>
-            <p class='zzCopyright' style='text-indent:20.15pt;'> copyright@iso.org </p>
+            <p class='zzCopyright' style='text-indent:20.15pt;'> Phone: +41 22 749 01 11 </p>
+            <p class='zzCopyright' style='text-indent:20.15pt;'> Email: copyright@iso.org </p>
             <p class='zzCopyright' style='text-indent:20.15pt;'> www.iso.org</p>
           </div>
         </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/base_spec.rb

@@ -1008,14 +1008,11 @@ RSpec.describe Metanorma::ISO do
                   <title type='title-intro' format='text/plain' language='en' script='Latn'>Rubber latex</title>
                   <title type='title-main' format='text/plain' language='en' script='Latn'>Sampling</title>
                   <title type='main' format='text/plain' language='en' script='Latn'>Rubber latex&#8201;&#8212;&#8201;Sampling</title>
-                  <title type='title-intro' format='text/plain' language='fr' script='Latn'>Latex de caoutchouc</title>
-                  <title type='title-main' format='text/plain' language='fr' script='Latn'>&#201;chantillonnage</title>
-                  <title type='main' format='text/plain' language='fr' script='Latn'>Latex de caoutchouc&#8201;&#8212;&#8201;&#201;chantillonnage</title>
                   <uri type='src'>https://www.iso.org/standard/23281.html</uri>
                   <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
                   <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
                   <docidentifier type='ISO' primary="true">ISO 123:2001</docidentifier>
-                  <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:en,fr</docidentifier>
+                  <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
                   <docnumber>123</docnumber>
                   <date type='published'><on>2001-05</on></date>
                   <contributor>
@@ -1028,7 +1025,6 @@ RSpec.describe Metanorma::ISO do
                   </contributor>
                   <edition>3</edition>
                   <language>en</language>
-                  <language>fr</language>
                   <script>Latn</script>
           <abstract format='text/plain' language='en' script='Latn'>
             This International Standard specifies procedures for sampling natural
@@ -1036,16 +1032,6 @@ RSpec.describe Metanorma::ISO do
             artificial latices. It is also suitable for sampling rubber latex
             contained in drums, tank cars or tanks. The procedures may also be
             used for sampling plastics dispersions.
-          </abstract>
-          <abstract format='text/plain' language='fr' script='Latn'>
-            La pr&#233;sente Norme internationale sp&#233;cifie des m&#233;thodes
-            d&#8217;&#233;chantillonnage pour des concentr&#233;s de latex de
-            caoutchouc naturel et pour &#233;chantillonner des latex de caoutchouc
-            synth&#233;tique et des latex artificiels. Elle s&#8217;applique
-            &#233;galement &#224; l&#8217;&#233;chantillonnage de latex de
-            caoutchouc contenus dans des f&#251;ts, citernes routi&#232;res ou de
-            stockage. Le mode op&#233;ratoire peut aussi &#234;tre utilis&#233;
-            pour l&#8217;&#233;chantillonnage de dispersions de plastiques.
           </abstract>
                   <status>
                     <stage>90</stage>
@@ -1062,6 +1048,7 @@ RSpec.describe Metanorma::ISO do
                   <relation type='obsoletes'>
                     <bibitem type='standard'>
                       <formattedref format='text/plain'>ISO 123:1985</formattedref>
+                      <docidentifier type='ISO' primary='true'>ISO 123:1985</docidentifier>
                     </bibitem>
                   </relation>
                   <place>Geneva</place>
@@ -1088,7 +1075,7 @@ RSpec.describe Metanorma::ISO do
                  <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:72849:en</uri>
                  <uri type='rss'>https://www.iso.org/contents/data/standard/07/28/72849.detail.rss</uri>
                  <docidentifier type='ISO' primary="true">ISO 125</docidentifier>
-                 <docidentifier type='URN'>urn:iso:std:iso:125:stage-60.60:ed-7:en,fr</docidentifier>
+                 <docidentifier type='URN'>urn:iso:std:iso:125:stage-60.60:ed-7</docidentifier>
                  <docnumber>125</docnumber>
                  <contributor>
                    <role type='publisher'/>
@@ -1117,6 +1104,7 @@ RSpec.describe Metanorma::ISO do
                  <relation type='obsoletes'>
                    <bibitem type='standard'>
                      <formattedref format='text/plain'>ISO 125:2011</formattedref>
+                     <docidentifier type='ISO' primary='true'>ISO 125:2011</docidentifier>
                    </bibitem>
                  </relation>
                  <relation type='instance'>
@@ -1139,7 +1127,7 @@ RSpec.describe Metanorma::ISO do
                      <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:72849:en</uri>
                      <uri type='rss'>https://www.iso.org/contents/data/standard/07/28/72849.detail.rss</uri>
                      <docidentifier type='ISO' primary="true">ISO 125:2020</docidentifier>
-                     <docidentifier type='URN'>urn:iso:std:iso:125:stage-60.60:ed-7:en,fr</docidentifier>
+                     <docidentifier type='URN'>urn:iso:std:iso:125:stage-60.60:ed-7</docidentifier>
                      <docnumber>125</docnumber>
                      <date type='published'>
                        <on>2020-02</on>
@@ -1192,6 +1180,7 @@ RSpec.describe Metanorma::ISO do
                      <relation type='obsoletes'>
                        <bibitem type='standard'>
                          <formattedref format='text/plain'>ISO 125:2011</formattedref>
+                         <docidentifier type='ISO' primary='true'>ISO 125:2011</docidentifier>
                        </bibitem>
                      </relation>
                      <place>Geneva</place>

data/spec/metanorma/blocks_spec.rb

@@ -621,37 +621,4 @@ RSpec.describe Metanorma::ISO do
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
-
-  it "processes the macro for editorial notes" do
-    input = <<~INPUT
-      #{ASCIIDOC_BLANK_HDR}
-      EDITOR: Note1
-
-      [EDITOR]
-      ====
-      Note2
-      ====
-
-      [EDITOR]
-      Note3
-    INPUT
-    output = <<~OUTPUT
-      #{BLANK_HDR}
-         <sections>
-           <admonition id='_' type='editorial'>
-             <p id='_'>Note1</p>
-           </admonition>
-           <admonition id='_' type='editorial'>
-             <p id='_'>Note2</p>
-           </admonition>
-           <admonition id='_' type='editorial'>
-             <p id='_'>Note3</p>
-           </admonition>
-         </sections>
-      </iso-standard>
-    OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to xmlpp(output)
-  end
-
 end