isodoc 2.10.3 → 2.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d57eb699105f5f1b40c5b31cf51259a1bd60b458ac2b6ab0326beaa915c63750
-  data.tar.gz: 99b2d95988e2f1bb989f0779a60298c57fe08e69127bc07f063bd813403e5858
+  metadata.gz: df0cc3b9722ac37d5d0853fe0b483fedc476ad51655488a893dcb7c58f08b5a3
+  data.tar.gz: 8f5fe80aa471b64d274e3c8b44b87cc6c9fd5ff20bf52b9a61ee3d8ede5421e0
 SHA512:
-  metadata.gz: 5657c1f981918049eab6e6cd2d17d9d929309714025936dc27256f4ce0ec6b04b3c60a8bbd8839daec8eb322515425349cba06972ef888706ed44ea886cd8527
-  data.tar.gz: 1129bf0dbb9d6e31ef5a8fc50d2dd1f63aa70658c4ffdc60329c6e60fd6da3ffb7127fb32c99609ddd68da4b703f8712f0487820362081d1752d2ac983f5b079
+  metadata.gz: 2f8da1dc68e54da5f58af3ad2ca370e175cc914216ecd2148068ec745975c8229371fa87b586ab60c4701b0b21d9b676893e15d97cabc1e513cba20c5ed2ad80
+  data.tar.gz: b20e85c69fe1f89c327b22c2f0232ab751c577028de077bb6b890ae337d24c98de939a8ecb1ff8607a6d2dd9e577abec8404372572033361c4939578be4e0c99

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,77 +21,25 @@ 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 = @numfmt
+          .localized_number(x.text, locale: locale,
+                                    precision: num_precision(x.text))
       rescue ArgumentError
       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?
-
-      [integer, decorate_fraction_part(fraction, locale)]
-        .join(twitter_cldr_reader_symbols[:decimal])
-    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)
-      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))
-      end
-      result.join(twitter_cldr_reader_symbols[:fraction_group].to_s)
+    def num_precision(num)
+      precision = 0
+      /\./.match?(num) and precision =
+                             twitter_cldr_localiser_symbols[:precision] ||
+                             num.sub(/^.*\./, "").size
+      precision
     end
 
     def twitter_cldr_localiser_symbols
       {}
     end
 
-    def twitter_cldr_reader(locale)
-      return @twitter_cldr_reader if @twitter_cldr_reader
-
-      num = TwitterCldr::DataReaders::NumberDataReader.new(locale)
-      @twitter_cldr_reader = num.symbols.merge!(twitter_cldr_localiser_symbols)
-        .merge!(parse_localize_number)
-      @twitter_cldr_reader
-    end
-
-    def twitter_cldr_localiser
-      locale = TwitterCldr.supported_locale?(@lang.to_sym) ? @lang.to_sym : :en
-      twitter_cldr_reader(locale)
-      locale
-    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
-    end
-
     def asciimath_dup(node)
       @suppressasciimathdup || node.parent.at(ns("./asciimath")) and return
       math = node.to_xml.gsub(/ xmlns=["'][^"']+["']/, "")

data/lib/isodoc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.10.3
+  version: 2.10.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-03 00:00:00.000000000 Z
+date: 2024-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html2doc