plurimath 0.10.0 → 0.10.2

data/lib/plurimath/math/function/table/bmatrix.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../table"
 
 module Plurimath
   module Math

data/lib/plurimath/math/function/table/cases.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../table"
 
 module Plurimath
   module Math

data/lib/plurimath/math/function/table/eqarray.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../table"
 
 module Plurimath
   module Math

data/lib/plurimath/math/function/table/matrix.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../table"
 
 module Plurimath
   module Math

data/lib/plurimath/math/function/table/multline.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../table"
 
 module Plurimath
   module Math

data/lib/plurimath/math/function/table/pmatrix.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../table"
 
 module Plurimath
   module Math

data/lib/plurimath/math/function/table/split.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../table"
 
 module Plurimath
   module Math

data/lib/plurimath/math/function/table/vmatrix.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../table"
 
 module Plurimath
   module Math

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

@@ -1,12 +1,19 @@
 # frozen_string_literal: true
 
-require_relative "../../mathml/utility"
-
 module Plurimath
   module Math
     module Function
       class Table < Core
-        include Mathml::Utility
+        autoload :Align, "#{__dir__}/table/align"
+        autoload :Array, "#{__dir__}/table/array"
+        autoload :Bmatrix, "#{__dir__}/table/bmatrix"
+        autoload :Cases, "#{__dir__}/table/cases"
+        autoload :Eqarray, "#{__dir__}/table/eqarray"
+        autoload :Matrix, "#{__dir__}/table/matrix"
+        autoload :Multline, "#{__dir__}/table/multline"
+        autoload :Pmatrix, "#{__dir__}/table/pmatrix"
+        autoload :Split, "#{__dir__}/table/split"
+        autoload :Vmatrix, "#{__dir__}/table/vmatrix"
 
         attr_accessor :value, :open_paren, :close_paren, :options
 
@@ -141,26 +148,6 @@ module Plurimath
           }
         end
 
-        def mtr_value=(value)
-          return if value.nil? || value.empty?
-
-          self.value = replace_order_with_value(
-            clear_temp_order,
-            update_temp_mathml_values(value),
-            "mtr"
-          )
-        end
-
-        def mlabeledtr_value=(value)
-          return if value.nil? || value.empty?
-
-          self.value = replace_order_with_value(
-            clear_temp_order,
-            update_temp_mathml_values(value),
-            "mlabeledtr"
-          )
-        end
-
         def frame=(value)
           return if value.nil? || value.empty?
 

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math

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

@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
-require_relative "binary_function"
-require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Td < BinaryFunction
-        include Mathml::Utility
-
         def initialize(parameter_one = nil, parameter_two = nil)
           parameter_one&.delete_if { |td| td == "&" }
           super(Array(parameter_one), parameter_two)

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

@@ -54,11 +54,13 @@ module Plurimath
         end
 
         def any_value_exist?
-          !(parameter_one.nil? || parameter_two.nil? || parameter_three.nil?)
+          parameter_one || parameter_two || parameter_three
         end
 
         def all_values_exist?
-          !(parameter_one.nil? && parameter_two.nil? && parameter_three.nil?)
+          !parameter_one.nil? &&
+            !parameter_two.nil? &&
+            !parameter_three.nil?
         end
 
         def to_asciimath_math_zone(spacing, last = false, _, options:)
@@ -186,6 +188,8 @@ module Plurimath
         end
 
         def underover(display_style, options:)
+          # Build Overset from source argument positions, not OMML child names,
+          # so shared under/over functions keep the same format-neutral model.
           overset = Overset.new(parameter_one, parameter_three)
           return overset.to_omml_without_math_tag(display_style, options: options) unless parameter_two
 

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

@@ -1,14 +1,9 @@
 # frozen_string_literal: true
 
-require "htmlentities"
-require_relative "unary_function"
-require_relative "../../mathml/utility"
-
 module Plurimath
   module Math
     module Function
       class Text < UnaryFunction
-        include Mathml::Utility
 
         PARSER_REGEX = %r{unicode\[:(?<unicode>\w{1,})\]}.freeze
 
@@ -102,7 +97,7 @@ module Plurimath
           text = text.join if text.is_a?(Array)
           entities = HTMLEntities.new
           symbols  = Mathml::Constants::UNICODE_SYMBOLS.transform_keys(&:to_s)
-          text     = entities.encode(text, :hexadecimal)
+          text     = entities.encode(entities.decode(text), :hexadecimal)
           symbols.each do |code, string|
             text = text.gsub(code.downcase, "unicode[:#{string}]")
           end

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math
@@ -44,6 +43,10 @@ module Plurimath
           obj.update(Utility.filter_values(obj.value)) if obj.value_exist?
         end
 
+        def accent_char
+          "˜"
+        end
+
         protected
 
         def acc_tag(display_style, options:)

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

@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
-require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Tr < UnaryFunction
-        include Mathml::Utility
-
         def initialize(parameter_one = [])
           parameter_one.map!.with_index { |_, index| Td.new([]) } if parameter_one&.all?("@")
           super(parameter_one)
@@ -97,15 +93,6 @@ module Plurimath
           first_value
         end
 
-        def mtd_value=(value)
-          return if value.nil? || value.empty?
-
-          self.parameter_one = replace_order_with_value(
-            clear_temp_order,
-            update_temp_mathml_values(value),
-            "mtd"
-          )
-        end
       end
     end
   end

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math
@@ -61,6 +60,10 @@ module Plurimath
           Bar.new(parameter_one, attributes)
         end
 
+        def accent_char
+          "\u203E"
+        end
+
         protected
 
         def groupchr_tag(display_style, options:)

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

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
-require_relative "../../mathml/utility"
-require_relative "ternary_function"
 
 module Plurimath
   module Math
     module Function
       class Underover < TernaryFunction
-        include Mathml::Utility
 
         FUNCTION = {
           name: "UnderOver",

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

@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
-require_relative "binary_function"
-require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Underset < BinaryFunction
-        include Mathml::Utility
-
         attr_accessor :options
 
         FUNCTION = {
@@ -22,14 +18,7 @@ module Plurimath
           parameter_two = nil,
           options = {})
           super(parameter_one, parameter_two)
-          @options = options unless options.empty?
-        end
-
-        def element_order=(value)
-          @temp_mathml_order = validated_order(
-            value&.map(&:name),
-            rejectable_array: ["comment"]
-          )
+          @options = options unless options.nil?
         end
 
         def to_mathml_without_math_tag(intent, options:)
@@ -46,6 +35,10 @@ module Plurimath
             return base.to_omml_without_math_tag(display_style, options: options)
           end
 
+          if @options[:accentunder]
+            return group_chr(display_style, options: options)
+          end
+
           limlow   = Utility.ox_element("limLow", namespace: "m")
           limlowpr = Utility.ox_element("limLowPr", namespace: "m")
           limlowpr << Utility.pr_element("ctrl", true, namespace: "m")
@@ -60,6 +53,23 @@ module Plurimath
           [limlow]
         end
 
+        def group_chr(display_style, options:)
+          groupchr = Utility.ox_element("groupChr", namespace: "m")
+          groupchrpr = Utility.ox_element("groupChrPR", namespace: "m")
+          chr = Utility.ox_element("chr", namespace: "m", attributes: { "m:val" => "_" })
+          pos = Utility.ox_element("pos", namespace: "m", attributes: { "m:val" => "bot" })
+          groupchrpr << chr
+          groupchrpr << pos
+          Utility.update_nodes(
+            groupchr,
+            [
+              groupchrpr,
+              omml_parameter(parameter_two, display_style, tag_name: "e", options: options),
+            ],
+          )
+          [groupchr]
+        end
+
         def to_unicodemath(options:)
           return "#{parameter_one.to_unicodemath(options: options)}#{unicodemath_parens(parameter_two, options: options)}" if horizontal_brackets?
           return "#{parameter_two.to_unicodemath(options: options)}_#{unicodemath_parens(parameter_one, options: options)}" if unicode_classes_accent?(parameter_two)
@@ -90,41 +100,8 @@ module Plurimath
           parameter_two.is_nary_function? || parameter_two.is_nary_symbol?
         end
 
-        def content=(value)
-          if no_content_in?(Array(value))
-            delete_all_text
-          else
-            new_val = Array(value).map do |val|
-              validate_symbols(val) unless val.strip.empty?
-            end
-            validate_text_order(new_val)
-          end
-          update_temp_mathml_values(@temp_mathml_order)
-        end
-
         protected
 
-        def validate_text_order(value)
-          @temp_mathml_order.each_with_index do |item, index|
-            next unless item == "text"
-
-            shifted_value = value.shift
-            next @temp_mathml_order[index] = shifted_value if shifted_value
-
-            @temp_mathml_order.delete_at(index)
-          end
-        end
-
-        def delete_all_text
-          @temp_mathml_order.delete("text")
-        end
-
-        def no_content_in?(value)
-          value.nil? ||
-            value.empty? ||
-            value&.all? { |val| val.strip.empty? }
-        end
-
         def unicode_accent?(field)
           return unless field.is_a?(Math::Symbols::Symbol)
 

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

@@ -76,7 +76,8 @@ module Plurimath
 
         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?
+          xref = xml.nodes.find { |node| node.respond_to?(:[]) }&.[](:id)
+          mathml[:xref] = xref if xref
           Utility.update_nodes(mathml, xml.nodes)
         end
       end

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math
@@ -86,6 +85,10 @@ module Plurimath
           obj.update(Utility.filter_values(obj.value)) if obj.value_exist?
         end
 
+        def accent_char
+          "→"
+        end
+
         protected
 
         def acc_tag(display_style, options:)

data/lib/plurimath/math/function.rb

@@ -1,16 +1,113 @@
+# frozen_string_literal: true
+
 module Plurimath
   module Math
     module Function
+      autoload :Abs, "#{__dir__}/function/abs"
+      autoload :Arccos, "#{__dir__}/function/arccos"
+      autoload :Arcsin, "#{__dir__}/function/arcsin"
+      autoload :Arctan, "#{__dir__}/function/arctan"
+      autoload :Arg, "#{__dir__}/function/arg"
+      autoload :Bar, "#{__dir__}/function/bar"
+      autoload :Base, "#{__dir__}/function/base"
+      autoload :BinaryFunction, "#{__dir__}/function/binary_function"
+      autoload :Cancel, "#{__dir__}/function/cancel"
+      autoload :Ceil, "#{__dir__}/function/ceil"
+      autoload :Color, "#{__dir__}/function/color"
+      autoload :Cos, "#{__dir__}/function/cos"
+      autoload :Cosh, "#{__dir__}/function/cosh"
+      autoload :Cot, "#{__dir__}/function/cot"
+      autoload :Coth, "#{__dir__}/function/coth"
+      autoload :Csc, "#{__dir__}/function/csc"
+      autoload :Csch, "#{__dir__}/function/csch"
+      autoload :Ddot, "#{__dir__}/function/ddot"
+      autoload :Deg, "#{__dir__}/function/deg"
+      autoload :Det, "#{__dir__}/function/det"
+      autoload :Dim, "#{__dir__}/function/dim"
+      autoload :Dot, "#{__dir__}/function/dot"
+      autoload :Exp, "#{__dir__}/function/exp"
+      autoload :Fenced, "#{__dir__}/function/fenced"
+      autoload :Floor, "#{__dir__}/function/floor"
+      autoload :FontStyle, "#{__dir__}/function/font_style"
+      autoload :Frac, "#{__dir__}/function/frac"
+      autoload :Gcd, "#{__dir__}/function/gcd"
+      autoload :Glb, "#{__dir__}/function/glb"
+      autoload :Hat, "#{__dir__}/function/hat"
+      autoload :Hom, "#{__dir__}/function/hom"
+      autoload :Inf, "#{__dir__}/function/inf"
+      autoload :Int, "#{__dir__}/function/int"
+      autoload :Intent, "#{__dir__}/function/intent"
+      autoload :Ker, "#{__dir__}/function/ker"
+      autoload :Lcm, "#{__dir__}/function/lcm"
+      autoload :Left, "#{__dir__}/function/left"
+      autoload :Lg, "#{__dir__}/function/lg"
+      autoload :Lim, "#{__dir__}/function/lim"
+      autoload :Liminf, "#{__dir__}/function/liminf"
+      autoload :Limits, "#{__dir__}/function/limits"
+      autoload :Limsup, "#{__dir__}/function/limsup"
+      autoload :Linebreak, "#{__dir__}/function/linebreak"
+      autoload :Ln, "#{__dir__}/function/ln"
+      autoload :Log, "#{__dir__}/function/log"
+      autoload :Longdiv, "#{__dir__}/function/longdiv"
+      autoload :Lub, "#{__dir__}/function/lub"
+      autoload :Max, "#{__dir__}/function/max"
+      autoload :Mbox, "#{__dir__}/function/mbox"
+      autoload :Menclose, "#{__dir__}/function/menclose"
+      autoload :Merror, "#{__dir__}/function/merror"
+      autoload :Mglyph, "#{__dir__}/function/mglyph"
+      autoload :Min, "#{__dir__}/function/min"
+      autoload :Mlabeledtr, "#{__dir__}/function/mlabeledtr"
+      autoload :Mod, "#{__dir__}/function/mod"
+      autoload :Mpadded, "#{__dir__}/function/mpadded"
+      autoload :Ms, "#{__dir__}/function/ms"
+      autoload :Msgroup, "#{__dir__}/function/msgroup"
+      autoload :Msline, "#{__dir__}/function/msline"
+      autoload :Multiscript, "#{__dir__}/function/multiscript"
+      autoload :Nary, "#{__dir__}/function/nary"
+      autoload :None, "#{__dir__}/function/none"
+      autoload :Norm, "#{__dir__}/function/norm"
+      autoload :Obrace, "#{__dir__}/function/obrace"
+      autoload :Oint, "#{__dir__}/function/oint"
+      autoload :Over, "#{__dir__}/function/over"
+      autoload :Overbrace, "#{__dir__}/function/obrace"
+      autoload :Overline, "#{__dir__}/function/bar"
+      autoload :Overset, "#{__dir__}/function/overset"
+      autoload :Phantom, "#{__dir__}/function/phantom"
+      autoload :Power, "#{__dir__}/function/power"
+      autoload :PowerBase, "#{__dir__}/function/power_base"
+      autoload :Prod, "#{__dir__}/function/prod"
+      autoload :Right, "#{__dir__}/function/right"
+      autoload :Root, "#{__dir__}/function/root"
+      autoload :Rule, "#{__dir__}/function/rule"
+      autoload :Scarries, "#{__dir__}/function/scarries"
+      autoload :Scarry, "#{__dir__}/function/scarry"
+      autoload :Sec, "#{__dir__}/function/sec"
+      autoload :Sech, "#{__dir__}/function/sech"
+      autoload :Semantics, "#{__dir__}/function/semantics"
+      autoload :Sin, "#{__dir__}/function/sin"
+      autoload :Sinh, "#{__dir__}/function/sinh"
+      autoload :Sqrt, "#{__dir__}/function/sqrt"
+      autoload :Stackrel, "#{__dir__}/function/stackrel"
+      autoload :Substack, "#{__dir__}/function/substack"
+      autoload :Sum, "#{__dir__}/function/sum"
+      autoload :Sup, "#{__dir__}/function/sup"
+      autoload :Table, "#{__dir__}/function/table"
+      autoload :Tan, "#{__dir__}/function/tan"
+      autoload :Tanh, "#{__dir__}/function/tanh"
+      autoload :Td, "#{__dir__}/function/td"
+      autoload :TernaryFunction, "#{__dir__}/function/ternary_function"
+      autoload :Text, "#{__dir__}/function/text"
+      autoload :Tilde, "#{__dir__}/function/tilde"
+      autoload :Tr, "#{__dir__}/function/tr"
+      autoload :Ubrace, "#{__dir__}/function/ubrace"
+      autoload :Ul, "#{__dir__}/function/ul"
+      autoload :Underbrace, "#{__dir__}/function/ubrace"
+      autoload :Underline, "#{__dir__}/function/ul"
+      autoload :UnaryFunction, "#{__dir__}/function/unary_function"
+      autoload :Underover, "#{__dir__}/function/underover"
+      autoload :Underset, "#{__dir__}/function/underset"
+      autoload :Unitsml, "#{__dir__}/function/unitsml"
+      autoload :Vec, "#{__dir__}/function/vec"
     end
   end
 end
-
-# Include the first level files before the next
-if RUBY_ENGINE != 'opal'
-  (
-    Dir.glob(File.join(__dir__, "function", "*.rb")) +
-    Dir.glob(File.join(__dir__, "function", "*", "*.rb"))
-  ).each do |file|
-    require file
-  end
-end

data/lib/plurimath/math/number.rb

@@ -1,15 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "../mathml/utility"
-
 module Plurimath
   module Math
     class Number < Core
       attr_accessor :value, :mini_sub_sized, :mini_sup_sized
-      include Mathml::Utility
 
       def initialize(value = nil, mini_sub_sized: false, mini_sup_sized: false)
-        @value = value.is_a?(Parslet::Slice) ? value.to_s : value
+        @value = value.is_a?(::Parslet::Slice) ? value.to_s : value
         @mini_sub_sized = mini_sub_sized if mini_sub_sized
         @mini_sup_sized = mini_sup_sized if mini_sup_sized
       end
@@ -95,9 +92,14 @@ module Plurimath
       end
 
       def format_value_with_options(options)
-        return value unless options[:formatter]&.respond_to?(:localized_number)
-
-        options[:formatter].localized_number(value.to_s)
+        formatter = options[:formatter]
+        if formatter&.respond_to?(:format)
+          formatter.format(options[:formula], self)
+        elsif formatter&.respond_to?(:localized_number)
+          formatter.localized_number(value.to_s)
+        else
+          value
+        end
       end
     end
   end

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

@@ -25,7 +25,7 @@ module Plurimath
         end
 
         def to_mathml_without_math_tag(_, **)
-          ox_element("mo") << ","
+          ox_element("mo") << (value || ",")
         end
 
         def to_omml_without_math_tag(_, **)

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

@@ -25,7 +25,7 @@ module Plurimath
         end
 
         def to_mathml_without_math_tag(_, **)
-          ox_element("mo") << "+"
+          ox_element("mo") << (value || "+")
         end
 
         def to_omml_without_math_tag(_, **)

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

@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
-require_relative "../../mathml/utility"
-
 module Plurimath
   module Math
     module Symbols
       class Symbol < Core
-        include Mathml::Utility
 
         attr_accessor :value, :slashed, :mini_sub_sized, :mini_sup_sized, :options
 
@@ -27,7 +24,7 @@ module Plurimath
         def ==(object)
           object.respond_to?(:value) &&
             object.class == self.class &&
-            object.value == value &&
+            comparable_value(object) == comparable_value(self) &&
             object.slashed == slashed &&
             object.mini_sub_sized == mini_sub_sized &&
             object.mini_sup_sized == mini_sup_sized &&
@@ -167,6 +164,22 @@ module Plurimath
 
         private
 
+        def comparable_value(symbol)
+          normalize_value(symbol.value || symbol.send(:default_value_for_comparison))
+        end
+
+        def default_value_for_comparison
+          return if instance_of?(Symbol)
+
+          to_unicodemath
+        end
+
+        def normalize_value(raw_value)
+          return if raw_value.nil?
+
+          Utility.html_entity_to_unicode(raw_value.to_s)
+        end
+
         def t_element
           Utility.ox_element("t", namespace: "m")
         end