plurimath 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ec251305cefca33f4a6d66180a797595d43ef370d55f7b67bdeac63b37e3111
-  data.tar.gz: 2c041edf5748e938813a20e0d397080d2f8cedcf96b19e9e39e98edae6b47ef8
+  metadata.gz: d4c3f2e8fb24ec72671101a001b6a359f1bf678a19b229f7238c7e250bb2689b
+  data.tar.gz: 1899fb80d23b9145c6a9b61d4fec13d521b3abadf57f81201101ad32b166b816
 SHA512:
-  metadata.gz: 37065161c1a09768bbec28f0d98e5438be18a5a0affa9e6024f7027ad002324c1e66e63c22f921f43fd32fa2bf1b723ace3f08b99464a8af3b7e6d265e092df6
-  data.tar.gz: 596e9cb2ce7f7d41ab8f93b4c0f330ffcdfec6adba518b49086dc4792c12f7eafed799ee087ea2ea82a3753389c179fab8883445c1b804a52fe779314941280c
+  metadata.gz: 57dd9fc70c73e8e29209dce21f08dcc4ab16473cf155cf29f19560bfabb0680ca22c4e337b0d766057c6357e24aae1f55a1965f79c881ead796d69730b153337
+  data.tar.gz: c16720307e808c0e7efe6435302b622aab66ec7dcc2a4df95a898d6b637a834464fd500e33362398033ed1422b3059db63e8577e267a68fbfb09007738af0623

data/lib/plurimath/latex/constants.rb

@@ -3783,6 +3783,7 @@ module Plurimath
       UNDEROVER_CLASSES = %w[
         bmod
         pmod
+        mod
       ].freeze
       LEFT_RIGHT_PARENTHESIS = {
         "\\backslash": "\",

data/lib/plurimath/latex/parse.rb

@@ -15,7 +15,12 @@ module Plurimath
       end
 
       rule(:begining) do
-        (slash >> str("begin") >> (str("{") >> symbol_text_or_integer >> str("*").as(:asterisk).maybe >> str("}")) >> optional_args)
+        (slash >> str("begin") >> (str("{") >> symbol_text_or_integer >> str("*").as(:asterisk) >> str("}")) >> optional_args.maybe) |
+        (slash >> str("begin") >> (str("{") >> symbol_text_or_integer >> str("}")))
+      end
+
+      rule(:array_begin) do
+        (str("\\begin{") >> str("array").as(:environment) >> str("}"))
       end
 
       rule(:ending) do
@@ -91,7 +96,8 @@ module Plurimath
           match["a-zA-Z"].as(:symbols) |
           match(/\d+(\.[0-9]+)|\d/).repeat(1).as(:number) |
           (str("\\\\").as("\\\\") >> match(/\s/).repeat) |
-          str("\\ ").as(:space)
+          str("\\ ").as(:space) |
+          (str("\\operatorname{") >> match("[^}]").repeat.as(:symbols) >> str("}"))
       end
 
       rule(:intermediate_exp) do
@@ -133,7 +139,7 @@ module Plurimath
           (left_right.as(:left_right) >> base >> intermediate_exp.as(:subscript)) |
           left_right.as(:left_right) |
           (slash >> str("substack").as(:substack) >> intermediate_exp) |
-          (begining >> array_args >> expression.as(:table_data) >> ending).as(:environment) |
+          (array_begin >> array_args >> expression.as(:table_data) >> ending).as(:environment) |
           (begining >> expression.as(:table_data) >> ending).as(:environment) |
           (slash >> environment >> intermediate_exp).as(:table_data) |
           power_base |

data/lib/plurimath/latex/transform.rb

@@ -275,6 +275,14 @@ module Plurimath
         )
       end
 
+      rule(operant: simple(:operant),
+           supscript: simple(:supscript)) do
+        Math::Function::Power.new(
+          Math::Symbol.new(operant),
+          supscript,
+        )
+      end
+
       rule(sequence: simple(:sequence),
            expression: simple(:expr)) do
         [sequence, expr].compact
@@ -446,6 +454,14 @@ module Plurimath
         )
       end
 
+      rule(intermediate_exp: simple(:int_exp),
+           subscript: simple(:subscript)) do
+        Math::Function::Base.new(
+          int_exp,
+          subscript,
+        )
+      end
+
       rule(unicode_symbols: simple(:sym),
            subscript: simple(:subscript)) do
         Math::Function::Base.new(

data/lib/plurimath/math/formula.rb

@@ -139,6 +139,7 @@ module Plurimath
       def nary_tag_able?(display_style)
         value.length == 2 &&
           ["underover", "powerbase"].include?(value&.first&.class_name) &&
+          !value.first.parameter_one.is_a?(Function::FontStyle) &&
           (
             value&.first&.parameter_one&.to_omml_without_math_tag(display_style)&.length == 1 ||
             value&.first&.parameter_one.to_omml_without_math_tag(display_style).match?(/^&#x\w*\d*;$/)

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

@@ -84,6 +84,7 @@ module Plurimath
 
         def latex_paren(paren)
           return "" if paren.nil? || paren.empty?
+          return paren.gsub(":", "") if paren.include?(":") && ["{:", ":}"].include?(paren)
 
           paren = %w[{ }].include?(paren) ? "\\#{paren}" : paren
           paren = "\\#{Latex::Constants::UNICODE_SYMBOLS.invert[paren]}" if paren&.to_s&.match?(/&#x.{0,4};/)

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

@@ -8,8 +8,10 @@ module Plurimath
       class Sqrt < UnaryFunction
         def to_mathml_without_math_tag
           sqrt_tag = Utility.ox_element("msqrt")
-          first_value = parameter_one&.to_mathml_without_math_tag
-          sqrt_tag << first_value if first_value
+          Utility.update_nodes(
+            sqrt_tag,
+            Array(parameter_one&.to_mathml_without_math_tag),
+          )
           sqrt_tag
         end
 

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

@@ -69,7 +69,7 @@ module Plurimath
             entities = HTMLEntities.new
             entities.encode(
               entities.decode(parameter_one&.gsub(/ /, " ")),
-              :named,
+              :hexadecimal,
             )
           else
             parameter_one

data/lib/plurimath/mathml/constants.rb

@@ -108,6 +108,7 @@ module Plurimath
         "′": "'",
         "  ": "quad",
         "    ": "qquad",
+        "‾": "overline",
         "⌢": "frown",
         "⋯": "cdots",
         "⋮": "vdots",

data/lib/plurimath/omml/transform.rb

@@ -12,7 +12,6 @@ module Plurimath
       rule(val: simple(:val))    { val }
       rule(scr: simple(:scr))    { scr }
       rule(sty: simple(:sty))    { sty }
-      rule(dPr: subtree(:dpr))   { dpr }
       rule(num: subtree(:num))   { num }
       rule(den: subtree(:den))   { den }
       rule(fPr: subtree(:fPr))   { nil }
@@ -22,7 +21,6 @@ module Plurimath
       rule(deg: sequence(:deg))  { Utility.filter_values(deg) }
       rule(sub: sequence(:sub))  { Utility.filter_values(sub) }
       rule(sup: sequence(:sup))  { Utility.filter_values(sup) }
-      rule(mtd: sequence(:mtd))  { mtd.flatten.compact }
       rule(boxPr: subtree(:box)) { nil }
       rule(argPr: subtree(:arg)) { nil }
       rule(accPr: subtree(:acc)) { acc.flatten.compact }
@@ -107,12 +105,28 @@ module Plurimath
         )
       end
 
+      rule(dPr: subtree(:dpr)) do
+        dpr.reject! { |d| d.is_a?(Hash) }
+        dpr
+      end
+
+      rule(mtd: sequence(:mtd)) do
+        flatten_mtd = mtd&.flatten&.compact
+        if flatten_mtd.length > 1 && !flatten_mtd.first.is_a?(Math::Core)
+          font = flatten_mtd.shift
+          font.new(
+            Utility.filter_values(flatten_mtd),
+            Utility::OMML_FONTS.invert[font].to_s,
+          )
+        else
+          flatten_mtd
+        end
+      end
+
       rule(mr: subtree(:mr)) do
         row = []
         mr.each do |td|
-          row << Math::Function::Td.new(
-            Array(td),
-          )
+          row << Math::Function::Td.new(Array(td))
         end
         Math::Function::Tr.new(row)
       end

data/lib/plurimath/utility.rb

@@ -562,8 +562,8 @@ module Plurimath
           close_paren = mrow.pop
           if mrow.length == 1 && mrow.first.is_a?(Math::Function::Table)
             table = mrow.first
-            table.open_paren = open_paren
-            table.close_paren = close_paren
+            table.open_paren = open_paren.value
+            table.close_paren = close_paren.value
           else
             mrow.replace(
               [

data/lib/plurimath/version.rb

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

metadata

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