plurimath 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4c3f2e8fb24ec72671101a001b6a359f1bf678a19b229f7238c7e250bb2689b
-  data.tar.gz: 1899fb80d23b9145c6a9b61d4fec13d521b3abadf57f81201101ad32b166b816
+  metadata.gz: 6fabed12e1b85fa2c5d7b2cacfebaf2bafb8481025f6f0a9b072649ff2991131
+  data.tar.gz: ec912de1e4e356af0d7458c0b2147ea9aee1fb4676506429ac5e4161cd974c79
 SHA512:
-  metadata.gz: 57dd9fc70c73e8e29209dce21f08dcc4ab16473cf155cf29f19560bfabb0680ca22c4e337b0d766057c6357e24aae1f55a1965f79c881ead796d69730b153337
-  data.tar.gz: c16720307e808c0e7efe6435302b622aab66ec7dcc2a4df95a898d6b637a834464fd500e33362398033ed1422b3059db63e8577e267a68fbfb09007738af0623
+  metadata.gz: d31d2f5b644402ab58c0f19a9c14e88f91fff26d44dff6c89484b66d45d3760087be0827002c87c3b9ca540ac7dd52ad2ceb014f4b0f6b16fc9f94630f823c70
+  data.tar.gz: 8f5ea828f70451af6ae075d8e06db4055145e096c83fc39b9a31cdcc57ddfff57afdd736e9f696d83e68d7b6c50ada74fa68f46acc00e878e08c1db22050ed2d

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/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/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

@@ -72,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)
@@ -116,7 +116,7 @@ module Plurimath
           font = flatten_mtd.shift
           font.new(
             Utility.filter_values(flatten_mtd),
-            Utility::OMML_FONTS.invert[font].to_s,
+            Utility::FONT_STYLES.rassoc(font).first.to_s,
           )
         else
           flatten_mtd
@@ -133,7 +133,11 @@ module Plurimath
 
       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 = {
       "〈": "〉",
       "⌊": "⌋",

data/lib/plurimath/version.rb

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

metadata

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