plurimath 0.8.24 → 0.8.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c205999703df727ab9f7a9cda7a4fddb7359b0b57e59413e52ecebc7e961de1
-  data.tar.gz: 158c063d2ae937a256a859cbbcb42826de6289874c592fccb55ef76dde97b7f9
+  metadata.gz: 567734f98d50c880712b5f5e044b44698872fddb28f9a42d6db7f9be2c3d14f4
+  data.tar.gz: f070e5341608e4135e83c5715e2af06c849a56c28deeda6a3d69a6892af83d86
 SHA512:
-  metadata.gz: 02e70b4a39ca41afbe43b2ba6099f07b7882e5908f140ab5d4a6bd0f600272d47912d548ac1d8794707affc57b9efe00e472e2c2a6e92e793d6b2b105b85d5f2
-  data.tar.gz: 7b6172ca6cd799cf8f4d81044eb7380ed9326f87cebf286d1bf25ccd81fa4674f6d9190df0f3555983b1b2a2e946725b1594e4eb72bc18e5d4da16d92d4119e2
+  metadata.gz: cf74d549f20a7d2af98744ebbf10e1c68c78b550e11a2b56c7a66f1fb4ea68313044987144b26403f91658201c3a0892520434b7b6d2b10745dc2962cd9b96c4
+  data.tar.gz: a11b93465a74fd63518cb9c2336fcf7a843f067e32018f701a8d838276881b54a214453d1d4c5568ac82b7bd06f471de83961a8dfebe15eacc610f8bb0879c38

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

@@ -18,7 +18,7 @@ module Plurimath
         end
 
         def element_order=(value)
-          @value = validated_order(value, rejectable_array: ["comment"])
+          @value = validated_order(value&.map(&:name), rejectable_array: ["comment"])
         end
 
         def content; end

data/lib/plurimath/math/formula.rb

@@ -308,7 +308,7 @@ module Plurimath
       end
 
       def element_order=(value)
-        @value = validated_order(value)
+        @value = validated_order(value.map(&:name))
       end
 
       # Attributes start

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

@@ -186,7 +186,7 @@ module Plurimath
         end
 
         def element_order=(value)
-          @parameter_two = validated_order(value)
+          @parameter_two = validated_order(value&.map(&:name))
         end
 
         def mi_value=(value)

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

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "unary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class None < UnaryFunction
+        include Mathml::Utility
+
         def to_asciimath(**); end
 
         def to_latex(**); end

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

@@ -39,8 +39,8 @@ module Plurimath
             rad_element,
             [
               pr_element,
-              omml_parameter(parameter_two, display_style, tag_name: "deg", options: options),
-              omml_parameter(parameter_one, display_style, tag_name: "e", options: options),
+              omml_parameter(parameter_one, display_style, tag_name: "deg", options: options),
+              omml_parameter(parameter_two, display_style, tag_name: "e", options: options),
             ],
           )
           [rad_element]

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

@@ -27,7 +27,7 @@ module Plurimath
 
         def element_order=(value)
           @temp_mathml_order = validated_order(
-            value,
+            value&.map(&:name),
             rejectable_array: ["comment"]
           )
         end

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

@@ -41,7 +41,7 @@ module Plurimath
         end
 
         def value=(value)
-          @value = value.is_a?(Array) ? value.join : value.to_s
+          @value = value.is_a?(Array) ? value.join : value&.to_s
         end
 
         def to_mathml_without_math_tag(intent, **)

data/lib/plurimath/mathml/parser.rb

@@ -1,67 +1,67 @@
 # frozen_string_literal: true
 
 require_relative "constants"
+require "mml"
 
 module Plurimath
   class Mathml
     class Parser
+      CONFIGURATION = {
+        Mml::MathWithNilNamespace => Plurimath::Math::Formula,
+        Mml::MathWithNamespace => Plurimath::Math::Formula,
+        Mml::Mmultiscripts => Plurimath::Math::Function::Multiscript,
+        Mml::Mlabeledtr => Plurimath::Math::Function::Mlabeledtr,
+        Mml::Munderover => Plurimath::Math::Function::Underover,
+        Mml::Semantics => Plurimath::Math::Function::Semantics,
+        Mml::Mscarries => Plurimath::Math::Function::Scarries,
+        Mml::Mfraction => Plurimath::Math::Function::Frac,
+        Mml::Menclose => Plurimath::Math::Function::Menclose,
+        Mml::Mlongdiv => Plurimath::Math::Function::Longdiv,
+        Mml::Mphantom => Plurimath::Math::Function::Phantom,
+        Mml::Msubsup => Plurimath::Math::Function::PowerBase,
+        Mml::Msgroup => Plurimath::Math::Function::Msgroup,
+        Mml::Mpadded => Plurimath::Math::Function::Mpadded,
+        Mml::Mfenced => Plurimath::Math::Function::Fenced,
+        Mml::Mstack => Plurimath::Math::Function::Stackrel,
+        Mml::Munder => Plurimath::Math::Function::Underset,
+        Mml::Msline => Plurimath::Math::Function::Msline,
+        Mml::Merror => Plurimath::Math::Function::Merror,
+        Mml::Mtable => Plurimath::Math::Function::Table,
+        Mml::Mstyle => Plurimath::Math::Formula::Mstyle,
+        Mml::Mglyph => Plurimath::Math::Function::Mglyph,
+        Mml::Mover => Plurimath::Math::Function::Overset,
+        Mml::Msqrt => Plurimath::Math::Function::Sqrt,
+        Mml::Mroot => Plurimath::Math::Function::Root,
+        Mml::Mtext => Plurimath::Math::Function::Text,
+        Mml::Mfrac => Plurimath::Math::Function::Frac,
+        Mml::Msrow => Plurimath::Math::Formula,
+        Mml::Msup => Plurimath::Math::Function::Power,
+        Mml::Msub => Plurimath::Math::Function::Base,
+        Mml::None => Plurimath::Math::Function::None,
+        Mml::Mrow => Plurimath::Math::Formula::Mrow,
+        Mml::Mtd => Plurimath::Math::Function::Td,
+        Mml::Mtr => Plurimath::Math::Function::Tr,
+        Mml::Mi => Plurimath::Math::Symbols::Symbol,
+        Mml::Mo => Plurimath::Math::Symbols::Symbol,
+        Mml::Ms => Plurimath::Math::Function::Ms,
+        Mml::Mn => Plurimath::Math::Number,
+      }
       attr_accessor :text
+      @@models_set = false
 
       def initialize(text)
-        mml_config
+        mml_config unless @@models_set
         @text = text
       end
 
       def parse
         namespace_exist = text.split(">").first.include?(" xmlns=")
-        ::Mml.parse(text, namespace_exist: namespace_exist)
+        Mml.parse(text, namespace_exist: namespace_exist)
       end
 
-      private
-
       def mml_config
-        return if ::Mml.respond_to?(:config)
-
-        ::Mml::Configuration.config = {
-          mmultiscripts: Plurimath::Math::Function::Multiscript,
-          mlabeledtr: Plurimath::Math::Function::Mlabeledtr,
-          munderover: Plurimath::Math::Function::Underover,
-          semantics: Plurimath::Math::Function::Semantics,
-          mscarries: Plurimath::Math::Function::Scarries,
-          mfraction: Plurimath::Math::Function::Frac,
-          menclose: Plurimath::Math::Function::Menclose,
-          mlongdiv: Plurimath::Math::Function::Longdiv,
-          mphantom: Plurimath::Math::Function::Phantom,
-          msubsup: Plurimath::Math::Function::PowerBase,
-          msgroup: Plurimath::Math::Function::Msgroup,
-          mpadded: Plurimath::Math::Function::Mpadded,
-          mfenced: Plurimath::Math::Function::Fenced,
-          mstack: Plurimath::Math::Function::Stackrel,
-          munder: Plurimath::Math::Function::Underset,
-          msline: Plurimath::Math::Function::Msline,
-          merror: Plurimath::Math::Function::Merror,
-          mtable: Plurimath::Math::Function::Table,
-          mstyle: Plurimath::Math::Formula::Mstyle,
-          mglyph: Plurimath::Math::Function::Mglyph,
-          mover: Plurimath::Math::Function::Overset,
-          msqrt: Plurimath::Math::Function::Sqrt,
-          mroot: Plurimath::Math::Function::Root,
-          mtext: Plurimath::Math::Function::Text,
-          mfrac: Plurimath::Math::Function::Frac,
-          msrow: Plurimath::Math::Formula,
-          msup: Plurimath::Math::Function::Power,
-          msub: Plurimath::Math::Function::Base,
-          none: Plurimath::Math::Function::None,
-          mrow: Plurimath::Math::Formula::Mrow,
-          math: Plurimath::Math::Formula,
-          mtd: Plurimath::Math::Function::Td,
-          mtr: Plurimath::Math::Function::Tr,
-          mi: Plurimath::Math::Symbols::Symbol,
-          mo: Plurimath::Math::Symbols::Symbol,
-          ms: Plurimath::Math::Function::Ms,
-          mn: Plurimath::Math::Number,
-        }
-        require "mml"
+        Mml::Configuration.custom_models = CONFIGURATION
+        @@models_set = true
       end
     end
   end

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

@@ -104,6 +104,8 @@ module Plurimath
           when Array
             array_validations(value)
           when Math::Symbols::Symbol
+            return value if value.value.nil?
+
             mathml_symbol_to_class(value.value)
           when String
             mathml_symbol_to_class(value)

data/lib/plurimath/mathml/utility.rb

@@ -12,7 +12,7 @@ module Plurimath
       attr_accessor :temp_mathml_order
 
       def element_order=(value)
-        @temp_mathml_order = Array(validated_order(value))
+        @temp_mathml_order = Array(validated_order(value&.map(&:name)))
       end
 
       def clear_temp_order

data/lib/plurimath/omml/transform.rb

@@ -242,8 +242,8 @@ module Plurimath
           )
         else
           Math::Function::Root.new(
-            Utility.filter_values(rad[2]),
             rad[1],
+            Utility.filter_values(rad[2]),
           )
         end
       end

data/lib/plurimath/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plurimath
 version: !ruby/object:Gem::Version
-  version: 0.8.24
+  version: 0.8.26
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-07 00:00:00.000000000 Z
+date: 2025-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ox