isodoc 2.10.3 → 2.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d57eb699105f5f1b40c5b31cf51259a1bd60b458ac2b6ab0326beaa915c63750
-  data.tar.gz: 99b2d95988e2f1bb989f0779a60298c57fe08e69127bc07f063bd813403e5858
+  metadata.gz: 82d1c3ed71a05f100f76c7e3ff42ec7fd4fe27c2a018bb312a2639f27d69e8b1
+  data.tar.gz: b170bf5e893fb25d9506d34b7ee725c19cf7778270b724f3697a7ac56a487a98
 SHA512:
-  metadata.gz: 5657c1f981918049eab6e6cd2d17d9d929309714025936dc27256f4ce0ec6b04b3c60a8bbd8839daec8eb322515425349cba06972ef888706ed44ea886cd8527
-  data.tar.gz: 1129bf0dbb9d6e31ef5a8fc50d2dd1f63aa70658c4ffdc60329c6e60fd6da3ffb7127fb32c99609ddd68da4b703f8712f0487820362081d1752d2ac983f5b079
+  metadata.gz: ca60c3933004e3b6b5ebcf1864baf52ebe1702e31dbc2aebe7762451552c4efaad660cbe166a5d4e88e0c25fc431970aa4519e94864a9e54b8c548d65c724831
+  data.tar.gz: b0b0375281dd5900fe8f328c61d4efb895b13e7965d645a1d551df1afa09144749056ea0e43424732208da5ec0e5a7f2209d685f5851cf9761d0e47662002abf

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"

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

@@ -67,7 +67,7 @@ module IsoDoc
 
     def nearest_block_parent(node)
       until %w(p title td th name formula li dt dd sourcecode pre quote
-               note example)
+               note example target clause annex term appendix bibdata)
           .include?(node.name)
         node = node.parent
       end

data/lib/isodoc/presentation_function/math.rb

@@ -8,7 +8,10 @@ module IsoDoc
 
     def mathml(docxml)
       docxml.xpath("//m:math", MATHML).each { |f| mathml_linebreak(f) }
-      locale = twitter_cldr_localiser
+      locale = @lang.to_sym
+      @numfmt = Plurimath::NumberFormatter
+        .new(locale, localize_number: @localizenumber,
+                     localizer_symbols: twitter_cldr_localiser_symbols)
       docxml.xpath("//m:math", MATHML).each do |f| # rubocop:disable Style/CombinableLoops
         mathml1(f, locale)
       end
@@ -18,75 +21,88 @@ module IsoDoc
     # TwitterCldr::DataReaders::NumberDataReader.new(locale).symbols
     def localize_maths(node, locale)
       node.xpath(".//m:mn", MATHML).each do |x|
-        num = BigDecimal(x.text)
-        precision = /\./.match?(x.text) ? x.text.sub(/^.*\./, "").size : 0
-        x.children = localized_number(num, locale, precision)
+        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 Error => e
+        warn "Failure to localised MathML/mn\n#{node.parent.to_xml}\n#{e}"
       end
     end
 
-    # By itself twitter-cldr does not support fraction part digits grouping
-    # and custom delimeter, will decorate fraction part manually
-    def localized_number(num, locale, precision)
-      localized = localized_number1(num, locale, precision)
-      twitter_cldr_reader_symbols = twitter_cldr_reader(locale)
-      return localized unless twitter_cldr_reader_symbols[:decimal]
-
-      integer, fraction = localized.split(twitter_cldr_reader_symbols[:decimal])
-      return localized if fraction.nil? || fraction.empty?
+    def normalise_number(num)
+      n = BigDecimal(num).to_s("F")
+      /\.\d/.match?(num) or n.sub!(/\.\d+$/, "")
+      n
+    end
 
-      [integer, decorate_fraction_part(fraction, locale)]
-        .join(twitter_cldr_reader_symbols[:decimal])
+    def implicit_number_formatter(num, locale)
+      fmt = { digit_count: num_totaldigits(num.text) }.compact
+      n = normalise_number(num.text)
+      # Plurimath confused by exponent notation
+      #warn "IMPLICIT: precision: #{num_precision(num.text)} ; symbols: #{fmt}, n: #{n}; output: #{@numfmt.localized_number(n, locale:, format: fmt, precision: num_precision(num.text))}"
+      @numfmt.localized_number(n, locale:, format: fmt,
+                                  precision: num_precision(num.text))
     end
 
-    def localized_number1(num, locale, precision)
-      if precision.zero?
-        num.localize(locale).to_s
-      else
-        num.localize(locale).to_decimal.to_s(precision: precision)
+    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 decorate_fraction_part(fract, locale)
-      result = []
-      twitter_cldr_reader_symbols = twitter_cldr_reader(locale)
-      fract = fract.slice(0..(twitter_cldr_reader_symbols[:precision] || -1))
-      fr_group_digits = twitter_cldr_reader_symbols[:fraction_group_digits] || 1
-      until fract.empty?
-        result.push(fract.slice!(0, fr_group_digits))
+    def numberformat_type(ret)
+      %i(precision digit_count group_digits fraction_group_digits).each do |i|
+        ret[i] &&= ret[i].to_i
       end
-      result.join(twitter_cldr_reader_symbols[:fraction_group].to_s)
+      %i(notation exponent_sign locale).each do |i|
+        ret[i] &&= ret[i].to_sym
+      end
+      ret
     end
 
-    def twitter_cldr_localiser_symbols
-      {}
+    def explicit_number_formatter(num, locale, options)
+      ret = numberformat_type(numberformat_extract(options))
+      l = ret[:locale] || locale
+      precision, symbols, digit_count = explicit_number_formatter_cfg(num, ret)
+      n = normalise_number(num.text)
+      # Plurimath confused by exponent notation
+      #warn "EXPLICIT: precision: #{precision} ; symbols: #{symbols}, n: #{n}; output: #{Plurimath::NumberFormatter.new(l, localizer_symbols: symbols).localized_number(n, precision:, format: symbols.merge(digit_count:))}"
+      Plurimath::NumberFormatter.new(l, localizer_symbols: symbols)
+        .localized_number(n, precision:,
+                             format: symbols.merge(digit_count:))
     end
 
-    def twitter_cldr_reader(locale)
-      return @twitter_cldr_reader if @twitter_cldr_reader
+    def explicit_number_formatter_cfg(num, fmt)
+      symbols = twitter_cldr_localiser_symbols.dup.merge(fmt)
+      precision = symbols[:precision]&.to_i || num_precision(num.text)
+      symbols[:precision] or digit_count = num_totaldigits(num.text)
+      [precision, symbols, digit_count]
+    end
 
-      num = TwitterCldr::DataReaders::NumberDataReader.new(locale)
-      @twitter_cldr_reader = num.symbols.merge!(twitter_cldr_localiser_symbols)
-        .merge!(parse_localize_number)
-      @twitter_cldr_reader
+    def num_precision(num)
+      precision = nil
+      /\.(?!\d+e)/.match?(num) and
+        precision = twitter_cldr_localiser_symbols[:precision] ||
+          num.sub(/^.*\./, "").size
+      precision
     end
 
-    def twitter_cldr_localiser
-      locale = TwitterCldr.supported_locale?(@lang.to_sym) ? @lang.to_sym : :en
-      twitter_cldr_reader(locale)
-      locale
+    def num_totaldigits(num)
+      totaldigits = nil
+      /\.(?=\d+e)/.match?(num) and
+        totaldigits = twitter_cldr_localiser_symbols[:digit_count] ||
+          num.sub(/^.*\./, "").sub(/e.*$/, "").size
+      totaldigits
     end
 
-    def parse_localize_number
-      @localizenumber or return {}
-      m = %r{(?<grp>[^#])?(?<grpdig>#+0)(?<decpt>.)(?<frdig>#+)(?<frgrp>[^#])?}
-        .match(@localizenumber) or return {}
-      ret = { decimal: m[:decpt], group_digits: m[:grpdig].size,
-              fraction_group_digits: m[:frdig].size,
-              group: m[:grp] || "",
-              fraction_group: m[:frgrp] || "" }.compact
-      %i(group fraction_group).each { |x| ret[x] == " " and ret[x] = "\u00A0" }
-      ret
+    def twitter_cldr_localiser_symbols
+      {}
     end
 
     def asciimath_dup(node)

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.3".freeze
+  VERSION = "2.10.5".freeze
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.10.3
+  version: 2.10.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-03 00:00:00.000000000 Z
+date: 2024-07-08 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
@@ -418,7 +446,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:
   - - ">="