plurimath 0.3.7 → 0.3.9

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

@@ -9,6 +9,10 @@ module Plurimath
         def validate_function_formula
           false
         end
+
+        def to_omml_without_math_tag
+          [r_element("min"), omml_value]
+        end
       end
     end
   end

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

@@ -38,6 +38,14 @@ module Plurimath
           second_value = "<i>#{parameter_two.to_html}</i>" if parameter_two
           "#{first_value}<i>mod</i>#{second_value}"
         end
+
+        def to_omml_without_math_tag
+          values = []
+          values << parameter_one.insert_t_tag if parameter_one
+          values << r_element("mod")
+          values << parameter_two.insert_t_tag if parameter_two
+          values
+        end
       end
     end
   end

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

@@ -6,6 +6,9 @@ module Plurimath
   module Math
     module Function
       class Msline < UnaryFunction
+        def to_omml_without_math_tag
+          omml_value
+        end
       end
     end
   end

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

@@ -26,6 +26,14 @@ module Plurimath
             ],
           )
         end
+
+        def to_omml_without_math_tag
+          [
+            r_element("∥"),
+            omml_value,
+            r_element("∥"),
+          ]
+        end
       end
     end
   end

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

@@ -22,13 +22,38 @@ module Plurimath
           end
         end
 
-        def tag_name
-          "underover"
-        end
-
         def validate_function_formula
           false
         end
+
+        def to_omml_without_math_tag
+          groupchr = Utility.ox_element("groupChr", namespace: "m")
+          Utility.update_nodes(
+            groupchr,
+            [
+              group_chr_pr,
+              omml_parameter(parameter_one, tag_name: "e"),
+            ],
+          )
+          [groupchr]
+        end
+
+        protected
+
+        def group_chr_pr
+          groupchrpr = Utility.ox_element("groupChrPr", namespace: "m")
+          vert_jc = Utility.ox_element("vertJc", namespace: "m", attributes: { "m:val": "bot" })
+          chr = Utility.ox_element("chr", namespace: "m", attributes: { "m:val": "⏞" })
+          pos = Utility.ox_element("pos", namespace: "m", attributes: { "m:val": "top" })
+          Utility.update_nodes(
+            groupchrpr,
+            [
+              chr,
+              pos,
+              vert_jc,
+            ],
+          )
+        end
       end
 
       Overbrace = Obrace

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

@@ -1,15 +1,67 @@
 # frozen_string_literal: true
 
-require_relative "binary_function"
+require_relative "ternary_function"
 
 module Plurimath
   module Math
     module Function
-      class Oint < BinaryFunction
+      class Oint < TernaryFunction
         def to_asciimath
           first_value = "_#{wrapped(parameter_one)}" if parameter_one
           second_value = "^#{wrapped(parameter_two)}" if parameter_two
-          "oint#{first_value}#{second_value}"
+          "oint#{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} #{parameter_three&.to_latex}".strip
+        end
+
+        def to_mathml_without_math_tag
+          mo_tag = Utility.ox_element("mo") << invert_unicode_symbols.to_s
+          return mo_tag unless all_values_exist?
+
+          value_array = [mo_tag]
+          value_array << parameter_one&.to_mathml_without_math_tag
+          value_array << parameter_two&.to_mathml_without_math_tag
+          tag_name = if parameter_one && parameter_two
+                       "subsup"
+                     else
+                       parameter_one ? "sub" : "sup"
+                     end
+          msubsup_tag = Utility.ox_element("m#{tag_name}")
+          Utility.update_nodes(msubsup_tag, value_array)
+          return msubsup_tag if parameter_three.nil?
+
+          Utility.update_nodes(
+            Utility.ox_element("mrow"),
+            [
+              msubsup_tag,
+              parameter_three&.to_mathml_without_math_tag,
+            ].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 << "&#x222e;")
+            [r_tag]
+          end
         end
       end
     end

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

@@ -9,7 +9,7 @@ module Plurimath
         def to_asciimath
           first_value = wrapped(parameter_one)
           second_value = wrapped(parameter_two)
-          "overset#{first_value}#{second_value}"
+          "frac#{first_value}#{second_value}"
         end
 
         def to_mathml_without_math_tag
@@ -30,6 +30,20 @@ module Plurimath
           two_value = parameter_two&.to_latex
           "{#{first_value} \\over #{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")
+          Utility.update_nodes(
+            f_element,
+            [
+              fpr_element << Utility.pr_element("ctrl", true, namespace: "m"),
+              omml_parameter(parameter_one, tag_name: "num"),
+              omml_parameter(parameter_two, tag_name: "den"),
+            ],
+          )
+          [f_element]
+        end
       end
     end
   end

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

@@ -7,7 +7,7 @@ module Plurimath
     module Function
       class Phantom < UnaryFunction
         def to_asciimath
-          "\"#{Array.new(parameter_one&.length, ' ').join}\""
+          "#{Array.new(parameter_one&.length, '\ ').join}"
         end
 
         def to_html
@@ -15,12 +15,15 @@ module Plurimath
         end
 
         def to_latex
-          "<i>#{Array.new(parameter_one&.length, '\\ ').join}</i>"
+          Array.new(parameter_one&.length, '\\ ').join
         end
 
         def to_mathml_without_math_tag
-          mi_tag_value = Array.new(parameter_one&.length, "&nbsp;&nbsp;").join
-          Utility.ox_element("mi") << mi_tag_value
+          phantom = Utility.ox_element("mphantom")
+          Utility.update_nodes(
+            phantom,
+            parameter_one&.map(&:to_mathml_without_math_tag),
+          )
         end
       end
     end

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

@@ -35,7 +35,7 @@ module Plurimath
           narypr << Utility.ox_element(
             "limLoc",
             namespace: "m",
-            attributes: { "m:val": "subSup" },
+            attributes: { "m:val": parameter_one.omml_tag_name },
           )
           hide_tags(narypr)
           narypr << Utility.pr_element("ctrl", true, namespace: "m")
@@ -47,6 +47,8 @@ module Plurimath
         end
 
         def to_omml_without_math_tag
+          return underover if parameter_one.omml_tag_name == "undOvr"
+
           ssubsup   = Utility.ox_element("sSubSup", namespace: "m")
           ssubsuppr = Utility.ox_element("sSubSupPr", namespace: "m")
           ssubsuppr << hide_tags(

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

@@ -74,6 +74,10 @@ module Plurimath
             [r_tag]
           end
         end
+
+        def nary_attr_value
+          "∏"
+        end
       end
     end
   end

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

@@ -27,16 +27,12 @@ module Plurimath
         def to_omml_without_math_tag
           rad_element = Utility.ox_element("rad", namespace: "m")
           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,
-              e_element,
+              omml_parameter(parameter_two, tag_name: "deg"),
+              omml_parameter(parameter_one, tag_name: "e"),
             ],
           )
           [rad_element]

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

@@ -6,6 +6,9 @@ module Plurimath
   module Math
     module Function
       class Scarries < UnaryFunction
+        def to_omml_without_math_tag
+          omml_value
+        end
       end
     end
   end

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

@@ -23,6 +23,10 @@ module Plurimath
           parameter_one&.to_asciimath
         end
 
+        def to_omml_without_math_tag
+          Array(parameter_one.insert_t_tag)
+        end
+
         protected
 
         def other_tags(array)

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

@@ -21,14 +21,12 @@ module Plurimath
             namespace: "m",
             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")),
               Utility.ox_element("deg", namespace: "m"),
-              e_element,
+              omml_parameter(parameter_one, tag_name: "e"),
             ],
           )
           [rad_element]

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

@@ -27,6 +27,21 @@ module Plurimath
           "#{first_value}#{second_value}"
         end
 
+        def to_omml_without_math_tag
+          limupp   = Utility.ox_element("limUpp", namespace: "m")
+          limupppr = Utility.ox_element("limUppPr", namespace: "m")
+          limupppr << Utility.pr_element("ctrl", true, namespace: "m")
+          Utility.update_nodes(
+            limupp,
+            [
+              limupppr,
+              omml_parameter(parameter_two, tag_name: "e"),
+              omml_parameter(parameter_one, tag_name: "lim"),
+            ],
+          )
+          [limupp]
+        end
+
         protected
 
         def wrapped(field)

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

@@ -18,6 +18,51 @@ module Plurimath
           value_array << parameter_two.to_mathml_without_math_tag if parameter_two
           Utility.update_nodes(Utility.ox_element("mtable"), value_array)
         end
+
+        def to_omml_without_math_tag
+          Array(
+            Utility.update_nodes(
+              mm_element,
+              [
+                omml_parameter(parameter_one, tag_name: "mr"),
+                omml_parameter(parameter_two, tag_name: "mr"),
+              ],
+            ),
+          )
+        end
+
+        protected
+
+        def mm_element
+          mcjc = Utility.ox_element(
+            "mcJc",
+            namespace: "m",
+            attributes: { "m:val": "center" },
+          )
+          mcount = Utility.ox_element(
+            "count",
+            namespace: "m",
+            attributes: { "m:val": "1" },
+          )
+          mbasejc = Utility.ox_element(
+            "baseJc",
+            namespace: "m",
+            attributes: { "m:val": "center", },
+          )
+          mplchide = Utility.ox_element(
+            "plcHide",
+            namespace: "m",
+            attributes: { "m:val": "1" },
+          )
+          mm   = Utility.ox_element("m", namespace: "m")
+          mc   = Utility.ox_element("mc", namespace: "m")
+          mpr  = Utility.ox_element("mpr", namespace: "m")
+          mcs  = Utility.ox_element("mcs", namespace: "m")
+          mcpr = Utility.ox_element("mcPr", namespace: "m")
+          mc << Utility.update_nodes(mcpr, [mcjc, mcount])
+          mcs << mc
+          Utility.update_nodes(mm, [mpr])
+        end
       end
     end
   end

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

@@ -74,6 +74,14 @@ module Plurimath
             [r_tag]
           end
         end
+
+        def omml_tag_name
+          "undOvr"
+        end
+
+        def nary_attr_value
+          "∑"
+        end
       end
     end
   end

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

@@ -9,6 +9,10 @@ module Plurimath
         def to_mathml_without_math_tag
           Utility.ox_element("mo") << "sup"
         end
+
+        def to_omml_without_math_tag
+          [r_element("sup"), omml_value]
+        end
       end
     end
   end

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

@@ -77,10 +77,6 @@ module Plurimath
           end
         end
 
-        def class_name
-          self.class.name.split("::").last.downcase
-        end
-
         protected
 
         def present?(field)

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

@@ -51,10 +51,6 @@ module Plurimath
           "#{first_value}#{second_value}#{third_value}"
         end
 
-        def class_name
-          self.class.name.split("::").last.downcase
-        end
-
         protected
 
         def latex_wrapped(field)
@@ -129,6 +125,19 @@ module Plurimath
         def all_values_exist?
           !(parameter_one.nil? && parameter_two.nil? && parameter_three.nil?)
         end
+
+        def validate_mathml_tag(parameter)
+          return Array(Utility.ox_element("mrow")) unless parameter
+
+          Array(parameter.to_mathml_without_math_tag)
+        end
+
+        def underover
+          overset = Overset.new(parameter_one, parameter_three)
+          return overset unless parameter_two
+
+          Underset.new(overset, parameter_two)&.to_omml_without_math_tag
+        end
       end
     end
   end

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

@@ -12,6 +12,20 @@ module Plurimath
           second_value = parameter_one.to_mathml_without_math_tag if parameter_one
           Utility.update_nodes(mover, [second_value, first_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": "˜" }))
+          Utility.update_nodes(
+            acc_tag,
+            [
+              acc_pr_tag,
+              omml_parameter(parameter_one, tag_name: "e"),
+            ],
+          )
+          [acc_tag]
+        end
       end
     end
   end

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

@@ -26,9 +26,29 @@ module Plurimath
           "underover"
         end
 
+        def omml_tag_name
+          "undOvr"
+        end
+
         def validate_function_formula
           false
         end
+
+        def to_omml_without_math_tag
+          limlow   = Utility.ox_element("limLow", namespace: "m")
+          limlowpr = Utility.ox_element("limLowPr", namespace: "m")
+          limlowpr << Utility.pr_element("ctrl", true, namespace: "m")
+          lim = Utility.ox_element("lim", namespace: "m")
+          Utility.update_nodes(
+            limlow,
+            [
+              limlowpr,
+              omml_parameter(parameter_one, tag_name: "e"),
+              Utility.update_nodes(lim, r_element("⏟")),
+            ],
+          )
+          [limlow]
+        end
       end
 
       Underbrace = Ubrace

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

@@ -37,6 +37,8 @@ module Plurimath
           "underline"
         end
       end
+
+      Underline = Ul
     end
   end
 end

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

@@ -74,10 +74,6 @@ module Plurimath
           [func]
         end
 
-        def class_name
-          self.class.name.split("::").last.downcase
-        end
-
         protected
 
         def asciimath_value

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

@@ -36,10 +36,7 @@ module Plurimath
         end
 
         def to_omml_without_math_tag
-          overset = Overset.new(parameter_one, parameter_three)
-          return overset unless parameter_two
-
-          Underset.new(overset, parameter_two)&.to_omml_without_math_tag
+          underover
         end
 
         def omml_nary_tag
@@ -86,7 +83,7 @@ module Plurimath
         end
 
         def first_value(pr_element)
-          first_value = parameter_one.is_a?(Number) ? parameter_one.value : parameter_one.to_omml_without_math_tag
+          first_value = parameter_one.nary_attr_value
           first_value = Utility.html_entity_to_unicode(first_value)
           unless first_value == "∫"
             pr_element << Utility.ox_element(

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

@@ -16,6 +16,20 @@ module Plurimath
             ],
           )
         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": "→" }))
+          Utility.update_nodes(
+            acc_tag,
+            [
+              acc_pr_tag,
+              omml_parameter(parameter_one, tag_name: "e"),
+            ],
+          )
+          [acc_tag]
+        end
       end
     end
   end

data/lib/plurimath/math/symbol.rb

@@ -72,6 +72,14 @@ module Plurimath
         ["⋀", "⋁", "⋂", "⋃"].include?(value) ? "underover" : "subsup"
       end
 
+      def omml_tag_name
+        if ["⋀", "⋁", "⋂", "⋃", "⋃", "∑", "∏"].include?(value)
+          return "undOvr"
+        end
+
+        "subSup"
+      end
+
       def nary_attr_value
         value
       end

data/lib/plurimath/math.rb

@@ -42,7 +42,9 @@ module Plurimath
 
       begin
         klass = klass_from_type(type)
-        klass.new(text).to_formula
+        formula = klass.new(text).to_formula
+        formula.input_string = text
+        formula
       rescue => ee
         parse_error!(text, type.to_sym)
       end

data/lib/plurimath/mathml/parser.rb

@@ -22,11 +22,11 @@ module Plurimath
 
       def parse
         ox_nodes = Ox.load(text, strip_namespace: true)
-        display_style = ox_nodes&.locate("*/mstyle/@displaystyle")&.first
+        display_style = ox_nodes&.locate("*/mstyle/@displaystyle")&.first || true
         nodes = parse_nodes(ox_nodes.nodes)
         Math::Formula.new(
           Transform.new.apply(nodes).flatten.compact,
-          displaystyle: display_style
+          displaystyle: display_style,
         )
       end
 

data/lib/plurimath/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Plurimath
-  VERSION = "0.3.7"
+  VERSION = "0.3.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plurimath
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-02 00:00:00.000000000 Z
+date: 2023-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -183,7 +183,6 @@ files:
 - lib/plurimath/math/function/ubrace.rb
 - lib/plurimath/math/function/ul.rb
 - lib/plurimath/math/function/unary_function.rb
-- lib/plurimath/math/function/underline.rb
 - lib/plurimath/math/function/underover.rb
 - lib/plurimath/math/function/underset.rb
 - lib/plurimath/math/function/vec.rb

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

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