plurimath 0.3.6 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10711816eed513eb42250bdc90628a5ed3c9847cb33546e7df19ea29ca56b85e
-  data.tar.gz: 872e488b9b856e55c6e00ac6c19e089853950ec8a58fb4057abe601efee88604
+  metadata.gz: 78fffd236ecb53260b07fa02ce5cc2254d3835a6491229a7acc50c2a2ed80dbb
+  data.tar.gz: e17acb1342c8b5a7f5de3b8496962a12264404f9dd8902a42c47069a6ad0a157
 SHA512:
-  metadata.gz: b916d733033785acb282ffe2544e05387b65b54f53e83ba7f28cbb7e73ea71f8766129adb8d369560cb3b2df46de6f5215d68bb85755c3bb1b3d35e44963403e
-  data.tar.gz: 07204d723d30656e42791e79d954864da64acc41dbf84dff936e8fc88a51ca4a22d40b8fd426bd81f523a829837d5c0e8f7fcd5569a12025eb5128dc00cda0de
+  metadata.gz: a66739db5ef92081d8c73af2bbebaf77aa03bab5f8befbd14a9a80bdb4eea4d8c03e996dbc0aedbb5cf16c0bd90189a32dde1d67925c646f02cec6423e532f3c
+  data.tar.gz: 81e43972fead184a05ebc04948bba6433fef1ce6824223bd59b8a89d08c2ac41f4adbcb41e00426dd2d9dad6d6ff04a0ec2fc34ba7f51a7457f258b5087e0e72

data/lib/plurimath/asciimath/constants.rb

@@ -312,11 +312,11 @@ module Plurimath
       ].freeze
       TERNARY_CLASSES = %w[
         prod
+        oint
         sum
         int
       ].freeze
       SUB_SUP_CLASSES = %w[
-        oint
         lim
         log
       ].freeze

data/lib/plurimath/latex/constants.rb

@@ -1601,7 +1601,6 @@ module Plurimath
         nmid: "∤",
         land: "∧",
         iint: "∬",
-        oint: "∮",
         nsim: "≁",
         cong: "≅",
         sdef: "≙",
@@ -1720,7 +1719,6 @@ module Plurimath
         lor: "∨",
         cap: "∩",
         cup: "∪",
-        int: "∫",
         sim: "∼",
         neq: "≠",
         leq: "≤",
@@ -2524,7 +2522,7 @@ module Plurimath
         rmoustache: :symbols,
         sqrtbottom: :symbols,
         underparen: :symbols,
-        underbrace: :underover,
+        underbrace: :unary,
         hrectangle: :symbols,
         vrectangle: :symbols,
         LEFTcircle: :symbols,
@@ -3455,7 +3453,7 @@ module Plurimath
         nmid: :symbols,
         land: :symbols,
         iint: :symbols,
-        oint: :symbols,
+        oint: :ternary,
         nsim: :symbols,
         cong: :symbols,
         sdef: :symbols,
@@ -3586,7 +3584,7 @@ module Plurimath
         lor: :symbols,
         cap: :symbols,
         cup: :symbols,
-        int: :symbols,
+        int: :ternary,
         sim: :symbols,
         neq: :symbols,
         leq: :symbols,

data/lib/plurimath/math/core.rb

@@ -38,6 +38,16 @@ module Plurimath
       def validate_function_formula
         true
       end
+
+      def r_element(string, rpr_tag: true)
+        r_tag = Utility.ox_element("r", namespace: "m")
+        if rpr_tag
+          sty_tag = Utility.ox_element("sty", namespace: "m", attributes: { "m:val": "p" })
+          r_tag << (Utility.ox_element("rPr", namespace: "m") << sty_tag)
+        end
+        r_tag << (Utility.ox_element("t", namespace: "m") << string)
+        Array(r_tag)
+      end
     end
   end
 end

data/lib/plurimath/math/formula.rb

@@ -3,12 +3,17 @@
 module Plurimath
   module Math
     class Formula < Core
-      attr_accessor :value, :left_right_wrapper
+      attr_accessor :value, :left_right_wrapper, :displaystyle
 
-      def initialize(value = [], left_right_wrapper = true)
+      def initialize(
+        value = [],
+        left_right_wrapper = true,
+        displaystyle: true
+      )
         @value = value.is_a?(Array) ? value : [value]
         left_right_wrapper = false if @value.first.is_a?(Function::Left)
         @left_right_wrapper = left_right_wrapper
+        @displaystyle = displaystyle
       end
 
       def ==(object)
@@ -20,12 +25,12 @@ module Plurimath
         value.map(&:to_asciimath).join(" ")
       end
 
-      def to_mathml
+      def to_mathml(display_style: displaystyle)
         math_attrs = {
           xmlns: "http://www.w3.org/1998/Math/MathML",
           display: "block",
         }
-        style_attrs = { displaystyle: "true" }
+        style_attrs = { displaystyle: display_style }
         math  = Utility.ox_element("math", attributes: math_attrs)
         style = Utility.ox_element("mstyle", attributes: style_attrs)
         Utility.update_nodes(style, mathml_content)

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

@@ -56,10 +56,6 @@ module Plurimath
           [r_tag]
         end
 
-        def class_name
-          self.class.name.split("::").last.downcase
-        end
-
         protected
 
         def latex_wrapped(field)
@@ -85,6 +81,10 @@ module Plurimath
           r_tag << (Utility.ox_element("t", namespace: "m") << "&#8203;")
           wrapper_tag << r_tag
         end
+
+        def all_values_exist?
+          !parameter_one.nil? && !parameter_two.nil?
+        end
       end
     end
   end

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

@@ -14,6 +14,10 @@ module Plurimath
           first_value = parameter_one&.to_mathml_without_math_tag
           Utility.update_nodes(cancel_tag, [first_value])
         end
+
+        def to_omml_without_math_tag
+          omml_value
+        end
       end
     end
   end

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

@@ -19,6 +19,13 @@ module Plurimath
             first_value << right_value,
           )
         end
+
+        def to_omml_without_math_tag
+          lceil = Symbol.new("⌈")
+          rceil = Symbol.new("⌉")
+          fenced = Fenced.new(lceil, Array(parameter_one), rceil)
+          Array(fenced.to_omml_without_math_tag)
+        end
       end
     end
   end

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

@@ -27,6 +27,10 @@ module Plurimath
           second_value = parameter_two&.to_latex
           "{\\#{class_name}{#{first_value}} #{second_value}}"
         end
+
+        def to_omml_without_math_tag
+          Array(parameter_two.insert_t_tag)
+        end
       end
     end
   end

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

@@ -18,11 +18,12 @@ module Plurimath
           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_pr_tag,
+              omml_parameter(parameter_one, tag_name: "e"),
+            ],
           )
           [acc_tag]
         end

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

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

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

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

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

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

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

@@ -18,6 +18,24 @@ 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/function/exp.rb

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

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

@@ -21,6 +21,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/font_style.rb

@@ -22,9 +22,7 @@ module Plurimath
         end
 
         def 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]
+          Array(parameter_one&.insert_t_tag)
         end
 
         def to_html

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

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

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

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

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

@@ -22,6 +22,19 @@ module Plurimath
         def validate_function_formula
           false
         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/hom.rb

@@ -6,6 +6,9 @@ module Plurimath
   module Math
     module Function
       class Hom < UnaryFunction
+        def to_omml_without_math_tag
+          [r_element("hom"), omml_value]
+        end
       end
     end
   end

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

@@ -14,23 +14,30 @@ module Plurimath
 
         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
+          return first_value if all_values_exist?
+
+          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
+          Utility.update_nodes(
+            Utility.ox_element("m#{tag_name}"),
+            value_array,
+          )
+        end
+
+        def to_omml_without_math_tag
+          return r_element("inf", rpr_tag: false) unless all_values_exist?
+
+          inf = Symbol.new("inf")
+          overset = Overset.new(inf, parameter_two)
+          return Array(overset.to_omml_without_math_tag) unless parameter_one
+
+          Array(Underset.new(overset, parameter_one)&.to_omml_without_math_tag)
         end
       end
     end

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

@@ -13,22 +13,22 @@ module Plurimath
         end
 
         def to_latex
-          first_value = "_#{latex_wrapped(parameter_one)}" if parameter_one
-          second_value = "^#{latex_wrapped(parameter_two)}" if parameter_two
+          first_value = "_{#{parameter_one.to_latex}}" if parameter_one
+          second_value = "^{#{parameter_two.to_latex}}" if parameter_two
           "\\#{class_name}#{first_value}#{second_value} #{parameter_three&.to_latex}".strip
         end
 
         def to_mathml_without_math_tag
+          base_element = (Utility.ox_element("mo") << invert_unicode_symbols.to_s)
+          return base_element unless all_values_exist?
+
           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(
             msubsup_tag,
             [
-              mo_tag,
-              first_value,
-              second_value,
+              base_element,
+              validate_mathml_tag(parameter_one),
+              validate_mathml_tag(parameter_two),
             ],
           )
           return msubsup_tag if parameter_three.nil?

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

@@ -6,6 +6,9 @@ module Plurimath
   module Math
     module Function
       class Ker < UnaryFunction
+        def to_omml_without_math_tag
+          [r_element("ker"), omml_value]
+        end
       end
     end
   end

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

@@ -6,6 +6,9 @@ module Plurimath
   module Math
     module Function
       class Lcm < UnaryFunction
+        def to_omml_without_math_tag
+          [r_element("lcm"), omml_value]
+        end
       end
     end
   end

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

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

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

@@ -40,9 +40,11 @@ module Plurimath
         end
 
         def to_omml_without_math_tag
+          return r_element("lim", rpr_tag: false) unless all_values_exist?
+
           lim = Symbol.new("lim")
           overset = Overset.new(lim, parameter_two)
-          return overset unless parameter_one
+          return overset.to_omml_without_math_tag unless parameter_one
 
           Underset.new(overset, parameter_one)&.to_omml_without_math_tag
         end

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

@@ -6,6 +6,9 @@ module Plurimath
   module Math
     module Function
       class Liminf < UnaryFunction
+        def to_omml_without_math_tag
+          [r_element("liminf"), omml_value]
+        end
       end
     end
   end

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

@@ -6,6 +6,9 @@ module Plurimath
   module Math
     module Function
       class Limsup < UnaryFunction
+        def to_omml_without_math_tag
+          [r_element("limsup"), omml_value]
+        end
       end
     end
   end

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

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

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

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

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

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

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

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

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

@@ -30,13 +30,11 @@ module Plurimath
           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")
-          Utility.update_nodes(me, Array(parameter_two.to_omml_without_math_tag)) if parameter_two
           Utility.update_nodes(
             borderbox,
             [
               borderpr,
-              me,
+              omml_parameter(parameter_two, tag_name: "e"),
             ],
           )
           [borderbox]

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

@@ -6,6 +6,7 @@ module Plurimath
   module Math
     module Function
       class Merror < BinaryFunction
+        def to_omml_without_math_tag; end
       end
     end
   end

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,68 @@
 # 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?
+
+          msubsup_tag = Utility.ox_element("msubsup")
+          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(
+            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 << "&#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/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/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/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,12 @@ 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
       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

@@ -29,6 +29,22 @@ module Plurimath
         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/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/mathml/parser.rb

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

data/lib/plurimath/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plurimath
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-26 00:00:00.000000000 Z
+date: 2023-08-03 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