plurimath 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43bfa34fd25956b0ee8308569e2f42f83f25a714e1d1f736d0b39f9fb464a312
-  data.tar.gz: df1e211c96baf094adb4d5fdb784b24d47750ac15c00ddfcd4ca9565f8d2e916
+  metadata.gz: f961f580d6f46c943b805f8c2f2a77281151ddcb76eab4a7e7adabbfe61b2b6b
+  data.tar.gz: fbe6a5651b11576a161fe0620780aa359151688d97fac674874679d138c8c34d
 SHA512:
-  metadata.gz: 6119f28efdfb00ad31b7fa32bab9d21b95c50c92a24be7610988677cb9708debcc9a8fd71d1896cea6595f9fe2ca1e7b5c1e33ca109aa9577b9bd1d246fc8cc3
-  data.tar.gz: 864c82b97e142080d9a5f2524e3879d0102721adb5788dbadfa1baaa3e7c89ea433c395e1b43d447556a72ae078b23b43d7dbb24d0032d9a19d2844bbfefc75b
+  metadata.gz: badfd5bd7eb9f2b84ef7604c21ab4f82fa93de5c52df760ee2fcc7ade85cd6900dbc527d41faf2c2521ae6dfbeb2cf79f8af0028927c6a1049bd921836fdec41
+  data.tar.gz: 886be496741ca30633f2ca6d25a5d39f1e5986065adb07cbc961a08ebb6fc04f4d060037afaafec59fb4fbcc5510c968aa1b06bfec366388d7bab1eaad2add99

data/lib/plurimath/asciimath/transform.rb

@@ -896,6 +896,11 @@ module Plurimath
         Math::Formula.new([table] + expr.flatten.compact)
       end
 
+      rule(table: simple(:table),
+           left_right: simple(:left_right)) do
+        Math::Formula.new([table, left_right])
+      end
+
       rule(table: simple(:table),
            expr: simple(:expr)) do
         formula_array = [table]

data/lib/plurimath/math/formula.rb

@@ -288,26 +288,19 @@ module Plurimath
 
       def unitsml_post_processing(nodes)
         nodes.each.with_index do |node, index|
-          if node.is_a?(Ox::Element) && node.attributes&.dig(:unitsml)
-            previous = nodes[index-1]
-            if previous && ["mi", "mn"].include?(previous.name)
-              if text_in_tag?(node.nodes)
-                nodes.insert(index, space_element(attributes: true))
-              else
-                nodes.insert(index, space_element)
-              end
-            end
-
-            node.attributes.delete_if {|k, v| k == :unitsml }
+          if node.is_a?(Ox::Element) && node&.attributes&.dig(:unitsml)
+            pre_index = index - 1
+            pre_node = nodes[pre_index] if pre_index.zero? || pre_index.positive?
+            nodes.insert(index, space_element(node)) if valid_previous?(pre_node)
+            node.attributes.delete_if { |k, _| k == :unitsml }
           end
-
-          unitsml_post_processing(node.nodes) if !node.nodes.any?(String)
+          unitsml_post_processing(node.nodes) if node.nodes.none?(String)
         end
       end
 
-      def space_element(attributes: false)
+      def space_element(node)
         element = (ox_element("mo") << "&#x2062;")
-        element.attributes[:rspace] = "thickmathspace" if attributes
+        element.attributes[:rspace] = "thickmathspace" if text_in_tag?(node.nodes)
         element
       end
 
@@ -327,6 +320,17 @@ module Plurimath
       def unicodemath_value
         (negated_value? || mini_sized?) ? value&.map(&:to_unicodemath)&.join : value&.map(&:to_unicodemath)&.join(" ")
       end
+
+      def valid_previous?(previous)
+        return unless previous
+
+        ["mi", "mn"].include?(previous.name) ||
+          inside_tag?(previous)
+      end
+
+      def inside_tag?(previous)
+        previous&.nodes&.any? { |node| valid_previous?(node) if node.is_a?(Ox::Element) }
+      end
     end
   end
 end

data/lib/plurimath/mathml/transform.rb

@@ -191,8 +191,12 @@ module Plurimath
         elsif flatten_mrow&.first&.is_nary_function? && flatten_mrow.length == 2
           nary_function = flatten_mrow.first
           if nary_function.is_ternary_function? && nary_function.all_values_exist?
-            flatten_mrow[0] = nary_function.new_nary_function(flatten_mrow.delete_at(1))
-            flatten_mrow
+            if nary_function.respond_to?(:new_nary_function)
+              flatten_mrow[0] = nary_function.new_nary_function(flatten_mrow.delete_at(1))
+              flatten_mrow
+            else
+              Utility.filter_values(flatten_mrow)
+            end
           elsif nary_function.is_binary_function? && nary_function.any_value_exist?
             flatten_mrow[0] = nary_function.new_nary_function(flatten_mrow.delete_at(1))
             flatten_mrow

data/lib/plurimath/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plurimath
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-11 00:00:00.000000000 Z
+date: 2024-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet