plurimath 0.3.9 → 0.4.1

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,10 +21,6 @@ module Plurimath
           )
         end
 
-        def to_omml_without_math_tag
-          Array(parameter_one&.insert_t_tag)
-        end
-
         def to_html
           parameter_one&.to_html
         end
@@ -36,6 +32,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

@@ -1,20 +1,32 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
+require_relative "binary_function"
 
 module Plurimath
   module Math
     module Function
-      class Hat < UnaryFunction
+      class Hat < BinaryFunction
+        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!(parameter_two) if parameter_two && !parameter_two.empty?
           Utility.update_nodes(
             mover_tag,
             [
-              first_value,
-              second_value,
+              parameter_one&.to_mathml_without_math_tag,
+              mo_tag,
             ],
           )
         end
@@ -23,15 +35,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 all_values_exist?
+
+          if parameter_two && parameter_two[: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]

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

@@ -6,8 +6,8 @@ module Plurimath
   module Math
     module Function
       class Longdiv < UnaryFunction
-        def to_omml_without_math_tag
-          omml_value
+        def to_omml_without_math_tag(display_style)
+          omml_value(display_style)
         end
       end
     end

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

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

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

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

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

@@ -20,8 +20,8 @@ module Plurimath
           parameter_one&.to_html
         end
 
-        def to_omml_without_math_tag
-          omml_value
+        def to_omml_without_math_tag(display_style)
+          omml_value(display_style)
         end
       end
     end

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

@@ -26,7 +26,7 @@ module Plurimath
           "<menclose notation=\"#{parameter_one}\">#{second_value}</menclose>"
         end
 
-        def to_omml_without_math_tag
+        def to_omml_without_math_tag(display_style)
           borderbox = Utility.ox_element("borderBox", namespace: "m")
           borderpr = Utility.ox_element("borderBoxPr", namespace: "m")
           borderpr << Utility.pr_element("ctrl", true, namespace: "m")
@@ -34,7 +34,7 @@ module Plurimath
             borderbox,
             [
               borderpr,
-              omml_parameter(parameter_two, tag_name: "e"),
+              omml_parameter(parameter_two, display_style, tag_name: "e"),
             ],
           )
           [borderbox]

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

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

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

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

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

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

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

@@ -21,8 +21,8 @@ module Plurimath
           )
         end
 
-        def to_omml_without_math_tag
-          omml_value
+        def to_omml_without_math_tag(display_style)
+          omml_value(display_style)
         end
 
         def to_html

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

@@ -6,8 +6,8 @@ module Plurimath
   module Math
     module Function
       class Msline < UnaryFunction
-        def to_omml_without_math_tag
-          omml_value
+        def to_omml_without_math_tag(display_style)
+          omml_value(display_style)
         end
       end
     end

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

@@ -5,16 +5,16 @@ module Plurimath
   module Math
     module Function
       class Multiscript < TernaryFunction
-        def to_omml_without_math_tag
+        def to_omml_without_math_tag(display_style)
           pre_element = Utility.ox_element("sPre", namespace: "m")
           pr_element  = Utility.ox_element("sPrePr", namespace: "m")
           Utility.update_nodes(
             pre_element,
             [
               pr_element << Utility.pr_element("ctrl", true, namespace: "m"),
-              omml_parameter(parameter_two, tag_name: "sub"),
-              omml_parameter(parameter_three, tag_name: "sup"),
-              omml_parameter(parameter_one, tag_name: "e"),
+              omml_parameter(parameter_two, display_style, tag_name: "sub"),
+              omml_parameter(parameter_three, display_style, tag_name: "sup"),
+              omml_parameter(parameter_one, display_style, tag_name: "e"),
             ],
           )
           [pre_element]

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

@@ -27,10 +27,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