plurimath 0.8.17 → 0.8.18

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

@@ -2,13 +2,20 @@
 
 require "htmlentities"
 require_relative "unary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Text < UnaryFunction
+        include Mathml::Utility
+
         PARSER_REGEX = %r{unicode\[:(?<unicode>\w{1,})\]}.freeze
 
+        def initialize(parameter_one = "")
+          super(parameter_one)
+        end
+
         def to_asciimath(**)
           "\"#{parse_text('asciimath') || parameter_one}\""
         end
@@ -67,12 +74,25 @@ module Plurimath
           "#{spacing}\"#{dump_omml(self, display_style, options: options)}\" text\n"
         end
 
+        def to_unicodemath_math_zone(spacing, _, _, options:)
+          "#{spacing}#{to_unicodemath(options: options)} text\n"
+        end
+
         def value
           parameter_one
         end
 
-        def to_unicodemath_math_zone(spacing, _, _, options:)
-          "#{spacing}#{to_unicodemath(options: options)} text\n"
+        def element_order=(*); end
+
+        def value=(text)
+          text = text.join if text.is_a?(Array)
+          entities = HTMLEntities.new
+          symbols  = Mathml::Constants::UNICODE_SYMBOLS.transform_keys(&:to_s)
+          text     = entities.encode(text, :hexadecimal)
+          symbols.each do |code, string|
+            text = text.gsub(code.downcase, "unicode[:#{string}]")
+          end
+          self.parameter_one = text
         end
 
         protected

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

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "unary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Tr < UnaryFunction
+        include Mathml::Utility
+
         def initialize(parameter_one = [])
           parameter_one.map!.with_index { |_, index| Td.new([]) } if parameter_one&.all?("@")
           super(parameter_one)
@@ -93,6 +96,16 @@ module Plurimath
           row_lines.shift if row_lines.first.is_a?(Math::Symbols::Hline)
           first_value
         end
+
+        def mtd_value=(value)
+          return if value.nil? || value.empty?
+
+          self.parameter_one = replace_order_with_value(
+            clear_temp_order,
+            update_temp_mathml_values(value),
+            "mtd"
+          )
+        end
       end
     end
   end

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

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
+require_relative "../../mathml/utility"
 require_relative "ternary_function"
 
 module Plurimath
   module Math
     module Function
       class Underover < TernaryFunction
+        include Mathml::Utility
+
         FUNCTION = {
           name: "UnderOver",
           first_value: "base",

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

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
 require_relative "binary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Underset < BinaryFunction
+        include Mathml::Utility
+
         attr_accessor :options
+
         FUNCTION = {
           name: "underscript",
           first_value: "underscript value",
@@ -21,6 +25,13 @@ module Plurimath
           @options = options unless options.empty?
         end
 
+        def element_order=(value)
+          @temp_mathml_order = validated_order(
+            value,
+            rejectable_array: ["comment"]
+          )
+        end
+
         def to_mathml_without_math_tag(intent, options:)
           value_array = [
             validate_mathml_fields(parameter_two, intent, options: options),
@@ -79,8 +90,41 @@ module Plurimath
           parameter_two.is_nary_function? || parameter_two.is_nary_symbol?
         end
 
+        def content=(value)
+          if no_content_in?(Array(value))
+            delete_all_text
+          else
+            new_val = Array(value).map do |val|
+              validate_symbols(val) unless val.strip.empty?
+            end
+            validate_text_order(new_val)
+          end
+          update_temp_mathml_values(@temp_mathml_order)
+        end
+
         protected
 
+        def validate_text_order(value)
+          @temp_mathml_order.each_with_index do |item, index|
+            next unless item == "text"
+
+            shifted_value = value.shift
+            next @temp_mathml_order[index] = shifted_value if shifted_value
+
+            @temp_mathml_order.delete_at(index)
+          end
+        end
+
+        def delete_all_text
+          @temp_mathml_order.delete("text")
+        end
+
+        def no_content_in?(value)
+          value.nil? ||
+            value.empty? ||
+            value&.all? { |val| val.strip.empty? }
+        end
+
         def unicode_accent?(field)
           return unless field.is_a?(Math::Symbols::Symbol)
 

data/lib/plurimath/math/number.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
+require_relative "../mathml/utility"
+
 module Plurimath
   module Math
     class Number < Core
       attr_accessor :value, :mini_sub_sized, :mini_sup_sized
+      include Mathml::Utility
 
-      def initialize(value, mini_sub_sized: false, mini_sup_sized: false)
+      def initialize(value = nil, mini_sub_sized: false, mini_sup_sized: false)
         @value = value.is_a?(Parslet::Slice) ? value.to_s : value
         @mini_sub_sized = mini_sub_sized if mini_sub_sized
         @mini_sup_sized = mini_sup_sized if mini_sup_sized
@@ -18,6 +21,8 @@ module Plurimath
           object.mini_sup_sized == mini_sup_sized
       end
 
+      def element_order=(*); end
+
       def to_asciimath(options:)
         format_value_with_options(options)
       end
@@ -71,6 +76,10 @@ module Plurimath
         mini_sub_sized || mini_sup_sized
       end
 
+      def value=(value)
+        @value = value.is_a?(Array) ? value.join : value
+      end
+
       protected
 
       def mini_sub

data/lib/plurimath/math/symbols/gg.rb

@@ -3,10 +3,10 @@ module Plurimath
     module Symbols
       class Gg < Symbol
         INPUT = {
-          unicodemath: [["gg", "&#x226b;"]],
-          asciimath: [["&#x226b;"], parsing_wrapper(["gg"], lang: :asciimath)],
+          unicodemath: ["gg", "&#x226b;", parsing_wrapper(["mgt"], lang: :unicode)],
+          asciimath: ["&#x226b;", "gg", "mgt"],
           mathml: ["&#x226b;"],
-          latex: [["gg", "&#x226b;"]],
+          latex: ["gg", "&#x226b;", parsing_wrapper(["mgt"], lang: :latex)],
           omml: ["&#x226b;"],
           html: ["&#x226b;"],
         }.freeze
@@ -17,7 +17,7 @@ module Plurimath
         end
 
         def to_asciimath(**)
-          parsing_wrapper("gg", lang: :asciimath)
+          "gg"
         end
 
         def to_unicodemath(**)

data/lib/plurimath/math/symbols/ll.rb

@@ -3,10 +3,10 @@ module Plurimath
     module Symbols
       class Ll < Symbol
         INPUT = {
-          unicodemath: [["ll", "&#x226a;"]],
-          asciimath: [["&#x226a;"], parsing_wrapper(["ll"], lang: :asciimath)],
+          unicodemath: ["ll", "&#x226a;", parsing_wrapper(["mlt"], lang: :unicode)],
+          asciimath: ["&#x226a;", "ll", "mlt"],
           mathml: ["&#x226a;"],
-          latex: [["ll", "&#x226a;"]],
+          latex: ["ll", "&#x226a;", parsing_wrapper(["mlt"], lang: :latex)],
           omml: ["&#x226a;"],
           html: ["&#x226a;"],
         }.freeze
@@ -17,7 +17,7 @@ module Plurimath
         end
 
         def to_asciimath(**)
-          parsing_wrapper("ll", lang: :asciimath)
+          "ll"
         end
 
         def to_unicodemath(**)

data/lib/plurimath/math/symbols/minus.rb

@@ -5,7 +5,7 @@ module Plurimath
         INPUT = {
           unicodemath: [["−", "-"], parsing_wrapper(["minus"], lang: :unicode)],
           asciimath: [["-", "−"], parsing_wrapper(["minus"], lang: :asciimath)],
-          mathml: ["−"],
+          mathml: ["−", "-"],
           latex: [["minus", "-", "−"]],
           omml: ["−"],
           html: ["−"],

data/lib/plurimath/math/symbols/symbol.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
+require_relative "../../mathml/utility"
+
 module Plurimath
   module Math
     module Symbols
       class Symbol < Core
+        include Mathml::Utility
+
         attr_accessor :value, :slashed, :mini_sub_sized, :mini_sup_sized, :options
 
         INPUT = {}.freeze
@@ -13,7 +17,7 @@ module Plurimath
                        mini_sub_sized: false,
                        mini_sup_sized: false,
                        options: {})
-          @value = sym.is_a?(Parslet::Slice) ? sym.to_s : sym
+          @value = sym.is_a?(Array) ? sym.join : sym&.to_s
           @slashed = slashed if slashed
           @mini_sub_sized = mini_sub_sized if mini_sub_sized
           @mini_sup_sized = mini_sup_sized if mini_sup_sized
@@ -22,7 +26,7 @@ module Plurimath
 
         def ==(object)
           object.respond_to?(:value) &&
-            object.class == object.class &&
+            object.class == self.class &&
             object.value == value &&
             object.slashed == slashed &&
             object.mini_sub_sized == mini_sub_sized &&
@@ -36,6 +40,10 @@ module Plurimath
           value
         end
 
+        def value=(value)
+          @value = value.is_a?(Array) ? value.join : value.to_s
+        end
+
         def to_mathml_without_math_tag(intent, **)
           if value&.include?("&#x2147;")
             attributes = {
@@ -45,7 +53,7 @@ module Plurimath
           mi_tag = ox_element("mi", attributes: attributes)
           return mi_tag if ["{:", ":}"].include?(value)
 
-          mi_tag << value
+          value ? mi_tag << value : mi_tag
         end
 
         def to_latex(**)
@@ -108,7 +116,7 @@ module Plurimath
             self.is_a?(Math::Symbols::Ampersand)
         end
 
-        def linebreak
+        def linebreak?
           value == "\\\\"
         end
 

data/lib/plurimath/math.rb

@@ -13,6 +13,8 @@ require_relative "math/core"
 require_relative "math/number"
 require_relative "math/symbols"
 require_relative "math/formula"
+require_relative "math/formula/mrow"
+require_relative "math/formula/mstyle"
 require_relative "math/function"
 require_relative "asciimath/parser"
 require_relative "unicode_math/parser"

data/lib/plurimath/mathml/parser.rb

@@ -1,106 +1,65 @@
 # frozen_string_literal: true
 
 require_relative "constants"
-require_relative "transform"
+
 module Plurimath
   class Mathml
     class Parser
       attr_accessor :text
 
-      SUPPORTED_ATTRS = %w[
-        linebreakstyle
-        linethickness
-        columnlines
-        mathvariant
-        accentunder
-        separators
-        linebreak
-        mathcolor
-        notation
-        bevelled
-        rowlines
-        intent
-        accent
-        height
-        frame
-        depth
-        height
-        width
-        index
-        close
-        alt
-        src
-        open
-      ].freeze
-
       def initialize(text)
+        mml_config
         @text = text
       end
 
       def parse
-        ox_nodes = Plurimath.xml_engine.load(text)
-        display_style = ox_nodes&.locate("mstyle/@displaystyle")&.first
-        nodes = parse_nodes(Array(ox_nodes))
-        Math::Formula.new(
-          Transform.new.apply(nodes).flatten.compact,
-          display_style: (display_style || true),
-        )
+        namespace_exist = text.split(">").first.include?(" xmlns=")
+        ::Mml.parse(text, namespace_exist: namespace_exist)
       end
 
-      protected
-
-      def parse_nodes(nodes)
-        nodes.map do |node|
-          next if Plurimath.xml_engine.is_xml_comment?(node)
-
-          if node.is_a?(String)
-            node
-          elsif !node.attributes.empty?
-            attrs_hash(node)
-          else
-            manage_tags(node)
-          end
-        end
-      end
-
-      def validate_attributes(attributes)
-        attributes&.select! { |key, _| SUPPORTED_ATTRS.include?(key.to_s) }
-        attributes&.transform_keys(&:to_sym) if attributes&.any?
-      end
+      private
 
-      def attrs_hash(node)
-        {
-          node.name.to_sym => {
-            attributes: validate_attributes(node.attributes),
-            value: parse_nodes(node.nodes),
-          },
+      def mml_config
+        ::Mml::Configuration.config = {
+          mmultiscripts: Plurimath::Math::Function::Multiscript,
+          mlabeledtr: Plurimath::Math::Function::Mlabeledtr,
+          munderover: Plurimath::Math::Function::Underover,
+          semantics: Plurimath::Math::Function::Semantics,
+          mscarries: Plurimath::Math::Function::Scarries,
+          mfraction: Plurimath::Math::Function::Frac,
+          menclose: Plurimath::Math::Function::Menclose,
+          mlongdiv: Plurimath::Math::Function::Longdiv,
+          mphantom: Plurimath::Math::Function::Phantom,
+          msubsup: Plurimath::Math::Function::PowerBase,
+          msgroup: Plurimath::Math::Function::Msgroup,
+          mpadded: Plurimath::Math::Function::Mpadded,
+          mfenced: Plurimath::Math::Function::Fenced,
+          mstack: Plurimath::Math::Function::Stackrel,
+          munder: Plurimath::Math::Function::Underset,
+          msline: Plurimath::Math::Function::Msline,
+          merror: Plurimath::Math::Function::Merror,
+          mtable: Plurimath::Math::Function::Table,
+          mstyle: Plurimath::Math::Formula::Mstyle,
+          mglyph: Plurimath::Math::Function::Mglyph,
+          mover: Plurimath::Math::Function::Overset,
+          msqrt: Plurimath::Math::Function::Sqrt,
+          mroot: Plurimath::Math::Function::Root,
+          mtext: Plurimath::Math::Function::Text,
+          mfrac: Plurimath::Math::Function::Frac,
+          msrow: Plurimath::Math::Formula,
+          msup: Plurimath::Math::Function::Power,
+          msub: Plurimath::Math::Function::Base,
+          none: Plurimath::Math::Function::None,
+          mrow: Plurimath::Math::Formula::Mrow,
+          math: Plurimath::Math::Formula,
+          mtd: Plurimath::Math::Function::Td,
+          mtr: Plurimath::Math::Function::Tr,
+          mi: Plurimath::Math::Symbols::Symbol,
+          mo: Plurimath::Math::Symbols::Symbol,
+          ms: Plurimath::Math::Function::Ms,
+          mn: Plurimath::Math::Number,
         }
-      end
-
-      def manage_tags(node)
-        if node.name == "ms"
-          Plurimath::xml_engine.replace_nodes(
-            node,
-            ms_tag(comment_remove(node.nodes)).join(" "),
-          )
-        end
-        { node.name.to_sym => parse_nodes(node.nodes) }
-      end
-
-      def ms_tag(nodes)
-        return nodes if nodes.any?(String)
-
-        nodes.map do |node|
-          if node.nodes.any?(String)
-            node.nodes
-          else
-            ms_tag(node.nodes)
-          end
-        end
-      end
-
-      def comment_remove(nodes)
-        nodes.delete_if { |node| Plurimath.xml_engine.is_xml_comment?(node)  }
+        require "mml" unless ::Mml.respond_to?(:config)
       end
     end
   end