RubyGems - metanorma-iso - Versions diffs - 2.1.4 → 2.1.5 - Mend

metanorma-iso 2.1.4 → 2.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (23) hide show

checksums.yaml +4 -4
data/lib/isodoc/iso/html/isodoc-dis.css +1 -10
data/lib/isodoc/iso/html/isodoc-dis.scss +1 -13
data/lib/isodoc/iso/html/isodoc.css +4 -11
data/lib/isodoc/iso/html/isodoc.scss +5 -15
data/lib/isodoc/iso/i18n-en.yaml +1 -1
data/lib/isodoc/iso/iso.amendment.xsl +12 -2
data/lib/isodoc/iso/iso.international-standard.xsl +12 -2
data/lib/isodoc/iso/presentation_xml_convert.rb +4 -0
data/lib/isodoc/iso/word_cleanup.rb +40 -6
data/lib/isodoc/iso/word_dis_cleanup.rb +2 -14
data/lib/metanorma/iso/isodoc.rng +10 -0
data/lib/metanorma/iso/version.rb +1 -1
data/spec/isodoc/postproc_spec.rb +2 -62
data/spec/isodoc/terms_spec.rb +62 -0
data/spec/isodoc/word_dis_spec.rb +125 -3
data/spec/metanorma/base_spec.rb +6 -3
data/spec/metanorma/cleanup_spec.rb +5 -5
data/spec/metanorma/refs_spec.rb +5 -3
data/spec/metanorma/section_spec.rb +6 -6
data/spec/spec_helper.rb +1 -1
data/spec/vcr_cassettes/withdrawn_iso.yml +34 -34
metadata +2 -2

data/spec/isodoc/word_dis_spec.rb CHANGED Viewed

@@ -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>
@@ -1943,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/base_spec.rb CHANGED Viewed

@@ -1015,7 +1015,7 @@ RSpec.describe Metanorma::ISO do
                   <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>
@@ -1062,6 +1062,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 +1089,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 +1118,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 +1141,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 +1194,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/cleanup_spec.rb CHANGED Viewed

@@ -1240,7 +1240,7 @@ RSpec.describe Metanorma::ISO do
             <title>Terms and definitions</title>
             <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
             <p id='_'>
-              ISO and IEC maintain terminological databases for use in standardization
+              ISO and IEC maintain terminology databases for use in standardization
               at the following addresses:
             </p>
             <ul id='_'>
@@ -1289,7 +1289,7 @@ RSpec.describe Metanorma::ISO do
               <title>Terms and definitions</title>
               <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
               <p id='_'>
-                ISO and IEC maintain terminological databases for use in standardization
+                ISO and IEC maintain terminology databases for use in standardization
                 at the following addresses:
               </p>
               <ul id='_'>
@@ -1353,7 +1353,7 @@ RSpec.describe Metanorma::ISO do
                 <title>Terms and definitions</title>
                 <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
                 <p id='_'>
-                  ISO and IEC maintain terminological databases for use in
+                  ISO and IEC maintain terminology databases for use in
                   standardization at the following addresses:
                 </p>
                 <ul id='_'>
@@ -1420,7 +1420,7 @@ RSpec.describe Metanorma::ISO do
                 <title>Terms and definitions</title>
                 <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
                 <p id='_'>
-                  ISO and IEC maintain terminological databases for use in
+                  ISO and IEC maintain terminology databases for use in
                   standardization at the following addresses:
                 </p>
                 <ul id='_'>
@@ -1478,7 +1478,7 @@ RSpec.describe Metanorma::ISO do
           <terms id='_' obligation='normative'>
             <title>Terms and definitions</title>
             <p id='_'>
-              ISO and IEC maintain terminological databases for use in standardization
+              ISO and IEC maintain terminology databases for use in standardization
               at the following addresses:
             </p>
             <ul id='_'>

data/spec/metanorma/refs_spec.rb CHANGED Viewed

@@ -410,7 +410,7 @@ RSpec.describe Metanorma::ISO do
                <uri type='src'>https://www.iso.org/standard/2405.html</uri>
                <uri type='rss'>https://www.iso.org/contents/data/standard/00/24/2405.detail.rss</uri>
                <docidentifier type='ISO' primary='true'>ISO 31-0</docidentifier>
-               <docidentifier type='URN'>urn:iso:std:iso:31:-0:stage-95.99:ed-1:en</docidentifier>
+               <docidentifier type='URN'>urn:iso:std:iso:31:-0:stage-95.99:ed-1</docidentifier>
                <docnumber>31</docnumber>
                <contributor>
                  <role type='publisher'/>
@@ -447,7 +447,7 @@ RSpec.describe Metanorma::ISO do
                    <uri type='src'>https://www.iso.org/standard/2405.html</uri>
                    <uri type='rss'>https://www.iso.org/contents/data/standard/00/24/2405.detail.rss</uri>
                    <docidentifier type='ISO' primary='true'>ISO 31-0:1974</docidentifier>
-                   <docidentifier type='URN'>urn:iso:std:iso:31:-0:stage-95.99:ed-1:en</docidentifier>
+                   <docidentifier type='URN'>urn:iso:std:iso:31:-0:stage-95.99:ed-1</docidentifier>
                    <docnumber>31</docnumber>
                    <date type='published'>
                      <on>1974-01</on>
@@ -494,7 +494,7 @@ RSpec.describe Metanorma::ISO do
                <uri type='src'>https://www.iso.org/standard/76389.html</uri>
                <uri type='rss'>https://www.iso.org/contents/data/standard/07/63/76389.detail.rss</uri>
                <docidentifier type='ISO' primary='true'>ISO 683-3:2019</docidentifier>
-               <docidentifier type='URN'>urn:iso:std:iso:683:-3:stage-95.99:ed-3:en</docidentifier>
+               <docidentifier type='URN'>urn:iso:std:iso:683:-3:stage-95.99:ed-3</docidentifier>
                <docnumber>683</docnumber>
                <date type='published'>
                  <on>2019-01</on>
@@ -551,11 +551,13 @@ RSpec.describe Metanorma::ISO do
                <relation type='obsoletes'>
                  <bibitem type='standard'>
                    <formattedref format='text/plain'>ISO 683-3:2016</formattedref>
+                   <docidentifier type='ISO' primary='true'>ISO 683-3:2016</docidentifier>
                  </bibitem>
                </relation>
                <relation type='updates'>
                  <bibitem type='standard'>
                    <formattedref format='text/plain'>ISO 683-3:2022</formattedref>
+                   <docidentifier type='ISO' primary='true'>ISO 683-3:2022</docidentifier>
                    <date type='circulated'>
                      <on>2022-01-21</on>
                    </date>

data/spec/metanorma/section_spec.rb CHANGED Viewed

@@ -81,7 +81,7 @@ RSpec.describe Metanorma::ISO do
           <terms id="_" obligation="normative">
             <title>Terms and definitions</title>
             <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-            <p id="_">ISO and IEC maintain terminological databases for use in standardization at the following addresses:</p>
+            <p id="_">ISO and IEC maintain terminology databases for use in standardization at the following addresses:</p>
             <ul id="_">
               <li>
                 <p id="_">ISO Online browsing platform: available at
@@ -275,7 +275,7 @@ RSpec.describe Metanorma::ISO do
               given in <eref bibitemid="iso1234"/>
               and <eref bibitemid="iso5678"/>
               and the following apply.</p>
-            <p id="_">ISO and IEC maintain terminological databases for use in
+            <p id="_">ISO and IEC maintain terminology databases for use in
         standardization at the following addresses:</p>
             <ul id="_">
               <li>
@@ -321,7 +321,7 @@ RSpec.describe Metanorma::ISO do
             <title>Terms and definitions</title>
             <p id='_'>No terms and definitions are listed in this document.</p>
             <p id='_'>
-              ISO and IEC maintain terminological databases for use in standardization
+              ISO and IEC maintain terminology databases for use in standardization
               at the following addresses:
             </p>
             <ul id='_'>
@@ -373,7 +373,7 @@ RSpec.describe Metanorma::ISO do
               and <eref bibitemid="iso5678"/>
               apply.
             </p>
-            <p id="_">ISO and IEC maintain terminological databases for use in standardization at the following addresses:</p>
+            <p id="_">ISO and IEC maintain terminology databases for use in standardization at the following addresses:</p>
             <ul id="_">
               <li>
                 <p id="_">ISO Online browsing platform: available at
@@ -411,7 +411,7 @@ RSpec.describe Metanorma::ISO do
              <title>Terms and definitions</title>
              <p id='_'>No terms and definitions are listed in this document.</p>
              <p id='_'>
-               ISO and IEC maintain terminological databases for use in standardization
+               ISO and IEC maintain terminology databases for use in standardization
                at the following addresses:
              </p>
              <ul id='_'>
@@ -461,7 +461,7 @@ RSpec.describe Metanorma::ISO do
            <terms id='_' obligation='normative'>
              <title>Terms and Definitions</title>
              <p id='_'>No terms and definitions are listed in this document.</p>
-             <p id='_'>ISO and IEC maintain terminological databases for use in standardization
+             <p id='_'>ISO and IEC maintain terminology databases for use in standardization
                at the following addresses:
              </p>
              <ul id='_'>

data/spec/spec_helper.rb CHANGED Viewed

@@ -225,7 +225,7 @@ HDR
 TERM_BOILERPLATE = <<~TERM.freeze
   <p id="_">For the purposes of this document,
     the following terms and definitions apply.</p>
-  <p id="_">ISO and IEC maintain terminological databases for use in
+  <p id="_">ISO and IEC maintain terminology databases for use in
     standardization at the following addresses:</p>
   <ul id="_">