plurimath 0.5.0 → 0.6.0

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

@@ -6,6 +6,12 @@ module Plurimath
   module Math
     module Function
       class Frac < BinaryFunction
+        FUNCTION = {
+          name: "fraction",
+          first_value: "numerator",
+          second_value: "denominator",
+        }.freeze
+
         def to_asciimath
           first_value = "(#{parameter_one&.to_asciimath})" if parameter_one
           second_value = "(#{parameter_two&.to_asciimath})" if parameter_two

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

@@ -6,6 +6,13 @@ module Plurimath
   module Math
     module Function
       class Int < TernaryFunction
+        FUNCTION = {
+          name: "integral",
+          first_value: "lower limit",
+          second_value: "upper limit",
+          third_value: "integrand"
+        }
+
         def to_asciimath
           first_value = "_#{wrapped(parameter_one)}" if parameter_one
           second_value = "^#{wrapped(parameter_two)}" if parameter_two

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

@@ -30,13 +30,31 @@ module Plurimath
         end
 
         def to_latex
-          "\\left #{Latex::Constants::LEFT_RIGHT_PARENTHESIS.invert[parameter_one] || '.'}"
+          "\\left #{latex_paren}"
         end
 
         def validate_function_formula
           false
         end
 
+        def to_asciimath_math_zone(spacing = "", _, _)
+          "#{spacing}\"#{latex_paren}\" left\n"
+        end
+
+        def to_latex_math_zone(spacing = "", _, _)
+          "#{spacing}\"#{latex_paren}\" left\n"
+        end
+
+        def to_mathml_math_zone(spacing = "", _, _)
+          mo_tag = (Utility.ox_element("mo") << left_paren)
+          "#{spacing}\"#{dump_ox_nodes(mo_tag).gsub(/\s+/, "")}\" left\n"
+        end
+
+        def to_omml_math_zone(spacing = "", _, _, display_style:)
+          t_tag = (Utility.ox_element("t", namespace: "m") << left_paren)
+          "#{spacing}\"#{dump_ox_nodes(t_tag).gsub(/\s+/, "")}\" left\n"
+        end
+
         protected
 
         def left_paren

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

@@ -6,6 +6,12 @@ module Plurimath
   module Math
     module Function
       class Lim < BinaryFunction
+        FUNCTION = {
+          name: "limit",
+          first_value: "limit subscript",
+          second_value: "limit supscript",
+        }.freeze
+
         def to_asciimath
           first_value = "_#{wrapped(parameter_one)}" if parameter_one
           second_value = "^#{wrapped(parameter_two)}" if parameter_two

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

@@ -6,6 +6,13 @@ module Plurimath
   module Math
     module Function
       class Limits < TernaryFunction
+        FUNCTION = {
+          name: "function apply",
+          first_value: "base",
+          second_value: "subscript",
+          third_value: "supscript",
+        }.freeze
+
         def to_mathml_without_math_tag
           underover = Utility.ox_element("munderover")
           value_array = []

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

@@ -6,6 +6,12 @@ module Plurimath
   module Math
     module Function
       class Log < BinaryFunction
+        FUNCTION = {
+          name: "function apply",
+          first_value: "subscript",
+          second_value: "supscript",
+        }
+
         def to_asciimath
           first_value = "_#{wrapped(parameter_one)}" if parameter_one
           second_value = "^#{wrapped(parameter_two)}" if parameter_two

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

@@ -6,6 +6,12 @@ module Plurimath
   module Math
     module Function
       class Menclose < BinaryFunction
+        FUNCTION = {
+          name: "enclosure",
+          first_value: "enclosure type",
+          second_value: "expression",
+        }.freeze
+
         def to_asciimath
           parameter_two&.to_asciimath
         end

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

@@ -6,6 +6,12 @@ module Plurimath
   module Math
     module Function
       class Mod < BinaryFunction
+        FUNCTION = {
+          name: "mod",
+          first_value: "base",
+          second_value: "argument",
+        }
+
         def to_asciimath
           first_value = parameter_one&.to_asciimath
           second_value = parameter_two&.to_asciimath

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

@@ -28,6 +28,34 @@ module Plurimath
         def to_html
           "<i>#{parameter_one.map(&:to_html).join}</i>"
         end
+
+        def to_asciimath_math_zone(spacing, last = false, _indent = true)
+          [
+            "#{spacing}\"msgroup\" function apply\n",
+            Formula.new(parameter_one).to_asciimath_math_zone(gsub_spacing(spacing, last)),
+          ]
+        end
+
+        def to_latex_math_zone(spacing, last = false, indent = true)
+          [
+            "#{spacing}\"msgroup\" 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}\"msgroup\" 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}\"msgroup\" 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/multiscript.rb

@@ -5,6 +5,13 @@ module Plurimath
   module Math
     module Function
       class Multiscript < TernaryFunction
+        FUNCTION = {
+          name: "multiscript",
+          first_value: "base",
+          second_value: "subscript",
+          third_value: "supscript",
+        }.freeze
+
         def to_omml_without_math_tag(display_style)
           pre_element = Utility.ox_element("sPre", namespace: "m")
           pr_element  = Utility.ox_element("sPrePr", namespace: "m")

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

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+module Plurimath
+  module Math
+    module Function
+      class Nary < Core
+        attr_accessor :parameter_one, :parameter_two, :parameter_three, :parameter_four, :options
+
+        def initialize(parameter_one = nil,
+                       parameter_two = nil,
+                       parameter_three = nil,
+                       parameter_four = nil,
+                       options = {})
+          @parameter_one = parameter_one
+          @parameter_two = parameter_two
+          @parameter_three = parameter_three
+          @parameter_four = parameter_four
+          @options = options
+          Utility.validate_left_right([parameter_one, parameter_two, parameter_three, parameter_four])
+        end
+
+        def ==(object)
+          self.class == object.class &&
+            object.parameter_one == parameter_one &&
+            object.parameter_two == parameter_two &&
+            object.parameter_three == parameter_three &&
+            object.parameter_four == parameter_four &&
+            object.options == options
+        end
+
+        def to_asciimath
+          first_value  = parameter_one&.to_asciimath || "int"
+          second_value = "_#{parameter_two.to_asciimath}" if parameter_two
+          third_value  = "^#{parameter_three.to_asciimath}" if parameter_three
+          fourth_value = " #{parameter_four.to_asciimath}" if parameter_four
+          "#{first_value}#{second_value}#{third_value}#{fourth_value}"
+        end
+
+        def to_latex
+          first_value  = parameter_one&.to_latex || "\\int"
+          second_value = "_#{parameter_two.to_latex}" if parameter_two
+          third_value  = "^#{parameter_three.to_latex}" if parameter_three
+          fourth_value = "{#{parameter_four.to_latex}}" if parameter_four
+          "#{first_value}#{second_value}#{third_value}#{fourth_value}"
+        end
+
+        def to_mathml_without_math_tag
+          tag_name = options[:type] == "undOvr" ? "munderover" : "msubsup"
+          subsup_tag = Utility.ox_element(tag_name)
+          new_arr = []
+          new_arr << validate_mathml_fields(parameter_one)
+          new_arr << validate_mathml_fields(parameter_two)
+          new_arr << validate_mathml_fields(parameter_three)
+          Utility.update_nodes(subsup_tag, new_arr)
+        end
+
+        def to_omml_without_math_tag(display_style)
+          nary_element = Utility.ox_element("nary", namespace: "m")
+          Utility.update_nodes(nary_element, omml_nary_tag(display_style))
+          Array(nary_element)
+        end
+
+        protected
+
+        def chr_value(narypr)
+          first_value = Utility.html_entity_to_unicode(parameter_one&.nary_attr_value)
+          narypr << Utility.ox_element("chr", namespace: "m", attributes: { "m:val": first_value }) unless first_value == "∫"
+
+          narypr << Utility.ox_element("limLoc", namespace: "m", attributes: { "m:val": options[:type].to_s })
+          hide_tags(narypr, parameter_two, "sub")
+          hide_tags(narypr, parameter_three, "sup")
+          narypr
+        end
+
+        def hide_tags(nar, field, tag_prefix)
+          return nar unless field.nil?
+
+          nar << Utility.ox_element("#{tag_prefix}Hide", namespace: "m", attributes: { "m:val": "1" })
+        end
+
+        def omml_nary_tag(display_style)
+          narypr = Utility.ox_element("naryPr", namespace: "m")
+          chr_value(narypr)
+          [
+            (narypr << Utility.pr_element("ctrl", true, namespace: "m")),
+            omml_parameter(parameter_two, display_style, tag_name: "sub"),
+            omml_parameter(parameter_three, display_style, tag_name: "sup"),
+            omml_parameter(parameter_four, display_style, tag_name: "e"),
+          ]
+        end
+      end
+    end
+  end
+end

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

@@ -6,6 +6,12 @@ module Plurimath
   module Math
     module Function
       class Oint < TernaryFunction
+        FUNCTION = {
+          name: "contour integral",
+          first_value: "subscript",
+          second_value: "supscript",
+        }
+
         def to_asciimath
           first_value = "_#{wrapped(parameter_one)}" if parameter_one
           second_value = "^#{wrapped(parameter_two)}" if parameter_two

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

@@ -6,6 +6,12 @@ module Plurimath
   module Math
     module Function
       class Over < BinaryFunction
+        FUNCTION = {
+          name: "over",
+          first_value: "numerator",
+          second_value: "denominator",
+        }.freeze
+
         def to_asciimath
           first_value = wrapped(parameter_one)
           second_value = wrapped(parameter_two)

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

@@ -6,6 +6,12 @@ module Plurimath
   module Math
     module Function
       class Overset < BinaryFunction
+        FUNCTION = {
+          name: "overset",
+          first_value: "base",
+          second_value: "supscript",
+        }.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/power.rb

@@ -6,6 +6,12 @@ module Plurimath
   module Math
     module Function
       class Power < BinaryFunction
+        FUNCTION = {
+          name: "superscript",
+          first_value: "base",
+          second_value: "script",
+        }.freeze
+
         def to_asciimath
           second_value = "^#{wrapped(parameter_two)}" if parameter_two
           "#{parameter_one.to_asciimath}#{second_value}"
@@ -14,8 +20,8 @@ module Plurimath
         def to_mathml_without_math_tag
           tag_name = (["ubrace", "obrace"].include?(parameter_one&.class_name) ? "over" : "sup")
           sup_tag = Utility.ox_element("m#{tag_name}")
-          mathml_value = [parameter_one.to_mathml_without_math_tag]
-          mathml_value << parameter_two&.to_mathml_without_math_tag
+          mathml_value = [validate_mathml_fields(parameter_one)]
+          mathml_value << validate_mathml_fields(parameter_two)
           Utility.update_nodes(sup_tag, mathml_value)
         end
 

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

@@ -6,12 +6,19 @@ module Plurimath
   module Math
     module Function
       class PowerBase < TernaryFunction
+        FUNCTION = {
+          name: "subsup",
+          first_value: "base",
+          second_value: "subscript",
+          third_value: "supscript",
+        }.freeze
+
         def to_mathml_without_math_tag
           subsup_tag = Utility.ox_element("m#{parameter_one.tag_name}")
           new_arr = []
-          new_arr << parameter_one.to_mathml_without_math_tag
-          new_arr << parameter_two&.to_mathml_without_math_tag
-          new_arr << parameter_three&.to_mathml_without_math_tag
+          new_arr << validate_mathml_fields(parameter_one)
+          new_arr << validate_mathml_fields(parameter_two)
+          new_arr << validate_mathml_fields(parameter_three)
           Utility.update_nodes(subsup_tag, new_arr)
         end
 
@@ -29,23 +36,6 @@ module Plurimath
           "#{first_value}#{second_value}#{third_value}"
         end
 
-        def omml_nary_tag(display_style)
-          narypr = Utility.ox_element("naryPr", namespace: "m")
-          chr_value(narypr)
-          narypr << Utility.ox_element(
-            "limLoc",
-            namespace: "m",
-            attributes: { "m:val": parameter_one.omml_tag_name },
-          )
-          hide_tags(narypr)
-          narypr << Utility.pr_element("ctrl", true, namespace: "m")
-          [
-            narypr,
-            omml_parameter(parameter_two, display_style, tag_name: "sub"),
-            omml_parameter(parameter_three, display_style, tag_name: "sup"),
-          ]
-        end
-
         def to_omml_without_math_tag(display_style)
           return underover(display_style) if parameter_one.omml_tag_name == "undOvr"
 
@@ -68,17 +58,6 @@ module Plurimath
 
         protected
 
-        def chr_value(narypr)
-          first_value = Utility.html_entity_to_unicode(parameter_one&.nary_attr_value)
-          return narypr if first_value == "∫"
-
-          narypr << Utility.ox_element(
-            "chr",
-            namespace: "m",
-            attributes: { "m:val": first_value },
-          )
-        end
-
         def hide_tags(nar)
           attr = { "m:val": "1" }
           if parameter_two.nil?

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

@@ -6,6 +6,12 @@ module Plurimath
   module Math
     module Function
       class Prod < TernaryFunction
+        FUNCTION = {
+          name: "prod",
+          first_value: "subscript",
+          second_value: "supscript",
+        }.freeze
+
         def to_asciimath
           first_value = "_#{wrapped(parameter_one)}" if parameter_one
           second_value = "^#{wrapped(parameter_two)}" if parameter_two
@@ -55,24 +61,19 @@ module Plurimath
         end
 
         def to_omml_without_math_tag(display_style)
-          if all_values_exist?
-            nary = Utility.ox_element("nary", namespace: "m")
-            Utility.update_nodes(
-              nary,
-              [
-                narypr("∏"),
-                omml_parameter(parameter_one, display_style, tag_name: "sub"),
-                omml_parameter(parameter_two, display_style, tag_name: "sup"),
-                omml_parameter(parameter_three, display_style, tag_name: "e"),
-              ],
-            )
-            [nary]
-          else
-            r_tag = Utility.ox_element("r", namespace: "m")
-            t_tag = Utility.ox_element("t", namespace: "m")
-            r_tag << (t_tag << "&#x220f;")
-            [r_tag]
-          end
+          return r_element("&#x220f;", rpr_tag: false) unless all_values_exist?
+
+          nary = Utility.ox_element("nary", namespace: "m")
+          Utility.update_nodes(
+            nary,
+            [
+              narypr("∏"),
+              omml_parameter(parameter_one, display_style, tag_name: "sub"),
+              omml_parameter(parameter_two, display_style, tag_name: "sup"),
+              omml_parameter(parameter_three, display_style, tag_name: "e"),
+            ],
+          )
+          [nary]
         end
 
         def nary_attr_value

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

@@ -30,13 +30,31 @@ module Plurimath
         end
 
         def to_latex
-          "\\right #{Latex::Constants::LEFT_RIGHT_PARENTHESIS.invert[parameter_one] || '.'}"
+          "\\right #{latex_paren}"
         end
 
         def validate_function_formula
           false
         end
 
+        def to_asciimath_math_zone(spacing = "", _, _)
+          "#{spacing}\"#{latex_paren}\" right\n"
+        end
+
+        def to_latex_math_zone(spacing = "", _, _)
+          "#{spacing}\"#{latex_paren}\" right\n"
+        end
+
+        def to_mathml_math_zone(spacing = "", _, _)
+          mo_tag = (Utility.ox_element("mo") << right_paren)
+          "#{spacing}\"#{dump_ox_nodes(mo_tag).gsub(/\s+/, "")}\" right\n"
+        end
+
+        def to_omml_math_zone(spacing = "", _, _, display_style:)
+          t_tag = (Utility.ox_element("t", namespace: "m") << right_paren)
+          "#{spacing}\"#{dump_ox_nodes(t_tag).gsub(/\s+/, "")}\" right\n"
+        end
+
         protected
 
         def right_paren

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

@@ -6,6 +6,12 @@ module Plurimath
   module Math
     module Function
       class Root < BinaryFunction
+        FUNCTION = {
+          name: "root",
+          first_value: "radicand",
+          second_value: "index",
+        }.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/rule.rb

@@ -5,6 +5,13 @@ module Plurimath
   module Math
     module Function
       class Rule < TernaryFunction
+        FUNCTION = {
+          name: "rule",
+          first_value: "first argument",
+          second_value: "second argument",
+          third_value: "third argument",
+        }.freeze
+
         def to_asciimath
           ""
         end

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

@@ -6,6 +6,12 @@ module Plurimath
   module Math
     module Function
       class Semantics < BinaryFunction
+        FUNCTION = {
+          name: "semantics",
+          first_value: "first argument",
+          second_value: "second argument",
+        }.freeze
+
         def to_mathml_without_math_tag
           first_value = parameter_one&.to_mathml_without_math_tag
           second_value = other_tags(parameter_two)

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

@@ -6,6 +6,12 @@ module Plurimath
   module Math
     module Function
       class Stackrel < BinaryFunction
+        FUNCTION = {
+          name: "stackrel",
+          first_value: "above",
+          second_value: "below",
+        }.freeze
+
         def to_asciimath
           first_value  = wrapped(parameter_one)
           second_value = wrapped(parameter_two)

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

@@ -6,6 +6,12 @@ module Plurimath
   module Math
     module Function
       class Substack < BinaryFunction
+        FUNCTION = {
+          name: "substack",
+          first_value: "above",
+          second_value: "below",
+        }.freeze
+
         def to_latex
           first_value  = parameter_one.to_latex if parameter_one
           second_value = "\\\\#{parameter_two.to_latex}" if parameter_two

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

@@ -6,6 +6,13 @@ module Plurimath
   module Math
     module Function
       class Sum < TernaryFunction
+        FUNCTION = {
+          name: "summation",
+          first_value: "subscript",
+          second_value: "supscript",
+          third_value: "term",
+        }.freeze
+
         def to_asciimath
           first_value = "_#{wrapped(parameter_one)}" if parameter_one
           second_value = "^#{wrapped(parameter_two)}" if parameter_two
@@ -20,32 +27,26 @@ module Plurimath
 
         def to_mathml_without_math_tag
           first_value = Utility.ox_element("mo") << invert_unicode_symbols.to_s
-          if parameter_one || parameter_two
-            value_array = []
-            value_array << parameter_one&.to_mathml_without_math_tag
-            value_array << parameter_two&.to_mathml_without_math_tag
-            tag_name = if parameter_two && parameter_one
-                         "underover"
-                       else
-                         parameter_one ? "under" : "over"
-                       end
-            munderover_tag = Utility.ox_element("m#{tag_name}")
-            Utility.update_nodes(
-              munderover_tag,
-              value_array.insert(0, first_value),
-            )
-            return munderover_tag if parameter_three.nil?
+          return first_value unless parameter_one || parameter_two
 
-            Utility.update_nodes(
-              Utility.ox_element("mrow"),
-              [
-                munderover_tag,
-                parameter_three&.to_mathml_without_math_tag,
-              ].flatten.compact,
-            )
-          else
-            first_value
-          end
+          value_array = [parameter_one&.to_mathml_without_math_tag]
+          value_array << parameter_two&.to_mathml_without_math_tag
+          tag_name = if parameter_two && parameter_one
+                       "underover"
+                     else
+                       parameter_one ? "under" : "over"
+                     end
+          munderover_tag = Utility.ox_element("m#{tag_name}")
+          Utility.update_nodes(munderover_tag, value_array.insert(0, first_value))
+          return munderover_tag if parameter_three.nil?
+
+          Utility.update_nodes(
+            Utility.ox_element("mrow"),
+            [
+              munderover_tag,
+              parameter_three&.to_mathml_without_math_tag,
+            ].flatten.compact,
+          )
         end
 
         def to_html