plurimath 0.8.26 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 567734f98d50c880712b5f5e044b44698872fddb28f9a42d6db7f9be2c3d14f4
-  data.tar.gz: f070e5341608e4135e83c5715e2af06c849a56c28deeda6a3d69a6892af83d86
+  metadata.gz: 54bd34437d295276f1d97598c8f61725e92d5c23a2a8bfc8351f0552c0235043
+  data.tar.gz: 54fd5e1e5bf685a91e1811ab794ab17b0a6be1ad468147f6b524bef37be972d3
 SHA512:
-  metadata.gz: cf74d549f20a7d2af98744ebbf10e1c68c78b550e11a2b56c7a66f1fb4ea68313044987144b26403f91658201c3a0892520434b7b6d2b10745dc2962cd9b96c4
-  data.tar.gz: a11b93465a74fd63518cb9c2336fcf7a843f067e32018f701a8d838276881b54a214453d1d4c5568ac82b7bd06f471de83961a8dfebe15eacc610f8bb0879c38
+  metadata.gz: 137b2eee3b725d8d2b76ae1e30c5a4e65e346e446b90e5745a327deffe1a00254f47150049fcb1cc35b54e326064debc1ad9a74cdf67566fe221bc0a67714dc5
+  data.tar.gz: 653339b6aa420cd9e6e578805073bf504a0684f3154c5107c46f7481027e92a7bcb990825252f602292beb3a4bea5bfac5891b21be4751a445e1fdcc82153f47

data/Gemfile

@@ -11,5 +11,4 @@ gem 'equivalent-xml'
 gem 'opal-rspec', "~> 1.1.0a"
 gem 'oga'
 gem 'ox'
-gem "unitsml"
 gem "debug"

data/lib/plurimath/math/core.rb

@@ -345,6 +345,7 @@ module Plurimath
           :@using_default,
           :@displaystyle,
           :@__ordered,
+          :@unitsml,
           :@__mixed,
           :@is_mrow,
           :@values,

data/lib/plurimath/math/formula/mrow.rb

@@ -10,8 +10,7 @@ module Plurimath
           value = [],
           left_right_wrapper = true,
           display_style: true,
-          input_string: nil,
-          unitsml: false
+          input_string: nil
         )
           super
           @is_mrow = true

data/lib/plurimath/math/formula.rb

@@ -7,7 +7,7 @@ module Plurimath
     class Formula < Core
       include Mathml::Utility
 
-      attr_accessor :value, :left_right_wrapper, :displaystyle, :input_string, :unitsml, :unitsml_xml, :display
+      attr_accessor :value, :left_right_wrapper, :displaystyle, :input_string, :display
 
       MATH_ZONE_TYPES = %i[
         omml
@@ -28,14 +28,12 @@ module Plurimath
         value = [],
         left_right_wrapper = true,
         display_style: true,
-        input_string: nil,
-        unitsml: false
+        input_string: nil
       )
         @value = value.is_a?(Array) ? value : [value]
         left_right_wrapper = false if @value.first.is_a?(Function::Left)
         @left_right_wrapper = left_right_wrapper
         @displaystyle = boolean_display_style(display_style)
-        @unitsml = unitsml if unitsml
       end
 
       def ==(object)
@@ -45,8 +43,8 @@ module Plurimath
           object.left_right_wrapper == left_right_wrapper
       end
 
-      def to_asciimath(formatter: nil, options: nil)
-        options ||= { formatter: formatter }
+      def to_asciimath(formatter: nil, unitsml: {}, options: nil)
+        options ||= { formatter: formatter, unitsml: unitsml }.compact
         value.map { |val| val.to_asciimath(options: options) }.join(" ")
       rescue
         parse_error!(:asciimath)
@@ -55,11 +53,11 @@ module Plurimath
       def to_mathml(
         intent: false,
         formatter: nil,
-        unitsml_xml: nil,
+        unitsml: {},
         split_on_linebreak: false,
         display_style: displaystyle
       )
-        options = { formatter: formatter, unitsml_xml: unitsml_xml }
+        options = { formatter: formatter, unitsml: unitsml }.compact
         return line_breaked_mathml(display_style, intent, options: options) if split_on_linebreak
 
         math_attrs = {
@@ -89,8 +87,6 @@ module Plurimath
         mathml_value = mathml_content(intent, options: options)
         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
 
@@ -100,15 +96,15 @@ module Plurimath
         nodes
       end
 
-      def to_latex(formatter: nil, options: nil)
-        options ||= { formatter: formatter }
+      def to_latex(formatter: nil, unitsml: {}, options: nil)
+        options ||= { formatter: formatter, unitsml: unitsml }.compact
         value.map { |val| val.to_latex(options: options) }.join(" ")
       rescue
         parse_error!(:latex)
       end
 
-      def to_html(formatter: nil, options: nil)
-        options ||= { formatter: formatter }
+      def to_html(formatter: nil, unitsml: {}, options: nil)
+        options ||= { formatter: formatter, unitsml: unitsml }.compact
         value&.map { |val| val.to_html(options: options) }&.join(" ")
       rescue
         parse_error!(:html)
@@ -137,9 +133,9 @@ module Plurimath
         }
       end
 
-      def to_omml(display_style: displaystyle, split_on_linebreak: false, formatter: nil)
+      def to_omml(display_style: displaystyle, split_on_linebreak: false, formatter: nil, unitsml: {})
         objects = split_on_linebreak ? new_line_support : [self]
-        options = { formatter: formatter }
+        options = { formatter: formatter, unitsml: unitsml }.compact
         para_element = Utility.ox_element("oMathPara", attributes: omml_attrs, namespace: "m")
         objects.each.with_index(1) do |object, index|
           para_element << Utility.update_nodes(
@@ -163,15 +159,15 @@ module Plurimath
         omml_content(display_style, options: options)
       end
 
-      def to_unicodemath(formatter: nil, options: nil)
-        options ||= { formatter: formatter }
+      def to_unicodemath(formatter: nil, unitsml: {}, options: nil)
+        options ||= { formatter: formatter, unitsml: unitsml }.compact
         Utility.html_entity_to_unicode(unicodemath_value(options: options)).gsub(/\s\/\s/, "/")
       rescue
         parse_error!(:unicodemath)
       end
 
-      def to_display(type = nil, formatter: nil)
-        options = { formatter: formatter }
+      def to_display(type = nil, formatter: nil, unitsml: {})
+        options = { formatter: formatter, unitsml: unitsml }
         return type_error!(type) unless MATH_ZONE_TYPES.include?(type.downcase.to_sym)
 
         math_zone = case type
@@ -640,12 +636,6 @@ 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"

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

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require "unitsml"
+
+module Plurimath
+  module Math
+    module Function
+      class Unitsml < Core
+        attr_accessor :text
+
+        def initialize(text)
+          @text = text
+          @unitsml = ::Unitsml.parse(text)
+        end
+
+        def ==(other)
+          other.is_a?(Unitsml) &&
+            other.text == @text
+        end
+
+        def to_asciimath(options:)
+          formula(options).to_asciimath(options: options)
+        end
+
+        def to_latex(options:)
+          formula(options).to_latex(options: options)
+        end
+
+        def to_unicodemath(options:)
+          formula(options).to_unicodemath(options: options)
+        end
+
+        def to_html(options:)
+          formula(options).to_html(options: options)
+        end
+
+        def to_mathml_without_math_tag(intent, options:)
+          mathml = formula(options).to_mathml_without_math_tag(intent, options: options)
+          mathml["unitsml"] = true
+          options&.dig(:unitsml, :xml) ? wrapped_unitsml_xml(mathml, @unitsml, options) : mathml
+        end
+
+        def to_omml_without_math_tag(display_style, options:)
+          formula(options).to_omml_without_math_tag(display_style, options: options)
+        end
+
+        def to_asciimath_math_zone(spacing = "", last = false, indent = true, options:)
+          formula(options).to_asciimath_math_zone(spacing, last, indent, options: options)
+        end
+
+        def to_latex_math_zone(spacing = "", last = false, indent = true, options:)
+          formula(options).to_latex_math_zone(spacing, last, indent, options: options)
+        end
+
+        def to_mathml_math_zone(spacing = "", last = false, indent = true, options:)
+          formula(options).to_mathml_math_zone(spacing, last, indent, options: options)
+        end
+
+        def to_omml_math_zone(spacing = "", last = false, indent = true, options:)
+          formula(options).to_omml_math_zone(spacing, last, indent, options: options)
+        end
+
+        def to_unicodemath_math_zone(spacing = "", last = false, indent = true, options:)
+          formula(options).to_unicodemath_math_zone(spacing, last, indent, options: options)
+        end
+
+        private
+
+        def formula(options)
+          @unitsml.to_plurimath(options.fetch(:unitsml, {}))
+        end
+
+        def wrapped_unitsml_xml(mathml, unitsml, options)
+          xml = Plurimath.xml_engine.load("<mrow>#{unitsml.to_xml(options.fetch(:unitsml, {}))}</mrow>")
+          mathml.attributes[:xref] = xml.locate("*/@id").first if xml.locate("*/@id").any?
+          Utility.update_nodes(mathml, xml.nodes)
+        end
+      end
+    end
+  end
+end

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

@@ -45,11 +45,11 @@ module Plurimath
         end
 
         def to_mathml_without_math_tag(intent, **)
+          attributes = {}
           if value&.include?("ⅇ")
-            attributes = {
-              intent: Utility.html_entity_to_unicode(value),
-            }
+            attributes[:intent] = Utility.html_entity_to_unicode(value)
           end
+          attributes[:rspace] = @options[:rspace] if @options&.key?(:rspace)
           mi_tag = ox_element("mi", attributes: attributes)
           return mi_tag if ["{:", ":}"].include?(value)
 

data/lib/plurimath/mathml/utility/empty_defined_methods.rb

@@ -430,8 +430,6 @@ module Plurimath
 
         def rquote=(_); end
 
-        def rspace=(_); end
-
         def selection=(_); end
 
         def separator=(_); end

data/lib/plurimath/mathml/utility/formula_transformation.rb

@@ -106,7 +106,11 @@ module Plurimath
           when Math::Symbols::Symbol
             return value if value.value.nil?
 
-            mathml_symbol_to_class(value.value)
+            instance = mathml_symbol_to_class(value.value)
+            if value&.options&.any? && instance.is_a?(Math::Symbols::Symbol)
+              instance.options = value.options
+            end
+            instance
           when String
             mathml_symbol_to_class(value)
           end

data/lib/plurimath/mathml/utility.rb

@@ -358,6 +358,12 @@ module Plurimath
 
         update_temp_order(value, "mglyph")
       end
+
+      def rspace=(value)
+        return if value.nil? || value.empty?
+
+        @options = Hash(@options).merge(rspace: value)
+      end
     end
   end
 end

data/lib/plurimath/unitsml.rb

@@ -5,18 +5,15 @@ module Plurimath
   class Unitsml
     attr_accessor :text
 
+    VALID_UNITSML = %r{\^(([^\s][^*\/,"]*?[a-z]+)|(\([^-\d]+\)|[^\(\d-]+))}
+
     def initialize(text)
       @text = text
-      raise Math::ParseError.new(error_message) if text.match?(/\^(([^\s][^*\/,"]*?[a-z]+)|(\([^-\d]+\)|[^\(\d-]+))/)
+      raise Math::ParseError.new(error_message) if text.match?(VALID_UNITSML)
     end
 
     def to_formula
-      unitsml = ::Unitsml.parse(text)
-      formula = unitsml.to_plurimath
-      formula.unitsml = true
-      formula.input_string = text
-      formula.unitsml_xml = unitsml.to_xml
-      formula
+      Math::Function::Unitsml.new(text)
     end
 
     def error_message

data/lib/plurimath/version.rb

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

data/plurimath.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mml'
   spec.add_dependency 'thor'
   spec.add_dependency 'parslet'
+  spec.add_dependency 'unitsml'
   spec.add_dependency 'bigdecimal'
   spec.add_dependency 'lutaml-model'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plurimath
 version: !ruby/object:Gem::Version
-  version: 0.8.26
+  version: 0.9.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-13 00:00:00.000000000 Z
+date: 2025-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ox
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: unitsml
+  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: bigdecimal
   requirement: !ruby/object:Gem::Requirement
@@ -277,6 +291,7 @@ files:
 - lib/plurimath/math/function/unary_function.rb
 - lib/plurimath/math/function/underover.rb
 - lib/plurimath/math/function/underset.rb
+- lib/plurimath/math/function/unitsml.rb
 - lib/plurimath/math/function/vec.rb
 - lib/plurimath/math/number.rb
 - lib/plurimath/math/symbols.rb
@@ -1801,7 +1816,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Converts LaTeX math into MathML.