plurimath 0.8.12 → 0.8.14

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

@@ -4,20 +4,20 @@ module Plurimath
       class Zwnj < Symbol
         INPUT = {
           unicodemath: [["zwnj", "&#x200c;"]],
-          asciimath: [["&#x200c;"], parsing_wrapper(["zwnj"])],
+          asciimath: [["&#x200c;"], parsing_wrapper(["zwnj"], lang: :asciimath)],
           mathml: ["&#x200c;"],
-          latex: [["&#x200c;"], parsing_wrapper(["zwnj"])],
+          latex: [["&#x200c;"], parsing_wrapper(["zwnj"], lang: :latex)],
           omml: ["&#x200c;"],
           html: ["&#x200c;"],
         }.freeze
 
         # output methods
         def to_latex
-          parsing_wrapper("zwnj")
+          parsing_wrapper("zwnj", lang: :latex)
         end
 
         def to_asciimath
-          parsing_wrapper("zwnj")
+          parsing_wrapper("zwnj", lang: :asciimath)
         end
 
         def to_unicodemath

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

@@ -4,20 +4,20 @@ module Plurimath
       class Zwsp < Symbol
         INPUT = {
           unicodemath: [["zwsp", "&#x200b;"]],
-          asciimath: [["&#x200b;"], parsing_wrapper(["zwsp"])],
+          asciimath: [["&#x200b;"], parsing_wrapper(["zwsp"], lang: :asciimath)],
           mathml: ["&#x200b;"],
-          latex: [["&#x200b;"], parsing_wrapper(["zwsp"])],
+          latex: [["&#x200b;"], parsing_wrapper(["zwsp"], lang: :latex)],
           omml: ["&#x200b;"],
           html: ["&#x200b;"],
         }.freeze
 
         # output methods
         def to_latex
-          parsing_wrapper("zwsp")
+          parsing_wrapper("zwsp", lang: :latex)
         end
 
         def to_asciimath
-          parsing_wrapper("zwsp")
+          parsing_wrapper("zwsp", lang: :asciimath)
         end
 
         def to_unicodemath

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

@@ -3,10 +3,10 @@ module Plurimath
     module Symbols
       class Zz < Symbol
         INPUT = {
-          unicodemath: [["&#x2124;"], parsing_wrapper(["ZZ"])],
-          asciimath: [["&#x2124;"], parsing_wrapper(["ZZ"])],
+          unicodemath: [["&#x2124;"], parsing_wrapper(["ZZ"], lang: :unicode)],
+          asciimath: ["&#x2124;", "ZZ"],
           mathml: ["&#x2124;"],
-          latex: [["ZZ", "&#x2124;"]],
+          latex: ["ZZ", "&#x2124;"],
           omml: ["&#x2124;"],
           html: ["&#x2124;"],
         }.freeze

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

@@ -1021,7 +1021,7 @@ module Plurimath
 
       class << self
         def wrapper_symbols
-          @@wrapper_symbols ||= Utility.symbols_hash(:unicodemath).keys.grep(/__{/)
+          @@wrapper_symbols ||= Utility.symbols_hash(:unicodemath).keys.grep(/"P{[^}]+}/)
         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

@@ -14,7 +14,7 @@ module Plurimath
         rule(:supscript) { base_value >> supscript_value }
 
         rule(:sub_or_sup)  { subscript | supscript }
-        rule(:base_symbol) { wrapper_symbols.absent? >> str("_") }
+        rule(:base_symbol) { str("_") }
         rule(:base_syntax) { base_symbol | below }
         rule(:alpha_ascii) { match["A-Za-z"].as(:symbol) }
         rule(:script_base) { mini_sub_sup | sub_sup_operand }
@@ -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.12"
+  VERSION = "0.8.14"
 end

data/plurimath.gemspec

@@ -24,8 +24,8 @@ 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'
+  spec.add_dependency 'bigdecimal'
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: plurimath
 version: !ruby/object:Gem::Version
-  version: 0.8.12
+  version: 0.8.14
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-05 00:00:00.000000000 Z
+date: 2024-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: twitter_cldr
+  name: parslet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: parslet
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: ox
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ox
+  name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -102,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
@@ -515,6 +515,7 @@ files:
 - lib/plurimath/math/symbols/degc.rb
 - lib/plurimath/math/symbols/degf.rb
 - lib/plurimath/math/symbols/degree.rb
+- lib/plurimath/math/symbols/del.rb
 - lib/plurimath/math/symbols/delta.rb
 - lib/plurimath/math/symbols/deltaeq.rb
 - lib/plurimath/math/symbols/diameter.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