plurimath 0.3.5 → 0.3.7

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

@@ -37,18 +37,16 @@ module Plurimath
         def to_omml_without_math_tag
           ssub_element  = Utility.ox_element("sSub", namespace: "m")
           subpr_element = Utility.ox_element("sSubPr", namespace: "m")
-          e_element     = Utility.ox_element("e", namespace: "m")
-          sub_element   = Utility.ox_element("sub", namespace: "m")
-          sub_element << parameter_two.to_omml_without_math_tag if parameter_two
+          subpr_element << Utility.pr_element("ctrl", true, namespace: "m")
           Utility.update_nodes(
             ssub_element,
             [
-              subpr_element << Utility.pr_element("ctrl", true, namespace: "m"),
-              e_element << parameter_one.to_omml_without_math_tag,
-              sub_element,
+              subpr_element,
+              omml_parameter(parameter_one, tag_name: "e"),
+              omml_parameter(parameter_two, tag_name: "sub"),
             ],
           )
-          ssub_element
+          [ssub_element]
         end
       end
     end

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

@@ -3,7 +3,7 @@
 module Plurimath
   module Math
     module Function
-      class BinaryFunction
+      class BinaryFunction < Core
         attr_accessor :parameter_one, :parameter_two
 
         def initialize(parameter_one = nil, parameter_two = nil)
@@ -51,9 +51,9 @@ module Plurimath
 
         def to_omml_without_math_tag
           r_tag = Utility.ox_element("r", namespace: "m")
-          update_row_tag(r_tag, parameter_one) if parameter_one
-          update_row_tag(r_tag, parameter_two) if parameter_two
-          r_tag
+          Utility.update_nodes(r_tag, [parameter_one.insert_t_tag]) if parameter_one
+          Utility.update_nodes(r_tag, [parameter_two.insert_t_tag]) if parameter_two
+          [r_tag]
         end
 
         def class_name
@@ -62,79 +62,29 @@ module Plurimath
 
         protected
 
-        def update_row_tag(tag, field)
-          first_value = field.to_omml_without_math_tag
-          first_value = if first_value.is_a?(String)
-                          Utility.ox_element("t", namespace: "m") << first_value
-                        end
-          Utility.update_nodes(
-            tag,
-            first_value.is_a?(Array) ? first_value : [first_value],
-          )
-        end
-
         def latex_wrapped(field)
-          if validate_function_formula(field)
+          if field.validate_function_formula
             "{ \\left ( #{field.to_latex} \\right ) }"
           else
             "{#{field.to_latex}}"
           end
         end
 
-        def validate_function_formula(field)
-          unary_classes = (Utility::UNARY_CLASSES + ["obrace", "ubrace", "hat"])
-          if field.is_a?(Formula)
-            !(field.value.any?(Left) || field.value.any?(Right))
-          elsif unary_classes.include?(field.class_name)
-            false
-          elsif field.class.name.include?("Function") || field.is_a?(FontStyle)
-            !field.is_a?(Text)
-          end
-        end
-
-        def mathml_wrapped(field)
-          if validate_function_formula(field)
-            mrow_tag = Utility.ox_element("mrow")
-            open_paren = (Utility.ox_element("mo") << "(")
-            close_paren = (Utility.ox_element("mo") << ")")
-            Utility.update_nodes(
-              mrow_tag,
-              [
-                open_paren,
-                field.to_mathml_without_math_tag,
-                close_paren,
-              ],
-            )
-          else
-            field.to_mathml_without_math_tag
-          end
-        end
-
         def wrapped(field)
           return "" unless field
 
           "(#{field.to_asciimath})"
         end
 
-        def asciimath_base_value(field)
-          if validate_function_formula(field)
-            "(#{field.to_asciimath})"
-          else
-            field.to_asciimath
-          end
-        end
-
-        def latex_base_value(field)
-          if validate_function_formula(field)
-            "{ \\left ( #{field.to_latex} \\right ) }"
-          else
-            field.to_latex
-          end
-        end
-
         def invert_unicode_symbols
           Mathml::Constants::UNICODE_SYMBOLS.invert[class_name] || class_name
         end
+
+        def empty_tag(wrapper_tag)
+          r_tag = Utility.ox_element("r", namespace: "m")
+          r_tag << (Utility.ox_element("t", namespace: "m") << "&#8203;")
+          wrapper_tag << r_tag
+        end
       end
     end
   end

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -13,6 +13,19 @@ module Plurimath
             mathml_value << second_value,
           )
         end
+
+        def to_omml_without_math_tag
+          acc_tag    = Utility.ox_element("acc", namespace: "m")
+          acc_pr_tag = Utility.ox_element("accPr", namespace: "m")
+          acc_pr_tag << (Utility.ox_element("chr", namespace: "m", attributes: { "m:val": ".." }))
+          me = Utility.ox_element("e", namespace: "m")
+          Utility.update_nodes(me, omml_value)
+          Utility.update_nodes(
+            acc_tag,
+            [acc_pr_tag, me],
+          )
+          [acc_tag]
+        end
       end
     end
   end

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

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

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

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

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

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

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

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

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

@@ -46,8 +46,15 @@ module Plurimath
           dpr << Utility.pr_element("ctrl", true, namespace: "m")
           Utility.update_nodes(
             d,
-            [dpr] + Array(second_value),
+            [
+              dpr,
+              omml_parameter(
+                Formula.new(Array(parameter_two)),
+                tag_name: "e",
+              ),
+            ],
           )
+          [d]
         end
 
         protected
@@ -64,18 +71,6 @@ module Plurimath
           )
         end
 
-        def second_value
-          class_names = ["number", "symbol"].freeze
-          parameter_two&.map do |object|
-            e_tag = Utility.ox_element("e", namespace: "m")
-            e_tag << if class_names.include?(object.class_name)
-                       fenced_omml_value(object)
-                     else
-                       object&.to_omml_without_math_tag
-                     end
-          end
-        end
-
         def third_value(dpr)
           third_value = parameter_three&.value
           return dpr if third_value.nil? || third_value.empty?
@@ -88,18 +83,11 @@ module Plurimath
           )
         end
 
-        def fenced_omml_value(object)
-          r_tag = Utility.ox_element("r", namespace: "m")
-          t_tag = Utility.ox_element("t", namespace: "m")
-          t_tag << object&.value
-          r_tag << t_tag
-        end
-
         def latex_paren(paren)
           return "" if paren.nil? || paren.empty?
 
           paren = %w[{ }].include?(paren) ? "\\#{paren}" : paren
-          paren = "\\#{Latex::Constants::UNICODE_SYMBOLS.invert[paren]}" if paren.to_s.match?(/\&#x.{0,4};/)
+          paren = "\\#{Latex::Constants::UNICODE_SYMBOLS.invert[paren]}" if paren.to_s.match?(/&#x.{0,4};/)
           paren.to_s
         end
 

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

@@ -22,7 +22,9 @@ module Plurimath
         end
 
         def to_omml_without_math_tag
-          parameter_one&.to_omml_without_math_tag
+          r_tag = Utility.ox_element("r", namespace: "m")
+          Utility.update_nodes(r_tag, parameter_one&.insert_t_tag)
+          [r_tag]
         end
 
         def to_html
@@ -32,6 +34,10 @@ module Plurimath
         def to_latex
           parameter_one&.to_latex
         end
+
+        def validate_function_formula
+          true
+        end
       end
     end
   end

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

@@ -34,18 +34,16 @@ module Plurimath
         def to_omml_without_math_tag
           f_element   = Utility.ox_element("f", namespace: "m")
           fpr_element = Utility.ox_element("fPr", namespace: "m")
-          num_element = Utility.ox_element("num", namespace: "m")
-          num_element << parameter_one.to_omml_without_math_tag if parameter_one
-          den_element = Utility.ox_element("den", namespace: "m")
-          den_element << parameter_two.to_omml_without_math_tag if parameter_two
+          fpr_element << Utility.pr_element("ctrl", true, namespace: "m")
           Utility.update_nodes(
             f_element,
             [
-              fpr_element << Utility.pr_element("ctrl", true, namespace: "m"),
-              num_element,
-              den_element,
+              fpr_element,
+              omml_parameter(parameter_one, tag_name: "num"),
+              omml_parameter(parameter_two, tag_name: "den"),
             ],
           )
+          [f_element]
         end
       end
     end

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

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

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

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

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

@@ -18,6 +18,10 @@ module Plurimath
             ],
           )
         end
+
+        def validate_function_formula
+          false
+        end
       end
     end
   end

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

@@ -1,36 +1,66 @@
 # frozen_string_literal: true
 
-require_relative "binary_function"
+require_relative "ternary_function"
 
 module Plurimath
   module Math
     module Function
-      class Int < BinaryFunction
+      class Int < TernaryFunction
         def to_asciimath
           first_value = "_#{wrapped(parameter_one)}" if parameter_one
           second_value = "^#{wrapped(parameter_two)}" if parameter_two
-          "int#{first_value}#{second_value}"
+          "int#{first_value}#{second_value} #{parameter_three&.to_asciimath}".strip
         end
 
         def to_latex
           first_value = "_#{latex_wrapped(parameter_one)}" if parameter_one
           second_value = "^#{latex_wrapped(parameter_two)}" if parameter_two
-          "\\#{class_name}#{first_value}#{second_value}"
+          "\\#{class_name}#{first_value}#{second_value} #{parameter_three&.to_latex}".strip
         end
 
         def to_mathml_without_math_tag
-          mrow_tag = Utility.ox_element("msubsup")
+          msubsup_tag = Utility.ox_element("msubsup")
           mo_tag = Utility.ox_element("mo") << invert_unicode_symbols.to_s
           first_value = parameter_one&.to_mathml_without_math_tag if parameter_one
           second_value = parameter_two&.to_mathml_without_math_tag if parameter_two
           Utility.update_nodes(
-            mrow_tag,
+            msubsup_tag,
             [
               mo_tag,
               first_value,
               second_value,
             ],
           )
+          return msubsup_tag if parameter_three.nil?
+
+          Utility.update_nodes(
+            Utility.ox_element("mrow"),
+            [
+              msubsup_tag,
+              parameter_three&.to_mathml_without_math_tag,
+            ].flatten.compact,
+          )
+        end
+
+        def to_omml_without_math_tag
+          if all_values_exist?
+            nary = Utility.ox_element("nary", namespace: "m")
+            Utility.update_nodes(
+              nary,
+              [
+                narypr("∫", function_type: "subSup"),
+                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 << "&#x222b;")
+            [r_tag]
+          end
         end
       end
     end

data/lib/plurimath/math/function/left.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
           "\\left #{Latex::Constants::LEFT_RIGHT_PARENTHESIS.invert[parameter_one] || '.'}"
         end
 
+        def validate_function_formula
+          false
+        end
+
         protected
 
         def left_paren

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

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

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

@@ -40,20 +40,11 @@ module Plurimath
         end
 
         def to_omml_without_math_tag
-          limupp = Utility.ox_element("limUpp", namespace: "m")
-          limpr = Utility.ox_element("limUppPr", namespace: "m")
-          limpr << Utility.pr_element("ctrl", namespace: "m")
-          e_tag = Utility.ox_element("e", namespace: "m")
-          e_tag << parameter_one&.to_omml_without_math_tag
-          lim = Utility.ox_element("lim", namespace: "m")
-          lim << parameter_two&.to_omml_without_math_tag if parameter_two
-          Utility.update_nodes(
-            limupp,
-            [
-              e_tag,
-              lim,
-            ],
-          )
+          lim = Symbol.new("lim")
+          overset = Overset.new(lim, parameter_two)
+          return overset unless parameter_one
+
+          Underset.new(overset, parameter_one)&.to_omml_without_math_tag
         end
       end
     end

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

@@ -21,6 +21,14 @@ module Plurimath
           third_value  = "{#{parameter_three.to_latex}}" if parameter_three
           "#{first_value}\\#{class_name}_#{second_value}^#{third_value}"
         end
+
+        def to_omml_without_math_tag
+          value_array = []
+          value_array << parameter_one.insert_t_tag if parameter_one
+          value_array << parameter_two.insert_t_tag if parameter_two
+          value_array << parameter_three.insert_t_tag if parameter_three
+          value_array
+        end
       end
     end
   end

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

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

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

@@ -25,22 +25,21 @@ module Plurimath
         end
 
         def to_omml_without_math_tag
-          func   = Utility.ox_element("func", namespace: "m")
-          funcpr = Utility.ox_element("funcPr", namespace: "m")
-          funcpr << Utility.pr_element("ctrl", true, namespace: "m")
-          fname  = Utility.ox_element("fName", namespace: "m")
-          mr     = Utility.ox_element("r", namespace: "m")
-          rpr    = Utility.rpr_element
-          mt     = Utility.ox_element("t", namespace: "m") << class_name
-          fname << Utility.update_nodes(mr, [rpr, mt])
-          log_values = [first_value, second_value].flatten.compact
+          ssubsup   = Utility.ox_element("sSubSup", namespace: "m")
+          ssubsuppr = Utility.ox_element("sSubSupPr", namespace: "m")
+          ssubsuppr << hide_tags(
+            Utility.pr_element("ctrl", true, namespace: "m"),
+          )
           Utility.update_nodes(
-            func,
+            ssubsup,
             [
-              funcpr,
-              fname,
-            ] + log_values,
+              ssubsuppr,
+              e_parameter,
+              omml_parameter(parameter_one, tag_name: "sub"),
+              omml_parameter(parameter_two, tag_name: "sup"),
+            ],
           )
+          [ssubsup]
         end
 
         def to_mathml_without_math_tag
@@ -61,18 +60,37 @@ module Plurimath
 
         protected
 
-        def first_value
-          return nil if parameter_one.nil?
-
-          first_value = parameter_one.to_omml_without_math_tag
-          Utility.ox_element("e", namespace: "m") << first_value
+        def e_parameter
+          e_tag = Utility.ox_element("e", namespace: "m")
+          e_tag << rpr_tag
         end
 
-        def second_value
-          return nil if parameter_two.nil?
+        def hide_tags(nar)
+          attr = { "m:val": "1" }
+          if parameter_one.nil?
+            nar << Utility.ox_element(
+              "subHide",
+              namespace: "m",
+              attributes: attr,
+            )
+          end
+          if parameter_two.nil?
+            nar << Utility.ox_element(
+              "supHide",
+              namespace: "m",
+              attributes: attr,
+            )
+          end
+          nar
+        end
 
-          second_value = parameter_two.to_omml_without_math_tag
-          Utility.ox_element("e", namespace: "m") << second_value
+        def rpr_tag
+          sty_atrs = { "m:val": "p" }
+          sty_tag  = Utility.ox_element("sty", attributes: sty_atrs, namespace: "m")
+          rpr_tag  = (Utility.ox_element("rPr", namespace: "m") << sty_tag)
+          r_tag = Utility.ox_element("r", namespace: "m")
+          t_tag = (Utility.ox_element("t", namespace: "m") << "log")
+          Utility.update_nodes(r_tag, [rpr_tag, t_tag])
         end
       end
     end

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

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

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

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