plurimath 0.8.17 → 0.8.18

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

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "unary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Longdiv < UnaryFunction
+        include Mathml::Utility
+
         def to_asciimath(options:)
           asciimath_value(options: options)
         end

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

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "binary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Menclose < BinaryFunction
+        include Mathml::Utility
+
         FUNCTION = {
           name: "enclosure",
           first_value: "enclosure type",

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

@@ -1,14 +1,17 @@
 # frozen_string_literal: true
 
 require_relative "unary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Merror < UnaryFunction
-        def to_asciimath(**);end
+        include Mathml::Utility
 
-        def to_latex(**);end
+        def to_asciimath(**); end
+
+        def to_latex(**); end
 
         def to_mathml_without_math_tag(intent, options:)
           merror = Utility.ox_element("merror")

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

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "unary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Mglyph < UnaryFunction
+        include Mathml::Utility
+
         def initialize(parameter_one = {})
           super(parameter_one)
         end
@@ -34,8 +37,32 @@ module Plurimath
           parameter_one[:alt] if parameter_one
         end
 
+        def alt; end
+
+        def src; end
+
+        def index; end
+
+        def src=(value)
+          set_option(:src, value)
+        end
+
+        def alt=(value)
+          set_option(:alt, value)
+        end
+
+        def index=(value)
+          set_option(:index, value)
+        end
+
         protected
 
+        def set_option(option, value)
+          return if value.nil?
+
+          parameter_one[option] = value
+        end
+
         def glyph_user_index(index)
           return "" unless index > 0
 

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

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "binary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Mlabeledtr < BinaryFunction
+        include Mathml::Utility
+
         def to_mathml_without_math_tag(intent, options:)
           table = ox_element("mtable")
           mlabeledtr = ox_element(class_name)
@@ -18,6 +21,22 @@ module Plurimath
           "#{parameter_one&.to_unicodemath(options: options)}##{parameter_two&.value}"
         end
 
+        def id=(value)
+          return if value.nil?
+
+          @parameter_two = Text.new(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
+
         protected
 
         def labeledtr_td(tr, value)

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

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
 require_relative "unary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Mpadded < UnaryFunction
+        include Mathml::Utility
+
         attr_accessor :options
+
         ZERO_TAGS = {
           height: "zeroAsc",
           depth: "zeroDesc",
@@ -58,11 +62,34 @@ module Plurimath
           end
         end
 
+        def voffset; end
+
+        def voffset=(value); end
+
+        def height=(value)
+          set_option(:height, value)
+        end
+
+        def depth=(value)
+          set_option(:depth, value)
+        end
+
+        def width=(value)
+          set_option(:width, value)
+        end
+
         protected
 
+        def set_option(option, value)
+          return if value.nil?
+
+          @options ||= {}
+          @options[option] = value
+        end
+
         def phant_pr
           attributes = { "m:val": "on" }
-          options.map do |atr, value|
+          options&.map do |atr, value|
             ox_element(ZERO_TAGS[atr], attributes: attributes) if attr_value_zero?(value)
           end
         end

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

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "unary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Ms < UnaryFunction
+        include Mathml::Utility
+
         def to_mathml_without_math_tag(intent, **)
           Utility.ox_element("ms") << parameter_one
         end
@@ -27,6 +30,83 @@ module Plurimath
         def to_unicodemath(options:)
           Text.new(parameter_one).to_unicodemath(options: options)
         end
+
+        def value
+          parameter_one
+        end
+
+        def value=(content)
+          internal_content = updated_temp_mathml_values.flatten.map(&:to_ms_value)
+          @parameter_one = [internal_content, content.is_a?(String) ? content : content].flatten.compact.join(" ")
+        end
+
+        def mi_value=(value)
+          return if value.nil?
+
+          @temp_mathml_order = replace_order_with_value(
+            @temp_mathml_order,
+            value,
+            "mi"
+          )
+        end
+
+        def mn_value=(value)
+          return if value.nil?
+
+          @temp_mathml_order = replace_order_with_value(
+            @temp_mathml_order,
+            value,
+            "mn"
+          )
+        end
+
+        def mo_value=(value)
+          return if value.nil?
+
+          @temp_mathml_order = replace_order_with_value(
+            @temp_mathml_order,
+            value,
+            "mo"
+          )
+        end
+
+        def msub_value=(value)
+          return if value.nil?
+
+          @temp_mathml_order = replace_order_with_value(
+            @temp_mathml_order,
+            value,
+            "msub"
+          )
+        end
+
+        def msup_value=(value)
+          return if value.nil?
+
+          @temp_mathml_order = replace_order_with_value(
+            @temp_mathml_order,
+            value,
+            "msup"
+          )
+        end
+
+        def msubsup_value=(value)
+          return if value.nil?
+
+          @temp_mathml_order = replace_order_with_value(
+            @temp_mathml_order,
+            value,
+            "msubsup"
+          )
+        end
+
+        def updated_temp_mathml_values
+          @temp_mathml_order.map do |element|
+            next element if element.is_a?(Math::Symbols::Symbol)
+
+            update_temp_mathml_values([element])
+          end
+        end
       end
     end
   end

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

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "unary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Msgroup < UnaryFunction
+        include Mathml::Utility
+
         def to_asciimath(options:)
           parameter_one.map { |param| param.to_asciimath(options: options) }.join
         end
@@ -71,6 +74,18 @@ module Plurimath
         def line_breaking(obj)
           custom_array_line_breaking(obj)
         end
+
+        def msgroup_text; end
+
+        def msgroup_text=(value)
+          return unless value
+
+          if value.is_a?(Array) && value.none? { |element| element.match?(/[^\s]/) }
+            @temp_mathml_order << Text.new(value.pop)
+          else
+            @temp_mathml_order << Text.new(value)
+          end
+        end
       end
     end
   end

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

@@ -1,14 +1,17 @@
 # frozen_string_literal: true
 
 require_relative "unary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Msline < UnaryFunction
-        def to_asciimath(**);end
+        include Mathml::Utility
 
-        def to_latex(**);end
+        def to_asciimath(**); end
+
+        def to_latex(**); end
 
         def to_mathml_without_math_tag(intent, **)
           ox_element("msline")

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

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "ternary_function"
+require_relative "../../mathml/utility"
+
 module Plurimath
   module Math
     module Function
       class Multiscript < TernaryFunction
+        include Mathml::Utility
+
         FUNCTION = {
           name: "multiscript",
           first_value: "base",
@@ -79,6 +83,16 @@ module Plurimath
           end
         end
 
+        def none_value=(value)
+          return if value.nil? || value.empty?
+
+          @temp_mathml_order = replace_order_with_value(
+            @temp_mathml_order,
+            value,
+            "none"
+          )
+        end
+
         private
 
         def prescripts

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

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "binary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Over < BinaryFunction
+        include Mathml::Utility
+
         FUNCTION = {
           name: "over",
           first_value: "numerator",

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

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
 require_relative "binary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Overset < BinaryFunction
+        include Mathml::Utility
+
         attr_accessor :options
+
         FUNCTION = {
           name: "overset",
           first_value: "base",
@@ -77,6 +81,13 @@ module Plurimath
           parameter_two.is_nary_function? || parameter_two.is_nary_symbol?
         end
 
+        def accent=(value)
+          return unless value
+
+          @options ||= {}
+          @options[:accent] = value
+        end
+
         protected
 
         def unicode_accent?(field)

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

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "unary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Phantom < UnaryFunction
+        include Mathml::Utility
+
         def to_asciimath(options:)
           "#{Array.new(asciimath_value(options: options)&.length, '\ ').join}"
         end

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

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

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

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

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

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "binary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Root < BinaryFunction
+        include Mathml::Utility
+
         FUNCTION = {
           name: "root",
           first_value: "radicand",

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

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "unary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Scarries < UnaryFunction
+        include Mathml::Utility
+
         def to_asciimath(options:)
           asciimath_value(options: options)
         end

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

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "binary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Semantics < BinaryFunction
+        include Mathml::Utility
+
         FUNCTION = {
           name: "semantics",
           first_value: "first argument",
@@ -41,6 +44,17 @@ module Plurimath
           end
         end
 
+        def annotation=(value)
+          return unless value
+
+          @parameter_two = [
+            {
+              annotation: value,
+            }
+          ]
+          @temp_mathml_order.delete("annotation")
+        end
+
         protected
 
         def other_tags(array, intent, options:)

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

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "unary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Sqrt < UnaryFunction
+        include Mathml::Utility
+
         attr_accessor :options
 
         def to_mathml_without_math_tag(intent, options:)

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

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "binary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Stackrel < BinaryFunction
+        include Mathml::Utility
+
         FUNCTION = {
           name: "stackrel",
           first_value: "above",

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

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
+require_relative "../../mathml/utility"
+
 module Plurimath
   module Math
     module Function
       class Table < Core
+        include Mathml::Utility
+
         attr_accessor :value, :open_paren, :close_paren, :options
 
         SIMPLE_TABLES = %w[array align split].freeze
@@ -137,10 +141,59 @@ module Plurimath
           }
         end
 
+        def mtr_value=(value)
+          return if value.nil? || value.empty?
+
+          self.value = replace_order_with_value(
+            clear_temp_order,
+            update_temp_mathml_values(value),
+            "mtr"
+          )
+        end
+
+        def mlabeledtr_value=(value)
+          return if value.nil? || value.empty?
+
+          self.value = replace_order_with_value(
+            clear_temp_order,
+            update_temp_mathml_values(value),
+            "mlabeledtr"
+          )
+        end
+
+        def frame=(value)
+          return if value.nil? || value.empty?
+
+          set_option(:frame, value)
+        end
+
+        def rowlines=(value)
+          return if value.nil? || value.empty?
+
+          set_option(:rowlines, value)
+        end
+
+        def columnlines=(value)
+          return if value.nil? || value.empty?
+          return if value.split.all? { |val| val.include?("none") }
+
+          Plurimath::Utility.table_separator(
+            value.split,
+            @value,
+          )
+          set_option(:columnlines, value)
+        end
+
         protected
 
+        def set_option(option, value)
+          @options ||= {}
+          @options[option] = value
+        end
+
         def mathml_parenthesis(field, intent, options:)
           return "" unless field
+
           if field&.class_name == "symbol"
             paren = field&.to_mathml_without_math_tag(intent, options: options)&.nodes&.first
             return invisible_paren?(paren) ? "" : paren.to_s

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

@@ -1,14 +1,17 @@
 # frozen_string_literal: true
 
 require_relative "binary_function"
+require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Td < BinaryFunction
+        include Mathml::Utility
+
         def initialize(parameter_one = nil, parameter_two = nil)
           parameter_one&.delete_if { |td| td == "&" }
-          super(parameter_one, parameter_two)
+          super(Array(parameter_one), parameter_two)
         end
 
         def to_asciimath(options:)