plurimath 0.10.0 → 0.10.2

data/lib/plurimath/math/formula.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "../mathml/utility"
-
 module Plurimath
   module Math
     class Formula < Core
-      include Mathml::Utility
+      autoload :Mrow, "#{__dir__}/formula/mrow"
+      autoload :Mstyle, "#{__dir__}/formula/mstyle"
+
+      include Mathml::FormulaTransformation
 
       attr_accessor :value, :left_right_wrapper, :displaystyle, :input_string, :display
 
@@ -54,11 +55,12 @@ module Plurimath
 
       def to_asciimath(formatter: nil, unitsml: {}, options: nil)
         options ||= { formatter: formatter, unitsml: unitsml }.compact
-        output = value.map do |val|
-          val.to_asciimath(options: asciimath_table_options(options, val))
-        end.join(" ")
-      rescue
-        parse_error!(:asciimath)
+        options[:formula] ||= self
+        wrap_render_error(:asciimath) do
+          value.map do |val|
+            val.to_asciimath(options: asciimath_table_options(options, val))
+          end.join(" ")
+        end
       end
 
       def to_mathml(
@@ -74,21 +76,22 @@ module Plurimath
           unitsml: unitsml,
           unary_function_spacing: unary_function_spacing
         }.compact
+        options[:formula] ||= self
         return line_breaked_mathml(display_style, intent, options: options) if split_on_linebreak
 
-        math_attrs = {
-          xmlns: "http://www.w3.org/1998/Math/MathML",
-          display: "block",
-        }
-        style_attrs = { displaystyle: boolean_display_style(display_style) }
-        math  = ox_element("math", attributes: math_attrs)
-        style = ox_element("mstyle", attributes: style_attrs)
-        Utility.update_nodes(style, mathml_content(intent, options: options))
-        Utility.update_nodes(math, [style])
-        unitsml_post_processing(math, style)
-        dump_nodes(math, indent: 2)
-      rescue
-        parse_error!(:mathml)
+        wrap_render_error(:mathml) do
+          math_attrs = {
+            xmlns: "http://www.w3.org/1998/Math/MathML",
+            display: "block",
+          }
+          style_attrs = { displaystyle: boolean_display_style(display_style) }
+          math  = ox_element("math", attributes: math_attrs)
+          style = ox_element("mstyle", attributes: style_attrs)
+          Utility.update_nodes(style, mathml_content(intent, options: options))
+          Utility.update_nodes(math, [style])
+          unitsml_post_processing(math, style)
+          dump_nodes(math, indent: 2)
+        end
       end
 
       def line_breaked_mathml(display_style, intent, options:)
@@ -119,34 +122,37 @@ module Plurimath
 
       def to_latex(formatter: nil, unitsml: {}, options: nil)
         options ||= { formatter: formatter, unitsml: unitsml }.compact
-        value.map { |val| val.to_latex(options: options) }.join(" ")
-      rescue
-        parse_error!(:latex)
+        options[:formula] ||= self
+        wrap_render_error(:latex) do
+          value.map { |val| val.to_latex(options: options) }.join(" ")
+        end
       end
 
       def to_html(formatter: nil, unitsml: {}, options: nil)
         options ||= { formatter: formatter, unitsml: unitsml }.compact
-        value&.map { |val| val.to_html(options: options) }&.join(" ")
-      rescue
-        parse_error!(:html)
+        options[:formula] ||= self
+        wrap_render_error(:html) do
+          value&.map { |val| val.to_html(options: options) }&.join(" ")
+        end
       end
 
       def to_omml(display_style: displaystyle, split_on_linebreak: false, formatter: nil, unitsml: {})
-        objects = split_on_linebreak ? new_line_support : [self]
-        options = { formatter: formatter, unitsml: unitsml }.compact
-        para_element = Utility.ox_element("oMathPara", attributes: OMML_NAMESPACES, namespace: "m")
-        objects.each.with_index(1) do |object, index|
-          para_element << Utility.update_nodes(
-            Utility.ox_element("oMath", namespace: "m"),
-            object.omml_content(boolean_display_style(display_style), options: options),
-          )
-          next if objects.length == index
+        wrap_render_error(:omml) do
+          objects = split_on_linebreak ? new_line_support : [self]
+          options = { formatter: formatter, unitsml: unitsml }.compact
+          options[:formula] ||= self
+          para_element = Utility.ox_element("oMathPara", attributes: OMML_NAMESPACES, namespace: "m")
+          objects.each.with_index(1) do |object, index|
+            para_element << Utility.update_nodes(
+              Utility.ox_element("oMath", namespace: "m"),
+              object.omml_content(boolean_display_style(display_style), options: options),
+            )
+            next if objects.length == index
 
-          para_element << omml_br_tag
+            para_element << omml_br_tag
+          end
+          dump_nodes(para_element, indent: 2)
         end
-        dump_nodes(para_element, indent: 2)
-      rescue
-        parse_error!(:omml)
       end
 
       def omml_content(display_style, options:)
@@ -159,9 +165,10 @@ module Plurimath
 
       def to_unicodemath(formatter: nil, unitsml: {}, options: nil)
         options ||= { formatter: formatter, unitsml: unitsml }.compact
-        Utility.html_entity_to_unicode(unicodemath_value(options: options)).gsub(/\s\/\s/, "/")
-      rescue
-        parse_error!(:unicodemath)
+        options[:formula] ||= self
+        wrap_render_error(:unicodemath) do
+          Utility.html_entity_to_unicode(unicodemath_value(options: options)).gsub(/\s\/\s/, "/")
+        end
       end
 
       def to_display(type = nil, formatter: nil, unitsml: {}, unary_function_spacing: true)
@@ -170,6 +177,7 @@ module Plurimath
           unitsml: unitsml,
           unary_function_spacing: unary_function_spacing
         }
+        options[:formula] ||= self
         return type_error!(type) unless MATH_ZONE_TYPES.include?(type.downcase.to_sym)
 
         math_zone = case type
@@ -305,10 +313,6 @@ module Plurimath
         }
       end
 
-      def element_order=(value)
-        @value = validated_order(value.map(&:name))
-      end
-
       # Attributes start
       def mathcolor=(value)
         return if value.nil? || value.empty?
@@ -352,244 +356,6 @@ module Plurimath
       end
       # Attributes end
 
-      def ms_value=(value)
-        return if value.nil? || value.empty?
-
-        update(
-          replace_order_with_value(
-            @value,
-            Array(validate_symbols(value)),
-            "ms"
-          )
-        )
-      end
-
-      def mi_value=(value)
-        return if value.nil? || value.empty?
-
-        value = update_temp_mathml_values(value) if value.any? do |val|
-          val.is_a?(Math::Core) && val.temp_mathml_order.any?
-        end
-        update(
-          replace_order_with_value(
-            @value,
-            Array(validate_symbols(value)).flatten,
-            "mi"
-          )
-        )
-      end
-
-      def mn_value=(value)
-        return if value.nil? || value.empty?
-
-        update(
-          replace_order_with_value(
-            @value,
-            Array(validate_symbols(value)),
-            "mn"
-          )
-        )
-      end
-
-      def mtext_value=(value)
-        return if value.nil? || value.empty?
-
-        update(
-          replace_order_with_value(
-            @value,
-            Array(validate_symbols(value)),
-            "mtext"
-          )
-        )
-      end
-
-      def mo_value=(value)
-        return if value.nil? || value.empty?
-
-        value = update_temp_mathml_values(value)
-        update(
-          replace_order_with_value(
-            @value,
-            Array(value),
-            "mo"
-          )
-        )
-      end
-
-      def mstyle_value=(value)
-        return if value.nil? || value.empty?
-
-        replacing_order = value.length > 1 && value.any?(String)
-        update(
-          filter_values(
-            replace_order_with_value(
-              @value,
-              Array(
-                filter_values(
-                  value,
-                  array_to_instance: true,
-                  replacing_order: replacing_order,
-                ),
-              ),
-              "mstyle"
-            )
-          )
-        )
-      end
-
-      def mrow_value=(value)
-        return if value.nil? || value.empty?
-
-        replacing_order = value.length > 1 && value.any?(String)
-        update(
-          replace_order_with_value(
-            @value,
-            filter_values(
-              value,
-              array_to_instance: true,
-              replacing_order: replacing_order
-            ),
-            "mrow"
-          )
-        )
-      end
-
-      def munderover_value=(value)
-        update_temp_order(value, "munderover")
-      end
-
-      def msub_value=(value)
-        update_temp_order(value, "msub")
-      end
-
-      def msup_value=(value)
-        update_temp_order(value, "msup")
-      end
-
-      def mover_value=(value)
-        update_temp_order(value, "mover")
-      end
-
-      def munder_value=(value)
-        update_temp_order(value, "munder")
-      end
-
-      def msubsup_value=(value)
-        update_temp_order(value, "msubsup")
-      end
-
-      def mfrac_value=(value)
-        update_temp_order(value, "mfrac")
-      end
-
-      def msqrt_value=(value)
-        update_temp_order(value, "msqrt")
-      end
-
-      def mfenced_value=(value)
-        update_temp_order(value, "mfenced")
-      end
-
-      def mroot_value=(value)
-        update_temp_order(value, "mroot")
-      end
-
-      def msgroup_value=(value)
-        update_temp_order(value, "msgroup")
-      end
-
-      def mscarries_value=(value)
-        update_temp_order(value, "mscarries")
-      end
-
-      def msline_value=(value)
-        update_temp_order(value, "msline")
-      end
-
-      def msrow_value=(value)
-        update_temp_order(value, "msrow")
-      end
-
-      def semantics_value=(value)
-        update_temp_order(value, "semantics")
-      end
-
-      def mstack_value=(value)
-        update_temp_order(value, "mstack")
-      end
-
-      def merror_value=(value)
-        return if value.nil? || value.empty?
-
-        update(
-          replace_order_with_value(
-            @value,
-            filter_values(update_temp_mathml_values(value)),
-            "merror"
-          )
-        )
-      end
-
-      def mlongdiv_value=(value)
-        update_temp_order(value, "mlongdiv")
-      end
-
-      def none_value=(_)
-        @value&.delete("none")
-      end
-
-      def maligngroup_value=(value)
-        @value&.delete("maligngroup")
-      end
-
-      def menclose_value=(value)
-        update_temp_order(value, "menclose")
-      end
-
-      def mspace_value=(value)
-        return if value.nil? || value.empty?
-
-        if value.first.linebreak
-          linebreak = Math::Function::Linebreak.new(
-            nil,
-            { linebreak: value.first.linebreak }
-          )
-          update(
-            replace_order_with_value(
-              @value,
-              [linebreak],
-              "mspace"
-            )
-          )
-        else
-          @value&.delete("mspace")
-        end
-      end
-
-      def malignmark_value=(value)
-        @value&.delete("malignmark")
-      end
-
-      def mpadded_value=(value)
-        update_temp_order(value, "mpadded")
-      end
-
-      def mfraction_value=(value)
-        update_temp_order(value, "mfraction")
-      end
-
-      def mmultiscripts_value=(value)
-        update_temp_order(value, "mmultiscripts")
-      end
-
-      def mphantom_value=(value)
-        update_temp_order(value, "mphantom")
-      end
-
-      def mglyph_value=(value)
-        update_temp_order(value, "mglyph")
-      end
-
       protected
 
       def asciimath_table_options(options, object)
@@ -598,22 +364,6 @@ module Plurimath
         options.merge(literal_comma: true)
       end
 
-      def update_temp_order(value, order_name)
-        return if value.nil? || value.empty?
-
-        update(
-          replace_order_with_value(
-            Array(@value),
-            Array(update_temp_mathml_values(value)),
-            order_name
-          )
-        )
-      end
-
-      def remove_order(order)
-        value.delete_if { |val| val.is_a?(String) && val == order }
-      end
-
       def boolean_display_style(display_style = displaystyle)
         YAML.safe_load(display_style.to_s)
       end
@@ -634,6 +384,14 @@ module Plurimath
         raise ParseError.new(input_string, type)
       end
 
+      def wrap_render_error(type)
+        yield
+      rescue ParseError
+        raise
+      rescue StandardError
+        parse_error!(type)
+      end
+
       def omml_br_tag
         r_tag = ox_element("r", namespace: "m")
         r_tag << ox_element("br")

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "binary_function"
 
 module Plurimath
   module Math

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math

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

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
-require_relative "binary_function"
-require_relative "../../mathml/utility"
 
 module Plurimath
   module Math
     module Function
       class Base < BinaryFunction
-        include Mathml::Utility
 
         attr_accessor :options
 

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

@@ -57,11 +57,11 @@ module Plurimath
         end
 
         def any_value_exist?
-          !(parameter_one.nil? || parameter_two.nil?)
+          (parameter_one || parameter_two)
         end
 
         def all_values_exist?
-          !(parameter_one.nil? && parameter_two.nil?)
+          (parameter_one && parameter_two)
         end
 
         def to_asciimath_math_zone(spacing, last = false, _, options:)
@@ -127,7 +127,7 @@ module Plurimath
         end
 
         def underover(display_style, options:)
-          return r_element(class_name, rpr_tag: false) unless all_values_exist?
+          return r_element(class_name, rpr_tag: false) unless any_value_exist?
 
           first_value = Symbols::Symbol.new(class_name)
           if !display_style
@@ -135,6 +135,8 @@ module Plurimath
             return power_base.to_omml_without_math_tag(display_style, options: options)
           end
 
+          # Build Overset from source argument positions, not OMML child names,
+          # so shared under/over functions keep the same format-neutral model.
           overset = Overset.new(first_value, parameter_two)
           return Array(overset.to_omml_without_math_tag(display_style, options: options)) unless parameter_one
 

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "binary_function"
 
 module Plurimath
   module Math

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unary_function"
 
 module Plurimath
   module Math