plurimath 0.2.7 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ea66a26d225e41e692ad7d708c2b7d673de51d5398a504b183dea1bcaceb197
-  data.tar.gz: f9c4710c348e0bf351138f45d55c53da5f0525a90439c317c823d4c838d8ef5f
+  metadata.gz: 8c97fcf3901a7da18bbac329563b358490117e3ec3103f6c5c9e4e8ad7b5d3c8
+  data.tar.gz: abe2849aa2d81cb246b2b703576c6ae0df283b323e27433a9af95d07c1dd9932
 SHA512:
-  metadata.gz: 0af365c1786b6de865615fa5843ca3446556619ce99d1fb931455dc77e3a5a8f532c79c5eea4c3120b43805437f61a11b70aa5eec5bbf73855eac22c572ac706
-  data.tar.gz: d66fcf0ca35d06b2ebb64da22b6b9a99499ff2a7164cac69becc847dcc5bf3ba7c4d0329bb0f5df45b5f31b3f913629173f2532e16643d9842866286040fb2f8
+  metadata.gz: 2ac0c52f647ba6ff70bbf2fd0d9af2a33df8176c287699e8e99aa3478eaa44fe9b8fabcb54d115de5116f6823f2cdcda0f53965bbde806f47b948f3ca5d2a81c
+  data.tar.gz: ba854ed8ecd87cd3fb30e2c80508abfaa0d900a22f3492d531f0b592272d692d9886203db73d81da1dbe0b3402831c2164f8c32472d69926f8976f069eab3718

data/lib/plurimath/asciimath/parse.rb

@@ -109,7 +109,7 @@ module Plurimath
 
       rule(:sequence) do
         (lparen.as(:lparen) >> space.maybe >> expression.maybe.as(:expr) >> space.maybe >> rparen.maybe.as(:rparen)).as(:intermediate_exp) |
-          (str("text") >> lparen.capture(:paren).as(:lparen) >> read_text.as(:text) >> rparen.maybe.as(:rparen)).as(:intermediate_exp) |
+          (str("text") >> lparen.capture(:paren) >> read_text.as(:text) >> rparen.maybe).as(:intermediate_exp) |
           symbol_text_or_integer
       end
 

data/lib/plurimath/asciimath/transform.rb

@@ -1089,15 +1089,11 @@ module Plurimath
                         [expr]
                       end
         right_paren = rparen.to_s.empty? ? "" : rparen
-        if expr.is_a?(Math::Function::Text)
-          expr
-        else
-          Math::Function::Fenced.new(
-            Utility.symbol_object(lparen),
-            form_value&.flatten&.compact,
-            Utility.symbol_object(right_paren),
-          )
-        end
+        Math::Function::Fenced.new(
+          Utility.symbol_object(lparen),
+          form_value&.flatten&.compact,
+          Utility.symbol_object(right_paren),
+        )
       end
 
       rule(lparen: simple(:lparen),
@@ -1117,6 +1113,12 @@ module Plurimath
         Math::Function::Text.new(text)
       end
 
+      rule(lparen: simple(:lparen),
+           text: sequence(:text),
+           rparen: simple(:rparen)) do
+        Math::Function::Text.new(text.flatten.compact.join)
+      end
+
       rule(lparen: simple(:lparen),
            rgb_color: sequence(:color),
            rparen: simple(:rparen)) do

data/lib/plurimath/math/formula.rb

@@ -42,11 +42,11 @@ module Plurimath
       end
 
       def to_latex
-        value.map(&:to_latex).join(" ")
+        value&.map(&:to_latex)&.join(" ")
       end
 
       def to_html
-        value.map(&:to_html).join(" ")
+        value&.map(&:to_html)&.join(" ")
       end
 
       def omml_math_attrs

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

@@ -13,8 +13,7 @@ module Plurimath
         end
 
         def to_mathml_without_math_tag
-          under_classes = ["ubrace", "obrace"] + Utility::UNARY_CLASSES
-          tag_name = (under_classes.include?(parameter_one&.class_name) ? "under" : "sub")
+          tag_name = (Utility::MUNDER_CLASSES.include?(parameter_one&.class_name) ? "under" : "sub")
           sub_tag = Utility.ox_element("m#{tag_name}")
           mathml_value = []
           mathml_value << parameter_one&.to_mathml_without_math_tag

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

@@ -46,7 +46,7 @@ module Plurimath
           dpr << Utility.pr_element("ctrl", true, namespace: "m")
           Utility.update_nodes(
             d,
-            [dpr] + second_value,
+            [dpr] + Array(second_value),
           )
         end
 
@@ -54,12 +54,12 @@ module Plurimath
 
         def second_value
           class_names = ["number", "symbol"].freeze
-          parameter_two.map do |object|
+          parameter_two&.map do |object|
             e_tag = Utility.ox_element("e", namespace: "m")
             e_tag << if class_names.include?(object.class_name)
                        fenced_omml_value(object)
                      else
-                       object.to_omml_without_math_tag
+                       object&.to_omml_without_math_tag
                      end
           end
         end
@@ -67,7 +67,7 @@ module Plurimath
         def fenced_omml_value(object)
           r_tag = Utility.ox_element("r", namespace: "m")
           t_tag = Utility.ox_element("t", namespace: "m")
-          t_tag << object.value
+          t_tag << object&.value
           r_tag << t_tag
         end
 
@@ -97,16 +97,16 @@ module Plurimath
 
         def latex_paren(paren, right)
           paren_side = right ? "\\right" : "\\left"
-          return "#{paren_side} ." if paren.include?(":")
+          return "#{paren_side} ." if paren&.include?(":")
 
           paren = %w[{ }].include?(paren) ? "\\#{paren}" : paren
           " #{paren_side} #{paren} "
         end
 
         def mathml_paren(field)
-          return "" if field.value.include?(":")
+          return "" if field&.value&.include?(":")
 
-          field.value
+          field&.value
         end
       end
     end

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

@@ -13,12 +13,11 @@ module Plurimath
           end
 
           def to_asciimath
-            "mathbf(#{parameter_one.to_asciimath})"
+            "mathbf(#{parameter_one&.to_asciimath})"
           end
 
           def to_latex
-            first_value = parameter_one.to_latex if parameter_one
-            "\\mathbf{#{first_value}}"
+            "\\mathbf{#{parameter_one&.to_latex}}"
           end
 
           def to_mathml_without_math_tag
@@ -27,7 +26,7 @@ module Plurimath
                 "mstyle",
                 attributes: { mathvariant: "bold" },
               ),
-              [parameter_one.to_mathml_without_math_tag],
+              [parameter_one&.to_mathml_without_math_tag],
             )
           end
         end

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

@@ -13,12 +13,11 @@ module Plurimath
           end
 
           def to_asciimath
-            "mathbb(#{parameter_one.to_asciimath})"
+            "mathbb(#{parameter_one&.to_asciimath})"
           end
 
           def to_latex
-            first_value = parameter_one.to_latex if parameter_one
-            "\\mathbb{#{first_value}}"
+            "\\mathbb{#{parameter_one&.to_latex}}"
           end
 
           def to_mathml_without_math_tag
@@ -27,7 +26,7 @@ module Plurimath
                 "mstyle",
                 attributes: { mathvariant: "double-struck" },
               ),
-              [parameter_one.to_mathml_without_math_tag],
+              [parameter_one&.to_mathml_without_math_tag],
             )
           end
         end

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

@@ -13,12 +13,11 @@ module Plurimath
           end
 
           def to_asciimath
-            "mathfrak(#{parameter_one.to_asciimath})"
+            "mathfrak(#{parameter_one&.to_asciimath})"
           end
 
           def to_latex
-            first_value = parameter_one.to_latex if parameter_one
-            "\\mathfrak{#{first_value}}"
+            "\\mathfrak{#{parameter_one&.to_latex}}"
           end
 
           def to_mathml_without_math_tag
@@ -27,7 +26,7 @@ module Plurimath
                 "mstyle",
                 attributes: { mathvariant: "fraktur" },
               ),
-              [parameter_one.to_mathml_without_math_tag],
+              [parameter_one&.to_mathml_without_math_tag],
             )
           end
         end

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

@@ -13,12 +13,11 @@ module Plurimath
           end
 
           def to_asciimath
-            "ii(#{parameter_one.to_asciimath})"
+            "ii(#{parameter_one&.to_asciimath})"
           end
 
           def to_latex
-            first_value = parameter_one.to_latex if parameter_one
-            "\\mathit{#{first_value}}"
+            "\\mathit{#{parameter_one&.to_latex}}"
           end
 
           def to_mathml_without_math_tag
@@ -27,7 +26,7 @@ module Plurimath
                 "mstyle",
                 attributes: { mathvariant: "italic" },
               ),
-              [parameter_one.to_mathml_without_math_tag],
+              [parameter_one&.to_mathml_without_math_tag],
             )
           end
         end

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

@@ -13,12 +13,11 @@ module Plurimath
           end
 
           def to_asciimath
-            "mathtt(#{parameter_one.to_asciimath})"
+            "mathtt(#{parameter_one&.to_asciimath})"
           end
 
           def to_latex
-            first_value = parameter_one.to_latex if parameter_one
-            "\\mathtt{#{first_value}}"
+            "\\mathtt{#{parameter_one&.to_latex}}"
           end
 
           def to_mathml_without_math_tag
@@ -27,7 +26,7 @@ module Plurimath
                 "mstyle",
                 attributes: { mathvariant: "monospace" },
               ),
-              [parameter_one.to_mathml_without_math_tag],
+              [parameter_one&.to_mathml_without_math_tag],
             )
           end
         end

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

@@ -13,12 +13,11 @@ module Plurimath
           end
 
           def to_asciimath
-            "rm(#{parameter_one.to_asciimath})"
+            "rm(#{parameter_one&.to_asciimath})"
           end
 
           def to_latex
-            first_value = parameter_one.to_latex if parameter_one
-            "\\mathrm{#{first_value}}"
+            "\\mathrm{#{parameter_one&.to_latex}}"
           end
 
           def to_mathml_without_math_tag
@@ -27,7 +26,7 @@ module Plurimath
                 "mstyle",
                 attributes: { mathvariant: "normal" },
               ),
-              [parameter_one.to_mathml_without_math_tag],
+              [parameter_one&.to_mathml_without_math_tag],
             )
           end
         end

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

@@ -13,12 +13,11 @@ module Plurimath
           end
 
           def to_asciimath
-            "mathsf(#{parameter_one.to_asciimath})"
+            "mathsf(#{parameter_one&.to_asciimath})"
           end
 
           def to_latex
-            first_value = parameter_one.to_latex if parameter_one
-            "\\mathsf{#{first_value}}"
+            "\\mathsf{#{parameter_one&.to_latex}}"
           end
 
           def to_mathml_without_math_tag
@@ -27,7 +26,7 @@ module Plurimath
                 "mstyle",
                 attributes: { mathvariant: "sans-serif" },
               ),
-              [parameter_one.to_mathml_without_math_tag],
+              [parameter_one&.to_mathml_without_math_tag],
             )
           end
         end

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

@@ -13,12 +13,11 @@ module Plurimath
           end
 
           def to_asciimath
-            "mathcal(#{parameter_one.to_asciimath})"
+            "mathcal(#{parameter_one&.to_asciimath})"
           end
 
           def to_latex
-            first_value = parameter_one.to_latex if parameter_one
-            "\\mathcal{#{first_value}}"
+            "\\mathcal{#{parameter_one&.to_latex}}"
           end
 
           def to_mathml_without_math_tag
@@ -27,7 +26,7 @@ module Plurimath
                 "mstyle",
                 attributes: { mathvariant: "script" },
               ),
-              [parameter_one.to_mathml_without_math_tag],
+              [parameter_one&.to_mathml_without_math_tag],
             )
           end
         end

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

@@ -48,16 +48,15 @@ module Plurimath
         def to_omml_without_math_tag
           limupp   = Utility.ox_element("limLow", namespace: "m")
           limupppr = Utility.ox_element("limUppPr", namespace: "m")
-          sum << Utility.pr_element("e", true, namespace: "m")
-          me = (Utility.ox_element("e", namespace: "m") << omml_first_value)
-          lim = (Utility.ox_element("lim", namespace: "m") << omml_second_value)
+          me = (Utility.ox_element("e", namespace: "m") << omml_first_value) if parameter_one
+          lim = (Utility.ox_element("lim", namespace: "m") << omml_second_value) if parameter_two
           Utility.update_nodes(limupp, [limupppr, me, lim])
         end
 
         protected
 
         def omml_first_value
-          return parameter_one.to_omml_without_math_tag unless parameter_one.is_a?(Math::Symbol)
+          return parameter_one&.to_omml_without_math_tag unless parameter_one&.is_a?(Math::Symbol)
 
           mt = Utility.ox_element("t", namespace: "m")
           mt << parameter_one.to_omml_without_math_tag if parameter_one
@@ -65,7 +64,7 @@ module Plurimath
         end
 
         def omml_second_value
-          return parameter_two.to_omml_without_math_tag unless parameter_two.is_a?(Math::Symbol)
+          return parameter_two&.to_omml_without_math_tag unless parameter_two&.is_a?(Math::Symbol)
 
           mt = Utility.ox_element("t", namespace: "m")
           mt << parameter_two.to_omml_without_math_tag if parameter_two

data/lib/plurimath/math.rb

@@ -41,6 +41,14 @@ module Plurimath
 
       klass = VALID_TYPES[type.to_sym]
       klass.new(text).to_formula
+    rescue => ee
+      message = <<~MESSAGE
+        An error occurred while processing the input. Please check your input to ensure it is valid or open an issue on Github If you believe the input is correct.
+        ---- INPUT START ----
+          #{text}
+        ---- INPUT END ----
+      MESSAGE
+      raise Math::Error.new(message), cause: nil
     end
 
     private

data/lib/plurimath/utility.rb

@@ -67,6 +67,13 @@ module Plurimath
       f
       g
     ].freeze
+    MUNDER_CLASSES = %w[
+      ubrace
+      obrace
+      right
+      max
+      min
+    ].freeze
 
     class << self
       def organize_table(array, column_align: nil, options: nil)
@@ -187,7 +194,7 @@ module Plurimath
         element
       end
 
-      def pr_element(main_tag, wi_tag, namespace: "")
+      def pr_element(main_tag, wi_tag = false, namespace: "")
         tag_name = "#{main_tag}Pr"
         ox_element(
           tag_name,

data/lib/plurimath/version.rb

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

metadata

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