plurimath 0.8.13 → 0.8.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd471ff00338f1235d74433502b5589c0b95287f196c0088be89cbc91e65a456
-  data.tar.gz: 3f30ce7bd235c3e9c07768240ffafea84e93f63c0da3ae442b2687ad7b2b7f95
+  metadata.gz: e4917de6263422b35cc5d2c04dd466d10e1c0f50f214d0c54753fcef4df826d6
+  data.tar.gz: 8c26d6c94f2ab39735cc1011bd155af5dc74b01d714abe7050d55eeac4edebfd
 SHA512:
-  metadata.gz: 83007b138c9c86561350991289d7007d42b7aa24859f8039c961c7e2434f1f1b381d3e4f85f897bc3c5c1b1f4d22cb4ddf7257bb9f136a0c465695995ba72690
-  data.tar.gz: 6b019a7ed611f78e28c0e62473b4e8ee0780568de8b304fed12f9957fde6aebc7f88f30c4656ddd6500f7ef298462616d5fba6fd6d2e9fc3b03f24be1ef8fde4
+  metadata.gz: 2e23d92d441333bee877fe164bcfd3405311a78c8e310bfbed17eaca66bcfefaa1020201b8f89c13064c7b0c32bcaec146c0667479e4b45ddedc30e93ac97055
+  data.tar.gz: ecd0a5db9719cabf0bd3256776b9874aa7c25092105430eb3fe84aff79e6b18a849ab4e41265fcfcb08eee08352886536936dc92552373068edf569baf3d3548

data/lib/plurimath/formatter/number_formatter.rb

@@ -2,44 +2,70 @@
 
 module Plurimath
   module Formatter
-    class NumberFormatter < TwitterCldr::Formatters::NumberFormatter
-      def format(tokens, number, options = {})
-        options[:precision] ||= precision_from(number)
-        options[:type] ||= :decimal
+    class NumberFormatter
+      attr_reader :number, :data_reader
 
-        prefix, suffix, integer_format, fraction_format, signif_format = *partition_tokens(tokens)
-        number = truncate_number(number, integer_format.format.length)
+      STRING_SYMBOLS = {
+        dot: ".".freeze,
+        f: "F".freeze,
+      }.freeze
 
-        int, fraction = parse_number(number, options)
-        result = integer_format.apply(int, options)
-        result << fraction_format.apply(fraction, options, int) if fraction
+      def initialize(number, data_reader = {})
+        @number = number
+        @data_reader = data_reader
+      end
+
+      def format(precision: nil)
+        data_reader[:precision] = precision || precision_from(number)
+        int, frac, integer_format, fraction_format, signif_format = *partition_tokens(number)
+        result = integer_format.apply(int, data_reader)
+        result << fraction_format.apply(frac, data_reader, int) if frac
 
         result = signif_format.apply(result, integer_format, fraction_format)
 
-        number_system.transliterate(
-          "#{prefix.to_s}#{result}#{suffix.to_s}"
-        )
+        result
       end
 
       private
 
-      def partition_tokens(tokens)
+      def partition_tokens(number)
+        int, fraction = parse_number(number, data_reader)
         [
-          token_val_from(tokens[0]),
-          token_val_from(tokens[2]),
-          Numbers::Integer.new(
-            tokens[1],
-            data_reader.symbols
-          ),
-          Numbers::Fraction.new(
-            tokens[1],
-            data_reader.symbols
-          ),
-          Numbers::Significant.new(
-            data_reader.symbols,
-          )
+          int,
+          fraction,
+          Numbers::Integer.new(data_reader),
+          Numbers::Fraction.new(data_reader),
+          Numbers::Significant.new(data_reader),
         ]
       end
+
+      def precision_from(number)
+        return 0 if number.fix == number
+
+        parts = number.to_s(STRING_SYMBOLS[:f]).split(STRING_SYMBOLS[:dot])
+        parts.size == 2 ? parts[1].size : 0
+      end
+
+      def parse_number(number, options = {})
+        precision = options[:precision] || precision_from(number)
+
+        num = if precision == 0
+                round_to(number, precision).abs.fix.to_s(STRING_SYMBOLS[:f])
+              else
+                round_to(number, precision).abs.round(precision).to_s(STRING_SYMBOLS[:f])
+              end
+        num.split(STRING_SYMBOLS[:dot])
+      end
+
+      def round_to(number, precision)
+        factor = 10 ** precision
+        result = if number.is_a?(BigDecimal)
+                   ((number * factor).fix / factor)
+                 else
+                   ((number * factor).round.to_f / factor)
+                 end
+        result
+      end
     end
   end
 end

data/lib/plurimath/formatter/numbers/base.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Plurimath
+  module Formatter
+    module Numbers
+      class Base
+        def interpolate(string, value, orientation = :right)
+          value  = value.to_s
+          length = value.length
+          start  = orientation == :left ? 0 : -length
+
+          string = string.dup
+          string = string.ljust(length, '#') if string.length < length
+          string[start, length] = value
+          string.gsub('#', '')
+        end
+      end
+    end
+  end
+end

data/lib/plurimath/formatter/numbers/fraction.rb

@@ -3,20 +3,19 @@
 module Plurimath
   module Formatter
     module Numbers
-      class Fraction < TwitterCldr::Formatters::Numbers::Fraction
-        attr_reader :format, :decimal, :precision, :separator, :group
+      class Fraction < Base
+        attr_reader :decimal, :precision, :separator, :group
 
-        def initialize(token, symbols = {})
-          @format  = token ? token.value.split('.').pop : ''
+        def initialize(symbols = {})
+          @precision = 3
           @decimal = symbols[:decimal] || '.'
           @separator = symbols[:fraction_group].to_s
           @group = symbols[:fraction_group_digits]
           @digit_count = symbols[:digit_count] || nil
-          @precision = @format.length
         end
 
         def apply(fraction, options = {}, int = "")
-          precision = options[:precision] || self.precision
+          precision = options[:precision] || @precision
           return "" unless precision > 0
 
           number = interpolate(format(options), fraction, :left)
@@ -26,7 +25,7 @@ module Plurimath
         end
 
         def format(options)
-          precision = options[:precision] || self.precision
+          precision = options[:precision] || @precision
           precision ? '0' * precision : @format
         end
 
@@ -66,13 +65,13 @@ module Plurimath
         end
 
         def update_digit_count(number)
-          return @digit_count unless all_zeros?(number) == @precision
+          return @digit_count unless zeros_count_in(number) == @precision
 
           @digit_count - @precision + 1
         end
 
-        def all_zeros?(number)
-          return unless number.split('').all? { |dig| dig == "0" }
+        def zeros_count_in(number)
+          return unless number.split('').all? { |digit| digit == "0" }
 
           number.length
         end

data/lib/plurimath/formatter/numbers/integer.rb

@@ -3,13 +3,32 @@
 module Plurimath
   module Formatter
     module Numbers
-      class Integer < TwitterCldr::Formatters::Numbers::Integer
-        def initialize(token, symbols = {})
-          format     = token.value.split('.')[0]
-          @format    = prepare_format(format, symbols)
-          @groups    = Array(symbols[:group_digits] || parse_groups(format))
+      class Integer < Base
+        attr_reader :format, :separator, :groups
+
+        def initialize(symbols = {})
+          @groups    = Array(symbols[:group_digits] || 3)
           @separator = symbols[:group] || ','
         end
+
+        def apply(number, options = {})
+          format_groups(interpolate(number, number.to_i))
+        end
+
+        def format_groups(string)
+          return string if groups.empty?
+
+          tokens = []
+
+          tokens << chop_group(string, groups.first)
+          tokens << chop_group(string, groups.last) until string.empty?
+
+          tokens.compact.reverse.join(separator)
+        end
+
+        def chop_group(string, size)
+          string.slice!([string.size - size, 0].max, size)
+        end
       end
     end
   end

data/lib/plurimath/formatter/numeric_formatter.rb

@@ -1,10 +1,9 @@
-require "twitter_cldr"
+require_relative "supported_locales"
+require_relative "numbers/base"
 require_relative "numbers/integer"
 require_relative "numbers/fraction"
 require_relative "numbers/significant"
 require_relative "number_formatter"
-require_relative "number_data_reader"
-require_relative "localized_number"
 
 module Plurimath
   module Formatter
@@ -32,8 +31,8 @@ module Plurimath
       private
 
       def twitter_cldr_reader_lookup
-        num = TwitterCldr::DataReaders::NumberDataReader.new(locale)
-        num.symbols
+        symbols = Formatter::SupportedLocales::LOCALES[locale.to_sym]
+        symbols
           .merge!(@localizer_symbols)
           .merge!(parse_localize_number)
       end
@@ -51,10 +50,12 @@ module Plurimath
       end
 
       def localize_number(num)
-        localized = localize(BigDecimal(num.to_s))
-        return localized.to_s if @precision.zero?
-
-        localized.to_decimal.to_s(precision: @precision)
+        Formatter::NumberFormatter.new(
+          BigDecimal(num),
+          @twitter_cldr_reader,
+        ).format(
+          precision: @precision
+        )
       end
 
       def e_format(num_str)
@@ -122,10 +123,6 @@ module Plurimath
         chars.first.insert(index + 1, ".") unless chars.first[index + 2].nil?
         chars[-1] = (chars[-1].to_i - index).to_s
       end
-
-      def localize(value)
-        LocalizedNumber.new(value, @locale, type: :decimal)
-      end
     end
   end
 end

data/lib/plurimath/formatter/supported_locales.rb

@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+module Plurimath
+  module Formatter
+    class SupportedLocales
+      LOCALES = {
+        "sr-Cyrl-ME": { decimal: ",", group: "." },
+        "sr-Latn-ME": { decimal: ",", group: "." },
+        "zh-Hant": { decimal: ".", group: "," },
+        "en-001": { decimal: ".", group: "," },
+        "en-150": { decimal: ".", group: "," },
+        "pt-PT": { decimal: ",", group: " " },
+        "nl-BE": { decimal: ",", group: "." },
+        "it-CH": { decimal: ".", group: "’" },
+        "fr-BE": { decimal: ",", group: " " },
+        "fr-CA": { decimal: ",", group: " " },
+        "fr-CH": { decimal: ",", group: " " },
+        "de-AT": { decimal: ",", group: " " },
+        "de-CH": { decimal: ".", group: "’" },
+        "en-AU": { decimal: ".", group: "," },
+        "en-CA": { decimal: ".", group: "," },
+        "en-GB": { decimal: ".", group: "," },
+        "en-IE": { decimal: ".", group: "," },
+        "en-IN": { decimal: ".", group: "," },
+        "en-NZ": { decimal: ".", group: "," },
+        "en-SG": { decimal: ".", group: "," },
+        "en-US": { decimal: ".", group: "," },
+        "en-ZA": { decimal: ".", group: "," },
+        "es-419": { decimal: ".", group: "," },
+        "es-AR": { decimal: ",", group: "." },
+        "es-CO": { decimal: ",", group: "." },
+        "es-MX": { decimal: ".", group: "," },
+        "es-US": { decimal: ".", group: "," },
+        fil: { decimal: ".", group: "," },
+        af: { decimal: ",", group: " " },
+        ar: { decimal: "٫", group: "٬" },
+        az: { decimal: ",", group: "." },
+        be: { decimal: ",", group: " " },
+        bg: { decimal: ",", group: " " },
+        bn: { decimal: ".", group: "," },
+        bo: { decimal: ".", group: "," },
+        bs: { decimal: ",", group: "." },
+        ca: { decimal: ",", group: "." },
+        cs: { decimal: ",", group: " " },
+        cy: { decimal: ".", group: "," },
+        da: { decimal: ",", group: "." },
+        de: { decimal: ",", group: "." },
+        el: { decimal: ",", group: "." },
+        en: { decimal: ".", group: "," },
+        eo: { decimal: ",", group: " " },
+        es: { decimal: ",", group: "." },
+        et: { decimal: ",", group: " " },
+        eu: { decimal: ",", group: "." },
+        fa: { decimal: "٫", group: "٬" },
+        fi: { decimal: ",", group: " " },
+        fr: { decimal: ",", group: " " },
+        ga: { decimal: ".", group: "," },
+        gl: { decimal: ",", group: "." },
+        gu: { decimal: ".", group: "," },
+        he: { decimal: ".", group: "," },
+        hi: { decimal: ".", group: "," },
+        hr: { decimal: ",", group: "." },
+        hu: { decimal: ",", group: " " },
+        hy: { decimal: ",", group: " " },
+        id: { decimal: ",", group: "." },
+        is: { decimal: ",", group: "." },
+        it: { decimal: ",", group: "." },
+        ja: { decimal: ".", group: "," },
+        ka: { decimal: ",", group: " " },
+        kk: { decimal: ",", group: " " },
+        km: { decimal: ",", group: "." },
+        kn: { decimal: ".", group: "," },
+        ko: { decimal: ".", group: "," },
+        lo: { decimal: ",", group: "." },
+        lt: { decimal: ",", group: " " },
+        lv: { decimal: ",", group: " " },
+        mk: { decimal: ",", group: "." },
+        mr: { decimal: ".", group: "," },
+        ms: { decimal: ".", group: "," },
+        mt: { decimal: ".", group: "," },
+        my: { decimal: ".", group: "," },
+        nb: { decimal: ",", group: " " },
+        nl: { decimal: ",", group: "." },
+        pl: { decimal: ",", group: " " },
+        pt: { decimal: ",", group: "." },
+        ro: { decimal: ",", group: "." },
+        ru: { decimal: ",", group: " " },
+        sk: { decimal: ",", group: " " },
+        sl: { decimal: ",", group: "." },
+        sq: { decimal: ",", group: " " },
+        sr: { decimal: ",", group: "." },
+        sv: { decimal: ",", group: " " },
+        sw: { decimal: ".", group: "," },
+        ta: { decimal: ".", group: "," },
+        th: { decimal: ".", group: "," },
+        tr: { decimal: ",", group: "." },
+        uk: { decimal: ",", group: " " },
+        ur: { decimal: ".", group: "," },
+        vi: { decimal: ",", group: "." },
+        xh: { decimal: ".", group: " " },
+        zh: { decimal: ".", group: "," },
+        zu: { decimal: ".", group: "," },
+      }
+    end
+  end
+end

data/lib/plurimath/latex/parser.rb

@@ -8,7 +8,7 @@ module Plurimath
     class Parser
       attr_accessor :text
 
-      TEXT_REGEX = %r(\\(?:mbox|text){[^}]+})
+      TEXT_REGEX = %r(\\(?:mbox|text)\{[^\}]+\})
 
       def initialize(text)
         @text = pre_processing(text)

data/lib/plurimath/number_formatter.rb

@@ -1,4 +1,5 @@
-require "plurimath/formatter/numeric_formatter"
+require_relative "formatter/numeric_formatter"
+require_relative "formatter/supported_locales"
 
 module Plurimath
   class NumberFormatter
@@ -37,11 +38,11 @@ module Plurimath
     private
 
     def supported_locale(locale)
-      TwitterCldr.supported_locale?(locale.to_sym) ? locale.to_sym : :en
+      Formatter::SupportedLocales::LOCALES.key?(locale.to_sym) ? locale.to_sym : :en
     end
 
     def symbols(locale)
-      TwitterCldr::DataReaders::NumberDataReader.new(locale).symbols
+      Formatter::SupportedLocales::LOCALES[locale]
     end
   end
 end

data/lib/plurimath/unicode_math/parse.rb

@@ -226,6 +226,7 @@ module Plurimath
           element_exp_script_validation? >> space? >> exp_script |
           unary_arg_functions |
           combined_symbols |
+          wrapper_symbols |
           operand |
           char |
           alphanumeric |

data/lib/plurimath/unicode_math/parsing_rules/common_rules.rb

@@ -80,6 +80,7 @@ module Plurimath
             accents |
             negatable_symbols |
             fonts.as(:fonts) |
+            wrapper_symbols |
             ((parsing_text | factor.as(:factor)) >> operand.as(:operand).maybe)
         end
 

data/lib/plurimath/unicode_math/parsing_rules/sub_sup.rb

@@ -184,6 +184,7 @@ module Plurimath
             an_math |
             other |
             exp_bracket |
+            wrapper_symbols |
             parsing_text |
             negatable_symbols |
             soperand |

data/lib/plurimath/unicode_math/transform.rb

@@ -82,6 +82,7 @@ module Plurimath
       rule(sup_recursion: simple(:recursion)) { recursion }
       rule(nary_sub_sup: simple(:subsup_exp)) { subsup_exp }
       rule(open_paren: sequence(:open_paren)) { open_paren }
+      rule(subsup_exp: sequence(:subsup_exp)) { Utility.filter_values(subsup_exp) }
 
       rule(diacritics_accents: simple(:accent)) { accent }
       rule(mini_sub_sup: simple(:mini_sub_sup)) { mini_sub_sup }

data/lib/plurimath/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Plurimath
-  VERSION = "0.8.13"
+  VERSION = "0.8.14"
 end

data/plurimath.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.add_dependency 'twitter_cldr'
   spec.add_dependency 'parslet'
   spec.add_dependency 'thor'
   spec.add_dependency 'ox'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: plurimath
 version: !ruby/object:Gem::Version
-  version: 0.8.13
+  version: 0.8.14
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-23 00:00:00.000000000 Z
+date: 2024-08-30 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: twitter_cldr
-  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: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -116,13 +102,13 @@ files:
 - lib/plurimath/asciimath/parser.rb
 - lib/plurimath/asciimath/transform.rb
 - lib/plurimath/cli.rb
-- lib/plurimath/formatter/localized_number.rb
-- lib/plurimath/formatter/number_data_reader.rb
 - lib/plurimath/formatter/number_formatter.rb
+- lib/plurimath/formatter/numbers/base.rb
 - lib/plurimath/formatter/numbers/fraction.rb
 - lib/plurimath/formatter/numbers/integer.rb
 - lib/plurimath/formatter/numbers/significant.rb
 - lib/plurimath/formatter/numeric_formatter.rb
+- lib/plurimath/formatter/supported_locales.rb
 - lib/plurimath/html.rb
 - lib/plurimath/html/constants.rb
 - lib/plurimath/html/parse.rb

data/lib/plurimath/formatter/localized_number.rb

@@ -1,13 +0,0 @@
-module Plurimath
-  module Formatter
-    class LocalizedNumber < TwitterCldr::Localized::LocalizedNumber
-      def to_s(options = {})
-        opts = { type: @type, format: @format }.merge(options)
-
-        NumberDataReader
-          .new(locale, opts)
-          .format_number(base_obj, opts)
-      end
-    end
-  end
-end

data/lib/plurimath/formatter/number_data_reader.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Plurimath
-  module Formatter
-    class NumberDataReader < TwitterCldr::DataReaders::NumberDataReader
-      def formatter
-        NumberFormatter.new(self)
-      end
-    end
-  end
-end