metanorma-iso 2.1.4 → 2.1.7

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -178,12 +178,10 @@ module IsoDoc
                                             i18nhash: @i18n.get)
       end
 
-      def bibrender(xml)
-        unless xml.at(ns("./formattedref"))
-          xml.children =
-            "#{bibrenderer.render(xml.to_xml)}"\
-            "#{xml.xpath(ns('./docidentifier | ./uri | ./note')).to_xml}"
-        end
+      def bibrender_formattedref(formattedref, xml)
+        return if %w(techreport standard).include? xml["type"]
+
+        super
       end
 
       def ol_depth(node)
@@ -196,6 +194,10 @@ module IsoDoc
         type
       end
 
+      def related1(node)
+        node.remove
+      end
+
       include Init
     end
   end

data/lib/isodoc/iso/word_cleanup.rb

@@ -11,11 +11,10 @@ module IsoDoc
         end
       end
 
-      # force Annex h2 down to be p.h2Annex, so it is not picked up by ToC
       def word_annex_cleanup1(docxml, lvl)
         docxml.xpath("//h#{lvl}[ancestor::*[@class = 'Section3']]").each do |h2|
           h2.name = "p"
-          h2["class"] = "h#{lvl}Annex"
+          h2["class"] = "a#{lvl}"
         end
       end
 
@@ -37,40 +36,72 @@ module IsoDoc
 
       def style_cleanup(docxml)
         word_annex_cleanup_h1(docxml)
-        style_cleanup1(docxml)
+        figure_style(docxml)
+        new_styles(docxml)
       end
 
-      def style_cleanup1(docxml)
-        docxml.xpath("//*[@class = 'example']").each do |p|
-          p["class"] = "Example"
+      def figure_style(docxml)
+        docxml.xpath("//div[@class = 'figure']").each do |f|
+          f["style"] ||= ""
+          f["style"] += "text-align:center;"
         end
+      end
+
+      def quote_style(docxml)
+        docxml.xpath("//div[@class = 'Quote' or @class = 'Note' or "\
+                     "@class = 'Example' or @class = 'Admonition']").each do |d|
+                       quote_style1(d)
+                     end
+      end
+
+      def quote_style1(div)
+        div.xpath(".//li").each do |p|
+          p["style"] ||= ""
+          p["style"] += "font-size:#{default_fonts({})[:smallerfontsize]};"
+        end
+      end
+
+      STYLESMAP = {
+        example: "Example",
+        note: "Note",
+        Sourcecode: "Code",
+        tabletitle: "Tabletitle",
+        Biblio: "MsoNormal",
+        figure: "MsoNormal",
+        SourceTitle: "FigureTitle",
+      }.freeze
+
+      def new_styles(docxml)
+        STYLESMAP.each do |k, v|
+          docxml.xpath("//*[@class = '#{k}']").each { |s| s["class"] = v }
+        end
+        docxml.xpath("//div[@class = 'Section3']//p[@class = 'Tabletitle']")
+          .each { |t| t["class"] = "AnnexTableTitle" }
         docxml.xpath("//*[@class = 'zzHelp']/p[not(@class)]").each do |p|
           p["class"] = "zzHelp"
         end
+        quote_style(docxml)
       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_cleanup.rb

@@ -1,11 +1,6 @@
 module IsoDoc
   module Iso
     class WordDISConvert < WordConvert
-      def style_cleanup(docxml)
-        super
-        dis_styles(docxml)
-      end
-
       STYLESMAP = {
         AltTerms: "AdmittedTerm",
         TableFootnote: "Tablefootnote",
@@ -30,7 +25,7 @@ module IsoDoc
         zzCopyright1: "zzCopyright",
       }.freeze
 
-      def dis_styles(docxml)
+      def new_styles(docxml)
         STYLESMAP.each do |k, v|
           docxml.xpath("//*[@class = '#{k}']").each { |s| s["class"] = v }
         end
@@ -46,8 +41,8 @@ module IsoDoc
         figure_style(docxml)
         note_style(docxml)
         example_style(docxml)
-        quote_style(docxml)
         dis_style_interactions(docxml)
+        quote_style(docxml)
       end
 
       def dis_style_interactions(docxml)
@@ -68,13 +63,6 @@ module IsoDoc
         end
       end
 
-      def quote_style(docxml)
-        docxml.xpath("//div[@class = 'Quote' or @class = 'Note' or "\
-                     "@class = 'Example' or @class = 'Admonition']").each do |d|
-                       quote_style1(d)
-                     end
-      end
-
       def para_style_change(div, class1, class2)
         s = class1 ? "@class = '#{class1}'" : "not(@class)"
         div.xpath(".//p[#{s}]").each do |p|

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/cleanup.rb

@@ -88,7 +88,6 @@ module Metanorma
         end
       end
 
-      # TODO sort by authors
       # sort by: doc class (ISO, IEC, other standard (not DOI &c), other
       # then standard class (docid class other than DOI &c)
       # then docnumber if present, numeric sort

data/lib/metanorma/iso/front_id.rb

@@ -5,6 +5,7 @@ require "json"
 require "pathname"
 require "open-uri"
 require "twitter_cldr"
+require "pubid-iso"
 
 module Metanorma
   module ISO
@@ -72,7 +73,6 @@ module Metanorma
       def iso_id(node, xml)
         (!@amd && node.attr("docnumber")) || (@amd && node.attr("updates")) or
           return
-
         dn = id_stage_prefix(iso_id1(node), node)
         dns = [id_year(dn, node, mode: :default),
                id_year(dn, node, mode: :force),
@@ -80,6 +80,25 @@ module Metanorma
         iso_id_out(node, xml, dns)
       end
 
+=begin
+      def iso_id(node, _xml)
+        (!@amd && node.attr("docnumber")) || (@amd && node.attr("updates")) or
+          return
+        params = {
+          number: (@amd ? node.attr("updates") : node.attr("docnumber")),
+          part: node.attr("partnumber"),
+          amendment_number: node.attr("amendment-number"),
+          corrigendum_number: node.attr("corrigendum-number"),
+          language: node.attr("language") || "en",
+          urn_stage: "#{get_stage(node)}.#{get_substage(node)}",
+          stage: id_stage_abbr(get_stage(node), get_substage(node), node, true),
+          type: doctype(node),
+          year: node.attr("copyright-year") || node.attr("updated-date")&.sub(/-.*$/, ""),
+          copublisher: node.attr("agency"),
+        }
+      end
+=end
+
       def iso_id_out(node, xml, dns)
         xml.docidentifier dns[0], **attr_code(type: "ISO")
         xml.docidentifier dns[2], **attr_code(type: "iso-undated")

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>
@@ -2504,6 +2509,16 @@
           <text/>
         </element>
       </optional>
+      <optional>
+        <element name="amendment">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="corrigendum">
+          <text/>
+        </element>
+      </optional>
       <optional>
         <element name="language">
           <text/>

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.4".freeze
+    VERSION = "2.1.7".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

@@ -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'/>
@@ -904,11 +844,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>
@@ -951,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>
@@ -1015,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>