plurimath 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '04338f1ee3f1e78d5383c40bb04b3d3b48c11d04180eefaa0eafeb7ae2980efc'
-  data.tar.gz: 912bd2f8fa6d6bcfddc287214f06d537bb7084c7bd82945a7b57e981fc0943ab
+  metadata.gz: 10dc48ba50b0b3ace7230a0dc8c55ea8fa208e1b8e124cbbf19e2b081ddb6918
+  data.tar.gz: 36aa56b4193aa367343195e33160d5213dbd3efe9655b110a387b5fa84374e22
 SHA512:
-  metadata.gz: 4bbf747cf01f27e17fa1ea5b4138f59b5978f0cfcb493caaf3cb96885d2d36b42aa2bd6893ce1da8c302daaa80334c1b35a2283e7b6a3296d82b17b577700364
-  data.tar.gz: 01d79594d56773f04dee88a5830f5ae39087d034975566dffb6db4b64e853c517ed596f8951b5b64b391f5df96e7607b026e114a05fabbee19929f2a4d7dd69c
+  metadata.gz: 59b85358ee2f0de5f345a0179aca97243483aa5d31e0a7a858ef4c9421ce546d9a9ee72094a4306c704b350d7caa80315bc331b7e8d500ffbf0175a0d1c859b5
+  data.tar.gz: c3ada4b68b411110f533dfb2297f9d0f9cad47200a5b39475b300c9f1687b18ed5e199fd12b5d8d0f3ff971ae1790187d28629e162eba14edd575aafeab1ee74

data/lib/plurimath/asciimath/transform.rb

@@ -1117,6 +1117,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/function/semantics.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require_relative "binary_function"
+
+module Plurimath
+  module Math
+    module Function
+      class Semantics < BinaryFunction
+        def to_mathml_without_math_tag
+          first_value = parameter_one&.to_mathml_without_math_tag
+          second_value = other_tags(parameter_two)
+          Utility.update_nodes(
+            Utility.ox_element("semantics"),
+            second_value.insert(0, first_value),
+          )
+        end
+
+        def to_latex
+          parameter_one&.to_latex
+        end
+
+        def to_asciimath
+          parameter_one&.to_asciimath
+        end
+
+        protected
+
+        def other_tags(array)
+          contented = []
+          array&.each do |hash|
+            hash.each do |tag, content|
+              tag_element = Utility.ox_element(tag&.to_s)
+              contented << Utility.update_nodes(
+                tag_element,
+                content&.map(&:to_mathml_without_math_tag),
+              )
+            end
+          end
+          contented
+        end
+      end
+    end
+  end
+end

data/lib/plurimath/mathml/constants.rb

@@ -42,9 +42,9 @@ module Plurimath
         "Ψ": "Psi",
         "ω": "omega",
         "Ω": "omega",
-        "⋅": "dot",
+        "⋅": "cdot",
         "∙": "*",
-        "·": ".",
+        ".": ".",
         "∗": "**",
         "⋆": "***",
         "×": "xx",

data/lib/plurimath/mathml/parser.rb

@@ -6,6 +6,7 @@ module Plurimath
   class Mathml
     class Parser
       attr_accessor :text
+      SUPPORTED_ATTRIBUTES = %w[columnlines mathvariant mathcolor notation close open].freeze
 
       def initialize(text)
         @text = text
@@ -28,7 +29,7 @@ module Plurimath
           elsif !node.attributes.empty?
             {
               node.name.to_sym => {
-                attributes: node.attributes.transform_keys(&:to_sym),
+                attributes: validate_attributes(node.attributes),
                 value: parse_nodes(node.nodes),
               },
             }
@@ -37,6 +38,11 @@ module Plurimath
           end
         end
       end
+
+      def validate_attributes(attributes)
+        attributes&.select! { |key, _| SUPPORTED_ATTRIBUTES.include?(key&.to_s) }
+        attributes&.transform_keys(&:to_sym) if attributes&.any?
+      end
     end
   end
 end

data/lib/plurimath/mathml/transform.rb

@@ -6,13 +6,9 @@ module Plurimath
       rule(mi: simple(:mi))         { mi }
       rule(mo: simple(:mo))         { mo }
       rule(mo: sequence(:mo))       { Utility.mathml_unary_classes(mo) }
-      rule(xref: simple(:xref))     { nil }
       rule(mtd: sequence(:mtd))     { Math::Function::Td.new(mtd) }
       rule(mtr: sequence(:mtr))     { Math::Function::Tr.new(mtr) }
-      rule(accent: simple(:acc))    { nil }
       rule(none: sequence(:none))   { nil }
-      rule(maxsize: simple(:att))   { nil }
-      rule(minsize: simple(:att))   { nil }
       rule(notation: simple(:att))  { Math::Function::Menclose.new(att) }
       rule(mtable: simple(:table))  { table }
       rule(msqrt: sequence(:sqrt))  { Math::Function::Sqrt.new(sqrt.first) }
@@ -25,7 +21,6 @@ module Plurimath
       rule(mfenced: simple(:mfenced))   { mfenced }
       rule(mtable: sequence(:mtable))   { Math::Function::Table.new(mtable) }
       rule(mscarry: sequence(:scarry))  { nil }
-      rule(displaystyle: simple(:att))  { nil }
       rule(menclose: simple(:enclose))  { enclose }
       rule(mlabeledtr: sequence(:mtr))  { Math::Function::Tr.new(mtr) }
       rule(mpadded: sequence(:padded))  { Utility.filter_values(padded) }
@@ -204,10 +199,10 @@ module Plurimath
         )
       end
 
-      rule(mtext: sequence(:mtext)) do
+      rule(mtext: subtree(:mtext)) do
         entities = HTMLEntities.new
         symbols  = Constants::UNICODE_SYMBOLS.transform_keys(&:to_s)
-        text     = entities.encode(mtext.first, :hexadecimal)
+        text     = entities.encode(mtext.flatten.join, :hexadecimal)
         symbols.each do |code, string|
           text.gsub!(code.downcase, "unicode[:#{string}]")
         end
@@ -227,7 +222,7 @@ module Plurimath
       rule(mfenced: sequence(:fenced)) do
         Math::Function::Fenced.new(
           Math::Symbol.new("("),
-          fenced,
+          fenced.compact,
           Math::Symbol.new(")"),
         )
       end
@@ -281,14 +276,21 @@ module Plurimath
 
       rule(attributes: simple(:attrs),
            value: subtree(:value)) do
-        Utility.join_attr_value(attrs, value.flatten)
+        Utility.join_attr_value(attrs, value&.flatten&.compact)
+      end
+
+      rule(semantics: subtree(:value)) do
+        Math::Function::Semantics.new(
+          value.shift,
+          value,
+        )
       end
 
       rule(attributes: subtree(:attrs),
            value: sequence(:value)) do
         Utility.join_attr_value(
           attrs.is_a?(Hash) ? nil : attrs,
-          value.flatten,
+          value&.flatten.compact,
         )
       end
     end

data/lib/plurimath/utility.rb

@@ -315,7 +315,7 @@ module Plurimath
           attrs.parameter_two = filter_values(value)
           attrs
         elsif attrs.is_a?(Math::Function::Fenced)
-          attrs.parameter_two = value
+          attrs.parameter_two = value.compact
           attrs
         elsif attrs.is_a?(Math::Function::FontStyle)
           attrs.parameter_one = filter_values(value)

data/lib/plurimath/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plurimath
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-13 00:00:00.000000000 Z
+date: 2023-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -158,6 +158,7 @@ files:
 - lib/plurimath/math/function/scarry.rb
 - lib/plurimath/math/function/sec.rb
 - lib/plurimath/math/function/sech.rb
+- lib/plurimath/math/function/semantics.rb
 - lib/plurimath/math/function/sin.rb
 - lib/plurimath/math/function/sinh.rb
 - lib/plurimath/math/function/sqrt.rb