isodoc 2.10.4 → 2.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df0cc3b9722ac37d5d0853fe0b483fedc476ad51655488a893dcb7c58f08b5a3
-  data.tar.gz: 8f5fe80aa471b64d274e3c8b44b87cc6c9fd5ff20bf52b9a61ee3d8ede5421e0
+  metadata.gz: c9d6fb9b45b43931c09ae2961532d650434c834c94adf40ae698afdab0098dfd
+  data.tar.gz: eebae6b266587daad1ed883ff44a69914dece3ccfbf34e5135b811536f8b276e
 SHA512:
-  metadata.gz: 2f8da1dc68e54da5f58af3ad2ca370e175cc914216ecd2148068ec745975c8229371fa87b586ab60c4701b0b21d9b676893e15d97cabc1e513cba20c5ed2ad80
-  data.tar.gz: b20e85c69fe1f89c327b22c2f0232ab751c577028de077bb6b890ae337d24c98de939a8ecb1ff8607a6d2dd9e577abec8404372572033361c4939578be4e0c99
+  metadata.gz: cb7fca64087faf90b1581e9bbeed9809f2ce4253b876eaf8374450cd4fc2c44a5dece2d91febdd0b70914a98ceefaa3f16887303167d378f6ef0d2a83c223041
+  data.tar.gz: f190c3e9d07ff55030a409a7455e79d7f5bcf6813e0c5b0034f632616e78460539c9472a1df9983a574537357c69df0007a0cd308f67f974ffa294602ca2345d

data/.rubocop.yml

@@ -7,4 +7,4 @@ inherit_from:
 # ...
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.4

data/isodoc.gemspec

@@ -26,8 +26,10 @@ Gem::Specification.new do |spec|
     f.match(%r{^(test|spec|features|bin|.github)/}) \
     || f.match(%r{Rakefile|bin/rspec})
   end
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
+  spec.add_dependency "base64"
+  spec.add_dependency "bigdecimal"
   spec.add_dependency "html2doc", "~> 1.8.1"
   # spec.add_dependency "isodoc-i18n", "~> 1.1.0" # already in relaton-render and mn-requirements
   # spec.add_dependency "relaton-cli"
@@ -42,6 +44,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "twitter_cldr", ">= 6.6.0"
   spec.add_dependency "uuidtools"
 
+  spec.add_development_dependency "bigdecimal"
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"

data/lib/isodoc/base_style/scripts.html

@@ -12,12 +12,12 @@ $('#toggle').on('click', function(){
         $('nav').animate({ 'left': '-353px' }, 'slow', function(){
             $('nav').hide();
         });
-        $('body').animate({ 'margin-left': '0' }, 'slow');
+        $('body').animate({ 'padding-left': '30px' }, 'slow');
     }
     else {
         $('nav').show();
         $('nav').animate({ 'left': '0px' }, 'slow');
-        $('body').animate({ 'margin-left': '298px' }, 'slow');
+        $('body').animate({ 'padding-left': '360px' }, 'slow');
     }
 });
 </script>

data/lib/isodoc/css.rb

@@ -90,16 +90,14 @@ module IsoDoc
 
     # stripwordcss if HTML stylesheet, !stripwordcss if DOC stylesheet
     def generate_css(filename, stripwordcss)
-      return nil if filename.nil?
-
+      filename.nil? and return nil
       filename = precompiled_style_or_original(filename)
       stylesheet = File.read(filename, encoding: "UTF-8")
       stylesheet = populate_template(stylesheet, :word)
       stylesheet.gsub!(/(\s|\{)mso-[^:]+:[^;]+;/m, "\\1") if stripwordcss
       stylesheet.gsub!(/--/, "-DOUBLE_HYPHEN_ESCAPE-") unless stripwordcss
-      if File.extname(filename) == ".scss"
+      File.extname(filename) == ".scss" and
         stylesheet = convert_scss(filename, stylesheet, stripwordcss)
-      end
       Tempfile.open([File.basename(filename, ".*"), "css"],
                     mode: File::BINARY | File::SHARE_DELETE,
                     encoding: "utf-8") do |f|

data/lib/isodoc/function/blocks.rb

@@ -161,8 +161,7 @@ module IsoDoc
       def quote_attribution(node, out)
         author = node.at(ns("./author"))
         source = node.at(ns("./source"))
-        return if author.nil? && source.nil?
-
+        author.nil? && source.nil? and return
         out.p class: "QuoteAttribution" do |p|
           p << "&#x2014; #{author.text}" if author
           p << ", " if author && source
@@ -206,6 +205,18 @@ module IsoDoc
         end
       end
 
+      def cross_align_parse(node, out)
+        out.table do |t|
+          t.tbody do |b|
+            node.xpath(ns("./align-cell")).each do |c|
+              b.td do |td|
+                c.children.each { |n| parse(n, td) }
+              end
+            end
+          end
+        end
+      end
+
       def columnbreak_parse(node, out); end
     end
   end

data/lib/isodoc/function/references.rb

@@ -51,24 +51,31 @@ module IsoDoc
 
       # returns [metanorma, non-metanorma, DOI/ISSN/ISBN] identifiers
       def bibitem_ref_code(bib)
+        id, id1, id2, id3 = bibitem_ref_code_prep(bib)
+        id || id1 || id2 || id3 and return [id, id1, id2, id3]
+        bib["suppress_identifier"] == "true" and return [nil, nil, nil, nil]
+        [nil, no_identifier(bib), nil, nil]
+      end
+
+      def bibitem_ref_code_prep(bib)
         id = bib.at(ns("./docidentifier[@type = 'metanorma']"))
         id1 = pref_ref_code(bib)
         id2 = bib.at(ns("./docidentifier[#{SKIP_DOCID}]"))
         id3 = bib.at(ns("./docidentifier[@type = 'metanorma-ordinal']"))
-        return [id, id1, id2, id3] if id || id1 || id2 || id3
-        return [nil, nil, nil, nil] if bib["suppress_identifier"] == "true"
+        [id, id1, id2, id3]
+      end
 
+      def no_identifier(bib)
+        @i18n.no_identifier or return nil
         id = Nokogiri::XML::Node.new("docidentifier", bib.document)
-        id << "(NO ID)"
-        [nil, id, nil, nil]
+        id << @i18n.no_identifier
+        id
       end
 
       def bracket_if_num(num)
-        return nil if num.nil?
-
+        num.nil? and return nil
         num = num.text.sub(/^\[/, "").sub(/\]$/, "")
-        return "[#{num}]" if /^\d+$/.match?(num)
-
+        /^\d+$/.match?(num) and return "[#{num}]"
         num
       end
 

data/lib/isodoc/function/section_titles.rb

@@ -18,6 +18,14 @@ module IsoDoc
         end
       end
 
+      def freestanding_title(node, out)
+        parents = node.ancestors("clause, annex, terms, references, " \
+                               "definitions, acknowledgements, introduction, " \
+                               "foreword")
+        clause_parse_title(parents.empty? ? node : parents.first,
+                           out, node, out)
+      end
+
       # used for subclauses
       def clause_parse_title(node, div, title, out, header_class = {})
         return if title.nil?

data/lib/isodoc/function/to_word_html.rb

@@ -153,6 +153,12 @@ module IsoDoc
         @meta.get
       end
 
+      def cross_align(isoxml, out)
+        isoxml.xpath(ns("//cross-align")).each do |c|
+          parse(c, out)
+        end
+      end
+
       def boilerplate(node, out)
         @bare and return
         boilerplate = node.at(ns("//boilerplate")) or return
@@ -249,9 +255,11 @@ module IsoDoc
           when "option" then option_parse(node, out)
           when "textarea" then textarea_parse(node, out)
           when "toc" then toc_parse(node, out)
+          when "title" then freestanding_title(node, out) # not inside clause
           when "variant-title" then variant_title(node, out)
           when "span" then span_parse(node, out)
           when "location" then location_parse(node, out)
+          when "cross-align" then cross_align_parse(node, out)
           when "columnbreak" then columnbreak_parse(node, out)
           when "ruby" then ruby_parse(node, out)
           when "rt" then rt_parse(node, out)

data/lib/isodoc/presentation_function/math.rb

@@ -21,21 +21,85 @@ module IsoDoc
     # TwitterCldr::DataReaders::NumberDataReader.new(locale).symbols
     def localize_maths(node, locale)
       node.xpath(".//m:mn", MATHML).each do |x|
-        x.children = @numfmt
-          .localized_number(x.text, locale: locale,
-                                    precision: num_precision(x.text))
+        x.children =
+          if fmt = x["data-metanorma-numberformat"]
+            x.delete("data-metanorma-numberformat")
+            explicit_number_formatter(x, locale, fmt)
+          else implicit_number_formatter(x, locale)
+          end
       rescue ArgumentError
+      rescue StandardError, RuntimeError => e
+        warn "Failure to localise MathML/mn\n#{node.parent.to_xml}\n#{e}"
       end
     end
 
+    def normalise_number(num)
+      n = BigDecimal(num).to_s("F")
+      /\.\d/.match?(num) or n.sub!(/\.\d+$/, "")
+      n
+    end
+
+    def implicit_number_formatter(num, locale)
+      fmt = { significant: num_totaldigits(num.text) }.compact
+      n = normalise_number(num.text)
+      @numfmt.localized_number(n, locale:, format: fmt,
+                                  precision: num_precision(num.text))
+    end
+
+    def numberformat_extract(options)
+      options.gsub!(/([a-z_]+)='/, %('\\1=))
+      CSV.parse_line(options, quote_char: "'").each_with_object({}) do |x, acc|
+        m = /^(.+?)=(.+)?$/.match(x) or next
+        acc[m[1].to_sym] = m[2].sub(/^(["'])(.+)\1$/, "\\2")
+      end
+    end
+
+    def numberformat_type(ret)
+      %i(precision significant digit_count group_digits fraction_group_digits)
+        .each do |i|
+        ret[i] &&= ret[i].to_i
+      end
+      %i(notation exponent_sign locale).each do |i|
+        ret[i] &&= ret[i].to_sym
+      end
+      ret
+    end
+
+    def explicit_number_formatter(num, locale, options)
+      ret = numberformat_type(numberformat_extract(options))
+      l = ret[:locale] || locale
+      precision, symbols, significant = explicit_number_formatter_cfg(num, ret)
+      n = normalise_number(num.text)
+      Plurimath::NumberFormatter.new(l)
+        .localized_number(n, precision:,
+                             format: symbols.merge(significant:))
+    end
+
+    def explicit_number_formatter_cfg(num, fmt)
+      symbols = twitter_cldr_localiser_symbols.dup.merge(fmt)
+      precision = symbols[:precision] || num_precision(num.text)
+      signif = symbols[:significant]
+      (symbols.keys & %i(precision digit_count)).empty? and
+        signif ||= num_totaldigits(num.text)
+      [precision, symbols, signif]
+    end
+
     def num_precision(num)
-      precision = 0
-      /\./.match?(num) and precision =
-                             twitter_cldr_localiser_symbols[:precision] ||
-                             num.sub(/^.*\./, "").size
+      precision = nil
+      /\.(?!\d+e)/.match?(num) and
+        precision = twitter_cldr_localiser_symbols[:precision] ||
+          num.sub(/^.*\./, "").size
       precision
     end
 
+    def num_totaldigits(num)
+      totaldigits = nil
+      /\.(?=\d+e)/.match?(num) and
+        totaldigits = twitter_cldr_localiser_symbols[:significant] ||
+          num.sub(/^0\./, ".").sub(/^.*\./, "").sub(/e.*$/, "").size
+      totaldigits
+    end
+
     def twitter_cldr_localiser_symbols
       {}
     end
@@ -44,6 +108,7 @@ module IsoDoc
       @suppressasciimathdup || node.parent.at(ns("./asciimath")) and return
       math = node.to_xml.gsub(/ xmlns=["'][^"']+["']/, "")
         .gsub(%r{<[^:/>]+:}, "<").gsub(%r{</[^:/>]+:}, "</")
+        .gsub(%r{ data-metanorma-numberformat="[^"]+"}, "")
       ret = Plurimath::Math.parse(math, "mathml").to_asciimath
       node.next = "<asciimath>#{@c.encode(ret, :basic)}</asciimath>"
     rescue StandardError => e
@@ -51,7 +116,8 @@ module IsoDoc
     end
 
     def maths_just_numeral(node)
-      mn = node.at(".//m:mn", MATHML).children
+      mn = node.at(".//m:mn", MATHML).children.text
+        .sub(/\^([0-9+-]+)$/, "<sup>\\1</sup>")
       if node.parent.name == "stem"
         node.parent.replace(mn)
       else
@@ -77,11 +143,24 @@ module IsoDoc
       OUTPUT
     end
 
+    # convert any Ascii superscripts to correct(ish) MathML
+    # Not bothering to match times, base of 1.0 x 10^-20, just ^-20
+    def mn_to_msup(node)
+      node.xpath(".//m:mn", MATHML).each do |n|
+        m = %r{^(.+)\^([0-9+-]+)$}.match(n.text) or next
+        n.replace("<msup><mn>#{m[1]}</mn><mn>#{m[2]}</mn></msup>")
+      end
+    end
+
     def mathml_number(node, locale)
       justnumeral = numeric_mathml?(node)
       justnumeral or asciimath_dup(node)
       localize_maths(node, locale)
-      justnumeral and maths_just_numeral(node)
+      if justnumeral
+        maths_just_numeral(node)
+      else
+        mn_to_msup(node)
+      end
     end
 
     def numeric_mathml?(node)

data/lib/isodoc/presentation_function/refs.rb

@@ -13,15 +13,21 @@ module IsoDoc
 
     def move_norm_ref_to_sections(docxml)
       docxml.at(ns(@xrefs.klass.norm_ref_xpath)) or return
-      s = docxml.at(ns("//sections")) ||
-        docxml.at(ns("//preface"))&.after("<sections/>")&.next_element ||
-        docxml.at(ns("//annex | //bibliography"))&.before("<sections/>")
-          &.previous_element or return
+      s = move_norm_ref_to_sections_insert_pt(docxml) or return
       docxml.xpath(ns(@xrefs.klass.norm_ref_xpath)).each do |r|
+        r.at("./ancestor::xmlns:bibliography") or next
         s << r.remove
       end
     end
 
+    def move_norm_ref_to_sections_insert_pt(docxml)
+      s = docxml.at(ns("//sections")) and return s
+      s = docxml.at(ns("//preface")) and
+        return s.after("<sections/>").next_element
+      docxml.at(ns("//annex | //bibliography"))&.before("<sections/>")
+        &.previous_element
+    end
+
     def hidden_items(docxml)
       docxml.xpath(ns("//references[bibitem/@hidden = 'true']")).each do |x|
         x.at(ns("./bibitem[not(@hidden = 'true')]")) and next

data/lib/isodoc/presentation_xml_convert.rb

@@ -20,7 +20,7 @@ module IsoDoc
 
     def convert1(docxml, filename, dir)
       @outputdir = dir
-      @outputfile = filename
+      @outputfile = Pathname.new(filename).basename.to_s
       docid_prefixes(docxml) # feeds @xrefs.parse citation processing
       @xrefs.parse docxml
       @xrefs.klass.meta = @meta

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.10.4".freeze
+  VERSION = "2.10.6".freeze
 end

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -29,9 +29,9 @@ module IsoDoc
         j = 0
         clause.xpath(ns(self.class::FIGURE_NO_CLASS)).noblank.each do |t|
           j = subfigure_increment(j, c, t)
-          sequential_figure_body(j, c, t, "figure", container: container)
+          sequential_figure_body(j, c, t, "figure", container:)
         end
-        sequential_figure_class_names(clause, container: container)
+        sequential_figure_class_names(clause, container:)
       end
 
       def sequential_figure_class_names(clause, container: false)
@@ -42,13 +42,13 @@ module IsoDoc
           c[t["class"]] ||= Counter.new
           j = subfigure_increment(j, c[t["class"]], t)
           sequential_figure_body(j, c[t["class"]], t, t["class"],
-                                 container: container)
+                                 container:)
         end
       end
 
       def subfigure_label(subfignum)
         subfignum.zero? and return ""
-        "-#{subfignum}"
+        "#{hierfigsep}#{subfignum}"
       end
 
       def sequential_figure_body(subfig, counter, elem, klass, container: false)
@@ -100,8 +100,8 @@ module IsoDoc
           klass, label = reqt2class_label(t, m)
           id = c.increment(label, t).print
           sequential_permission_body(id, t, label, klass, m,
-                                     container: container)
-          sequential_permission_children(t, id, container: container)
+                                     container:)
+          sequential_permission_children(t, id, container:)
         end
       end
 
@@ -112,12 +112,13 @@ module IsoDoc
           klass, label = reqt2class_nested_label(t, m)
           id = "#{lbl}#{hierfigsep}#{c.increment(label, t).print}"
           sequential_permission_body(id, t, label, klass, m,
-                                     container: container)
-          sequential_permission_children(t, id, container: container)
+                                     container:)
+          sequential_permission_children(t, id, container:)
         end
       end
 
-      def sequential_permission_body(id, elem, label, klass, model, container: false)
+      def sequential_permission_body(id, elem, label, klass, model,
+container: false)
         @anchors[elem["id"]] = model.postprocess_anchor_struct(
           elem, anchor_struct(id, elem,
                               label, klass, elem["unnumbered"])
@@ -146,10 +147,10 @@ module IsoDoc
 
       # container makes numbering be prefixed with the parent clause reference
       def sequential_asset_names(clause, container: false)
-        sequential_table_names(clause, container: container)
-        sequential_figure_names(clause, container: container)
-        sequential_formula_names(clause, container: container)
-        sequential_permission_names(clause, container: container)
+        sequential_table_names(clause, container:)
+        sequential_figure_names(clause, container:)
+        sequential_formula_names(clause, container:)
+        sequential_permission_names(clause, container:)
       end
 
       def hierarchical_figure_names(clause, num)

data/lib/isodoc/xref/xref_util.rb

@@ -19,7 +19,8 @@ module IsoDoc
 
       SECTIONS_XPATH =
         "//foreword | //introduction | //acknowledgements | " \
-        "//preface/terms | preface/definitions | preface/references | " \
+        "//preface/abstract | " \
+        "//preface/terms | //preface/definitions | //preface/references | " \
         "//preface/clause | //sections/terms | //annex | " \
         "//sections/clause | //sections/definitions | " \
         "//bibliography/references | //bibliography/clause".freeze
@@ -34,8 +35,8 @@ module IsoDoc
         "./xmlns:X".gsub("X", asset)
       end
 
-            CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions | " \
-                       "./references".freeze
+      CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions | " \
+                 "./references".freeze
     end
   end
 end

data/lib/isodoc-yaml/i18n-ar.yaml

@@ -75,6 +75,7 @@ modified: معدلة
 adapted: تكيف
 deprecated: مهمل
 source: مصدر
+no_identifier: (لا يوجد معرف)
 and: و
 all_parts: كل الأجزاء
 edition_ordinal: "ﺎﻠﻄﺒﻋﺓ؜ {{ var1 | ordinal_word: 'edition', '' }}"

data/lib/isodoc-yaml/i18n-de.yaml

@@ -88,6 +88,7 @@ adapted: angepasst
 deprecated: VERALTET
 source: QUELLE
 and: und
+no_identifier: (KEIN KENNUNG)
 all_parts: Alle Teile
 edition_ordinal: "{{ var1 | ordinal_word: 'edition', '' }} Auflage"
 edition: Auflage

data/lib/isodoc-yaml/i18n-en.yaml

@@ -68,6 +68,7 @@ requirement: Requirement
 recommendation: Recommendation
 permission: Permission
 box: Box
+no_identifier: (NO ID)
 # Modspec
 recommendationtest: Recommendation test
 requirementtest: Requirement test

data/lib/isodoc-yaml/i18n-es.yaml

@@ -86,6 +86,7 @@ adapted: adaptado
 deprecated: OBSOLETO
 source: FUENTE
 and: y
+no_identifier: (SIN IDENTIFICADOR)
 all_parts: Todas las partes
 edition_ordinal: "{{ var1 | ordinal_word: 'edition', '' }} edición"
 edition: edición

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -85,6 +85,7 @@ source: SOURCE
 edition: édition
 version: version
 and: et
+no_identifier: (PAS D'IDENTIFIANT)
 all_parts: toutes les parties
 edition_ordinal: "{{ var1 | ordinal_word: 'edition', '' }} édition"
 edition: édition

data/lib/isodoc-yaml/i18n-ja.yaml

@@ -88,6 +88,7 @@ adapted: 適合しました
 deprecated: 推奨しない用語
 source: 出典
 and: and
+no_identifier: (識別子なし)
 all_parts: 規格群
 edition_ordinal: "第{{ var1 }}版"
 edition: 版

data/lib/isodoc-yaml/i18n-ru.yaml

@@ -153,6 +153,7 @@ adapted: адаптированный
 deprecated: НЕ РЕКОМЕНДУЕТСЯ
 source: ИСТОЧНИК
 and: и
+no_identifier: (БЕЗ ИДЕНТИФИКАТОРА)
 all_parts: Все части
 edition_ordinal: "{{ var1 | ordinal_word: 'edition', '' }} издание"
 edition: издание

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -77,6 +77,7 @@ adapted: 改编
 deprecated: 被取代
 source: 定义
 and: 和
+no_identifier: （无标识符）
 all_parts: 所有部分
 edition_ordinal: "第{{ var1 | ordinal_word: '', '' }}版"
 edition: 版

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.10.4
+  version: 2.10.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-17 00:00:00.000000000 Z
+date: 2024-07-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  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: bigdecimal
+  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: html2doc
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -418,7 +460,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="