plurimath 0.8.18 → 0.8.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 766097c1faa26dc82f8664fca18a302b52920df2fce4ec8395cf2f65d8a7d687
-  data.tar.gz: 35cf1a6b6a0e87fa5404b3eea87927cd69da535deeebfcd49f8db5ce1aaba8e6
+  metadata.gz: 674b18bd19282809f8e45b8d14b8249e67d7a80ae73df51bd678b2d15658dc36
+  data.tar.gz: a08def1749cece90982daf3ee329aa8a0a363d22fccceda9d41952f5f5d80afe
 SHA512:
-  metadata.gz: 7307ab95dc0d60e6fe65c939665e08ec59902527a454427956ee17e6d2c7bc207921e529ae107d51ec0f2a2a0909cd7da260943d277a03755efc34aa01edd2d0
-  data.tar.gz: 6f050eb9cae6730e911ccae66afe0a4384ab0fade68810fa4fa176e15d5f37eef225f0b11c1409fcd10ed05e75cbf7aa6fdd10a4e18d85ab335dbb947c22d350
+  metadata.gz: 626a181a170618aab1033863339c9423c2b85d76baa6eca4dfb68b5fd5cb01f37714456dc023b565784256ecb8e4bb170708185fe29a2ff8cb089df26300c5e2
+  data.tar.gz: 228a1da3ed8378fcf82b2c894b1a056d83c03a2d88d40ed0059312937a2104280cdbeaf65801b2c2c35d0c4f573a318d6987eaecc29f57a99b7c732fb17b6c23

data/Gemfile

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

data/lib/plurimath/math/formula.rb

@@ -629,11 +629,11 @@ module Plurimath
       end
 
       def unitsml_post_processing(nodes, prev_node)
+        insert_index = 0
         nodes.each.with_index do |node, index|
           if node[:unitsml]
-            pre_index = index - 1
-            pre_node = nodes[pre_index] if pre_index.zero? || pre_index.positive?
-            prev_node.insert_in_nodes(index, space_element(node)) if valid_previous?(pre_node)
+            prev_node.insert_in_nodes(index + insert_index, space_element(node))
+            insert_index += 1
             node.remove_attr("unitsml")
           end
           unitsml_post_processing(node.nodes, node) if node.nodes.none?(String)
@@ -648,19 +648,10 @@ module Plurimath
 
       def space_element(node)
         element = (ox_element("mo") << "&#x2062;")
-        element[:rspace] = "thickmathspace" if text_in_tag?(node.xml_nodes.nodes)
+        element[:rspace] = "thickmathspace"
         element
       end
 
-      def text_in_tag?(nodes)
-        next_nodes = nodes.first.nodes
-        if next_nodes.all?(String)
-          Utility.html_entity_to_unicode(next_nodes.first).match?(/\p{L}|\p{N}/)
-        else
-          text_in_tag?(next_nodes)
-        end
-      end
-
       def negated_value?
         value.last.is_a?(Math::Symbols::Symbol) && value.last.value == "&#x338;"
       end
@@ -670,21 +661,6 @@ module Plurimath
         value&.map { |v| v.to_unicodemath(options: options) }&.join(join_str)
       end
 
-      def valid_previous?(previous)
-        return unless previous
-
-        ["mi", "mn"].include?(previous.name) ||
-          inside_tag?(previous)
-      end
-
-      def inside_tag?(previous)
-        previous&.nodes&.any? do |node|
-          next if node.is_a?(String)
-
-          valid_previous?(node) if node.xml_node?
-        end
-      end
-
       def intent_attribute(mathml)
         return unless mathml || value.length != 2
         return unless valid_first_parameter?(value.first)

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

@@ -108,7 +108,10 @@ module Plurimath
         end
 
         def t_tag(options:)
-          Utility.ox_element("t", namespace: "m") << (value || to_omml_without_math_tag(nil, options: options))
+          output = value || to_omml_without_math_tag(nil, options: options)
+          return t_element unless output
+
+          t_element << output
         end
 
         def separate_table
@@ -158,6 +161,10 @@ module Plurimath
 
         private
 
+        def t_element
+          Utility.ox_element("t", namespace: "m")
+        end
+
         def explicit_checks(unicode)
           return true if [unicode, value].any? { |v| ["∣", "|"].include?(v) }
           return true if unicode_const(:ACCENT_SYMBOLS).has_value?(value)

data/lib/plurimath/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plurimath
 version: !ruby/object:Gem::Version
-  version: 0.8.18
+  version: 0.8.20
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-16 00:00:00.000000000 Z
+date: 2025-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ox