plurimath 0.3.9 → 0.4.2

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

@@ -6,10 +6,21 @@ module Plurimath
   module Math
     module Function
       class Dot < UnaryFunction
+        attr_accessor :attributes
+
+        def initialize(parameter_one = nil, attributes = {})
+          super(parameter_one)
+          @attributes = attributes
+        end
+
         def to_mathml_without_math_tag
+          dot_tag = (Utility.ox_element("mo") << ".")
+          return dot_tag unless parameter_one
+
           first_value = parameter_one&.to_mathml_without_math_tag
           dot_tag = (Utility.ox_element("mo") << ".")
           over_tag = Utility.ox_element("mover")
+          over_tag.attributes.merge!({ accent: attributes[:accent] }) if attributes && attributes[:accent]
           Utility.update_nodes(
             over_tag,
             [
@@ -19,7 +30,20 @@ module Plurimath
           )
         end
 
-        def to_omml_without_math_tag
+        def to_omml_without_math_tag(display_style)
+          return r_element(".", rpr_tag: false) unless parameter_one
+
+          if attributes && attributes[:accent]
+            acc_tag(display_style)
+          else
+            symbol = Symbol.new(".")
+            Overset.new(parameter_one, symbol).to_omml_without_math_tag(true)
+          end
+        end
+
+        protected
+
+        def acc_tag(display_style)
           acc_tag    = Utility.ox_element("acc", namespace: "m")
           acc_pr_tag = Utility.ox_element("accPr", namespace: "m")
           acc_pr_tag << Utility.ox_element(
@@ -31,7 +55,7 @@ module Plurimath
             acc_tag,
             [
               acc_pr_tag,
-              omml_parameter(parameter_one, tag_name: "e"),
+              omml_parameter(parameter_one, display_style, tag_name: "e"),
             ],
           )
           [acc_tag]

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

@@ -10,8 +10,8 @@ module Plurimath
           false
         end
 
-        def to_omml_without_math_tag
-          [r_element("exp"), omml_value]
+        def to_omml_without_math_tag(display_style)
+          [r_element("exp", rpr_tag: false), omml_value(display_style)]
         end
       end
     end

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

@@ -30,15 +30,13 @@ module Plurimath
         end
 
         def to_latex
-          open_paren   = parameter_one ? parameter_one.value : "("
           fenced_value = parameter_two&.map(&:to_latex)&.join(" ")
-          close_paren  = parameter_three ? parameter_three.value : ")"
-          first_value  = latex_paren(open_paren)
-          second_value = latex_paren(close_paren)
+          first_value  = latex_paren(parameter_one&.value)
+          second_value = latex_paren(parameter_three&.value)
           "#{first_value} #{fenced_value} #{second_value}"
         end
 
-        def to_omml_without_math_tag
+        def to_omml_without_math_tag(display_style)
           d = Utility.ox_element("d", namespace: "m")
           dpr = Utility.ox_element("dPr", namespace: "m")
           first_value(dpr)
@@ -50,6 +48,7 @@ module Plurimath
               dpr,
               omml_parameter(
                 Formula.new(Array(parameter_two)),
+                display_style,
                 tag_name: "e",
               ),
             ],
@@ -87,8 +86,8 @@ module Plurimath
           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.to_s
+          paren = "\\#{Latex::Constants::UNICODE_SYMBOLS.invert[paren]}" if paren&.to_s&.match?(/&#x.{0,4};/)
+          paren&.to_s
         end
 
         def mathml_paren(field)

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

@@ -22,10 +22,10 @@ module Plurimath
           )
         end
 
-        def to_omml_without_math_tag
+        def to_omml_without_math_tag(display_style)
           [
             r_element("⌊"),
-            omml_value,
+            omml_value(display_style),
             r_element("⌋"),
           ]
         end

data/lib/plurimath/math/function/font_style/bold-fraktur.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative "../font_style"
+
+module Plurimath
+  module Math
+    module Function
+      class FontStyle
+        class BoldFraktur < FontStyle
+          def to_omml_without_math_tag(display_style)
+            font_styles(display_style, sty: "b", scr: "fraktur")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative "../font_style"
+
+module Plurimath
+  module Math
+    module Function
+      class FontStyle
+        class BoldItalic < FontStyle
+          def to_omml_without_math_tag(display_style)
+            font_styles(display_style, sty: "bi")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative "../font_style"
+
+module Plurimath
+  module Math
+    module Function
+      class FontStyle
+        class BoldSansSerif < FontStyle
+          def to_omml_without_math_tag(display_style)
+            font_styles(display_style, sty: "b", scr: "sans-serif")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative "../font_style"
+
+module Plurimath
+  module Math
+    module Function
+      class FontStyle
+        class BoldScript < FontStyle
+          def to_omml_without_math_tag(display_style)
+            font_styles(display_style, sty: "b", scr: "script")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -29,6 +29,10 @@ module Plurimath
               [parameter_one&.to_mathml_without_math_tag],
             )
           end
+
+          def to_omml_without_math_tag(display_style)
+            font_styles(display_style, sty: "b")
+          end
         end
       end
     end

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

@@ -29,6 +29,10 @@ module Plurimath
               [parameter_one&.to_mathml_without_math_tag],
             )
           end
+
+          def to_omml_without_math_tag(display_style)
+            font_styles(display_style, sty: nil, scr: "double-struck")
+          end
         end
       end
     end

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

@@ -29,6 +29,10 @@ module Plurimath
               [parameter_one&.to_mathml_without_math_tag],
             )
           end
+
+          def to_omml_without_math_tag(display_style)
+            font_styles(display_style, scr: "fraktur")
+          end
         end
       end
     end

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

@@ -29,6 +29,10 @@ module Plurimath
               [parameter_one&.to_mathml_without_math_tag],
             )
           end
+
+          def to_omml_without_math_tag(display_style)
+            font_styles(display_style, sty: "i")
+          end
         end
       end
     end

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

@@ -29,6 +29,10 @@ module Plurimath
               [parameter_one&.to_mathml_without_math_tag],
             )
           end
+
+          def to_omml_without_math_tag(display_style)
+            font_styles(display_style, sty: nil, scr: "monospace")
+          end
         end
       end
     end

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

@@ -29,6 +29,10 @@ module Plurimath
               [parameter_one&.to_mathml_without_math_tag],
             )
           end
+
+          def to_omml_without_math_tag(display_style)
+            font_styles(display_style, sty: "p")
+          end
         end
       end
     end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative "../font_style"
+
+module Plurimath
+  module Math
+    module Function
+      class FontStyle
+        class SansSerifBoldItalic < FontStyle
+          def to_omml_without_math_tag(display_style)
+            font_styles(display_style, sty: "bi", scr: "sans-serif")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative "../font_style"
+
+module Plurimath
+  module Math
+    module Function
+      class FontStyle
+        class SansSerifItalic < FontStyle
+          def to_omml_without_math_tag(display_style)
+            font_styles(display_style, sty: "i", scr: "sans-serif")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -29,6 +29,10 @@ module Plurimath
               [parameter_one&.to_mathml_without_math_tag],
             )
           end
+
+          def to_omml_without_math_tag(display_style)
+            font_styles(display_style, sty: "p", scr: "sans-serif")
+          end
         end
       end
     end

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

@@ -29,6 +29,10 @@ module Plurimath
               [parameter_one&.to_mathml_without_math_tag],
             )
           end
+
+          def to_omml_without_math_tag(display_style)
+            font_styles(display_style, scr: "script")
+          end
         end
       end
     end

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

@@ -21,8 +21,8 @@ module Plurimath
           )
         end
 
-        def to_omml_without_math_tag
-          Array(parameter_one&.insert_t_tag)
+        def to_omml_without_math_tag(display_style)
+          font_styles(display_style)
         end
 
         def to_html
@@ -36,6 +36,28 @@ module Plurimath
         def validate_function_formula
           true
         end
+
+        def extract_class_from_text
+          parameter_one.parameter_one if parameter_one.is_a?(Text)
+          parameter_one.class_name
+        end
+
+        def extractable?
+          parameter_one.is_a?(Text)
+        end
+
+        def font_styles(display_style, sty: "p", scr: nil)
+          r_tag   = Utility.ox_element("r", namespace: "m")
+          rpr_tag = Utility.ox_element("rPr", namespace: "m")
+          fonts   = []
+          fonts << Utility.ox_element("scr", namespace: "m", attributes: { "m:val": scr }) if scr
+          fonts << Utility.ox_element("sty", namespace: "m", attributes: { "m:val": sty }) if sty
+          r_tag << Utility.update_nodes(rpr_tag, fonts)
+          Utility.update_nodes(
+            r_tag,
+            Array(parameter_one.font_style_t_tag(display_style)),
+          )
+        end
       end
     end
   end

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

@@ -31,7 +31,7 @@ module Plurimath
           "\\frac{#{first_value}}{#{two_value}}"
         end
 
-        def to_omml_without_math_tag
+        def to_omml_without_math_tag(display_style)
           f_element   = Utility.ox_element("f", namespace: "m")
           fpr_element = Utility.ox_element("fPr", namespace: "m")
           fpr_element << Utility.pr_element("ctrl", true, namespace: "m")
@@ -39,8 +39,8 @@ module Plurimath
             f_element,
             [
               fpr_element,
-              omml_parameter(parameter_one, tag_name: "num"),
-              omml_parameter(parameter_two, tag_name: "den"),
+              omml_parameter(parameter_one, display_style, tag_name: "num"),
+              omml_parameter(parameter_two, display_style, tag_name: "den"),
             ],
           )
           [f_element]

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

@@ -10,8 +10,8 @@ module Plurimath
           false
         end
 
-        def to_omml_without_math_tag
-          [r_element("gcd"), omml_value]
+        def to_omml_without_math_tag(display_style)
+          [r_element("gcd", rpr_tag: false), omml_value(display_style)]
         end
       end
     end

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

@@ -10,8 +10,8 @@ module Plurimath
           false
         end
 
-        def to_omml_without_math_tag
-          [r_element("glb"), omml_value]
+        def to_omml_without_math_tag(display_style)
+          [r_element("glb", rpr_tag: false), omml_value(display_style)]
         end
       end
     end

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

@@ -6,15 +6,34 @@ module Plurimath
   module Math
     module Function
       class Hat < UnaryFunction
+        attr_accessor :attributes
+
+        def initialize(parameter_one = nil, attributes = {})
+          super(parameter_one)
+          @attributes = attributes
+        end
+
+        def to_asciimath
+          first_value = "(#{parameter_one.to_asciimath})" if parameter_one
+          "hat#{first_value}"
+        end
+
+        def to_latex
+          first_value = "{#{parameter_one.to_latex}}" if parameter_one
+          "\\hat#{first_value}"
+        end
+
         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") << "^")
+          mo_tag = (Utility.ox_element("mo") << "^")
+          return mo_tag unless parameter_one
+
+          mover_tag = Utility.ox_element("mover")
+          mover_tag.attributes.merge!(attributes) if attributes && !attributes.empty?
           Utility.update_nodes(
             mover_tag,
             [
-              first_value,
-              second_value,
+              parameter_one&.to_mathml_without_math_tag,
+              mo_tag,
             ],
           )
         end
@@ -23,15 +42,29 @@ module Plurimath
           false
         end
 
-        def to_omml_without_math_tag
+        def to_omml_without_math_tag(display_style)
+          return r_element("^", rpr_tag: false)  unless parameter_one
+
+          if attributes && attributes[:accent]
+            accent_tag(display_style)
+          else
+            symbol = Symbol.new("&#x302;")
+            Overset.new(parameter_one, symbol).to_omml_without_math_tag(true)
+          end
+        end
+
+        protected
+
+        def accent_tag(display_style)
           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, display_style, tag_name: "e", namespace: "m"),
+            ],
           )
           [acc_tag]
         end

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

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

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

@@ -30,8 +30,8 @@ module Plurimath
           )
         end
 
-        def to_omml_without_math_tag
-          underover
+        def to_omml_without_math_tag(display_style)
+          underover(display_style)
         end
       end
     end

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

@@ -42,16 +42,16 @@ module Plurimath
           )
         end
 
-        def to_omml_without_math_tag
+        def to_omml_without_math_tag(display_style)
           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"),
+                omml_parameter(parameter_one, display_style, tag_name: "sub"),
+                omml_parameter(parameter_two, display_style, tag_name: "sup"),
+                omml_parameter(parameter_three, display_style, tag_name: "e"),
               ],
             )
             [nary]

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

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

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

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

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

@@ -16,7 +16,7 @@ module Plurimath
           mo
         end
 
-        def to_omml_without_math_tag
+        def to_omml_without_math_tag(display_style)
           mr = Utility.ox_element("m:r")
           if parameter_one
             mt = Utility.ox_element("m:t")

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

@@ -10,8 +10,8 @@ module Plurimath
           false
         end
 
-        def to_omml_without_math_tag
-          [r_element("lg"), omml_value]
+        def to_omml_without_math_tag(display_style)
+          [r_element("lg", rpr_tag: false), omml_value(display_style)]
         end
       end
     end

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

@@ -39,8 +39,8 @@ module Plurimath
           end
         end
 
-        def to_omml_without_math_tag
-          underover
+        def to_omml_without_math_tag(display_style)
+          underover(display_style)
         end
       end
     end

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

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

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

@@ -22,11 +22,11 @@ module Plurimath
           "#{first_value}\\#{class_name}_#{second_value}^#{third_value}"
         end
 
-        def to_omml_without_math_tag
+        def to_omml_without_math_tag(display_style)
           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 << parameter_one.insert_t_tag(display_style) if parameter_one
+          value_array << parameter_two.insert_t_tag(display_style) if parameter_two
+          value_array << parameter_three.insert_t_tag(display_style) if parameter_three
           value_array
         end
       end

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

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

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

@@ -10,8 +10,8 @@ module Plurimath
           false
         end
 
-        def to_omml_without_math_tag
-          [r_element("ln"), omml_value]
+        def to_omml_without_math_tag(display_style)
+          [r_element("ln", rpr_tag: false), omml_value(display_style)]
         end
       end
     end

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

@@ -24,7 +24,9 @@ module Plurimath
           "<i>log</i>#{first_value}#{second_value}"
         end
 
-        def to_omml_without_math_tag
+        def to_omml_without_math_tag(display_style)
+          return r_element("log", rpr_tag: false) unless all_values_exist?
+
           ssubsup   = Utility.ox_element("sSubSup", namespace: "m")
           ssubsuppr = Utility.ox_element("sSubSupPr", namespace: "m")
           ssubsuppr << hide_tags(
@@ -35,8 +37,8 @@ module Plurimath
             [
               ssubsuppr,
               e_parameter,
-              omml_parameter(parameter_one, tag_name: "sub"),
-              omml_parameter(parameter_two, tag_name: "sup"),
+              omml_parameter(parameter_one, display_style, tag_name: "sub"),
+              omml_parameter(parameter_two, display_style, tag_name: "sup"),
             ],
           )
           [ssubsup]