plurimath 0.3.5 → 0.3.7

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

@@ -21,9 +21,7 @@ module Plurimath
         end
 
         def to_omml_without_math_tag
-          text = Utility.ox_element("t", namespace: "m")
-          text << parameter_one.to_omml_without_math_tag if parameter_one
-          text
+          omml_value
         end
       end
     end

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

@@ -31,7 +31,7 @@ module Plurimath
           borderpr = Utility.ox_element("borderBoxPr", namespace: "m")
           borderpr << Utility.pr_element("ctrl", true, namespace: "m")
           me = Utility.ox_element("e", namespace: "m")
-          me << parameter_two.to_omml_without_math_tag if parameter_two
+          Utility.update_nodes(me, Array(parameter_two.to_omml_without_math_tag)) if parameter_two
           Utility.update_nodes(
             borderbox,
             [
@@ -39,6 +39,7 @@ module Plurimath
               me,
             ],
           )
+          [borderbox]
         end
       end
     end

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

@@ -6,6 +6,9 @@ module Plurimath
   module Math
     module Function
       class Min < UnaryFunction
+        def validate_function_formula
+          false
+        end
       end
     end
   end

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

@@ -22,10 +22,7 @@ module Plurimath
         end
 
         def to_omml_without_math_tag
-          Utility.update_nodes(
-            Utility.ox_element("msgroup"),
-            parameter_one&.map(&:to_omml_without_math_tag),
-          )
+          omml_value
         end
 
         def to_html

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

@@ -8,21 +8,16 @@ module Plurimath
         def to_omml_without_math_tag
           pre_element = Utility.ox_element("sPre", namespace: "m")
           pr_element  = Utility.ox_element("sPrePr", namespace: "m")
-          sub_element = Utility.ox_element("sub", namespace: "m")
-          sub_element << parameter_two.to_omml_without_math_tag if parameter_two
-          sup_element = Utility.ox_element("sup", namespace: "m")
-          sup_element << parameter_three.to_omml_without_math_tag if parameter_three
-          e_element   = Utility.ox_element("e", namespace: "m")
-          e_element  << parameter_one.to_omml_without_math_tag if parameter_one
           Utility.update_nodes(
             pre_element,
             [
               pr_element << Utility.pr_element("ctrl", true, namespace: "m"),
-              sub_element,
-              sup_element,
-              e_element,
+              omml_parameter(parameter_two, tag_name: "sub"),
+              omml_parameter(parameter_three, tag_name: "sup"),
+              omml_parameter(parameter_one, tag_name: "e"),
             ],
           )
+          [pre_element]
         end
       end
     end

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

@@ -21,6 +21,14 @@ module Plurimath
             mo_tag
           end
         end
+
+        def tag_name
+          "underover"
+        end
+
+        def validate_function_formula
+          false
+        end
       end
 
       Overbrace = Obrace

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

@@ -20,31 +20,18 @@ module Plurimath
         end
 
         def to_omml_without_math_tag
-          first_value  = if parameter_one.is_a?(Math::Symbol)
-                           mt = Utility.ox_element("t", namespace: "m")
-                           mt << parameter_one.to_omml_without_math_tag
-                         else
-                           parameter_one.to_omml_without_math_tag
-                         end
-          second_value = if parameter_two.is_a?(Math::Symbol)
-                           mt = Utility.ox_element("t", namespace: "m")
-                           mt << parameter_two.to_omml_without_math_tag
-                         else
-                           parameter_two.to_omml_without_math_tag
-                         end
           limupp   = Utility.ox_element("limUpp", namespace: "m")
           limupppr = Utility.ox_element("limUppPr", namespace: "m")
           limupppr << Utility.pr_element("ctrl", true, namespace: "m")
-          me = (Utility.ox_element("e", namespace: "m") << first_value)
-          lim = (Utility.ox_element("lim", namespace: "m") << second_value)
           Utility.update_nodes(
             limupp,
             [
               limupppr,
-              me,
-              lim,
+              omml_parameter(parameter_one, tag_name: "e"),
+              omml_parameter(parameter_two, tag_name: "lim"),
             ],
           )
+          [limupp]
         end
       end
     end

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

@@ -34,19 +34,16 @@ module Plurimath
         def to_omml_without_math_tag
           ssup_element  = Utility.ox_element("sSup", namespace: "m")
           suppr_element = Utility.ox_element("sSupPr", namespace: "m")
-          sup_element   = Utility.ox_element("sup", namespace: "m")
-          e_element     = Utility.ox_element("e", namespace: "m")
-          e_element << parameter_one.to_omml_without_math_tag if parameter_one
-          sup_element << parameter_two.to_omml_without_math_tag if parameter_two
+          suppr_element << Utility.pr_element("ctrl", true, namespace: "m")
           Utility.update_nodes(
             ssup_element,
             [
-              suppr_element << Utility.pr_element("ctrl", true, namespace: "m"),
-              e_element,
-              sup_element,
+              suppr_element,
+              omml_parameter(parameter_one, tag_name: "e"),
+              omml_parameter(parameter_two, tag_name: "sup"),
             ],
           )
-          ssup_element
+          [ssup_element]
         end
       end
     end

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

@@ -7,16 +7,12 @@ module Plurimath
     module Function
       class PowerBase < TernaryFunction
         def to_mathml_without_math_tag
-          tag_name = (["ubrace", "obrace"].include?(parameter_one&.class_name) ? "underover" : "subsup")
-          subsup_tag = Utility.ox_element("m#{tag_name}")
+          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
-          Utility.update_nodes(
-            subsup_tag,
-            new_arr,
-          )
+          Utility.update_nodes(subsup_tag, new_arr)
         end
 
         def to_latex
@@ -45,8 +41,8 @@ module Plurimath
           narypr << Utility.pr_element("ctrl", true, namespace: "m")
           [
             narypr,
-            sub_element,
-            sup_element,
+            omml_parameter(parameter_two, tag_name: "sub"),
+            omml_parameter(parameter_three, tag_name: "sup"),
           ]
         end
 
@@ -60,17 +56,18 @@ module Plurimath
             ssubsup,
             [
               ssubsuppr,
-              e_element,
-              sub_element,
-              sup_element,
+              omml_parameter(parameter_one, tag_name: "e"),
+              omml_parameter(parameter_two, tag_name: "sub"),
+              omml_parameter(parameter_three, tag_name: "sup"),
             ],
           )
+          [ssubsup]
         end
 
         protected
 
         def chr_value(narypr)
-          first_value = parameter_one.to_omml_without_math_tag
+          first_value = Utility.html_entity_to_unicode(parameter_one&.nary_attr_value)
           return narypr if first_value == "∫"
 
           narypr << Utility.ox_element(
@@ -80,33 +77,6 @@ module Plurimath
           )
         end
 
-        def e_element
-          elemnet = Utility.ox_element("e", namespace: "m")
-          if parameter_one
-            elemnet << parameter_one&.to_omml_without_math_tag
-          else
-            elemnet
-          end
-        end
-
-        def sub_element
-          elemnet = Utility.ox_element("sub", namespace: "m")
-          if parameter_two
-            elemnet << parameter_two&.to_omml_without_math_tag
-          else
-            elemnet
-          end
-        end
-
-        def sup_element
-          elemnet = Utility.ox_element("sup", namespace: "m")
-          if parameter_three
-            elemnet << parameter_three&.to_omml_without_math_tag
-          else
-            elemnet
-          end
-        end
-
         def hide_tags(nar)
           attr = { "m:val": "1" }
           if parameter_two.nil?

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

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
-require_relative "binary_function"
+require_relative "ternary_function"
 
 module Plurimath
   module Math
     module Function
-      class Prod < BinaryFunction
+      class Prod < TernaryFunction
         def to_asciimath
           first_value = "_#{wrapped(parameter_one)}" if parameter_one
           second_value = "^#{wrapped(parameter_two)}" if parameter_two
-          "prod#{first_value}#{second_value}"
+          "prod#{first_value}#{second_value} #{parameter_three&.to_asciimath}".strip
         end
 
         def to_latex
           first_value = "_{#{parameter_one.to_latex}}" if parameter_one
           second_value = "^{#{parameter_two.to_latex}}" if parameter_two
-          "\\prod#{first_value}#{second_value}"
+          "\\prod#{first_value}#{second_value} #{parameter_three&.to_latex}".strip
         end
 
         def to_mathml_without_math_tag
@@ -34,6 +34,15 @@ module Plurimath
               munderover_tag,
               value_array,
             )
+            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,
+            )
           else
             first_value
           end
@@ -44,6 +53,27 @@ module Plurimath
           second_value = "<sup>#{parameter_two.to_html}</sup>" if parameter_two
           "<i>&prod;</i>#{first_value}#{second_value}"
         end
+
+        def to_omml_without_math_tag
+          if all_values_exist?
+            nary = Utility.ox_element("nary", namespace: "m")
+            Utility.update_nodes(
+              nary,
+              [
+                narypr("∏"),
+                omml_parameter(parameter_one, tag_name: "sub"),
+                omml_parameter(parameter_two, tag_name: "sup"),
+                omml_parameter(parameter_three, 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
+        end
       end
     end
   end

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

@@ -17,9 +17,12 @@ module Plurimath
         end
 
         def to_omml_without_math_tag
-          mt = Utility.ox_element("m:t")
-          mt << parameter_one if parameter_one
-          mt
+          mr = Utility.ox_element("m:r")
+          if parameter_one
+            mt = Utility.ox_element("m:t")
+            mr << (mt << parameter_one)
+          end
+          [mr]
         end
 
         def to_html
@@ -30,6 +33,10 @@ module Plurimath
           "\\right #{Latex::Constants::LEFT_RIGHT_PARENTHESIS.invert[parameter_one] || '.'}"
         end
 
+        def validate_function_formula
+          false
+        end
+
         protected
 
         def right_paren

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

@@ -29,15 +29,17 @@ module Plurimath
           pr_element  = Utility.ox_element("radPr", namespace: "m")
           deg_element = Utility.ox_element("deg", namespace: "m")
           e_element   = Utility.ox_element("e", namespace: "m")
+          Utility.update_nodes(e_element, parameter_one.to_omml_without_math_tag)
+          Utility.update_nodes(deg_element, parameter_two.to_omml_without_math_tag)
           Utility.update_nodes(
             rad_element,
             [
-              pr_element  << Utility.pr_element("ctrl", true, namespace: "m"),
-              deg_element << parameter_two.to_omml_without_math_tag,
-              e_element   << parameter_one.to_omml_without_math_tag,
+              (pr_element << Utility.pr_element("ctrl", true, namespace: "m")),
+              deg_element,
+              e_element,
             ],
           )
-          rad_element
+          [rad_element]
         end
       end
     end

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

@@ -21,7 +21,7 @@ module Plurimath
         end
 
         def to_omml_without_math_tag
-          Utility.ox_element("m:e")
+          [Utility.ox_element("m:r") << Utility.ox_element("m:t")]
         end
 
         def to_html

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

@@ -6,6 +6,9 @@ module Plurimath
   module Math
     module Function
       class Sec < UnaryFunction
+        def validate_function_formula
+          false
+        end
       end
     end
   end

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

@@ -6,6 +6,9 @@ module Plurimath
   module Math
     module Function
       class Sech < UnaryFunction
+        def validate_function_formula
+          false
+        end
       end
     end
   end

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

@@ -6,6 +6,9 @@ module Plurimath
   module Math
     module Function
       class Sin < UnaryFunction
+        def validate_function_formula
+          false
+        end
       end
     end
   end

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

@@ -6,6 +6,9 @@ module Plurimath
   module Math
     module Function
       class Sinh < UnaryFunction
+        def validate_function_formula
+          false
+        end
       end
     end
   end

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

@@ -22,15 +22,16 @@ module Plurimath
             attributes: { "m:val": "1" },
           )
           e_element = Utility.ox_element("e", namespace: "m")
+          Utility.update_nodes(e_element, omml_value)
           Utility.update_nodes(
             rad_element,
             [
-              pr_element << Utility.pr_element("ctrl", true, namespace: "m"),
+              (pr_element << Utility.pr_element("ctrl", true, namespace: "m")),
               Utility.ox_element("deg", namespace: "m"),
-              e_element << parameter_one.to_omml_without_math_tag,
+              e_element,
             ],
           )
-          rad_element
+          [rad_element]
         end
       end
     end

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

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
-require_relative "binary_function"
+require_relative "ternary_function"
 
 module Plurimath
   module Math
     module Function
-      class Sum < BinaryFunction
+      class Sum < TernaryFunction
         def to_asciimath
           first_value = "_#{wrapped(parameter_one)}" if parameter_one
           second_value = "^#{wrapped(parameter_two)}" if parameter_two
-          "sum#{first_value}#{second_value}"
+          "sum#{first_value}#{second_value} #{parameter_three&.to_asciimath}".strip
         end
 
         def to_latex
           first_value = "_{#{parameter_one.to_latex}}" if parameter_one
           second_value = "^{#{parameter_two.to_latex}}" if parameter_two
-          "\\sum#{first_value}#{second_value}"
+          "\\sum#{first_value}#{second_value} #{parameter_three&.to_latex}".strip
         end
 
         def to_mathml_without_math_tag
@@ -34,6 +34,15 @@ module Plurimath
               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,
+            )
           else
             first_value
           end
@@ -46,29 +55,24 @@ module Plurimath
         end
 
         def to_omml_without_math_tag
-          limupp   = Utility.ox_element("limLow", namespace: "m")
-          limupppr = Utility.ox_element("limUppPr", namespace: "m")
-          me = (Utility.ox_element("e", namespace: "m") << omml_first_value) if parameter_one
-          lim = (Utility.ox_element("lim", namespace: "m") << omml_second_value) if parameter_two
-          Utility.update_nodes(limupp, [limupppr, me, lim])
-        end
-
-        protected
-
-        def omml_first_value
-          return parameter_one&.to_omml_without_math_tag unless parameter_one.is_a?(Math::Symbol)
-
-          mt = Utility.ox_element("t", namespace: "m")
-          mt << parameter_one.to_omml_without_math_tag if parameter_one
-          mt
-        end
-
-        def omml_second_value
-          return parameter_two&.to_omml_without_math_tag unless parameter_two.is_a?(Math::Symbol)
-
-          mt = Utility.ox_element("t", namespace: "m")
-          mt << parameter_two.to_omml_without_math_tag if parameter_two
-          mt
+          if all_values_exist?
+            nary = Utility.ox_element("nary", namespace: "m")
+            Utility.update_nodes(
+              nary,
+              [
+                narypr("∑"),
+                omml_parameter(parameter_one, tag_name: "sub"),
+                omml_parameter(parameter_two, tag_name: "sup"),
+                omml_parameter(parameter_three, 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 << "&#x2211;")
+            [r_tag]
+          end
         end
       end
     end

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

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require_relative "ternary_function"
-
 module Plurimath
   module Math
     module Function
-      class Table
+      class Table < Core
         attr_accessor :value, :open_paren, :close_paren, :options
 
         def initialize(value = nil,
@@ -75,7 +73,7 @@ module Plurimath
           if value.map { |d| d.parameter_one.length == 1 }.all?
             single_td_table
           else
-            multiple_td_table
+            fenced_table(multiple_td_table)
           end
         end
 
@@ -173,6 +171,7 @@ module Plurimath
           eqarr    << eqarrpr
           tr_value = value.map(&:to_omml_without_math_tag).flatten
           Utility.update_nodes(eqarr, tr_value.compact)
+          [eqarr]
         end
 
         def multiple_td_table
@@ -200,16 +199,59 @@ module Plurimath
           mpr << mcs
           mpr << ctrlpr
           mm_value = value&.map(&:to_omml_without_math_tag)
-          Utility.update_nodes(mm, mm_value.insert(0, mpr).flatten)
+          Utility.update_nodes(
+            mm,
+            mm_value.insert(0, mpr).flatten,
+          )
+          [mm]
         end
 
         def norm_table(table_tag)
           mo_tag = Utility.ox_element("mo") << "&#x2225;"
           Utility.update_nodes(
             Utility.ox_element("mrow"),
-            [mo_tag, table_tag, mo_tag],
+            [
+              mo_tag,
+              table_tag,
+              mo_tag,
+            ],
           )
         end
+
+        def fenced_table(ox_table)
+          return ox_table unless open_paren && close_paren
+
+          d_node = Utility.ox_element("d", namespace: "m")
+          e_node = Utility.ox_element("e", namespace: "m")
+          Utility.update_nodes(e_node, ox_table)
+          Utility.update_nodes(d_node, [mdpr_node, e_node])
+          [d_node]
+        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,
+            ],
+          )
+        end
+
+        def paren(parenthesis)
+          return "" if ["{:", ":}"].include?(parenthesis)
+
+          parenthesis
+        end
       end
     end
   end

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

@@ -6,6 +6,9 @@ module Plurimath
   module Math
     module Function
       class Tan < UnaryFunction
+        def validate_function_formula
+          false
+        end
       end
     end
   end

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

@@ -6,6 +6,9 @@ module Plurimath
   module Math
     module Function
       class Tanh < UnaryFunction
+        def validate_function_formula
+          false
+        end
       end
     end
   end

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

@@ -34,10 +34,13 @@ module Plurimath
 
         def to_omml_without_math_tag
           me = Utility.ox_element("e", namespace: "m")
+          return [me] if parameter_one&.empty?
+
           Utility.update_nodes(
             me,
-            parameter_one&.map(&:to_omml_without_math_tag),
+            Formula.new(parameter_one).omml_content,
           )
+          [me]
         end
       end
     end