plurimath 0.5.0 → 0.6.0

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

@@ -52,13 +52,11 @@ module Plurimath
         end
 
         def to_latex
-          if open_paren == "norm["
-            return "\\begin{Vmatrix}#{latex_content}\\end{Vmatrix}"
-          end
+          return "\\begin{Vmatrix}#{latex_content}\\end{Vmatrix}" if open_paren == "norm["
 
           separator = "{#{table_attribute(:latex)}}" if environment&.include?("array")
-          left_paren = latex_parenthesis(open_paren) || "."
-          right_paren = latex_parenthesis(close_paren) || "."
+          left_paren = latex_parenthesis(open_paren)
+          right_paren = latex_parenthesis(close_paren)
           left = "\\left #{left_paren}\\begin{matrix}"
           right = "\\end{matrix}\\right #{right_paren}"
           "#{left}#{separator}#{latex_content}#{right}"
@@ -70,11 +68,40 @@ module Plurimath
         end
 
         def to_omml_without_math_tag(display_style)
-          if value.map { |d| d.parameter_one.length == 1 }.all?
-            single_td_table(display_style)
-          else
-            fenced_table(multiple_td_table(display_style))
-          end
+          ox_table = if value.map { |d| d.parameter_one.length == 1 }.all?
+                       single_td_table(display_style)
+                     else
+                       multiple_td_table(display_style)
+                     end
+          fenced_table(ox_table)
+        end
+
+        def to_asciimath_math_zone(spacing, last = false, indent = true)
+          [
+            "#{spacing}\"table\" function apply\n",
+            Formula.new(value).to_asciimath_math_zone(gsub_spacing(spacing, last), last, indent),
+          ]
+        end
+
+        def to_latex_math_zone(spacing, last = false, indent = true)
+          [
+            "#{spacing}\"table\" function apply\n",
+            Formula.new(value).to_latex_math_zone(gsub_spacing(spacing, last), last, indent),
+          ]
+        end
+
+        def to_mathml_math_zone(spacing, last = false, indent = true)
+          [
+            "#{spacing}\"table\" function apply\n",
+            Formula.new(value).to_mathml_math_zone(gsub_spacing(spacing, last), last, indent),
+          ]
+        end
+
+        def to_omml_math_zone(spacing, last = false, indent = true, display_style:)
+          [
+            "#{spacing}\"table\" function apply\n",
+            Formula.new(value).to_omml_math_zone(gsub_spacing(spacing, last), last, indent, display_style: display_style),
+          ]
         end
 
         protected
@@ -90,6 +117,7 @@ module Plurimath
         end
 
         def latex_parenthesis(field)
+          return "." unless field
           return " ." if field&.include?(":")
 
           return "\\#{field}" if ["{", "}"].include?(field)
@@ -215,7 +243,7 @@ module Plurimath
         end
 
         def fenced_table(ox_table)
-          return ox_table unless open_paren && close_paren
+          return ox_table unless open_paren || close_paren
 
           d_node = Utility.ox_element("d", namespace: "m")
           e_node = Utility.ox_element("e", namespace: "m")
@@ -225,22 +253,22 @@ module Plurimath
         end
 
         def mdpr_node
-          begchr = Utility.ox_element("begChr", namespace: "m")
-          begchr.attributes["m:val"] = paren(open_paren)
-          endchr = Utility.ox_element("endChr", namespace: "m")
-          endchr.attributes["m:val"] = paren(close_paren)
           sepchr = Utility.ox_element("sepChr", attributes: { "m:val": "" }, namespace: "m")
           mgrow  = Utility.ox_element("grow", namespace: "m")
           mdpr = Utility.ox_element("dPr", namespace: "m")
-          Utility.update_nodes(
-            mdpr,
-            [
-              begchr,
-              endchr,
-              sepchr,
-              mgrow,
-            ],
-          )
+          Utility.update_nodes(mdpr, [begchr, endchr, sepchr, mgrow])
+        end
+
+        def begchr
+          return unless open_paren
+
+          Utility.ox_element("begChr", attributes: { "m:val": paren(open_paren) }, namespace: "m")
+        end
+
+        def endchr
+          return unless close_paren
+
+          Utility.ox_element("endChr", attributes: { "m:val": paren(close_paren) }, namespace: "m")
         end
 
         def paren(parenthesis)

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

@@ -42,6 +42,34 @@ module Plurimath
           )
           [me]
         end
+
+        def to_asciimath_math_zone(spacing, last = false, _)
+          [
+            "#{spacing}\"td\" function apply\n",
+            Formula.new(parameter_one).to_asciimath_math_zone(gsub_spacing(spacing, last), last),
+          ]
+        end
+
+        def to_latex_math_zone(spacing, last = false, indent = true)
+          [
+            "#{spacing}\"td\" function apply\n",
+            Formula.new(parameter_one).to_latex_math_zone(gsub_spacing(spacing, last), last, indent),
+          ]
+        end
+
+        def to_mathml_math_zone(spacing, last = false, indent = true)
+          [
+            "#{spacing}\"td\" function apply\n",
+            Formula.new(parameter_one).to_mathml_math_zone(gsub_spacing(spacing, last), last, indent),
+          ]
+        end
+
+        def to_omml_math_zone(spacing, last = false, indent = true, display_style:)
+          [
+            "#{spacing}\"td\" function apply\n",
+            Formula.new(parameter_one).to_omml_math_zone(gsub_spacing(spacing, last), last, indent, display_style: display_style),
+          ]
+        end
       end
     end
   end

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

@@ -59,6 +59,50 @@ module Plurimath
           !(parameter_one.nil? && parameter_two.nil? && parameter_three.nil?)
         end
 
+        def to_asciimath_math_zone(spacing, last = false, _)
+          parameters = self.class::FUNCTION
+          new_spacing = gsub_spacing(spacing, last)
+          new_arr = ["#{spacing}\"#{to_asciimath}\" #{parameters[:name]}\n"]
+          ascii_fields_to_print(parameter_one, { spacing: new_spacing, field_name: parameters[:first_value], additional_space: "|  |_ ", array: new_arr })
+          ascii_fields_to_print(parameter_two, { spacing: new_spacing, field_name: parameters[:second_value], additional_space: "  |_ ", array: new_arr })
+          ascii_fields_to_print(parameter_three, { spacing: new_spacing, field_name: parameters[:third_value], additional_space: "   |_ ", array: new_arr })
+          new_arr
+        end
+
+        def to_latex_math_zone(spacing, last = false, _)
+          parameters = self.class::FUNCTION
+          new_spacing = gsub_spacing(spacing, last)
+          new_arr = ["#{spacing}\"#{to_latex}\" #{parameters[:name]}\n"]
+          latex_fields_to_print(parameter_one, { spacing: new_spacing, field_name: parameters[:first_value], additional_space: "|  |_ ", array: new_arr })
+          latex_fields_to_print(parameter_two, { spacing: new_spacing, field_name: parameters[:second_value], additional_space: "  |_ ", array: new_arr })
+          latex_fields_to_print(parameter_three, { spacing: new_spacing, field_name: parameters[:third_value], additional_space: "   |_ ", array: new_arr })
+          new_arr
+        end
+
+        def to_mathml_math_zone(spacing, last = false, _)
+          parameters = self.class::FUNCTION
+          new_spacing = gsub_spacing(spacing, last)
+          new_arr = ["#{spacing}\"#{dump_mathml(self)}\" #{parameters[:name]}\n"]
+          mathml_fields_to_print(parameter_one, { spacing: new_spacing, field_name: parameters[:first_value], additional_space: "|  |_ ", array: new_arr })
+          mathml_fields_to_print(parameter_two, { spacing: new_spacing, field_name: parameters[:second_value], additional_space: "  |_ ", array: new_arr })
+          mathml_fields_to_print(parameter_three, { spacing: new_spacing, field_name: parameters[:third_value], additional_space: "   |_ ", array: new_arr })
+          new_arr
+        end
+
+        def to_omml_math_zone(spacing, last = false, _, display_style:)
+          parameters = self.class::FUNCTION
+          new_spacing = gsub_spacing(spacing, last)
+          new_arr = ["#{spacing}\"#{dump_omml(self, display_style)}\" #{parameters[:name]}\n"]
+          omml_fields_to_print(parameter_one, { spacing: new_spacing, field_name: parameters[:first_value], additional_space: "|  |_ ", array: new_arr, display_style: display_style })
+          omml_fields_to_print(parameter_two, { spacing: new_spacing, field_name: parameters[:second_value], additional_space: "  |_ ", array: new_arr, display_style: display_style })
+          omml_fields_to_print(parameter_three, { spacing: new_spacing, field_name: parameters[:third_value], additional_space: "   |_ ", array: new_arr, display_style: display_style })
+          new_arr
+        end
+
+        def any_value_exist?
+          !(parameter_one.nil? || parameter_two.nil? || parameter_three.nil?)
+        end
+
         protected
 
         def latex_wrapped(field)
@@ -69,10 +113,6 @@ module Plurimath
           end
         end
 
-        def invert_unicode_symbols
-          Mathml::Constants::UNICODE_SYMBOLS.invert[class_name] || class_name
-        end
-
         def wrapped(field, type: "ascii")
           return "" unless field
 

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

@@ -15,7 +15,9 @@ module Plurimath
 
         def to_mathml_without_math_tag
           text = Utility.ox_element("mtext")
-          text << (parse_text("mathml") || parameter_one) if parameter_one
+          return text unless parameter_one
+
+          text << (parse_text("mathml") || parameter_one)
         end
 
         def to_latex
@@ -43,6 +45,26 @@ module Plurimath
           false
         end
 
+        def to_asciimath_math_zone(spacing, _, _)
+          "#{spacing}#{to_asciimath} text\n"
+        end
+
+        def to_latex_math_zone(spacing, _, _)
+          "#{spacing}#{to_asciimath} text\n"
+        end
+
+        def to_mathml_math_zone(spacing, _, _)
+          "#{spacing}\"#{dump_mathml(self)}\" text\n"
+        end
+
+        def to_omml_math_zone(spacing, _, _, display_style:)
+          "#{spacing}\"#{dump_omml(self, display_style)}\" text\n"
+        end
+
+        def value
+          parameter_one
+        end
+
         protected
 
         def symbol_value(unicode)
@@ -52,7 +74,7 @@ module Plurimath
 
         def parse_text(lang)
           html_value = first_value(lang).dup
-          html_value&.gsub!(PARSER_REGEX) do |_text|
+          html_value = html_value&.gsub(PARSER_REGEX) do |_text|
             last_match = Regexp.last_match
             case lang
             when "mathml", "html", "omml"

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

@@ -44,6 +44,34 @@ module Plurimath
             [mr]
           end
         end
+
+        def to_asciimath_math_zone(spacing, last = false, indent = true)
+          [
+            "#{spacing}\"tr\" function apply\n",
+            Formula.new(parameter_one).to_asciimath_math_zone(gsub_spacing(spacing, last), last, indent),
+          ]
+        end
+
+        def to_latex_math_zone(spacing, last = false, indent = true)
+          [
+            "#{spacing}\"tr\" function apply\n",
+            Formula.new(parameter_one).to_latex_math_zone(gsub_spacing(spacing, last), last, indent),
+          ]
+        end
+
+        def to_mathml_math_zone(spacing, last = false, indent = true)
+          [
+            "#{spacing}\"tr\" function apply\n",
+            Formula.new(parameter_one).to_mathml_math_zone(gsub_spacing(spacing, last), last, indent),
+          ]
+        end
+
+        def to_omml_math_zone(spacing, last = false, indent = true, display_style:)
+          [
+            "#{spacing}\"tr\" function apply\n",
+            Formula.new(parameter_one).to_omml_math_zone(gsub_spacing(spacing, last), last, indent, display_style: display_style),
+          ]
+        end
       end
     end
   end

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

@@ -75,12 +75,48 @@ module Plurimath
           [func]
         end
 
-        protected
+        def to_asciimath_math_zone(spacing, last = false, _)
+          new_spacing = gsub_spacing(spacing, last)
+          new_arr = [
+            "#{spacing}\"#{to_asciimath}\" function apply\n",
+            "#{new_spacing}|_ \"#{class_name}\" function name\n",
+          ]
+          ascii_fields_to_print(parameter_one, { spacing: new_spacing, field_name: "argument", additional_space: "   |_ " , array: new_arr })
+          new_arr
+        end
+
+        def to_latex_math_zone(spacing, last = false, _)
+          new_spacing = gsub_spacing(spacing, last)
+          new_arr = [
+            "#{spacing}\"#{to_latex}\" function apply\n",
+            "#{new_spacing}|_ \"#{class_name}\" function name\n",
+          ]
+          latex_fields_to_print(parameter_one, { spacing: new_spacing, field_name: "argument", additional_space: "   |_ " , array: new_arr })
+          new_arr
+        end
+
+        def to_mathml_math_zone(spacing, last = false, _)
+          new_spacing = gsub_spacing(spacing, last)
+          new_arr = [
+            "#{spacing}\"#{dump_mathml(self)}\" function apply\n",
+            "#{new_spacing}|_ \"#{class_name}\" function name\n",
+          ]
+          mathml_fields_to_print(parameter_one, { spacing: new_spacing, field_name: "argument", additional_space: "   |_ ", array: new_arr })
+          new_arr
+        end
 
-        def invert_unicode_symbols
-          Mathml::Constants::UNICODE_SYMBOLS.invert[class_name] || class_name
+        def to_omml_math_zone(spacing, last = false, _, display_style:)
+          new_spacing = gsub_spacing(spacing, last)
+          new_arr = [
+            "#{spacing}\"#{dump_omml(self, display_style)}\" function apply\n",
+            "#{new_spacing}|_ \"#{class_name}\" function name\n",
+          ]
+          omml_fields_to_print(parameter_one, { spacing: new_spacing, field_name: "argument", additional_space: "   |_ ", array: new_arr, display_style: display_style })
+          new_arr
         end
 
+        protected
+
         def asciimath_value
           return "" unless parameter_one
 
@@ -116,6 +152,10 @@ module Plurimath
 
           Array(parameter_one&.insert_t_tag(display_style))
         end
+
+        def latex_paren
+          Latex::Constants::LEFT_RIGHT_PARENTHESIS.invert[parameter_one] || '.'
+        end
       end
     end
   end

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

@@ -6,6 +6,13 @@ module Plurimath
   module Math
     module Function
       class Underover < TernaryFunction
+        FUNCTION = {
+          name: "UnderOver",
+          first_value: "base",
+          second_value: "Under",
+          third_value: "Over",
+        }.freeze
+
         def to_asciimath
           first_value = first_field_wrap(parameter_one) if parameter_one
           second_value = "_#{wrapped(parameter_two)}" if parameter_two
@@ -43,61 +50,6 @@ module Plurimath
 
           underover(display_style)
         end
-
-        def omml_nary_tag(display_style)
-          pr = Utility.ox_element("naryPr", namespace: "m")
-          [
-            pr_element_value(pr),
-            omml_parameter(parameter_two, display_style, tag_name: "sub"),
-            omml_parameter(parameter_three, display_style, tag_name: "sup"),
-          ]
-        end
-
-        protected
-
-        def hidden_sub_tag(pr_element)
-          return true unless parameter_two.nil?
-
-          pr_element << Utility.ox_element(
-            "subHide",
-            namespace: "m",
-            attributes: { "m:val": 1 },
-          )
-        end
-
-        def hidden_sup_tag(pr_element)
-          return true unless parameter_three.nil?
-
-          pr_element << Utility.ox_element(
-            "supHide",
-            namespace: "m",
-            attributes: { "m:val": 1 },
-          )
-        end
-
-        def pr_element_value(pr_element)
-          first_value(pr_element)
-          pr_element << Utility.ox_element(
-            "limLoc",
-            namespace: "m",
-            attributes: { "m:val": "undOvr" },
-          )
-          hidden_sub_tag(pr_element)
-          hidden_sup_tag(pr_element)
-          pr_element << Utility.pr_element("ctrl", true, namespace: "m")
-        end
-
-        def first_value(pr_element)
-          first_value = parameter_one.nary_attr_value
-          first_value = Utility.html_entity_to_unicode(first_value)
-          unless first_value == "∫"
-            pr_element << Utility.ox_element(
-              "chr",
-              namespace: "m",
-              attributes: { "m:val": first_value },
-            )
-          end
-        end
       end
     end
   end

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

@@ -6,6 +6,12 @@ module Plurimath
   module Math
     module Function
       class Underset < BinaryFunction
+        FUNCTION = {
+          name: "underscript",
+          first_value: "underscript value",
+          second_value: "base expression",
+        }.freeze
+
         def to_mathml_without_math_tag
           first_value = parameter_one&.to_mathml_without_math_tag
           second_value = parameter_two&.to_mathml_without_math_tag

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

@@ -37,6 +37,46 @@ module Plurimath
           end
         end
 
+        def to_asciimath_math_zone(spacing, last = false, _)
+          new_spacing = gsub_spacing(spacing, last)
+          new_arr = [
+            "#{spacing}\"#{to_asciimath}\" function apply\n",
+            "#{new_spacing}|_ \"#{class_name}\" function name\n",
+          ]
+          ascii_fields_to_print(parameter_one, { spacing: new_spacing, field_name: "supscript", additional_space: "|  |_ " , array: new_arr })
+          new_arr
+        end
+
+        def to_latex_math_zone(spacing, last = false, _)
+          new_spacing = gsub_spacing(spacing, last)
+          new_arr = [
+            "#{spacing}\"#{to_latex}\" function apply\n",
+            "#{new_spacing}|_ \"#{class_name}\" function name\n",
+          ]
+          latex_fields_to_print(parameter_one, { spacing: new_spacing, field_name: "supscript", additional_space: "|  |_ " , array: new_arr })
+          new_arr
+        end
+
+        def to_mathml_math_zone(spacing, last = false, _)
+          new_spacing = gsub_spacing(spacing, last)
+          new_arr = [
+            "#{spacing}\"#{dump_mathml(self)}\" overset\n",
+            "#{new_spacing}|_ \"<mo>&#x2192;</mo>\" base\n",
+          ]
+          mathml_fields_to_print(parameter_one, { spacing: new_spacing, field_name: "supscript", additional_space: "|  |_ ", array: new_arr })
+          new_arr
+        end
+
+        def to_omml_math_zone(spacing, last = false, _, display_style:)
+          new_spacing = gsub_spacing(spacing, last)
+          new_arr = [
+            "#{spacing}\"#{dump_omml(self, display_style)}\" overset\n",
+            "#{new_spacing}|_ \"<m:t>&#x2192;</m:t>\" base\n",
+          ]
+          omml_fields_to_print(parameter_one, { spacing: new_spacing, field_name: "supscript", additional_space: "|  |_ ", array: new_arr, display_style: display_style })
+          new_arr
+        end
+
         protected
 
         def acc_tag(display_style)

data/lib/plurimath/math/function.rb

@@ -6,9 +6,11 @@ module Plurimath
 end
 
 # Include the first level files before the next
-(
-  Dir.glob(File.join(__dir__, "function", "*.rb")) +
-  Dir.glob(File.join(__dir__, "function", "*", "*.rb"))
-).each do |file|
-  require file
+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

@@ -10,7 +10,7 @@ module Plurimath
       end
 
       def ==(object)
-        object.value == value
+        object.respond_to?(:value) && object.value == value
       end
 
       def to_asciimath
@@ -30,16 +30,20 @@ module Plurimath
       end
 
       def to_omml_without_math_tag(_display_style)
-        [(Utility.ox_element("t", namespace: "m") << value)]
+        [t_tag]
       end
 
       def insert_t_tag(_display_style)
-        r_tag = Utility.ox_element("r", namespace: "m")
-        r_tag << (Utility.ox_element("t", namespace: "m") << value)
-        [r_tag]
+        [
+          (Utility.ox_element("r", namespace: "m") << t_tag),
+        ]
       end
 
       def font_style_t_tag(_display_style)
+        t_tag
+      end
+
+      def t_tag
         Utility.ox_element("t", namespace: "m") << value
       end
 

data/lib/plurimath/math/symbol.rb

@@ -10,7 +10,7 @@ module Plurimath
       end
 
       def ==(object)
-        object.value == value
+        object.respond_to?(:value) && object.value == value
       end
 
       def to_asciimath
@@ -29,11 +29,9 @@ module Plurimath
         mi_tag = Utility.ox_element("mi")
         return mi_tag if ["{:", ":}"].include?(value)
 
-        unicodes = Mathml::Constants::UNICODE_SYMBOLS
-        unicode = unicodes.invert[value]
+        unicode = Mathml::Constants::UNICODE_SYMBOLS.invert[value]
         if operator?(unicode) || unicode || explicit_checks(unicode)
-          mo_value = (unicodes[value] || unicode || value).to_s
-          return Utility.ox_element("mo") << mo_value
+          return Utility.ox_element("mo") << (unicode || value).to_s
         end
 
         mi_tag << value
@@ -63,9 +61,7 @@ module Plurimath
       end
 
       def insert_t_tag(_display_style)
-        r_tag = Utility.ox_element("r", namespace: "m")
-        r_tag << (Utility.ox_element("t", namespace: "m") << value)
-        [r_tag]
+        [(Utility.ox_element("r", namespace: "m") << t_tag)]
       end
 
       def tag_name
@@ -81,7 +77,7 @@ module Plurimath
       end
 
       def font_style_t_tag(_display_style)
-        Utility.ox_element("t", namespace: "m") << value
+        t_tag
       end
 
       def nary_attr_value
@@ -92,6 +88,14 @@ module Plurimath
         false
       end
 
+      def omml_nodes(display_style)
+        Array(t_tag)
+      end
+
+      def t_tag
+        Utility.ox_element("t", namespace: "m") << value
+      end
+
       private
 
       def operator?(unicode)

data/lib/plurimath/math.rb

@@ -19,9 +19,7 @@ require_relative "latex/parser"
 require_relative "html/parser"
 require_relative "omml/parser"
 require_relative "utility"
-require "ox"
 require "yaml"
-Ox.default_options = { encoding: "UTF-8" }
 
 module Plurimath
   module Math
@@ -72,7 +70,7 @@ module Plurimath
 
     def type_error!
       raise InvalidTypeError.new(
-        "`type` must be one of: `#{VALID_TYPES.keys.join('`, `')}`"
+        "`type` must be one of: `#{VALID_TYPES.keys.join('`, `')}`",
       )
     end
 

data/lib/plurimath/mathml/parser.rb

@@ -23,8 +23,8 @@ module Plurimath
       end
 
       def parse
-        ox_nodes = Ox.load(text, strip_namespace: true)
-        display_style = ox_nodes&.locate("*/mstyle/@displaystyle")&.first
+        ox_nodes = Plurimath.xml_engine.load(text)
+        display_style = ox_nodes&.locate("mstyle/@displaystyle")&.first
         nodes = parse_nodes(ox_nodes.nodes)
         Math::Formula.new(
           Transform.new.apply(nodes).flatten.compact,
@@ -34,7 +34,7 @@ module Plurimath
 
       def parse_nodes(nodes)
         nodes.map do |node|
-          next if node.is_a?(Ox::Comment)
+          next if Plurimath.xml_engine.is_xml_comment?(node)
 
           if node.is_a?(String)
             node
@@ -47,7 +47,7 @@ module Plurimath
       end
 
       def validate_attributes(attributes)
-        attributes&.select! { |key, _| SUPPORTED_ATTRS.include?(key&.to_s) }
+        attributes&.select! { |key, _| SUPPORTED_ATTRS.include?(key.to_s) }
         attributes&.transform_keys(&:to_sym) if attributes&.any?
       end