metanorma-iso 2.1.5 → 2.1.6

data/lib/isodoc/iso/word_cleanup.rb

@@ -84,27 +84,24 @@ module IsoDoc
       end
 
       def authority_hdr_cleanup(docxml)
-        docxml&.xpath("//div[@class = 'boilerplate-license']")&.each do |d|
-          d.xpath(".//h1").each do |p|
-            p.name = "p"
-            p["class"] = "zzWarningHdr"
+        { "boilerplate-license": "zzWarningHdr",
+          "boilerplate-copyright": "zzCopyrightHdr" }.each do |k, v|
+            docxml.xpath("//div[@class = '#{k}']").each do |d|
+              d.xpath(".//h1").each do |p|
+                p.name = "p"
+                p["class"] = v
+              end
+            end
           end
-        end
-        docxml&.xpath("//div[@class = 'boilerplate-copyright']")&.each do |d|
-          d.xpath(".//h1").each do |p|
-            p.name = "p"
-            p["class"] = "zzCopyrightHdr"
-          end
-        end
       end
 
       def authority_cleanup(docxml)
         insert = docxml.at("//div[@id = 'boilerplate-license-destination']")
-        auth = docxml&.at("//div[@class = 'boilerplate-license']")&.remove
+        auth = docxml.at("//div[@class = 'boilerplate-license']")&.remove
         auth&.xpath(".//p[not(@class)]")&.each { |p| p["class"] = "zzWarning" }
         auth and insert and insert.children = auth
         insert = docxml.at("//div[@id = 'boilerplate-copyright-destination']")
-        auth = docxml&.at("//div[@class = 'boilerplate-copyright']")&.remove
+        auth = docxml.at("//div[@class = 'boilerplate-copyright']")&.remove
         auth&.xpath(".//p[not(@class)]")&.each do |p|
           p["class"] = "zzCopyright"
         end

data/lib/isodoc/iso/word_dis_convert.rb

@@ -98,7 +98,7 @@ module IsoDoc
           @meta.get[:doctitlemain] && @meta.get[:doctitlepart] and p << " &#x2014; "
           if @meta.get[:doctitlepart]
             b = @meta.get[:doctitlepartlabel] and
-              p << "<span style='font-weight:normal'>#{b}</span> "
+              p << "<span style='font-weight:normal'>#{b}:</span> "
             p << " #{@meta.get[:doctitlepart]}"
           end
           @meta.get[:doctitleamdlabel] || @meta.get[:doctitleamd] ||

data/lib/metanorma/iso/boilerplate-fr.xml

@@ -19,7 +19,7 @@ l’adresse ci-après ou au comité membre de l’ISO dans le pays du demandeur.
     ISO copyright office<br/>
     CP 401 &#x2022; Ch. de Blandonnet 8<br/>
     CH-1214 Vernier, Geneva<br/>
-    Tél.&#xa0;&#xa0;+ 41 22 749 01 11<br/>
+    Tél: +41 22 749 01 11<br/>
     Email: copyright@iso.org<br/>
     Website: www.iso.org
   </p>

data/lib/metanorma/iso/boilerplate-ru.xml

@@ -14,7 +14,7 @@
     Бюро ISO по охране авторских прав<br/>
     CP 401 &#x2022; Ch. de Blandonnet 8<br/>
     CH-1214 Vernier, Geneva<br/>
-    Тел.&#xa0;&#xa0;+ 41 22 749 01 11<br/>
+    Тел: +41 22 749 01 11<br/>
     Электронная почта: copyright@iso.org<br/>
     Сайт: www.iso.org
   </p>

data/lib/metanorma/iso/boilerplate.xml

@@ -20,7 +20,7 @@ at the address below or ISO's member body in the country of the requester.
     ISO copyright office<br/>
     CP 401 &#x2022; Ch. de Blandonnet 8<br/>
     CH-1214 Vernier, Geneva<br/>
-    Phone:&#xa0;&#xa0;+ 41 22 749 01 11<br/>
+    Phone: +41 22 749 01 11<br/>
     Email: copyright@iso.org<br/>
     Website: www.iso.org
   </p>

data/lib/metanorma/iso/front_id.rb

@@ -5,6 +5,34 @@ require "json"
 require "pathname"
 require "open-uri"
 require "twitter_cldr"
+require "pubid-iso"
+
+ # @param stage [String] stage, eg. "WD", "CD", "DIS"
+    # @param urn_stage [Float] numeric stage for URN rendering
+    # @param iteration [Integer] document iteration, eg. "1", "2", "3"
+    # @param joint_document [Identifier] joint document
+    # @param supplement [Supplement] supplement
+    # @param tctype [String] Technical Committee type, eg. "TC", "JTC"
+    # @param sctype [String] TC subsommittee, eg. "SC"
+    # @param wgtype [String] TC working group type, eg. "AG", "AHG"
+    # @param tcnumber [Integer] Technical Committee number, eg. "1", "2"
+    # @param scnumber [Integer] Subsommittee number, eg. "1", "2"
+    # @param wgnumber [Integer] Working group number, eg. "1", "2"
+    # @param dir [Boolean] Directives document
+    # @param dirtype [String] Directives document type, eg. "JTC"
+    # @see Supplement
+    # @see Identifier
+    # @see Pubid::Core::Identifier
+    # @see Parser
+    #
+=begin
+    def initialize(number: nil, stage: nil, iteration: nil, supplement: nil,
+                   joint_document: nil, urn_stage: nil,
+                   tctype: nil, sctype: nil, wgtype: nil, tcnumber: nil,
+                   scnumber: nil, wgnumber:nil,
+                   dir: nil, dirtype: nil, **opts)
+      super(**opts.merge(number: number))
+=end
 
 module Metanorma
   module ISO

data/lib/metanorma/iso/isodoc.rng

@@ -1285,7 +1285,12 @@
   </define>
   <define name="span">
     <element name="span">
-      <attribute name="class"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>

data/lib/metanorma/iso/reqt.rng

@@ -108,7 +108,7 @@
     </element>
   </define>
   <define name="label">
-    <element name="label">
+    <element name="identifier">
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.1.5".freeze
+    VERSION = "2.1.6".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -29,11 +29,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.1.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.2.0"
   spec.add_dependency "mnconvert", "~> 1.14"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "tokenizer", "~> 0.3.0"
   spec.add_dependency "twitter_cldr"
+  spec.add_dependency "pubid-iso"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

data/spec/isodoc/postproc_spec.rb

@@ -844,11 +844,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>
@@ -891,11 +889,9 @@ RSpec.describe IsoDoc do
                 <br/>
                 CH-1214 Vernier, Geneva, Switzerland
                 <br/>
-                Tel. + 41 22 749 01 11
-                <br/>
-                Fax + 41 22 749 09 47
+                Phone: +41 22 749 01 11
                 <br/>
-                copyright@iso.org
+                Email: copyright@iso.org
                 <br/>
                 www.iso.org</p>
             </clause>
@@ -955,13 +951,10 @@ RSpec.describe IsoDoc do
               CH-1214 Vernier, Geneva, Switzerland
 
               <br/>
-              Tel. + 41 22 749 01 11
-
-              <br/>
-              Fax + 41 22 749 09 47
+              Phone: +41 22 749 01 11
 
               <br/>
-              copyright@iso.org
+              Email: copyright@iso.org
 
               <br/>
               www.iso.org#{' '}</p>

data/spec/isodoc/word_dis_spec.rb

@@ -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,9 +1932,8 @@ 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>
@@ -2045,7 +2041,7 @@ RSpec.describe IsoDoc do
              <a name='ISO712' id='ISO712'/>
              [1]
              <span style='mso-tab-count:1'>  </span>
-             ISO/IEC 712-3:2022, ALUFFI, Paolo, ed. (2022). 
+             ISO/IEC 712-3:2022, ALUFFI, Paolo, ed. (2022).
              <i>
                Facets of Algebraic Geometry: A Collection in Honor of William Fulton's
                80th Birthday

data/spec/metanorma/base_spec.rb

@@ -1008,9 +1008,6 @@ 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>
@@ -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>

data/spec/metanorma/processor_spec.rb

@@ -78,8 +78,7 @@ l’adresse ci-après ou au comité membre de l’ISO dans le pa
     ISO copyright office<br/>
     Ch. de Blandonnet 8 &#8226; CP 401<br/>
     CH-1214 Vernier, Geneva, Switzerland<br/>
-    Tel.&#160;&#160;+ 41 22 749 01 11<br/>
-    Fax&#160;&#160;+ 41 22 749 09 47<br/>
+    Phone: +41 22 749 01 11<br/>
     Email: copyright@iso.org<br/>
     Website: www.iso.org
   </p>