metanorma-iso 2.7.5 → 2.7.6

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -212,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

@@ -140,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

@@ -58,9 +58,19 @@ module IsoDoc
         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/validate.rb

@@ -125,13 +125,6 @@ module Metanorma
                    "#{@doctype} is not a recognised document type")
       end
 
-      def script_validate(xmldoc)
-        script = xmldoc&.at("//bibdata/script")&.text
-        %w(Cyrl Latn).include?(script) or
-          @log.add("Document Attributes", nil,
-                   "#{script} is not a recognised script")
-      end
-
       def iteration_validate(xmldoc)
         iteration = xmldoc&.at("//bibdata/status/iteration")&.text or return
         /^\d+/.match(iteration) or
@@ -141,7 +134,6 @@ module Metanorma
 
       def bibdata_validate(doc)
         doctype_validate(doc)
-        script_validate(doc)
         iteration_validate(doc)
       end
 

data/lib/metanorma/iso/validate_style.rb

@@ -6,10 +6,10 @@ module Metanorma
   module ISO
     class Converter < Standoc::Converter
       def extract_text(node)
-        return "" if node.nil?
-
+        node.nil? and return ""
         node1 = Nokogiri::XML.fragment(node.to_s)
-        node1.xpath("//link | //locality | //localityStack").each(&:remove)
+        node1.xpath(".//link | .//locality | .//localityStack | .//stem")
+          .each(&:remove)
         ret = ""
         node1.traverse { |x| ret += x.text if x.text? }
         HTMLEntities.new.decode(ret)
@@ -17,30 +17,26 @@ module Metanorma
 
       # ISO/IEC DIR 2, 12.2
       def foreword_style(node)
-        return if @novalid
-
+        @novalid and return
         style_no_guidance(node, extract_text(node), "Foreword")
       end
 
       # ISO/IEC DIR 2, 14.2
       def scope_style(node)
-        return if @novalid
-
+        @novalid and return
         style_no_guidance(node, extract_text(node), "Scope")
       end
 
       # ISO/IEC DIR 2, 13.2
       def introduction_style(node)
-        return if @novalid
-
+        @novalid and return
         r = requirement_check(extract_text(node))
         style_warning(node, "Introduction may contain requirement", r) if r
       end
 
       # ISO/IEC DIR 2, 16.5.6
       def definition_style(node)
-        return if @novalid
-
+        @novalid and return
         r = requirement_check(extract_text(node))
         style_warning(node, "Definition may contain requirement", r) if r
       end
@@ -48,24 +44,21 @@ module Metanorma
       # ISO/IEC DIR 2, 16.5.7
       # ISO/IEC DIR 2, 25.5
       def example_style(node)
-        return if @novalid
-
+        @novalid and return
         style_no_guidance(node, extract_text(node), "Example")
         style(node, extract_text(node))
       end
 
       # ISO/IEC DIR 2, 24.5
       def note_style(node)
-        return if @novalid
-
+        @novalid and return
         style_no_guidance(node, extract_text(node), "Note")
         style(node, extract_text(node))
       end
 
       # ISO/IEC DIR 2, 26.5
       def footnote_style(node)
-        return if @novalid
-
+        @novalid and return
         style_no_guidance(node, extract_text(node), "Footnote")
         style(node, extract_text(node))
       end
@@ -91,7 +84,7 @@ module Metanorma
 
       def style(node, text)
         @novalid and return
-        style_number(node, text)
+        @novalid_number or style_number(node, text)
         style_percent(node, text)
         style_abbrev(node, text)
         style_units(node, text)
@@ -116,6 +109,8 @@ module Metanorma
       def style_ambig_words(node, text)
         r = ambig_words_check(text) and
           style_warning(node, "may contain ambiguous provision", r)
+        @lang == "en" and style_regex(/\b(?<num>billions?)\b/i,
+                                      "ambiguous number", node, text)
       end
 
       # ISO/IEC DIR 2, 9.1
@@ -124,11 +119,12 @@ module Metanorma
       def style_number(node, text)
         style_number_grouping(node, text)
         style_regex(/(?:^|\p{Zs})(?<num>[0-9]+\.[0-9]+)(?!\.[0-9])/i,
-                    "possible decimal point", node, text)
+                    "possible decimal point: mark up numbers with stem:[]", node, text)
         @lang == "en" and style_regex(/\b(?<num>billions?)\b/i,
                                       "ambiguous number", node, text)
         style_regex(/(?:^|\p{Zs})(?<num>-[0-9][0-9,.]*)/i,
                     "hyphen instead of minus sign U+2212", node, text)
+        @novalid_number = true
       end
 
       def style_number_grouping(node, text)
@@ -136,13 +132,13 @@ module Metanorma
           style_two_regex_not_prev(
             node, text, /^(?<num>-?[0-9]{4,}[,0-9]*)\Z/,
             %r{\b(ISO|IEC|IEEE|(in|January|February|March|April|May|June|August|September|October|November|December)\b)\Z},
-            "number not broken up in threes"
+            "number not broken up in threes: mark up numbers with stem:[]"
           )
         else
           style_two_regex_not_prev(
             node, text, /^(?<num>-?(?:[0-9]{5,}[,0-9]*|[03-9]\d\d\d|1[0-8]\d\d|2[1-9]\d\d|20[5-9]\d))\Z/,
             %r{\b(ISO|IEC|IEEE|\b)\Z},
-            "number not broken up in threes"
+            "number not broken up in threes: mark up numbers with stem:[]"
           )
         end
       end

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.7.5".freeze
+    VERSION = "2.7.6".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -34,9 +34,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "metanorma-standoc", "~> 2.8.4"
   spec.add_dependency "mnconvert", "~> 1.14"
-  spec.add_dependency "pubid-cen"
-  spec.add_dependency "pubid-iec"
-  spec.add_dependency "pubid-iso"
+  spec.add_dependency "pubid"
   spec.add_dependency "tokenizer", "~> 0.3.0"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 2.7.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-25 00:00:00.000000000 Z
+date: 2024-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -39,35 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: pubid-cen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pubid-iec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pubid-iso
+  name: pubid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="