plurimath 0.2.1 → 0.2.2

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require_relative "../font_style"
+
+module Plurimath
+  module Math
+    module Function
+      class FontStyle
+        class Italic < FontStyle
+          def initialize(parameter_one,
+                         parameter_two = "italic")
+            super
+          end
+
+          def to_asciimath
+            "ii(#{parameter_one.to_asciimath})"
+          end
+
+          def to_latex
+            first_value = parameter_one.to_latex if parameter_one
+            "\\mathit{#{first_value}}"
+          end
+
+          def to_mathml_without_math_tag
+            Utility.update_nodes(
+              Utility.ox_element(
+                "mstyle",
+                attributes: { mathvariant: "italic" },
+              ),
+              [parameter_one.to_mathml_without_math_tag],
+            )
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -11,6 +11,25 @@ module Plurimath
                          parameter_two = "monospace")
             super
           end
+
+          def to_asciimath
+            "mathtt(#{parameter_one.to_asciimath})"
+          end
+
+          def to_latex
+            first_value = parameter_one.to_latex if parameter_one
+            "\\mathtt{#{first_value}}"
+          end
+
+          def to_mathml_without_math_tag
+            Utility.update_nodes(
+              Utility.ox_element(
+                "mstyle",
+                attributes: { mathvariant: "monospace" },
+              ),
+              [parameter_one.to_mathml_without_math_tag],
+            )
+          end
         end
       end
     end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require_relative "../font_style"
+
+module Plurimath
+  module Math
+    module Function
+      class FontStyle
+        class Normal < FontStyle
+          def initialize(parameter_one,
+                         parameter_two = "rm")
+            super
+          end
+
+          def to_asciimath
+            "rm(#{parameter_one.to_asciimath})"
+          end
+
+          def to_latex
+            first_value = parameter_one.to_latex if parameter_one
+            "\\mathrm{#{first_value}}"
+          end
+
+          def to_mathml_without_math_tag
+            Utility.update_nodes(
+              Utility.ox_element(
+                "mstyle",
+                attributes: { mathvariant: "normal" },
+              ),
+              [parameter_one.to_mathml_without_math_tag],
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/plurimath/math/function/font_style/sans-serif.rb

@@ -11,6 +11,25 @@ module Plurimath
                          parameter_two = "sans-serif")
             super
           end
+
+          def to_asciimath
+            "mathsf(#{parameter_one.to_asciimath})"
+          end
+
+          def to_latex
+            first_value = parameter_one.to_latex if parameter_one
+            "\\mathsf{#{first_value}}"
+          end
+
+          def to_mathml_without_math_tag
+            Utility.update_nodes(
+              Utility.ox_element(
+                "mstyle",
+                attributes: { mathvariant: "sans-serif" },
+              ),
+              [parameter_one.to_mathml_without_math_tag],
+            )
+          end
         end
       end
     end

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

@@ -11,6 +11,25 @@ module Plurimath
                          parameter_two = "script")
             super
           end
+
+          def to_asciimath
+            "mathcal(#{parameter_one.to_asciimath})"
+          end
+
+          def to_latex
+            first_value = parameter_one.to_latex if parameter_one
+            "\\mathcal{#{first_value}}"
+          end
+
+          def to_mathml_without_math_tag
+            Utility.update_nodes(
+              Utility.ox_element(
+                "mstyle",
+                attributes: { mathvariant: "script" },
+              ),
+              [parameter_one.to_mathml_without_math_tag],
+            )
+          end
         end
       end
     end

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

@@ -7,17 +7,30 @@ module Plurimath
     module Function
       class FontStyle < BinaryFunction
         def to_asciimath
-          "#{parameter_two}(#{parameter_one.to_asciimath})"
+          parameter_one&.to_asciimath
         end
 
         def to_mathml_without_math_tag
-          first_value = parameter_one.to_mathml_without_math_tag
-          "<mstyle mathvariant='#{parameter_two}'>#{first_value}</mstyle>"
+          first_value = parameter_one&.to_mathml_without_math_tag
+          Utility.update_nodes(
+            Utility.ox_element(
+              "mstyle",
+              attributes: { mathvariant: parameter_two },
+            ),
+            [first_value],
+          )
+        end
+
+        def to_omml_without_math_tag
+          parameter_one&.to_omml_without_math_tag
+        end
+
+        def to_html
+          parameter_one&.to_html
         end
 
         def to_latex
-          first_value = parameter_one.to_latex if parameter_one
-          "\\#{parameter_two}{#{first_value}}"
+          parameter_one&.to_latex
         end
       end
     end

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

@@ -6,10 +6,23 @@ module Plurimath
   module Math
     module Function
       class Frac < BinaryFunction
+        def to_asciimath
+          first_value = "(#{parameter_one&.to_asciimath})" if parameter_one
+          second_value = "(#{parameter_two&.to_asciimath})" if parameter_two
+          "frac#{first_value}#{second_value}"
+        end
+
         def to_mathml_without_math_tag
-          first_value = parameter_one&.to_mathml_without_math_tag
-          two_value = parameter_two&.to_mathml_without_math_tag
-          "<mfrac>#{first_value}#{two_value}</mfrac>"
+          frac_tag     = Utility.ox_element("mfrac")
+          first_value  = parameter_one&.to_mathml_without_math_tag
+          second_value = parameter_two&.to_mathml_without_math_tag
+          Utility.update_nodes(
+            frac_tag,
+            [
+              first_value,
+              second_value,
+            ].flatten,
+          )
         end
 
         def to_latex
@@ -17,6 +30,23 @@ module Plurimath
           two_value = parameter_two&.to_latex
           "\\frac{#{first_value}}{#{two_value}}"
         end
+
+        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
+          Utility.update_nodes(
+            f_element,
+            [
+              fpr_element << Utility.pr_element("ctrl", true, namespace: "m"),
+              num_element,
+              den_element,
+            ],
+          )
+        end
       end
     end
   end

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

@@ -6,6 +6,13 @@ module Plurimath
   module Math
     module Function
       class G < UnaryFunction
+        def to_asciimath
+          "g#{parameter_one&.to_asciimath}"
+        end
+
+        def to_latex
+          "g#{parameter_one&.to_latex}"
+        end
       end
     end
   end

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

@@ -6,6 +6,18 @@ module Plurimath
   module Math
     module Function
       class Hat < UnaryFunction
+        def to_mathml_without_math_tag
+          mover_tag    = Utility.ox_element("mover")
+          first_value  = parameter_one&.to_mathml_without_math_tag
+          second_value = (Utility.ox_element("mo") << "^")
+          Utility.update_nodes(
+            mover_tag,
+            [
+              first_value,
+              second_value,
+            ],
+          )
+        end
       end
     end
   end

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

@@ -11,6 +11,27 @@ module Plurimath
           second_value = "^{#{parameter_two.to_latex}}" if parameter_two
           "\\#{class_name}#{first_value}#{second_value}"
         end
+
+        def to_mathml_without_math_tag
+          first_value = Utility.ox_element("mo") << class_name
+          if parameter_one || parameter_two
+            value_array = [first_value]
+            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,
+            )
+          else
+            first_value
+          end
+        end
       end
     end
   end

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

@@ -7,10 +7,31 @@ module Plurimath
     module Function
       class Int < BinaryFunction
         def to_asciimath
-          first_value = "_(#{parameter_one.to_asciimath})" if parameter_one
-          second_value = "^(#{parameter_two.to_asciimath})" if parameter_two
+          first_value = "_#{wrapped(parameter_one)}" if parameter_one
+          second_value = "^#{wrapped(parameter_two)}" if parameter_two
           "int#{first_value}#{second_value}"
         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}"
+        end
+
+        def to_mathml_without_math_tag
+          mrow_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,
+            [
+              mo_tag,
+              first_value,
+              second_value,
+            ],
+          )
+        end
       end
     end
   end

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

@@ -10,9 +10,33 @@ module Plurimath
           "left#{parameter_one}"
         end
 
+        def to_mathml_without_math_tag
+          mo = Utility.ox_element("mo")
+          mo << left_paren if parameter_one
+          mo
+        end
+
+        def to_omml_without_math_tag
+          mt = Utility.ox_element("m:t")
+          mt << parameter_one if parameter_one
+          mt
+        end
+
+        def to_html
+          "<i>#{parameter_one}</i>"
+        end
+
         def to_latex
           prefix = "\\" if parameter_one == "{"
-          "\\left#{prefix}#{parameter_one}"
+          "\\left #{prefix}#{parameter_one}"
+        end
+
+        protected
+
+        def left_paren
+          return "{" if parameter_one == "\\{"
+
+          parameter_one
         end
       end
     end

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

@@ -7,8 +7,8 @@ module Plurimath
     module Function
       class Lim < BinaryFunction
         def to_asciimath
-          first_value = "_(#{parameter_one.to_asciimath})" if parameter_one
-          second_value = "^(#{parameter_two.to_asciimath})" if parameter_two
+          first_value = "_#{wrapped(parameter_one)}" if parameter_one
+          second_value = "^#{wrapped(parameter_two)}" if parameter_two
           "lim#{first_value}#{second_value}"
         end
 
@@ -17,6 +17,44 @@ module Plurimath
           second_value = "^{#{parameter_two.to_latex}}" if parameter_two
           "\\#{class_name}#{first_value}#{second_value}"
         end
+
+        def to_mathml_without_math_tag
+          first_value = (Utility.ox_element("mo") << "lim")
+          if parameter_one || parameter_two
+            value_array = [first_value]
+            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,
+            )
+          else
+            first_value
+          end
+        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,
+            ],
+          )
+        end
       end
     end
   end

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

@@ -6,6 +6,15 @@ module Plurimath
   module Math
     module Function
       class Limits < TernaryFunction
+        def to_mathml_without_math_tag
+          underover = Utility.ox_element("munderover")
+          value_array = []
+          value_array << parameter_one&.to_mathml_without_math_tag
+          value_array << parameter_two&.to_mathml_without_math_tag
+          value_array << parameter_three&.to_mathml_without_math_tag
+          Utility.update_nodes(underover, value_array)
+        end
+
         def to_latex
           first_value  = parameter_one&.to_latex
           second_value = "{#{parameter_two.to_latex}}" if parameter_two

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

@@ -7,14 +7,14 @@ module Plurimath
     module Function
       class Log < BinaryFunction
         def to_asciimath
-          first_value = "_(#{parameter_one.to_asciimath})" if parameter_one
-          second_value = "^(#{parameter_two.to_asciimath})" if parameter_two
+          first_value = "_#{wrapped(parameter_one)}" if parameter_one
+          second_value = "^#{wrapped(parameter_two)}" if parameter_two
           "log#{first_value}#{second_value}"
         end
 
         def to_latex
-          first_value = "_{#{parameter_one.to_latex}}" if parameter_one
-          second_value = "^{#{parameter_two.to_latex}}" if parameter_two
+          first_value = "_#{latex_wrapped(parameter_one)}" if parameter_one
+          second_value = "^#{latex_wrapped(parameter_two)}" if parameter_two
           "\\log#{first_value}#{second_value}"
         end
 
@@ -23,6 +23,57 @@ module Plurimath
           second_value = "<sup>#{parameter_two.to_html}</sup>" if parameter_two
           "<i>log</i>#{first_value}#{second_value}"
         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
+          Utility.update_nodes(
+            func,
+            [
+              funcpr,
+              fname,
+            ] + log_values,
+          )
+        end
+
+        def to_mathml_without_math_tag
+          subsup_tag = Utility.ox_element("msubsup")
+          first_value = (Utility.ox_element("mi") << "log")
+          if parameter_one || parameter_two
+            new_arr = [first_value]
+            new_arr << parameter_one&.to_mathml_without_math_tag
+            new_arr << parameter_two&.to_mathml_without_math_tag
+            Utility.update_nodes(
+              subsup_tag,
+              new_arr,
+            )
+          else
+            first_value
+          end
+        end
+
+        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
+        end
+
+        def second_value
+          return nil if parameter_two.nil?
+
+          second_value = parameter_two.to_omml_without_math_tag
+          Utility.ox_element("e", namespace: "m") << second_value
+        end
       end
     end
   end

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require_relative "unary_function"
+
+module Plurimath
+  module Math
+    module Function
+      class Longdiv < UnaryFunction
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require_relative "unary_function"
+module Plurimath
+  module Math
+    module Function
+      class Mbox < UnaryFunction
+        def to_mathml_without_math_tag
+          text = Utility.ox_element("mtext")
+          text << (parameter_one.to_mathml_without_math_tag) if parameter_one
+          text
+        end
+
+        def to_latex
+          first_value = parameter_one&.to_latex
+          "\\mbox{#{first_value}}"
+        end
+
+        def to_html
+          parameter_one&.to_html
+        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
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require_relative "binary_function"
+
+module Plurimath
+  module Math
+    module Function
+      class Menclose < BinaryFunction
+        def to_asciimath
+          parameter_two&.to_asciimath
+        end
+
+        def to_mathml_without_math_tag
+          attributes = { notation: parameter_one }
+          menclose = Utility.ox_element("menclose", attributes: attributes)
+          menclose << parameter_two.to_mathml_without_math_tag if parameter_two
+          menclose
+        end
+
+        def to_latex
+          parameter_two&.to_latex
+        end
+
+        def to_html
+          second_value = parameter_two&.to_html
+          "<menclose notation=\"#{parameter_one}\">#{second_value}</menclose>"
+        end
+
+        def to_omml_without_math_tag
+          borderbox = Utility.ox_element("borderBox", namespace: "m")
+          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(
+            borderbox,
+            [
+              borderpr,
+              me,
+            ],
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require_relative "binary_function"
+
+module Plurimath
+  module Math
+    module Function
+      class Merror < BinaryFunction
+      end
+    end
+  end
+end

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

@@ -7,15 +7,30 @@ module Plurimath
     module Function
       class Mod < BinaryFunction
         def to_asciimath
-          first_value = "(#{parameter_one.to_asciimath})" if parameter_one
-          second_value = "(#{parameter_two.to_asciimath})" if parameter_two
-          "#{first_value}mod#{second_value}"
+          first_value = parameter_one&.to_asciimath
+          second_value = parameter_two&.to_asciimath
+          "#{first_value} mod #{second_value}"
+        end
+
+        def to_mathml_without_math_tag
+          mrow_tag = Utility.ox_element("mrow")
+          mo_tag = Utility.ox_element("mi") << "mod"
+          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,
+            [
+              first_value,
+              mo_tag,
+              second_value,
+            ],
+          )
         end
 
         def to_latex
           first_value = "{#{parameter_one.to_latex}}" if parameter_one
           second_value = "{#{parameter_two.to_latex}}" if parameter_two
-          "#{first_value}\\pmod#{second_value}"
+          "#{first_value} \\mod #{second_value}"
         end
 
         def to_html