plurimath 0.6.0 → 0.7.0

data/lib/plurimath/utility.rb

@@ -21,6 +21,7 @@ module Plurimath
       mathrm: Math::Function::FontStyle::Normal,
       textrm: Math::Function::FontStyle::Normal,
       italic: Math::Function::FontStyle::Italic,
+      mathit: Math::Function::FontStyle::Italic,
       mathbf: Math::Function::FontStyle::Bold,
       textbf: Math::Function::FontStyle::Bold,
       script: Math::Function::FontStyle::Script,
@@ -46,6 +47,8 @@ module Plurimath
       arccos
       arcsin
       arctan
+      liminf
+      limsup
       right
       sech
       sinh
@@ -58,6 +61,7 @@ module Plurimath
       min
       sec
       sin
+      sup
       deg
       det
       dim
@@ -65,6 +69,8 @@ module Plurimath
       gcd
       glb
       lub
+      lcm
+      ker
       tan
       cos
       cot
@@ -103,14 +109,13 @@ module Plurimath
         table = []
         table_data = []
         table_row = []
-        table_separators = ["&", "\\\\"].freeze
         organize_options(array, column_align) if options
         string_columns = column_align&.map(&:value)
         array.each do |data|
-          if data.is_a?(Math::Symbol) && table_separators.include?(data.value)
+          if data&.separate_table
             table_row << Math::Function::Td.new(filter_table_data(table_data).compact)
             table_data = []
-            if data.value == "\\\\"
+            if data.linebreak
               organize_tds(table_row.flatten, string_columns.dup, options)
               table << Math::Function::Tr.new(table_row)
               table_row = []
@@ -230,12 +235,10 @@ module Plurimath
       end
 
       def filter_values(array)
-        return array unless array.is_a?(Array)
+        return array unless array.is_a?(Array) || array.is_a?(Math::Formula)
 
-        array = array.flatten.compact
-        if array.length > 1
-          return Math::Formula.new(array)
-        end
+        array = array.is_a?(Math::Formula) ? array.value : array.flatten.compact
+        return Math::Formula.new(array) if array.length > 1
 
         array.first
       end
@@ -266,11 +269,6 @@ module Plurimath
         )
       end
 
-      def find_class_name(object)
-        new_object = object.value.first.parameter_one if object.is_a?(Math::Formula)
-        get_class(new_object) unless new_object.nil?
-      end
-
       def find_pos_chr(fonts_array, key)
         fonts_array.find { |d| d.is_a?(Hash) && d[key] }
       end
@@ -287,7 +285,8 @@ module Plurimath
       end
 
       def symbol_value(object, value)
-        object.is_a?(Math::Symbol) && object.value.include?(value)
+        (object.is_a?(Math::Symbol) && object.value.include?(value)) ||
+          (value == "\\\\" && object.is_a?(Math::Function::Linebreak))
       end
 
       def td_value(td_object)
@@ -299,20 +298,18 @@ module Plurimath
         td_object
       end
 
-      def mathml_unary_classes(text_array, omml: false)
+      def mathml_unary_classes(text_array, omml: false, unicode_only: false)
         return [] if text_array.empty?
 
         compacted = text_array.compact
-        string = if compacted.count == 1
-                   compacted.first
-                 else
-                   compacted.join
-                 end
-        return string unless string.is_a?(String)
+        return filter_values(compacted) unless compacted.any?(String)
 
+        string  = compacted.join
         classes = Mathml::Constants::CLASSES
         unicode = string_to_html_entity(string)
-        symbol  = Mathml::Constants::UNICODE_SYMBOLS[unicode.strip.to_sym]
+        return Math::Symbol.new(unicode) if unicode_only && unicode
+
+        symbol = Mathml::Constants::UNICODE_SYMBOLS[unicode.strip.to_sym]
         if classes.include?(symbol&.strip)
           get_class(symbol.strip).new
         elsif classes.any?(string&.strip)
@@ -347,17 +344,21 @@ module Plurimath
         value
       end
 
-      def join_attr_value(attrs, value)
+      def join_attr_value(attrs, value, unicode_only: false)
         if value.any?(String)
-          new_value = mathml_unary_classes(value)
+          new_value = mathml_unary_classes(value, unicode_only: unicode_only)
           array_value = Array(new_value)
-          attrs.nil? ? array_value : join_attr_value(attrs, array_value)
+          attrs.nil? ? array_value : join_attr_value(attrs, array_value, unicode_only: unicode_only)
         elsif attrs.nil?
           value
         elsif attrs.is_a?(String) && ["solid", "none"].include?(attrs.split.first.downcase)
           table_separator(attrs.split, value)
-        elsif attrs.is_a?(Hash) && (attrs.key?(:accent) || attrs.key?(:accentunder))
-          attr_is_accent(attrs, value)
+        elsif attrs.is_a?(Hash)
+          if (attrs.key?(:accent) || attrs.key?(:accentunder))
+            attr_is_accent(attrs, value)
+          elsif attrs.key?(:linebreak)
+            Math::Function::Linebreak.new(value.first, attrs)
+          end
         elsif attrs.is_a?(Math::Core)
           attr_is_function(attrs, value)
         end
@@ -470,7 +471,7 @@ module Plurimath
       end
 
       def valid_class(object)
-        text = object.extract_class_from_text
+        text = object.extract_class_name_from_text
         (object.extractable? && Asciimath::Constants::SUB_SUP_CLASSES.include?(text)) ||
           Latex::Constants::SYMBOLS[text.to_sym] == :power_base
       end

data/lib/plurimath/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plurimath
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-21 00:00:00.000000000 Z
+date: 2023-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -135,6 +135,7 @@ files:
 - lib/plurimath/math/function/liminf.rb
 - lib/plurimath/math/function/limits.rb
 - lib/plurimath/math/function/limsup.rb
+- lib/plurimath/math/function/linebreak.rb
 - lib/plurimath/math/function/ln.rb
 - lib/plurimath/math/function/log.rb
 - lib/plurimath/math/function/longdiv.rb
@@ -162,7 +163,6 @@ files:
 - lib/plurimath/math/function/root.rb
 - lib/plurimath/math/function/rule.rb
 - lib/plurimath/math/function/scarries.rb
-- lib/plurimath/math/function/scarry.rb
 - lib/plurimath/math/function/sec.rb
 - lib/plurimath/math/function/sech.rb
 - lib/plurimath/math/function/semantics.rb

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

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "unary_function"
-
-module Plurimath
-  module Math
-    module Function
-      class Scarry < UnaryFunction
-      end
-    end
-  end
-end