plurimath 0.10.5 → 0.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df50cd9d9fe202d3c2847ab7bd9cc5f40d702c9e531c80f62eff307dea491111
-  data.tar.gz: 27221b3755dca96be34fb924a83fa1fa495890f079b7f1f360f4b4f290286f3c
+  metadata.gz: 14c446bc1c84d523b37daea2d902eb69ecc7a5ee9b586dc425da9780b8d84560
+  data.tar.gz: 69f9e89f24bb17ebb5d9b2d8b9f5f91faeb7469d0b838b8e20e63b7fadef08c7
 SHA512:
-  metadata.gz: 37f43e179e056e95e857a4c6a79c810a6bd8922fba767607195b0e354376017b9329a8e29adc996aa495605d86d1f8244aaa42f07228a7acd882d785cd762e94
-  data.tar.gz: b7733abb9f05a78266577ec20b656b71c7d33a7c5db76823e7191906771645074944d29676b98c23bbbf26a21c5d14c6ef6c157aad59cbfa26464c4a72c5eee9
+  metadata.gz: b1f55afb6b629f26a4766bbc5839cce6814b5d47c743c91c7c232639d13ea3411c5b73531976b094b5de57157ef12f6df0ce1586f33c1a529916c9af4c275ec1
+  data.tar.gz: 8c07b342deb4e97f1993a5825ea5d53cdb1e8f96ccd65e37efdee90d1b4b960773bbcb41737df348ca1ca2c055e222f30837c173d234334fc368d0e30375fd21

data/Gemfile

@@ -4,9 +4,9 @@ source "https://rubygems.org"
 gemspec
 
 gem "canon"
-gem "lutaml-model", github: "lutaml/lutaml-model", branch: "main"
+#gem "lutaml-model", github: "lutaml/lutaml-model", branch: "main"
 gem "oga"
-gem "omml", github: "plurimath/omml", branch: "main"
+#gem "omml", github: "plurimath/omml", branch: "main"
 gem "opal-rspec", "~> 1.1.0a"
 gem "ox"
 gem "rake", "~> 12.0"

data/lib/plurimath/mathml/formula_transformation.rb

@@ -8,10 +8,18 @@ module Plurimath
       # Use each_mixed_content to get children in document order.
       def ordered_children(node)
         children = []
-        node.each_mixed_content { |child| children << child }
+        node.each_mixed_content do |child|
+          next if whitespace_text_child?(child)
+
+          children << child
+        end
         children
       end
 
+      def whitespace_text_child?(child)
+        child.is_a?(String) && child.strip.empty?
+      end
+
       def text_value(value)
         return if value.nil?
         return value if value.is_a?(String)
@@ -27,7 +35,7 @@ module Plurimath
       # before building the Plurimath AST.
       def content_children(node)
         ordered_children(node).reject do |child|
-          child.is_a?(Mml::V4::Malignmark) || child.is_a?(Mml::V4::Maligngroup)
+          child.is_a?(Mml::Base::Malignmark) || child.is_a?(Mml::Base::Maligngroup)
         end
       end
 
@@ -62,11 +70,11 @@ module Plurimath
       end
 
       def ms_token_element?(node)
-        node.is_a?(Mml::V4::Mi) ||
-          node.is_a?(Mml::V4::Mn) ||
-          node.is_a?(Mml::V4::Mo) ||
-          node.is_a?(Mml::V4::Ms) ||
-          node.is_a?(Mml::V4::Mtext)
+        node.is_a?(Mml::Base::Mi) ||
+          node.is_a?(Mml::Base::Mn) ||
+          node.is_a?(Mml::Base::Mo) ||
+          node.is_a?(Mml::Base::Ms) ||
+          node.is_a?(Mml::Base::Mtext)
       end
 
       def normalize_phantom_child(child)
@@ -204,7 +212,7 @@ module Plurimath
       end
 
       def convert_multiscript_child(child)
-        return Math::Function::None.new if child.is_a?(Mml::V4::None) || child.is_a?(Mml::V3::None)
+        return Math::Function::None.new if child.is_a?(Mml::Base::None)
         return Math::Function::None.new if child.respond_to?(:value) && Array(child.value).join.empty?
 
         mml_to_plurimath(child) || Math::Function::None.new
@@ -222,12 +230,19 @@ module Plurimath
       end
 
       def split_multiscript_children(children, post_element_count)
+        pre_children = Array(children[(post_element_count + 1)..])
+          .reject { |child| prescript_marker?(child) }
+
         [
           convert_multiscript_children(children[1..post_element_count]),
-          convert_multiscript_children(children[(post_element_count + 1)..]),
+          convert_multiscript_children(pre_children),
         ]
       end
 
+      def prescript_marker?(child)
+        child.is_a?(Mml::Base::Mprescripts)
+      end
+
       def split_script_pairs(children, compact: false)
         pairs = children.each_slice(2).to_a
         subscripts = pairs.map { |pair| pair[0] if pair[0] }

data/lib/plurimath/mathml/translator.rb

@@ -474,8 +474,6 @@ module Plurimath
       def msgroup_to_msgroup(sgroup)
         content = ordered_children(sgroup).filter_map do |child|
           if child.is_a?(String)
-            next if child.strip.empty?
-
             Plurimath::Math::Function::Text.new(child)
           else
             mml_to_plurimath(child)

data/lib/plurimath/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plurimath
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.10.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-14 00:00:00.000000000 Z
+date: 2026-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -1818,7 +1818,6 @@ files:
 - lib/plurimath/mathml/formula_transformation.rb
 - lib/plurimath/mathml/parser.rb
 - lib/plurimath/mathml/translator.rb
-- lib/plurimath/mathml/utility/formula_transformation.rb
 - lib/plurimath/number_formatter.rb
 - lib/plurimath/omml.rb
 - lib/plurimath/omml/formula_transformation.rb

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

@@ -1,143 +0,0 @@
-# frozen_string_literal: true
-
-module Plurimath
-  class Mathml
-    module Utility
-      module FormulaTransformation
-        private
-
-        def filter_values(value, array_to_instance: false,
-replacing_order: true)
-          return value unless value.is_a?(Array)
-          return array_to_instance ? nil : value if value.empty?
-
-          if is_a?(Math::Formula) && value.length == 1 && value.first.is_mstyle?
-            @displaystyle = value.first.displaystyle
-          end
-
-          if value.length == 1 && value.all?(Math::Formula)
-            if array_to_instance
-              filter_values(value.first.value, array_to_instance: true)
-            else
-              value.first
-            end
-          elsif value.is_a?(Array) && value.any?(Math::Formula::Mrow)
-            value.each_with_index do |element, index|
-              next unless element.is_a?(Math::Formula::Mrow)
-
-              value[index] = filter_values(
-                Array(element),
-                array_to_instance: true,
-                replacing_order: replacing_order,
-              )
-            end
-            value
-          elsif value_is_ternary_or_nary?(value)
-            value.first.parameter_three = value.delete_at(1)
-            filter_values(
-              Array(value),
-              array_to_instance: array_to_instance,
-              replacing_order: replacing_order,
-            )
-          elsif ternary_naryable?(value)
-            [
-              Math::Function::Nary.new(
-                value.first.parameter_one,
-                value.first.parameter_two,
-                value.first.parameter_three,
-                value.last,
-              ),
-            ]
-          elsif overset_naryable?(value)
-            [
-              Math::Function::Nary.new(
-                value.first.parameter_two,
-                nil,
-                value.first.parameter_one,
-                value.last,
-                { type: "undOvr" },
-              ),
-            ]
-          elsif power_naryable?(value)
-            [
-              Math::Function::Nary.new(
-                value.first.parameter_one,
-                nil,
-                value.first.parameter_two,
-                value.last,
-                { type: "subSup" },
-              ),
-            ]
-          elsif array_to_instance && replacing_order
-            value.length > 1 ? Math::Formula.new(value) : value.first
-          else
-            value
-          end
-        end
-
-        def validate_symbols(value)
-          case value
-          when Array
-            array_validations(value)
-          when Math::Symbols::Symbol
-            return value if value.value.nil?
-
-            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
-        end
-
-        def array_validations(value)
-          value.each_with_index do |val, index|
-            next unless val.is_a?(Math::Symbols::Symbol)
-
-            unless val.value.nil?
-              value[index] =
-                mathml_symbol_to_class(val.value)
-            end
-          end
-          value
-        end
-
-        def mathml_symbol_to_class(symbol)
-          Plurimath::Utility.mathml_unary_classes(
-            Array(symbol),
-            lang: :mathml,
-          )
-        end
-
-        def value_is_ternary_or_nary?(value)
-          return false if value.any?(String)
-
-          value.length >= 2 &&
-            value.first.is_ternary_function? &&
-            value.first.parameter_three.nil? &&
-            (!value.first.parameter_one.nil? || !value.first.parameter_two.nil?)
-        end
-
-        def ternary_naryable?(value)
-          value.length == 2 &&
-            value.first.is_a?(Math::Function::PowerBase) &&
-            value.first.parameter_one.is_nary_symbol?
-        end
-
-        def overset_naryable?(value)
-          value.length == 2 &&
-            value.first.is_a?(Math::Function::Overset) &&
-            value.first.parameter_two.is_nary_symbol?
-        end
-
-        def power_naryable?(value)
-          value.length == 2 &&
-            value.first.is_a?(Math::Function::Power) &&
-            value.first.parameter_one.is_nary_symbol?
-        end
-      end
-    end
-  end
-end