plurimath 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78fffd236ecb53260b07fa02ce5cc2254d3835a6491229a7acc50c2a2ed80dbb
-  data.tar.gz: e17acb1342c8b5a7f5de3b8496962a12264404f9dd8902a42c47069a6ad0a157
+  metadata.gz: 1d50026941bd556b94051c14a61a081ad96dbf839ed1aa324a9451382ef512e8
+  data.tar.gz: 40bf633bf5c0286daa011bf80d90baa2d522b18b9e545035d5dd6c32593792db
 SHA512:
-  metadata.gz: a66739db5ef92081d8c73af2bbebaf77aa03bab5f8befbd14a9a80bdb4eea4d8c03e996dbc0aedbb5cf16c0bd90189a32dde1d67925c646f02cec6423e532f3c
-  data.tar.gz: 81e43972fead184a05ebc04948bba6433fef1ce6824223bd59b8a89d08c2ac41f4adbcb41e00426dd2d9dad6d6ff04a0ec2fc34ba7f51a7457f258b5087e0e72
+  metadata.gz: 8cf6f394801e567d2a7b482a14fc4da5e3b4c19515ce549a00fc9c247ce4d26c565dc5ff72586648cd30c51c0361f40808fb1117ed408bd9c319156622b34640
+  data.tar.gz: 65d1590db64f33f620ad438ae2d328eb1fe9a6bffeee9a427dba9f782bdc9b429ed5c54e9892ade8c59894ddd57d2bcc6680a4b7cb1b9cee26c67c0cab1b05d2

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/math/core.rb

@@ -15,6 +15,10 @@ module Plurimath
         "subsup"
       end
 
+      def omml_tag_name
+        "subSup"
+      end
+
       def nary_attr_value
         ""
       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

@@ -83,7 +83,17 @@ module Plurimath
         end
 
         def all_values_exist?
-          !parameter_one.nil? && !parameter_two.nil?
+          !(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

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

@@ -14,7 +14,7 @@ module Plurimath
 
         def to_mathml_without_math_tag
           first_value = Utility.ox_element("mo") << class_name
-          return first_value if all_values_exist?
+          return first_value unless all_values_exist?
 
           value_array = [first_value]
           value_array << parameter_one&.to_mathml_without_math_tag
@@ -31,13 +31,7 @@ module Plurimath
         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)
+          underover
         end
       end
     end

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

@@ -40,13 +40,7 @@ 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.to_omml_without_math_tag unless parameter_one
-
-          Underset.new(overset, parameter_one)&.to_omml_without_math_tag
+          underover
         end
       end
     end

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

@@ -22,17 +22,16 @@ module Plurimath
           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,
-            ],
-          )
+          value_array = [mo_tag]
+          value_array << parameter_one&.to_mathml_without_math_tag
+          value_array << parameter_two&.to_mathml_without_math_tag
+          tag_name = if parameter_one && parameter_two
+                       "subsup"
+                     else
+                       parameter_one ? "sub" : "sup"
+                     end
+          msubsup_tag = Utility.ox_element("m#{tag_name}")
+          Utility.update_nodes(msubsup_tag, value_array)
           return msubsup_tag if parameter_three.nil?
 
           Utility.update_nodes(
@@ -40,7 +39,7 @@ module Plurimath
             [
               msubsup_tag,
               parameter_three&.to_mathml_without_math_tag,
-            ].flatten.compact,
+            ].compact,
           )
         end
 

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

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

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

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

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

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

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

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

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

@@ -131,6 +131,13 @@ module Plurimath
 
           Array(parameter.to_mathml_without_math_tag)
         end
+
+        def underover
+          overset = Overset.new(parameter_one, parameter_three)
+          return overset unless parameter_two
+
+          Underset.new(overset, parameter_two)&.to_omml_without_math_tag
+        end
       end
     end
   end

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

@@ -26,6 +26,10 @@ module Plurimath
           "underover"
         end
 
+        def omml_tag_name
+          "undOvr"
+        end
+
         def validate_function_formula
           false
         end

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

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

data/lib/plurimath/math/symbol.rb

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

data/lib/plurimath/math.rb

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

data/lib/plurimath/mathml/parser.rb

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

data/lib/plurimath/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plurimath
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-03 00:00:00.000000000 Z
+date: 2023-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet