plurimath 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d69a05ccfdd97b4b313df9c6bec1682ab39078adbb43c8823880f90df142f6f1
-  data.tar.gz: 441f919b29159720405b0bd685405e8ecb527a2716c0ac1427fff3c11575fa22
+  metadata.gz: 6fabed12e1b85fa2c5d7b2cacfebaf2bafb8481025f6f0a9b072649ff2991131
+  data.tar.gz: ec912de1e4e356af0d7458c0b2147ea9aee1fb4676506429ac5e4161cd974c79
 SHA512:
-  metadata.gz: f97960509050b66f88da2d6bb7b5f5466d6a2b0d51e06ad63322e39859aa84416a4996ae6df3403dffc838ac2d14edcb5f707fec3b4607b0ce367c13cf0df1eb
-  data.tar.gz: 1e7e533e85719d23428cdaad2aa218692802a20525059b6cd99951a0b63fffb2f00b4c6325f39bc039056f99c4ea72a80cb8a7660aebde916520f992ae69c5ea
+  metadata.gz: d31d2f5b644402ab58c0f19a9c14e88f91fff26d44dff6c89484b66d45d3760087be0827002c87c3b9ca540ac7dd52ad2ceb014f4b0f6b16fc9f94630f823c70
+  data.tar.gz: 8f5ea828f70451af6ae075d8e06db4055145e096c83fc39b9a31cdcc57ddfff57afdd736e9f696d83e68d7b6c50ada74fa68f46acc00e878e08c1db22050ed2d

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/font_style.rb

@@ -57,6 +57,7 @@ module Plurimath
             r_tag,
             Array(parameter_one.font_style_t_tag(display_style)),
           )
+          [r_tag]
         end
       end
     end

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

@@ -55,7 +55,7 @@ module Plurimath
           html_value&.gsub!(PARSER_REGEX) do |_text|
             last_match = Regexp.last_match
             case lang
-            when "mathml", "html"
+            when "mathml", "html", "omml"
               symbol_value(last_match[:unicode])
             else
               last_match[:unicode]

data/lib/plurimath/mathml/constants.rb

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

data/lib/plurimath/omml/parser.rb

@@ -11,6 +11,22 @@ module Plurimath
         mr
         r
       ].freeze
+      SUPPORTED_FONTS = {
+        "sans-serif-bi": "sans-serif-bold-italic",
+        "double-struck": "double-struck",
+        "sans-serif-i": "sans-serif-italic",
+        "sans-serif-b": "bold-sans-serif",
+        "sans-serif-p": "sans-serif",
+        "fraktur-p": "fraktur",
+        "fraktur-b": "bold-fraktur",
+        "script-b": "bold-script",
+        "script-p": "script",
+        monospace: "monospace",
+        bi: "bold-italic",
+        p: "normal",
+        i: "italic",
+        b: "bold",
+      }.freeze
 
       def initialize(text)
         @text = text

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 }
@@ -74,7 +72,7 @@ module Plurimath
           font = flatten_row.shift
           font.new(
             Utility.filter_values(flatten_row),
-            Utility::OMML_FONTS.invert[font].to_s,
+            Utility::FONT_STYLES.key(font).to_s,
           )
         else
           Utility.filter_values(flatten_row)
@@ -107,19 +105,39 @@ 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::FONT_STYLES.rassoc(font).first.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
 
       rule(rPr: subtree(:rpr)) do
         if rpr.is_a?(Array)
-          Utility::OMML_FONTS[rpr.join("-").to_sym]
+          Utility::FONT_STYLES[
+            Omml::Parser::SUPPORTED_FONTS[
+              rpr&.join("-")&.to_sym,
+            ]&.to_sym,
+          ]
         end
       end
 

data/lib/plurimath/utility.rb

@@ -4,24 +4,30 @@ module Plurimath
   class Utility
     FONT_STYLES = {
       "double-struck": Math::Function::FontStyle::DoubleStruck,
+      "sans-serif-bold-italic": Math::Function::FontStyle::SansSerifBoldItalic,
+      "sans-serif-italic": Math::Function::FontStyle::SansSerifItalic,
+      "bold-sans-serif": Math::Function::FontStyle::BoldSansSerif,
       "sans-serif": Math::Function::FontStyle::SansSerif,
+      "bold-fraktur": Math::Function::FontStyle::BoldFraktur,
+      "bold-italic": Math::Function::FontStyle::BoldItalic,
+      "bold-script": Math::Function::FontStyle::BoldScript,
       monospace: Math::Function::FontStyle::Monospace,
-      fraktur: Math::Function::FontStyle::Fraktur,
-      script: Math::Function::FontStyle::Script,
-      normal: Math::Function::FontStyle::Normal,
-      bold: Math::Function::FontStyle::Bold,
       mathfrak: Math::Function::FontStyle::Fraktur,
       mathcal: Math::Function::FontStyle::Script,
+      fraktur: Math::Function::FontStyle::Fraktur,
       mathbb: Math::Function::FontStyle::DoubleStruck,
       mathtt: Math::Function::FontStyle::Monospace,
       mathsf: Math::Function::FontStyle::SansSerif,
       mathrm: Math::Function::FontStyle::Normal,
       textrm: Math::Function::FontStyle::Normal,
+      italic: Math::Function::FontStyle::Italic,
       mathbf: Math::Function::FontStyle::Bold,
       textbf: Math::Function::FontStyle::Bold,
+      script: Math::Function::FontStyle::Script,
+      normal: Math::Function::FontStyle::Normal,
+      bold: Math::Function::FontStyle::Bold,
       bbb: Math::Function::FontStyle::DoubleStruck,
       cal: Math::Function::FontStyle::Script,
-      bf: Math::Function::FontStyle::Bold,
       sf: Math::Function::FontStyle::SansSerif,
       tt: Math::Function::FontStyle::Monospace,
       fr: Math::Function::FontStyle::Fraktur,
@@ -29,6 +35,7 @@ module Plurimath
       cc: Math::Function::FontStyle::Script,
       ii: Math::Function::FontStyle::Italic,
       bb: Math::Function::FontStyle::Bold,
+      bf: Math::Function::FontStyle::Bold,
     }.freeze
     ALIGNMENT_LETTERS = {
       c: "center",
@@ -72,22 +79,6 @@ module Plurimath
       max
       min
     ].freeze
-    OMML_FONTS = {
-      "sans-serif-bi": Math::Function::FontStyle::SansSerifBoldItalic,
-      "sans-serif-i": Math::Function::FontStyle::SansSerifItalic,
-      "sans-serif-b": Math::Function::FontStyle::BoldSansSerif,
-      "double-struck": Math::Function::FontStyle::DoubleStruck,
-      "sans-serif-p": Math::Function::FontStyle::SansSerif,
-      "fraktur-p": Math::Function::FontStyle::Fraktur,
-      "fraktur-b": Math::Function::FontStyle::BoldFraktur,
-      "script-b": Math::Function::FontStyle::BoldScript,
-      "script-p": Math::Function::FontStyle::Script,
-      monospace: Math::Function::FontStyle::Monospace,
-      bi: Math::Function::FontStyle::BoldItalic,
-      p: Math::Function::FontStyle::Normal,
-      i: Math::Function::FontStyle::Italic,
-      b: Math::Function::FontStyle::Bold,
-    }.freeze
     PARENTHESIS = {
       "〈": "〉",
       "⌊": "⌋",
@@ -562,8 +553,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.3"
+  VERSION = "0.5.0"
 end

metadata

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