plurimath 0.8.16 → 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/unary_function.rb

@@ -35,7 +35,7 @@ module Plurimath
             new_arr += mathml_value(intent, options: options)
             mrow = ox_element("mrow")
             Utility.update_nodes(mrow, new_arr)
-            intentify(mrow, intent, func_name: :function, intent_name: :function)
+            intentify(mrow, intent, func_name: :function, intent_name: intent_names[:name])
           else
             new_arr.first
           end
@@ -153,6 +153,10 @@ module Plurimath
           !parameter_one
         end
 
+        def intent_names
+          { name: ":function" }
+        end
+
         protected
 
         def asciimath_value(options:)

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

@@ -36,6 +36,10 @@ module Plurimath
           "⋀"
         end
 
+        def nary_intent_name
+          ":n-ary"
+        end
+
         def is_nary_symbol?
           true
         end

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

@@ -35,10 +35,6 @@ module Plurimath
         def to_html(**)
           "∩"
         end
-
-        def is_nary_symbol?
-          true
-        end
       end
     end
   end

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

@@ -41,7 +41,7 @@ module Plurimath
         end
 
         def nary_intent_name
-          "n-ary"
+          ":n-ary"
         end
 
         def tag_name

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

@@ -41,7 +41,7 @@ module Plurimath
         end
 
         def nary_intent_name
-          "anticlockwise contour integral"
+          ":anticlockwise contour integral"
         end
 
         def tag_name

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

@@ -41,7 +41,7 @@ module Plurimath
         end
 
         def nary_intent_name
-          "coproduct"
+          ":coproduct"
         end
       end
     end

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

@@ -37,6 +37,10 @@ module Plurimath
           "ⅆ"
         end
 
+        def intent_names
+          { name: encoded }
+        end
+
         private
 
         def encoded

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

@@ -36,6 +36,10 @@ module Plurimath
           "⋂"
         end
 
+        def nary_intent_name
+          ":n-ary"
+        end
+
         def is_nary_symbol?
           true
         end

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

@@ -36,6 +36,10 @@ module Plurimath
           "⋃"
         end
 
+        def nary_intent_name
+          ":n-ary"
+        end
+
         def is_nary_symbol?
           true
         end

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

@@ -37,6 +37,10 @@ module Plurimath
           "ⅈ"
         end
 
+        def intent_names
+          { name: encoded }
+        end
+
         private
 
         def encoded

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

@@ -41,7 +41,7 @@ module Plurimath
         end
 
         def nary_intent_name
-          "quadruple integral"
+          ":quadruple integral"
         end
       end
     end

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

@@ -36,6 +36,10 @@ module Plurimath
           "∭"
         end
 
+        def nary_intent_name
+          ":triple integral"
+        end
+
         def is_nary_symbol?
           true
         end

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

@@ -41,7 +41,7 @@ module Plurimath
         end
 
         def nary_intent_name
-          "double integral"
+          ":double integral"
         end
       end
     end

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

@@ -41,7 +41,7 @@ module Plurimath
         end
 
         def nary_intent_name
-          "clockwise contour integral"
+          ":clockwise contour integral"
         end
 
         def tag_name

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

@@ -36,6 +36,10 @@ module Plurimath
         def to_html(**)
           "⊺"
         end
+
+        def intent_names
+          { name: "transpose" }
+        end
       end
     end
   end

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

@@ -37,6 +37,10 @@ module Plurimath
           "ⅉ"
         end
 
+        def intent_names
+          { name: encoded }
+        end
+
         private
 
         def encoded

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

@@ -41,7 +41,7 @@ module Plurimath
         end
 
         def nary_intent_name
-          "volume integral"
+          ":volume integral"
         end
 
         def tag_name

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

@@ -41,7 +41,7 @@ module Plurimath
         end
 
         def nary_intent_name
-          "surface integral"
+          ":surface integral"
         end
 
         def tag_name

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

@@ -41,7 +41,7 @@ module Plurimath
         end
 
         def nary_intent_name
-          "contour integral"
+          ":contour integral"
         end
 
         def tag_name

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/symbols/upcase_dd.rb

@@ -37,6 +37,10 @@ module Plurimath
           "ⅅ"
         end
 
+        def intent_names
+          { name: encoded }
+        end
+
         private
 
         def encoded

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"