plurimath 0.3.7 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39522e32ac4e62af9eb862173a64e6e8650a9531bae27f321f25c6a1bc594e95
-  data.tar.gz: df5419195046dcf270cd4561c8cf3f9657536217a370d7a9aef150d7ca6aec72
+  metadata.gz: 1d50026941bd556b94051c14a61a081ad96dbf839ed1aa324a9451382ef512e8
+  data.tar.gz: 40bf633bf5c0286daa011bf80d90baa2d522b18b9e545035d5dd6c32593792db
 SHA512:
-  metadata.gz: 0a2c7880f03ba5d70c508b61f9c272be5a4780cbc5a30f56e142f7aa6798b5a8059051c6ecaf80ac9c209ab2cda977d55d7354f28e06e42c3dd439e3e96c0349
-  data.tar.gz: f2c0962524dc14232b0a48a4cd92015551f39603087bc42b08e73d0a3e66952ae2ab260f13166d159de378bd1757c24b0039a58d5b0fd129fb7be431f523e6a1
+  metadata.gz: 8cf6f394801e567d2a7b482a14fc4da5e3b4c19515ce549a00fc9c247ce4d26c565dc5ff72586648cd30c51c0361f40808fb1117ed408bd9c319156622b34640
+  data.tar.gz: 65d1590db64f33f620ad438ae2d328eb1fe9a6bffeee9a427dba9f782bdc9b429ed5c54e9892ade8c59894ddd57d2bcc6680a4b7cb1b9cee26c67c0cab1b05d2

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/asciimath/transform.rb

@@ -766,6 +766,18 @@ module Plurimath
         )
       end
 
+      rule(ternary_class: simple(:function),
+           base_value: simple(:base),
+           power_value: simple(:power),
+           third_value: sequence(:third)) do
+        third_value = third.is_a?(Slice) ? nil : third
+        Utility.get_class(function).new(
+          Utility.unfenced_value(base),
+          Utility.unfenced_value(power),
+          Utility.filter_values(third_value),
+        )
+      end
+
       rule(unary_class: simple(:function),
            intermediate_exp: simple(:int_exp)) do
         first_value = if Utility::UNARY_CLASSES.include?(function)
@@ -821,6 +833,11 @@ module Plurimath
         expr.insert(0, ternary)
       end
 
+      rule(ternary: simple(:ternary),
+           left_right: simple(:left_right)) do
+        [ternary, left_right]
+      end
+
       rule(unary_class: simple(:function),
            text: simple(:text)) do
         Utility.get_class(function).new(

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

@@ -15,6 +15,10 @@ module Plurimath
         "subsup"
       end
 
+      def omml_tag_name
+        "subSup"
+      end
+
       def nary_attr_value
         ""
       end
@@ -38,6 +42,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,13 @@
 module Plurimath
   module Math
     class Formula < Core
-      attr_accessor :value, :left_right_wrapper, :displaystyle
+      attr_accessor :value, :left_right_wrapper, :displaystyle, :input_string
 
       def initialize(
         value = [],
         left_right_wrapper = true,
-        displaystyle: true
+        displaystyle: true,
+        input_string: nil
       )
         @value = value.is_a?(Array) ? value : [value]
         left_right_wrapper = false if @value.first.is_a?(Function::Left)
@@ -23,6 +24,8 @@ module Plurimath
 
       def to_asciimath
         value.map(&:to_asciimath).join(" ")
+      rescue
+        parse_error!(:asciimath)
       end
 
       def to_mathml(display_style: displaystyle)
@@ -36,6 +39,8 @@ module Plurimath
         Utility.update_nodes(style, mathml_content)
         Utility.update_nodes(math, [style])
         Ox.dump(math, indent: 2).gsub("&amp;", "&")
+      rescue
+        parse_error!(:mathml)
       end
 
       def to_mathml_without_math_tag
@@ -53,10 +58,14 @@ module Plurimath
 
       def to_latex
         value&.map(&:to_latex)&.join(" ")
+      rescue
+        parse_error!(:latex)
       end
 
       def to_html
         value&.map(&:to_html)&.join(" ")
+      rescue
+        parse_error!(:html)
       end
 
       def omml_math_attrs
@@ -92,6 +101,8 @@ module Plurimath
         Utility.update_nodes(math_element, omml_content)
         Utility.update_nodes(para_element, Array(math_element))
         Ox.dump(para_element, indent: 2).gsub("&amp;", "&").lstrip
+      rescue
+        parse_error!(:omml)
       end
 
       def omml_content
@@ -115,10 +126,6 @@ module Plurimath
         [nary_tag]
       end
 
-      def class_name
-        self.class.name.split("::").last.downcase
-      end
-
       def extract_class_from_text
         return false unless (value.length < 2 && value&.first&.is_a?(Function::Text))
 
@@ -141,6 +148,12 @@ module Plurimath
       def validate_function_formula
         (value.none?(Function::Left) || value.none?(Function::Right))
       end
+
+      protected
+
+      def parse_error!(type)
+        Math.parse_error!(input_string, type)
+      end
     end
   end
 end

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,20 @@ 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
+
+        def underover
+          return r_element(class_name, rpr_tag: false) unless all_values_exist?
+
+          first_value = Symbol.new(class_name)
+          overset = Overset.new(first_value, 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
   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,24 @@ 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 unless 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
+          underover
         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,11 +40,7 @@ module Plurimath
         end
 
         def to_omml_without_math_tag
-          lim = Symbol.new("lim")
-          overset = Overset.new(lim, parameter_two)
-          return overset unless parameter_one
-
-          Underset.new(overset, parameter_one)&.to_omml_without_math_tag
+          underover
         end
       end
     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