plurimath 0.8.15 → 0.8.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1783cc0eadbbb06f0f9f8cf7ec7c1c67151ae7c85e5a8f6bd8d4f325a2823fc7
-  data.tar.gz: 8f59467437e61ab7e53d828256967f014eed2417400f6df29d3a9a037b7f9545
+  metadata.gz: 9de48dbb937f65122d95415947e417692fc0d5a11d48e7a1caa1b54f3c4465bf
+  data.tar.gz: 2f1e748929a2569b2e7b291381624648fc11a3fc2b93d44406a9a92c2fa21068
 SHA512:
-  metadata.gz: 91199c6a3c324fd5ac78147c402ba60ff1dc972d4f99dd33006230700f0b9aa07042e38f677f8440a6873663e977c1c0f9c6db09ce04dac1206535f99cdc43da
-  data.tar.gz: f21bffba36efc43968174c803319992edde54f4cf64e9dc840d5fa7fe9637898c01068d30021b933972ce349615d82ca477dd79ff63142178bd981feb8c09fd5
+  metadata.gz: c8054b884f09d830a6b7a1e98d1c5679434540f6ad018c4135654f3ea4495336aa4971e43be842def4ad0fc139664ffa477c12407cef5553c55c46f9d0f2037d
+  data.tar.gz: 852c85f6edab822fc8e880ceded6913283be3e65300069be0fd7a898b6d057bb1143fee9f1e5b182a9dee36213c564e11038cb38040b58586c5acbd16b0d063d

data/lib/plurimath/formatter/numeric_formatter.rb

@@ -1,9 +1,4 @@
-require_relative "supported_locales"
-require_relative "numbers/base"
-require_relative "numbers/integer"
-require_relative "numbers/fraction"
-require_relative "numbers/significant"
-require_relative "number_formatter"
+# frozen_string_literal: true
 
 module Plurimath
   module Formatter

data/lib/plurimath/formatter/standard.rb

@@ -14,6 +14,7 @@ module Plurimath
         group_digits: 3,
         significant: 0,
         digit_count: 0,
+        precision: 0,
         decimal: ".",
         group: ",",
         times: "x",
@@ -21,16 +22,17 @@ module Plurimath
       }.freeze
 
       def initialize(locale: "en", string_format: nil, options: {}, precision: nil)
-        @precision = precision
         super(
           locale,
           localize_number: string_format,
           localizer_symbols: set_default_options(options),
+          precision: precision,
         )
       end
 
       def set_default_options(options)
         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]

data/lib/plurimath/formatter.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+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"
+require_relative "formatter/number_formatter"
+
+module Plurimath
+  module Formatter
+  end
+end

data/lib/plurimath/latex/parse.rb

@@ -97,7 +97,8 @@ module Plurimath
           rparen.absent? >> symbol_class_commands |
           (slash >> math_operators_classes) |
           match["a-zA-Z"].as(:symbols) |
-          match(/\d+(\.[0-9]+)|\d/).repeat(1).as(:number) |
+          (match["0-9"].repeat(0) >> str(".").maybe >> match["0-9"].repeat(1)).as(:number) |
+          match["0-9"].repeat(1).as(:number) |
           (str("\\\\").as("\\\\") >> match(/\s/).repeat) |
           str("\\ ").as(:space) |
           (str("\\operatorname{") >> match("[^}]").repeat.as(:symbols) >> str("}"))

data/lib/plurimath/math/formula.rb

@@ -3,7 +3,7 @@
 module Plurimath
   module Math
     class Formula < Core
-      attr_accessor :value, :left_right_wrapper, :displaystyle, :input_string, :unitsml
+      attr_accessor :value, :left_right_wrapper, :displaystyle, :input_string, :unitsml, :unitsml_xml
 
       MATH_ZONE_TYPES = %i[
         omml
@@ -48,8 +48,14 @@ module Plurimath
         parse_error!(:asciimath)
       end
 
-      def to_mathml(display_style: displaystyle, split_on_linebreak: false, intent: false, formatter: nil)
-        options = { formatter: formatter }
+      def to_mathml(
+        intent: false,
+        formatter: nil,
+        unitsml_xml: nil,
+        split_on_linebreak: false,
+        display_style: displaystyle
+      )
+        options = { formatter: formatter, unitsml_xml: unitsml_xml }
         return line_breaked_mathml(display_style, intent, options: options) if split_on_linebreak
 
         math_attrs = {
@@ -80,6 +86,7 @@ module Plurimath
         attributes = intent_attribute(mathml_value) if intent
         mrow = ox_element("mrow", attributes: attributes)
         mrow[:unitsml] = true if unitsml
+        mathml_value += wrapped_unitsml_xml(mrow) if unitsml_xml && options[:unitsml_xml]
         Utility.update_nodes(mrow, mathml_value)
       end
 
@@ -329,6 +336,12 @@ module Plurimath
         end
       end
 
+      def wrapped_unitsml_xml(mrow)
+        node = Plurimath.xml_engine.load("<mrow>#{unitsml_xml}</mrow>")
+        mrow.attributes[:xref] = node.locate("*/@id").first if node.locate("*/@id").any?
+        node.nodes
+      end
+
       def space_element(node)
         element = (ox_element("mo") << "&#x2062;")
         element[:rspace] = "thickmathspace" if text_in_tag?(node.xml_nodes.nodes)

data/lib/plurimath/math.rb

@@ -8,6 +8,7 @@ require_relative "html"
 require_relative "latex"
 require_relative "unitsml"
 require_relative "number_formatter"
+require_relative "formatter/standard"
 require_relative "math/core"
 require_relative "math/number"
 require_relative "math/symbols"

data/lib/plurimath/number_formatter.rb

@@ -1,17 +1,17 @@
-require_relative "formatter/numeric_formatter"
-require_relative "formatter/supported_locales"
+require_relative "formatter"
 
 module Plurimath
   class NumberFormatter
-    attr_accessor :locale, :localize_number, :localizer_symbols
+    attr_accessor :locale, :localize_number, :localizer_symbols, :precision
 
-    def initialize(locale = "en", localize_number: nil, localizer_symbols: {})
+    def initialize(locale = "en", localize_number: nil, localizer_symbols: {}, precision: nil)
       @locale = supported_locale(locale)
       @localize_number = localize_number
       @localizer_symbols = localizer_symbols
+      @precision = precision
     end
 
-    def localized_number(number_string, locale: @locale, precision: nil, format: {})
+    def localized_number(number_string, locale: @locale, precision: @precision, format: {})
       prev_symbols = symbols(locale).dup
       Formatter::NumericFormatter.new(
         supported_locale(locale),

data/lib/plurimath/unitsml.rb

@@ -11,9 +11,11 @@ module Plurimath
     end
 
     def to_formula
-      formula = ::Unitsml.parse(text).to_plurimath
+      unitsml = ::Unitsml.parse(text)
+      formula = unitsml.to_plurimath
       formula.unitsml = true
       formula.input_string = text
+      formula.unitsml_xml = unitsml.to_xml
       formula
     end
 

data/lib/plurimath/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plurimath
 version: !ruby/object:Gem::Version
-  version: 0.8.15
+  version: 0.8.16
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-11 00:00:00.000000000 Z
+date: 2024-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -102,6 +102,7 @@ files:
 - lib/plurimath/asciimath/parser.rb
 - lib/plurimath/asciimath/transform.rb
 - 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