plurimath 0.8.20 → 0.8.22

data/lib/plurimath/formatter/number_formatter.rb

@@ -19,10 +19,14 @@ module Plurimath
       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)
+        # FIX FOR:
+        #   NotImplementedError: String#<< not supported. Mutable String methods are not supported in Opal.
+        result = []
+        result << integer_format.apply(int, data_reader)
         result << fraction_format.apply(frac, data_reader, int) if frac
+        result = result.join
         result = signif_format.apply(result, integer_format, fraction_format)
-        result = "+#{result}" if number.positive? && data_reader[:number_sign] == :plus
+        result = "+#{result}" if number.positive? && data_reader[:number_sign].to_s == "plus"
         "#{prefix}#{result}"
       end
 
@@ -58,13 +62,8 @@ module Plurimath
       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
+        factor = BigDecimal(10).power(precision)
+        (number * factor).fix / factor
       end
     end
   end

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

@@ -3,7 +3,7 @@
 module Plurimath
   module Formatter
     module Numbers
-      class Fraction < Base
+      class Fraction
         attr_reader :decimal, :precision, :separator, :group
 
         def initialize(symbols = {})
@@ -18,15 +18,14 @@ module Plurimath
           precision = options[:precision] || @precision
           return "" unless precision > 0
 
-          number = interpolate(format(options), fraction, :left)
+          number = format(fraction, precision)
           number = digit_count_format(int, fraction, number) if @digit_count
           formatted_number = change_format(number) if number
           formatted_number ? decimal + formatted_number : ""
         end
 
-        def format(options)
-          precision = options[:precision] || @precision
-          precision ? '0' * precision : @format
+        def format(number, precision)
+          number + "0" * (precision - number.length)
         end
 
         def format_groups(string)

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

@@ -3,7 +3,7 @@
 module Plurimath
   module Formatter
     module Numbers
-      class Integer < Base
+      class Integer
         attr_reader :format, :separator, :groups
 
         def initialize(symbols = {})
@@ -12,7 +12,7 @@ module Plurimath
         end
 
         def apply(number, options = {})
-          format_groups(interpolate(number, number.to_i))
+          format_groups(number)
         end
 
         def format_groups(string)
@@ -21,13 +21,18 @@ module Plurimath
           tokens = []
 
           tokens << chop_group(string, groups.first)
-          tokens << chop_group(string, groups.last) until string.empty?
+          string = string[0...-tokens.first.size]
+
+          until string.empty?
+            tokens << chop_group(string, groups.last)
+            string = string[0...-tokens.last.size]
+          end
 
           tokens.compact.reverse.join(separator)
         end
 
         def chop_group(string, size)
-          string.slice!([string.size - size, 0].max, size)
+          string.slice([string.size - size, 0].max, size)
         end
       end
     end

data/lib/plurimath/formatter/numeric_formatter.rb

@@ -72,7 +72,7 @@ module Plurimath
 
       def update_exponent_value(number_str)
         exponent_number = BigDecimal(number_str) - 1
-        return exponent_number.to_i if exponent_number.negative? || @exponent_sign != :plus
+        return exponent_number.to_i if exponent_number.negative? || @exponent_sign.to_s != "plus"
 
         "+#{exponent_number.to_i}"
       end

data/lib/plurimath/formatter/standard.rb

@@ -8,9 +8,9 @@ module Plurimath
 
       DEFAULT_OPTIONS = {
         fraction_group_digits: 3,
-        exponent_sign: "plus",
+        exponent_sign: nil,
         fraction_group: "'",
-        number_sign: "plus",
+        number_sign: nil,
         notation: :basic,
         group_digits: 3,
         significant: 0,
@@ -35,17 +35,17 @@ module Plurimath
         default_options = self.class::DEFAULT_OPTIONS
         self.precision ||= default_options[:precision]
         options ||= default_options
-        options[:fraction_group_digits] ||= default_options[:fraction_group_digits]
-        options[:fraction_group] ||= default_options[:fraction_group]
-        options[:exponent_sign] ||= default_options[:exponent_sign]
-        options[:group_digits] ||= default_options[:group_digits]
-        options[:number_sign] ||= default_options[:number_sign]
-        options[:significant] ||= default_options[:significant]
-        options[:notation] ||= default_options[:notation]
-        options[:decimal] ||= default_options[:decimal]
-        options[:group] ||= default_options[:group]
-        options[:times] ||= default_options[:times]
-        options[:e] ||= default_options[:e]
+        options[:fraction_group_digits] = default_options[:fraction_group_digits] unless options.key?(:fraction_group_digits)
+        options[:fraction_group] = default_options[:fraction_group] unless options.key?(:fraction_group)
+        options[:exponent_sign] = default_options[:exponent_sign] unless options.key?(:exponent_sign)
+        options[:group_digits] = default_options[:group_digits] unless options.key?(:group_digits)
+        options[:number_sign] = default_options[:number_sign] unless options.key?(:number_sign)
+        options[:significant] = default_options[:significant] unless options.key?(:significant)
+        options[:notation] = default_options[:notation] unless options.key?(:notation)
+        options[:decimal] = default_options[:decimal] unless options.key?(:decimal)
+        options[:group] = default_options[:group] unless options.key?(:group)
+        options[:times] = default_options[:times] unless options.key?(:times)
+        options[:e] = default_options[:e] unless options.key?(:e)
         options
       end
     end

data/lib/plurimath/formatter.rb

@@ -2,7 +2,6 @@
 
 require_relative "formatter/numeric_formatter"
 require_relative "formatter/supported_locales"
-require_relative "formatter/numbers/base"
 require_relative "formatter/numbers/integer"
 require_relative "formatter/numbers/fraction"
 require_relative "formatter/numbers/significant"

data/lib/plurimath/math/function/bar.rb

@@ -93,6 +93,8 @@ module Plurimath
           Utility.update_nodes(barpr, [pos, ctrlp])
         end
       end
+
+      Overline = Bar
     end
   end
 end

data/lib/plurimath/math/function/msgroup.rb

@@ -78,14 +78,27 @@ module Plurimath
         def msgroup_text; end
 
         def msgroup_text=(value)
-          return unless value
+          return if empty_value?(value)
 
-          if value.is_a?(Array) && value.none? { |element| element.match?(/[^\s]/) }
+          if value.is_a?(Array)
             @temp_mathml_order << Text.new(value.pop)
           else
             @temp_mathml_order << Text.new(value)
           end
         end
+
+        private
+
+        def empty_value?(value)
+          case value
+          when String
+            value.strip.empty?
+          when Array
+            value.none? { |element| element.match?(/[\S]/) }
+          when NilClass
+            true
+          end
+        end
       end
     end
   end

data/lib/plurimath/math/symbols/symbol.rb

@@ -68,6 +68,9 @@ module Plurimath
         end
 
         def to_omml_without_math_tag(_, **)
+          # TODO: remove this condition once to word rendering issue is resolved, plurimath/plurimath/pull/328
+          return if value == "⁢"
+
           value
         end
 
@@ -80,6 +83,9 @@ module Plurimath
         end
 
         def insert_t_tag(_, options:)
+          # TODO: remove this condition once to word rendering issue is resolved, plurimath/plurimath/pull/328
+          return if value == "⁢"
+
           [(Utility.ox_element("r", namespace: "m") << t_tag(options: options))]
         end
 

data/lib/plurimath/mathml/constants.rb

@@ -176,6 +176,7 @@ module Plurimath
         mathfrak
         underset
         stackrel
+        overline
         overset
         mathcal
         arccos

data/lib/plurimath/number_formatter.rb

@@ -1,3 +1,4 @@
+require "bigdecimal"
 require_relative "formatter"
 
 module Plurimath
@@ -12,7 +13,7 @@ module Plurimath
     end
 
     def localized_number(number_string, locale: @locale, precision: @precision, format: {})
-      prev_symbols = symbols(locale).dup
+      prev_symbols = symbols(locale.to_sym).dup
       Formatter::NumericFormatter.new(
         supported_locale(locale),
         localize_number: localize_number,
@@ -24,7 +25,7 @@ module Plurimath
         format: format,
       )
     ensure
-      symbols(locale).replace(prev_symbols)
+      symbols(locale.to_sym).replace(prev_symbols)
     end
 
     def twitter_cldr_reader(locale: @locale)

data/lib/plurimath/omml/parser.rb

@@ -45,6 +45,8 @@ module Plurimath
       end
 
       def parse_nodes(nodes)
+        nodes.delete_if { |node| node.is_xml_comment? if node.respond_to?(:is_xml_comment?) }
+
         nodes.map do |node|
           if node.is_a?(String)
             node == "​" ? nil : node

data/lib/plurimath/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plurimath
 version: !ruby/object:Gem::Version
-  version: 0.8.20
+  version: 0.8.22
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-06 00:00:00.000000000 Z
+date: 2025-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ox
@@ -133,7 +133,6 @@ files:
 - lib/plurimath/cli.rb
 - lib/plurimath/formatter.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
@@ -1787,7 +1786,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/plurimath/plurimath
   source_code_uri: https://github.com/plurimath/plurimath
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1803,7 +1802,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Converts LaTeX math into MathML.
 test_files: []

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

@@ -1,20 +0,0 @@
-# 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