metanorma-iso 2.7.4 → 2.7.6

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -79,6 +79,10 @@ module IsoDoc
           node["inline-header"] = "true"
         end
         super
+        if node["type"] == "section"
+          t = node.at(ns("./title/tab")) and
+            t.previous = @i18n.l10n(": ").sub(/\p{Zs}$/, "")
+        end
       end
 
       def clause(docxml)
@@ -208,6 +212,11 @@ module IsoDoc
         end
       end
 
+      def twitter_cldr_localiser_symbols
+        { group: " ", fraction_group: " ",
+          fraction_group_digits: 3 }
+      end
+
       include Init
     end
   end

data/lib/isodoc/iso/presentation_xref.rb

@@ -105,22 +105,6 @@ module IsoDoc
         locality_span_wrap(ret, opt[:type])
       end
 
-=begin
-      def prefix_container(container, linkend, node, target)
-        delim = ", "
-        ref = if @xrefs.anchor(target, :type) == "listitem" &&
-            !@xrefs.anchor(target, :refer_list)
-                delim = " "
-                @xrefs.anchor(container, :label)
-                # 7 a) : Clause 7 a), but Clause 7 List 1 a)
-              else anchor_xref(node, container)
-              end
-
-        ref and linkend = ref + delim + linkend
-        l10n(linkend)
-      end
-=end
-
       # 7 a) : Clause 7 a), but Clause 7 List 1 a)
       def prefix_container(container, linkend, node, target)
         prefix_container?(container, node) or return linkend
@@ -135,10 +119,11 @@ module IsoDoc
       def prefix_container_template(container, node, target)
         nested_xref = @i18n.nested_xref
         container_label = anchor_xref(node, container)
-        if @xrefs.anchor(target, :type) == "listitem" &&
-            !@xrefs.anchor(target, :refer_list)
+        if @xrefs.anchor(target, :type) == "listitem"
+            if !@xrefs.anchor(target, :refer_list)
           nested_xref = "%1 %2"
-          n = @xrefs.anchor(container, :label) and container_label = n
+          # n = @xrefs.anchor(container, :label) and container_label = n
+          end
         end
         [nested_xref, container_label]
       end

data/lib/isodoc/iso/word_convert.rb

@@ -52,18 +52,22 @@ module IsoDoc
 
       def convert(input_filename, file = nil, debug = false,
                 output_filename = nil)
-        file = File.read(input_filename, encoding: "utf-8") if file.nil?
-        docxml = Nokogiri::XML(file) { |config| config.huge }
-        stage = docxml&.at(ns("//bibdata/status/stage"))&.text
-        if @dis &&
-            ((/^[4569].$/.match?(stage) && @wordtemplate != "simple") ||
-            (/^[0-3].$/.match?(stage) && @wordtemplate == "dis"))
+        if @dis && use_dis?(input_filename, file)
+          swap_renderer(self, @dis, file, input_filename, debug)
           @dis.convert(input_filename, file, debug, output_filename)
         else
           super
         end
       end
 
+      def use_dis?(input_filename, file)
+        file ||= File.read(input_filename, encoding: "utf-8")
+        stage = Nokogiri::XML(file, &:huge)
+          .at(ns("//bibdata/status/stage"))&.text
+        (/^[4569].$/.match?(stage) && @wordtemplate != "simple") ||
+          (/^[0-3].$/.match?(stage) && @wordtemplate == "dis")
+      end
+
       def make_body(xml, docxml)
         body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72" }
         xml.body **body_attr do |body|

data/lib/isodoc/iso/word_dis_cleanup.rb

@@ -18,7 +18,7 @@ module IsoDoc
       end
 
       def word_section_end_empty_para(docxml)
-        docxml.at("//div[@class='WordSection1']/p[last()]").remove
+        docxml.at("//div[@class='WordSection1']/p[last()]")&.remove
       end
 
       def word_table_cell_para(docxml)

data/lib/isodoc/iso/word_dis_convert.rb

@@ -61,8 +61,6 @@ module IsoDoc
       end
 
       def toWord(result, filename, dir, header)
-        result = from_xhtml(word_cleanup(to_xhtml(result)))
-          .gsub("-DOUBLE_HYPHEN_ESCAPE-", "--")
         @wordstylesheet = wordstylesheet_update
         ::Html2Doc::IsoDIS.new(
           filename: filename,

data/lib/isodoc/iso/xref.rb

@@ -12,12 +12,12 @@ module IsoDoc
         if @klass.amd?(docxml)
           [{ path: "//sections/clause", multi: true }]
         else
-          [{ path: "//clause[@type = 'scope']" },
+          [{ path: "//sections/clause[@type = 'scope']" },
            { path: @klass.norm_ref_xpath },
            { path:
              "#{@klass.middle_clause(docxml)} | //sections/terms | " \
-             "//sections/clause[descendant::terms or descendant::definitions] " \
-             "| //sections/definitions", multi: true }]
+             "//sections/clause[descendant::terms or descendant::definitions] | " \
+             "//sections/definitions | //sections/clause[@type = 'section']", multi: true }]
         end
       end
 
@@ -46,9 +46,7 @@ module IsoDoc
 
       def hierarchical_formula_names(clause, num)
         c = IsoDoc::XrefGen::Counter.new
-        clause.xpath(ns(".//formula")).each do |t|
-          next if blank?(t["id"])
-
+        clause.xpath(ns(".//formula")).noblank.each do |t|
           @anchors[t["id"]] = anchor_struct(
             "#{num}#{hiersep}#{c.increment(t).print}", t,
             t["inequality"] ? @labels["inequality"] : @labels["formula"],
@@ -130,7 +128,7 @@ module IsoDoc
           notes = s.xpath(ns(".//ol")) - s.xpath(ns(".//clause//ol")) -
             s.xpath(ns(".//appendix//ol")) - s.xpath(ns(".//ol//ol"))
           c = Counter.new
-          notes.reject { |n| blank?(n["id"]) }.each do |n|
+          notes.noblank.each do |n|
             @anchors[n["id"]] = anchor_struct(increment_label(notes, n, c), n,
                                               @labels["list"], "list", false)
             list_item_anchor_names(n, @anchors[n["id"]], 1, "",
@@ -142,12 +140,10 @@ module IsoDoc
 
       # all li in the ol in lists are consecutively numbered through @start
       def single_ol_for_xrefs?(lists)
-        return true if lists.size == 1
-
+        lists.size == 1 and return true
         start = 0
         lists.each_with_index do |l, i|
-          next if i.zero?
-
+          i.zero? and next
           start += lists[i - 1].xpath(ns("./li")).size
           return false unless l["start"]&.to_i == start + 1
         end

data/lib/isodoc/iso/xref_section.rb

@@ -47,9 +47,30 @@ module IsoDoc
         end
       end
 
+      def section_name_anchors(clause, num, level)
+        if clause["type"] == "section"
+          @anchors[clause["id"]] =
+            { label: l10n("#{@labels['section']} #{num}"),
+              xref: l10n("#{@labels['section']} #{num}"),
+              title: clause_title(clause), level: level, type: "clause",
+              elem: @labels["section"] }
+        else super
+        end
+      end
+
+      def annex_name_anchors1(clause, num, level)
+        ret = { label: num, level: level, subtype: "annex" }
+        ret2 = if level == 2
+                 { xref: l10n("#{@labels['clause']} #{num}"),
+                   elem: @labels["clause"] }
+               else
+                 { xref: num }
+               end
+        @anchors[clause["id"]] = ret.merge(ret2)
+      end
+
       def annex_names1(clause, num, level)
-        @anchors[clause["id"]] = { label: num, xref: num, level: level,
-                                   subtype: "annex" }
+        annex_name_anchors1(clause, num, level)
         i = Counter.new(0, prefix: "#{num}.")
         clause.xpath(ns("./clause | ./references")).each do |c|
           annex_names1(c, i.increment(c).print, level + 1)

data/lib/metanorma/iso/base.rb

@@ -79,8 +79,16 @@ module Metanorma
         name
       end
 
+      DOCUMENT_SCHEMES = [1951, 1972, 1979, 1987, 1989, 2012, 2013, 2024].freeze
+
       def document_scheme(node)
-        node.attr("document-scheme") || "2024"
+        r = node.attr("document-scheme") and return r
+        r = node.attr("copyright-year")&.to_i or return "2024"
+        DOCUMENT_SCHEMES.each_index do |i|
+          i.zero? and next
+          r < DOCUMENT_SCHEMES[i] and return DOCUMENT_SCHEMES[i - 1].to_s
+        end
+        "2024"
       end
 
       def outputs(node, ret)

data/lib/metanorma/iso/biblio.rng

@@ -208,7 +208,9 @@
   </define>
   <define name="roledescription">
     <element name="description">
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="person">
@@ -333,7 +335,9 @@
   </define>
   <define name="affiliationdescription">
     <element name="description">
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="organization">
@@ -897,7 +901,9 @@
   </define>
   <define name="formattedref">
     <element name="formattedref">
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="license">
@@ -942,7 +948,9 @@
     <optional>
       <attribute name="type"/>
     </optional>
-    <ref name="FormattedString"/>
+    <zeroOrMore>
+      <ref name="TextElement"/>
+    </zeroOrMore>
   </define>
   <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
   <define name="TypedUri">
@@ -1042,7 +1050,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="docnumber">
@@ -1267,12 +1277,16 @@
       <optional>
         <attribute name="type"/>
       </optional>
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="bibabstract">
     <element name="abstract">
-      <ref name="FormattedString"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="copyright">
@@ -1377,7 +1391,9 @@
       </attribute>
       <optional>
         <element name="description">
-          <ref name="FormattedString"/>
+          <oneOrMore>
+            <ref name="TextElement"/>
+          </oneOrMore>
         </element>
       </optional>
       <element name="bibitem">

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

@@ -73,7 +73,7 @@ CP 401 • Ch. de Blandonnet 8 +
 CH-1214 Vernier, Geneva +
 Tél: +41 22 749 01 11 +
 Email: copyright@iso.org +
-Website: www.iso.org
+Website: {% if document_scheme == "2024" %}https://www.iso.org/[www.iso.org]{% else %}www.iso.org{% endif %}
 
 [[boilerplate-place]]
 Publié en Suisse

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

@@ -49,7 +49,7 @@ CP 401 • Ch. de Blandonnet 8 +
 CH-1214 Vernier, Geneva +
 Тел: +41 22 749 01 11 +
 Электронная почта: copyright@iso.org +
-Сайт: www.iso.org
+Сайт: {% if document_scheme == "2024" %}https://www.iso.org/[www.iso.org]{% else %}www.iso.org{% endif %}
 
 [[boilerplate-place]]
 Издано в Швейцарии

data/lib/metanorma/iso/boilerplate.adoc

@@ -73,7 +73,7 @@ CP 401 • Ch. de Blandonnet 8 +
 CH-1214 Vernier, Geneva +
 Phone: +41 22 749 01 11 +
 Email: copyright@iso.org +
-Website: www.iso.org
+Website: {% if document_scheme == "2024" %}https://www.iso.org/[www.iso.org]{% else %}www.iso.org{% endif %}
 
 [[boilerplate-place]]
 Published in Switzerland

data/lib/metanorma/iso/cleanup.rb

@@ -1,3 +1,5 @@
+require_relative "cleanup_biblio"
+
 module Metanorma
   module ISO
     class Converter < Standoc::Converter
@@ -24,80 +26,20 @@ module Metanorma
         end
       end
 
-      def id_prefix(prefix, id)
-        # we're just inheriting the prefixes from parent doc
-        @amd and return id.text
-        prefix.join("/") + (id.text.match?(%{^/}) ? "" : " ") + id.text
-      end
-
-      def get_id_prefix(xmldoc)
-        xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']" \
-                     "/organization").each_with_object([]) do |x, prefix|
-          x1 = x.at("abbreviation")&.text || x.at("name")&.text
-          prefix << x1
+      def ol_cleanup(doc)
+        doc.xpath("//ol[@explicit-type]").each do |x|
+          x["type"] = x["explicit-type"]
+          x.delete("explicit-type")
+          @log.add("Style", x,
+                   "Style override set for ordered list")
         end
       end
 
-      # ISO as a prefix goes first
-      def docidentifier_cleanup(xmldoc)
-        prefix = get_id_prefix(xmldoc)
-        id = xmldoc.at("//bibdata/ext/structuredidentifier/project-number") and
-          id.content = id_prefix(prefix, id)
-      end
-
-      def format_ref(ref, type)
-        ref = ref.sub(/ \(All Parts\)/i, "")
-        super
-      end
-
       TERM_CLAUSE =
         "//sections//terms | " \
         "//sections//clause[descendant::terms][not(descendant::definitions)]"
           .freeze
 
-      PUBLISHER = "./contributor[role/@type = 'publisher']/organization".freeze
-
-      def pub_class(bib)
-        return 1 if bib.at("#{PUBLISHER}[abbreviation = 'ISO']")
-        return 1 if bib.at("#{PUBLISHER}[name = 'International Organization " \
-                           "for Standardization']")
-        return 2 if bib.at("#{PUBLISHER}[abbreviation = 'IEC']")
-        return 2 if bib.at("#{PUBLISHER}[name = 'International " \
-                           "Electrotechnical Commission']")
-        return 3 if bib.at("./docidentifier[@type]" \
-                           "[not(#{skip_docid} or @type = 'metanorma')]") ||
-          bib.at("./docidentifier[not(@type)]")
-
-        4
-      end
-
-      def sort_biblio(bib)
-        bib.sort { |a, b| sort_biblio_key(a) <=> sort_biblio_key(b) }
-      end
-
-      # 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
-      #      else alphanumeric metanorma id (abbreviation)
-      # then doc part number if present, numeric sort
-      # then doc id (not DOI &c)
-      # then title
-      def sort_biblio_key(bib)
-        pubclass = pub_class(bib)
-        num = bib.at("./docnumber")&.text
-        id = bib.at("./docidentifier[@primary]") ||
-          bib.at("./docidentifier[not(#{skip_docid} or @type = 'metanorma')]")
-        metaid = bib.at("./docidentifier[@type = 'metanorma']")&.text
-        abbrid = metaid unless /^\[\d+\]$/.match?(metaid)
-        /\d-(?<partid>\d+)/ =~ id&.text
-        type = id["type"] if id
-        title = bib.at("./title[@type = 'main']")&.text ||
-          bib.at("./title")&.text || bib&.at("./formattedref")&.text
-        "#{pubclass} :: #{type} :: " \
-          "#{num.nil? ? abbrid : sprintf('%09d', num.to_i)} :: " \
-          "#{sprintf('%09d', partid.to_i)} :: #{id&.text} :: #{title}"
-      end
-
       def sections_cleanup(xml)
         super
         @amd or return
@@ -127,52 +69,6 @@ module Metanorma
         end
       end
 
-      def bibitem_cleanup(xmldoc)
-        super
-        unpublished_note(xmldoc)
-        withdrawn_note(xmldoc)
-      end
-
-      def unpublished_note(xmldoc)
-        xmldoc.xpath("//bibitem[not(./ancestor::bibitem)]" \
-                     "[not(note[@type = 'Unpublished-Status'])]").each do |b|
-          pub_class(b) > 2 and next
-          ((s = b.at("./status/stage")) && s.text.match?(/\d/) &&
-           (s.text.to_i < 60)) or next
-          insert_unpub_note(b, @i18n.under_preparation
-            .sub("%", b.at("docidentifier").text))
-        end
-      end
-
-      def withdrawn_note(xmldoc)
-        xmldoc.xpath("//bibitem[not(note[@type = 'Unpublished-Status'])]")
-          .each do |b|
-            withdrawn_ref?(b) or next
-            if id = replacement_standard(b)
-              insert_unpub_note(b, @i18n.cancelled_and_replaced.sub("%", id))
-            else insert_unpub_note(b, @i18n.withdrawn)
-            end
-          end
-      end
-
-      def withdrawn_ref?(biblio)
-        pub_class(biblio) > 2 and return false
-        (s = biblio.at("./status/stage")) && (s.text.to_i == 95) &&
-          (t = biblio.at("./status/substage")) && (t.text.to_i == 99)
-      end
-
-      def replacement_standard(biblio)
-        r = biblio.at("./relation[@type = 'updates']/bibitem") or return nil
-        id = r.at("./formattedref | ./docidentifier[@primary = 'true'] | " \
-                  "./docidentifier | ./formattedref") or return nil
-        id.text
-      end
-
-      def insert_unpub_note(biblio, msg)
-        biblio.at("./language | ./script | ./abstract | ./status")
-          .previous = %(<note type="Unpublished-Status"><p>#{msg}</p></note>)
-      end
-
       def termdef_boilerplate_insert(xmldoc, isodoc, once = false)
         once = true
         super

data/lib/metanorma/iso/cleanup_biblio.rb

@@ -0,0 +1,120 @@
+module Metanorma
+  module ISO
+    class Converter < Standoc::Converter
+      def id_prefix(prefix, id)
+        # we're just inheriting the prefixes from parent doc
+        @amd and return id.text
+        prefix.join("/") + (id.text.match?(%{^/}) ? "" : " ") + id.text
+      end
+
+      def get_id_prefix(xmldoc)
+        xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']" \
+                     "/organization").each_with_object([]) do |x, prefix|
+          x1 = x.at("abbreviation")&.text || x.at("name")&.text
+          prefix << x1
+        end
+      end
+
+      # ISO as a prefix goes first
+      def docidentifier_cleanup(xmldoc)
+        prefix = get_id_prefix(xmldoc)
+        id = xmldoc.at("//bibdata/ext/structuredidentifier/project-number") and
+          id.content = id_prefix(prefix, id)
+      end
+
+      def format_ref(ref, type)
+        ref = ref.sub(/ \(All Parts\)/i, "")
+        super
+      end
+
+      PUBLISHER = "./contributor[role/@type = 'publisher']/organization".freeze
+
+      def pub_class(bib)
+        return 1 if bib.at("#{PUBLISHER}[abbreviation = 'ISO']")
+        return 1 if bib.at("#{PUBLISHER}[name = 'International Organization " \
+                           "for Standardization']")
+        return 2 if bib.at("#{PUBLISHER}[abbreviation = 'IEC']")
+        return 2 if bib.at("#{PUBLISHER}[name = 'International " \
+                           "Electrotechnical Commission']")
+        return 3 if bib.at("./docidentifier[@type]" \
+                           "[not(#{skip_docid} or @type = 'metanorma')]") ||
+          bib.at("./docidentifier[not(@type)]")
+
+        4
+      end
+
+      def sort_biblio(bib)
+        bib.sort { |a, b| sort_biblio_key(a) <=> sort_biblio_key(b) }
+      end
+
+      # 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
+      #      else alphanumeric metanorma id (abbreviation)
+      # then doc part number if present, numeric sort
+      # then doc id (not DOI &c)
+      # then title
+      def sort_biblio_key(bib)
+        pubclass = pub_class(bib)
+        num = bib.at("./docnumber")&.text
+        id = bib.at("./docidentifier[@primary]") ||
+          bib.at("./docidentifier[not(#{skip_docid} or @type = 'metanorma')]")
+        metaid = bib.at("./docidentifier[@type = 'metanorma']")&.text
+        abbrid = metaid unless /^\[\d+\]$/.match?(metaid)
+        /\d-(?<partid>\d+)/ =~ id&.text
+        type = id["type"] if id
+        title = bib.at("./title[@type = 'main']")&.text ||
+          bib.at("./title")&.text || bib&.at("./formattedref")&.text
+        "#{pubclass} :: #{type} :: " \
+          "#{num.nil? ? abbrid : sprintf('%09d', num.to_i)} :: " \
+          "#{sprintf('%09d', partid.to_i)} :: #{id&.text} :: #{title}"
+      end
+
+      def bibitem_cleanup(xmldoc)
+        super
+        unpublished_note(xmldoc)
+        withdrawn_note(xmldoc)
+      end
+
+      def unpublished_note(xmldoc)
+        xmldoc.xpath("//bibitem[not(./ancestor::bibitem)]" \
+                     "[not(note[@type = 'Unpublished-Status'])]").each do |b|
+          pub_class(b) > 2 and next
+          ((s = b.at("./status/stage")) && s.text.match?(/\d/) &&
+           (s.text.to_i < 60)) or next
+          insert_unpub_note(b, @i18n.under_preparation
+            .sub("%", b.at("docidentifier").text))
+        end
+      end
+
+      def withdrawn_note(xmldoc)
+        xmldoc.xpath("//bibitem[not(note[@type = 'Unpublished-Status'])]")
+          .each do |b|
+            withdrawn_ref?(b) or next
+            if id = replacement_standard(b)
+              insert_unpub_note(b, @i18n.cancelled_and_replaced.sub("%", id))
+            else insert_unpub_note(b, @i18n.withdrawn)
+            end
+          end
+      end
+
+      def withdrawn_ref?(biblio)
+        pub_class(biblio) > 2 and return false
+        (s = biblio.at("./status/stage")) && (s.text.to_i == 95) &&
+          (t = biblio.at("./status/substage")) && (t.text.to_i == 99)
+      end
+
+      def replacement_standard(biblio)
+        r = biblio.at("./relation[@type = 'updates']/bibitem") or return nil
+        id = r.at("./formattedref | ./docidentifier[@primary = 'true'] | " \
+                  "./docidentifier | ./formattedref") or return nil
+        id.text
+      end
+
+      def insert_unpub_note(biblio, msg)
+        biblio.at("./language | ./script | ./abstract | ./status")
+          .previous = %(<note type="Unpublished-Status"><p>#{msg}</p></note>)
+      end
+    end
+  end
+end

data/lib/metanorma/iso/front_id.rb

@@ -9,7 +9,7 @@ module Metanorma
     class Converter < Standoc::Converter
       def metadata_id(node, xml)
         if id = node.attr("docidentifier")
-          xml.docidentifier id, **attr_code(type: "ISO")
+          xml.docidentifier id, **attr_code(type: "ISO", primary: "true")
         else iso_id(node, xml)
         end
         node.attr("tc-docnumber")&.split(/,\s*/)&.each do |n|
@@ -161,12 +161,13 @@ module Metanorma
       end
 
       def cen_id_out(xml, params)
-        xml.docidentifier iso_id_default(params).to_s, **attr_code(type: "CEN")
+        xml.docidentifier iso_id_default(params).to_s,
+                          **attr_code(type: "CEN", primary: "true")
       end
 
       def iso_id_out_common(xml, params, with_prf)
         xml.docidentifier iso_id_default(params).to_s(with_prf: with_prf),
-                          **attr_code(type: "ISO")
+                          **attr_code(type: "ISO", primary: "true")
         xml.docidentifier iso_id_reference(params)
           .to_s(format: :ref_num_short, with_prf: with_prf),
                           **attr_code(type: "iso-reference")
@@ -185,8 +186,7 @@ module Metanorma
         params_nolang = params.dup.tap { |hs| hs.delete(:language) }
         params1 = if params[:unpublished]
                     params_nolang.dup.tap { |hs| hs.delete(:year) }
-                  else params_nolang
-                  end
+                  else params_nolang end
         params1.delete(:unpublished)
         pubid_select(params1).create(**params1)
       end