mml 2.2.1 → 2.3.0

data/lib/mml/base/none.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Mml
+  module Base
+    module None
+      # NOTE: class_eval resolves constants in module's lexical scope.
+      # Use fully qualified names (e.g., Mml::Namespace).
+      def self.included(klass)
+        klass.class_eval do
+          attribute :mathcolor, :string
+          attribute :mathbackground, :string
+
+          xml do
+            namespace Mml::Namespace
+            element "none"
+
+            map_attribute "mathcolor", to: :mathcolor
+            map_attribute "mathbackground", to: :mathbackground
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mml/base/semantics.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Mml
+  module Base
+    module Semantics
+      # NOTE: class_eval resolves constants in module's lexical scope.
+      # Use fully qualified names (e.g., Mml::Namespace).
+      def self.included(klass)
+        klass.class_eval do
+          attribute :annotation, :mi, collection: true
+
+          xml do
+            namespace Mml::Namespace
+            element "semantics"
+            mixed_content
+
+            map_element :annotation, to: :annotation
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mml/base/v3_only/operator_attrs.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Mml
+  module Base
+    module V3Only
+      # Operator attributes removed in MathML 4: fence, separator.
+      # These are valid in mathml4-legacy schema only.
+      module OperatorAttributes
+        def self.included(klass)
+          klass.class_eval do
+            attribute :fence, :string
+            attribute :separator, :string
+
+            xml do
+              namespace Mml::Namespace
+              map_attribute "fence", to: :fence
+              map_attribute "separator", to: :separator
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mml/base/v3_only/style_attrs.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Mml
+  module Base
+    module V3Only
+      # Style attributes removed in MathML 4.
+      # fence, separator: removed from <mo> default schema.
+      # groupalign, side, minlabelspacing: removed with mlabeledtr.
+      module StyleAttributes
+        def self.included(klass)
+          klass.class_eval do
+            attribute :fence, :string
+            attribute :groupalign, :string
+            attribute :separator, :string
+            attribute :side, :string
+            attribute :minlabelspacing, :string
+
+            xml do
+              namespace Mml::Namespace
+              map_attribute "fence", to: :fence
+              map_attribute "groupalign", to: :groupalign
+              map_attribute "separator", to: :separator
+              map_attribute "side", to: :side
+              map_attribute "minlabelspacing", to: :minlabelspacing
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mml/base/v3_only/table_attrs.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Mml
+  module Base
+    module V3Only
+      # Table attributes removed in MathML 4: groupalign, side, minlabelspacing.
+      # groupalign: no longer supported per spec.
+      # side, minlabelspacing: removed with mlabeledtr per spec.
+      # These are valid in mathml4-legacy schema only.
+      module TableAttributes
+        def self.included(klass)
+          klass.class_eval do
+            attribute :groupalign, :string
+            attribute :side, :string
+            attribute :minlabelspacing, :string
+
+            xml do
+              namespace Mml::Namespace
+              map_attribute "groupalign", to: :groupalign
+              map_attribute "side", to: :side
+              map_attribute "minlabelspacing", to: :minlabelspacing
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mml/base/v3_only.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Mml
+  module Base
+    module V3Only
+      autoload :OperatorAttributes, "#{__dir__}/v3_only/operator_attrs"
+      autoload :TableAttributes, "#{__dir__}/v3_only/table_attrs"
+      autoload :StyleAttributes, "#{__dir__}/v3_only/style_attrs"
+    end
+  end
+end

data/lib/mml/base/v4_attributes.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Mml
+  module Base
+    # Universal MathML 4 attributes (V4-only, not in V3).
+    # intent, arg, displaystyle, scriptlevel, mathcolor, mathbackground.
+    module V4Attributes
+      def self.included(klass)
+        klass.class_eval do
+          attribute :intent, :string
+          attribute :arg, :string
+          attribute :displaystyle, :string
+          attribute :scriptlevel, :integer
+          attribute :mathcolor, :string
+          attribute :mathbackground, :string
+
+          xml do
+            namespace Mml::Namespace
+            map_attribute "intent", to: :intent
+            map_attribute "arg", to: :arg
+            map_attribute "displaystyle", to: :displaystyle
+            map_attribute "scriptlevel", to: :scriptlevel
+            map_attribute "mathcolor", to: :mathcolor
+            map_attribute "mathbackground", to: :mathbackground
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mml/base.rb

@@ -0,0 +1,51 @@
+module Mml
+  module Base
+    autoload :Maction, "#{__dir__}/base/maction"
+    autoload :Maligngroup, "#{__dir__}/base/maligngroup"
+    autoload :Malignmark, "#{__dir__}/base/malignmark"
+    autoload :Math, "#{__dir__}/base/math"
+    autoload :Menclose, "#{__dir__}/base/menclose"
+    autoload :Merror, "#{__dir__}/base/merror"
+    autoload :Mfenced, "#{__dir__}/base/mfenced"
+    autoload :Mfrac, "#{__dir__}/base/mfrac"
+    autoload :Mfraction, "#{__dir__}/base/mfraction"
+    autoload :Mglyph, "#{__dir__}/base/mglyph"
+    autoload :Mi, "#{__dir__}/base/mi"
+    autoload :Mlabeledtr, "#{__dir__}/base/mlabeledtr"
+    autoload :Mlongdiv, "#{__dir__}/base/mlongdiv"
+    autoload :Mmultiscripts, "#{__dir__}/base/mmultiscripts"
+    autoload :Mn, "#{__dir__}/base/mn"
+    autoload :Mo, "#{__dir__}/base/mo"
+    autoload :Mover, "#{__dir__}/base/mover"
+    autoload :Mpadded, "#{__dir__}/base/mpadded"
+    autoload :Mphantom, "#{__dir__}/base/mphantom"
+    autoload :Mprescripts, "#{__dir__}/base/mprescripts"
+    autoload :Mroot, "#{__dir__}/base/mroot"
+    autoload :Mrow, "#{__dir__}/base/mrow"
+    autoload :Ms, "#{__dir__}/base/ms"
+    autoload :Mscarries, "#{__dir__}/base/mscarries"
+    autoload :Mscarry, "#{__dir__}/base/mscarry"
+    autoload :Msgroup, "#{__dir__}/base/msgroup"
+    autoload :Msline, "#{__dir__}/base/msline"
+    autoload :Mspace, "#{__dir__}/base/mspace"
+    autoload :Msqrt, "#{__dir__}/base/msqrt"
+    autoload :Msrow, "#{__dir__}/base/msrow"
+    autoload :Mstack, "#{__dir__}/base/mstack"
+    autoload :Mstyle, "#{__dir__}/base/mstyle"
+    autoload :Msub, "#{__dir__}/base/msub"
+    autoload :Msubsup, "#{__dir__}/base/msubsup"
+    autoload :Msup, "#{__dir__}/base/msup"
+    autoload :Mtable, "#{__dir__}/base/mtable"
+    autoload :Mtd, "#{__dir__}/base/mtd"
+    autoload :Mtext, "#{__dir__}/base/mtext"
+    autoload :Mtr, "#{__dir__}/base/mtr"
+    autoload :Munder, "#{__dir__}/base/munder"
+    autoload :Munderover, "#{__dir__}/base/munderover"
+    autoload :None, "#{__dir__}/base/none"
+    autoload :Semantics, "#{__dir__}/base/semantics"
+    autoload :V4Attributes, "#{__dir__}/base/v4_attributes"
+    autoload :DeprecatedFontAttributes,
+             "#{__dir__}/base/deprecated_font_attributes"
+    autoload :V3Only, "#{__dir__}/base/v3_only"
+  end
+end

data/lib/mml/common_elements.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Mml
+  class CommonElements < Lutaml::Model::Serializable
+    attribute :mmultiscripts_value, :mmultiscripts, collection: true
+    attribute :maligngroup_value, :maligngroup, collection: true
+    attribute :malignmark_value, :malignmark, collection: true
+    attribute :munderover_value, :munderover, collection: true
+    attribute :semantics_value, :semantics, collection: true
+    attribute :mscarries_value, :mscarries, collection: true
+    attribute :mfraction_value, :mfraction, collection: true
+    attribute :mphantom_value, :mphantom, collection: true
+    attribute :menclose_value, :menclose, collection: true
+    attribute :mlongdiv_value, :mlongdiv, collection: true
+    attribute :mpadded_value, :mpadded, collection: true
+    attribute :msubsup_value, :msubsup, collection: true
+    attribute :mscarry_value, :mscarry, collection: true
+    attribute :mfenced_value, :mfenced, collection: true
+    attribute :msgroup_value, :msgroup, collection: true
+    attribute :mglyph_value, :mglyph, collection: true
+    attribute :mstack_value, :mstack, collection: true
+    attribute :munder_value, :munder, collection: true
+    attribute :mtable_value, :mtable, collection: true
+    attribute :mstyle_value, :mstyle, collection: true
+    attribute :mspace_value, :mspace, collection: true
+    attribute :msline_value, :msline, collection: true
+    attribute :merror_value, :merror, collection: true
+    attribute :msrow_value, :msrow, collection: true
+    attribute :mfrac_value, :mfrac, collection: true
+    attribute :mover_value, :mover, collection: true
+    attribute :mroot_value, :mroot, collection: true
+    attribute :mtext_value, :mtext, collection: true
+    attribute :msqrt_value, :msqrt, collection: true
+    attribute :none_value, :none, collection: true
+    attribute :mrow_value, :mrow, collection: true
+    attribute :msub_value, :msub, collection: true
+    attribute :msup_value, :msup, collection: true
+    attribute :mi_value, :mi, collection: true
+    attribute :mo_value, :mo, collection: true
+    attribute :mn_value, :mn, collection: true
+    attribute :ms_value, :ms, collection: true
+
+    xml do
+      map_element "mmultiscripts", to: :mmultiscripts_value
+      map_element "maligngroup", to: :maligngroup_value
+      map_element "malignmark", to: :malignmark_value
+      map_element "munderover", to: :munderover_value
+      map_element "semantics", to: :semantics_value
+      map_element "mscarries", to: :mscarries_value
+      map_element "mfraction", to: :mfraction_value
+      map_element "mphantom", to: :mphantom_value
+      map_element "menclose", to: :menclose_value
+      map_element "mlongdiv", to: :mlongdiv_value
+      map_element "mpadded", to: :mpadded_value
+      map_element "msubsup", to: :msubsup_value
+      map_element "mscarry", to: :mscarry_value
+      map_element "mfenced", to: :mfenced_value
+      map_element "msgroup", to: :msgroup_value
+      map_element "mglyph", to: :mglyph_value
+      map_element "mstack", to: :mstack_value
+      map_element "munder", to: :munder_value
+      map_element "mtable", to: :mtable_value
+      map_element "mstyle", to: :mstyle_value
+      map_element "mspace", to: :mspace_value
+      map_element "msline", to: :msline_value
+      map_element "merror", to: :merror_value
+      map_element "msrow", to: :msrow_value
+      map_element "mfrac", to: :mfrac_value
+      map_element "mover", to: :mover_value
+      map_element "mroot", to: :mroot_value
+      map_element "mtext", to: :mtext_value
+      map_element "msqrt", to: :msqrt_value
+      map_element "none", to: :none_value
+      map_element "mrow", to: :mrow_value
+      map_element "msub", to: :msub_value
+      map_element "msup", to: :msup_value
+      map_element "mi", to: :mi_value
+      map_element "mo", to: :mo_value
+      map_element "mn", to: :mn_value
+      map_element "ms", to: :ms_value
+    end
+  end
+end

data/lib/mml/context_configuration.rb

@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+module Mml
+  module ContextConfiguration
+    def context_id
+      self::CONTEXT_ID
+    end
+
+    # Expose the version's built-in context without mutating global state.
+    def context
+      Lutaml::Model::GlobalContext.context(context_id)
+    end
+
+    # Create the built-in context or a derived context with substitutions.
+    def create_context(
+      id:,
+      registry: nil,
+      fallback_to: [context_id],
+      substitutions: []
+    )
+      normalized_id = Mml::ContextOptions.normalize_context_reference(id)
+
+      return populate_context! if normalized_id == context_id
+
+      Lutaml::Model::GlobalContext.unregister_context(normalized_id) if Lutaml::Model::GlobalContext.context(normalized_id)
+      create_type_context(
+        id: normalized_id,
+        registry: registry || Lutaml::Model::TypeRegistry.new,
+        fallback_to: normalize_fallbacks(fallback_to),
+        substitutions: substitutions,
+      )
+    end
+
+    # Explicitly rebuild the built-in version context.
+    def populate_context!
+      Lutaml::Model::GlobalContext.unregister_context(context_id) if context
+      register_models_in(base_type_context)
+    end
+
+    # Register a model now and remember it for later rebuilds.
+    def register_model(klass, id:)
+      normalized_id = id.to_sym
+      registered_models[normalized_id] = klass
+      (context || populate_base_context).registry.register(normalized_id, klass)
+      clear_cache(klass)
+      klass
+    end
+
+    def register
+      Mml::ContextOptions.warn_register_deprecation("#{name}.register")
+      @deprecated_register_context_id || context_id
+    end
+
+    def register=(value)
+      Mml::ContextOptions.warn_register_deprecation("#{name}.register=")
+      @deprecated_register_context_id =
+        Mml::ContextOptions.normalize_context_reference(value)
+      create_context(id: @deprecated_register_context_id) unless Lutaml::Model::GlobalContext.context(@deprecated_register_context_id)
+    end
+
+    def adapter
+      Lutaml::Model::Config.xml_adapter_type
+    end
+
+    def adapter=(adapter)
+      Lutaml::Model::Config.xml_adapter_type = adapter
+    end
+
+    private
+
+    def populate_base_context
+      base_type_context
+    end
+
+    def create_type_context(id:, registry:, fallback_to:, substitutions: [])
+      Lutaml::Model::GlobalContext.create_context(
+        id: id,
+        registry: registry,
+        fallback_to: fallback_to,
+        substitutions: substitutions,
+      ).tap do
+        Lutaml::Model::GlobalContext.clear_caches
+      end
+    end
+
+    def base_type_context
+      create_type_context(
+        id: context_id,
+        registry: Lutaml::Model::TypeRegistry.new,
+        fallback_to: [:default],
+      )
+    end
+
+    def register_models_in(type_context)
+      registered_models.each do |model_id, klass|
+        type_context.registry.register(model_id, klass)
+        clear_cache(klass)
+      end
+
+      Lutaml::Model::GlobalContext.clear_caches
+      type_context
+    end
+
+    def normalize_fallbacks(fallback_to)
+      Array(fallback_to).map do |fallback|
+        Mml::ContextOptions.normalize_context_reference(fallback)
+      end
+    end
+
+    def registered_models
+      @registered_models ||= {}
+    end
+
+    def clear_cache(klass)
+      klass.clear_cache(context_id) if klass.respond_to?(:clear_cache)
+    end
+  end
+end

data/lib/mml/context_options.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Mml
+  module ContextOptions
+    extend self
+
+    # Normalize the public `context:` / `register:` options into one context id.
+    def normalize_context_option(
+      context:,
+      register:,
+      default_context:,
+      warning_source:
+    )
+      raise_if_conflicting_context_options!(context, register)
+
+      if register
+        return normalize_register_option(
+          register,
+          default_context,
+          warning_source,
+        )
+      end
+
+      return default_context unless context_specified?(context)
+
+      normalize_context_reference(context) || default_context
+    end
+
+    # Collapse supported references to the symbol id MML uses internally.
+    def normalize_context_reference(reference)
+      return nil if reference.nil?
+      return reference if reference.is_a?(Symbol)
+      return reference.to_sym if reference.is_a?(String)
+      return reference.id.to_sym if reference.respond_to?(:id)
+
+      raise ArgumentError,
+            "Unsupported context/register reference: #{reference.inspect}"
+    end
+
+    # Centralize the compatibility warning for parse/configuration callers.
+    def warn_register_deprecation(source)
+      warn "[Mml] `register` is deprecated in #{source}; use `context` instead."
+    end
+
+    private
+
+    def context_specified?(context)
+      !context.equal?(Mml::UNSPECIFIED_CONTEXT)
+    end
+
+    # MML accepts the old `register:` alias, but never both inputs at once.
+    def raise_if_conflicting_context_options!(context, register)
+      return unless context_specified?(context) && register
+
+      raise ArgumentError, "Use either `context` or `register`, not both"
+    end
+
+    # Keep the compatibility path in one place.
+    def normalize_register_option(register, default_context, warning_source)
+      warn_register_deprecation(warning_source)
+      normalize_context_reference(register) || default_context
+    end
+  end
+end

data/lib/mml/namespace.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Mml
+  class Namespace < Lutaml::Xml::Namespace
+    uri "http://www.w3.org/1998/Math/MathML"
+    prefix_default "mml"
+  end
+end

data/lib/mml/v3/common_elements.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Mml
+  module V3
+    class CommonElements < Mml::CommonElements
+    end
+  end
+end

data/lib/mml/v3/configuration.rb

@@ -1,105 +1,13 @@
 # frozen_string_literal: true
 
+require_relative "../context_configuration"
+
 module Mml
   module V3
     module Configuration
-      SUPPORTED_TAGS = %i[
-        mmultiscripts
-        maligngroup
-        malignmark
-        munderover
-        semantics
-        mscarries
-        mfraction
-        mphantom
-        menclose
-        mlongdiv
-        mpadded
-        msubsup
-        mscarry
-        mfenced
-        msgroup
-        mglyph
-        mstack
-        munder
-        mtable
-        mstyle
-        mspace
-        msline
-        merror
-        msrow
-        mfrac
-        mover
-        mroot
-        mtext
-        msqrt
-        none
-        mrow
-        msub
-        msup
-        mi
-        mo
-        mn
-        ms
-      ].freeze
-
-      COMMON_ATTRIBUTES_CLASSES = %w[
-        Math
-        Mmultiscripts
-        Munderover
-        Semantics
-        Mscarries
-        Mfraction
-        Mlongdiv
-        Mphantom
-        Menclose
-        Mfenced
-        Mpadded
-        Msubsup
-        Msgroup
-        Mscarry
-        Munder
-        Mstyle
-        Mstack
-        Merror
-        Mover
-        Mfrac
-        Msrow
-        Mroot
-        Msqrt
-        Mrow
-        Msub
-        Msup
-        Mtd
-        Ms
-      ].freeze
-
-      module_function
-
-      def config
-        @config ||= {}
-      end
-
-      def config=(config)
-        self.config.merge!(config)
-      end
-
-      def custom_models=(models_hash)
-        # { Mi => CustomMiClass, Mo => CustomMoClass }
-        models_hash.each { |klass, model| klass.model(model) }
-      end
-
-      def adapter
-        Lutaml::Model::Config.xml_adapter
-      end
-
-      def adapter=(adapter)
-        Lutaml::Model::Config.xml_adapter_type = adapter
-      end
+      extend Mml::ContextConfiguration
 
-      def class_for(class_name)
-        config[class_name]
-      end
+      CONTEXT_ID = :mml_v3
     end
   end
 end

data/lib/mml/v3/maction.rb

@@ -3,20 +3,8 @@
 module Mml
   module V3
     class Maction < Lutaml::Model::Serializable
-      attribute :mathcolor, :string
-      attribute :mathbackground, :string
-      attribute :actiontype, :string
-      attribute :selection, :string
-
-      xml do
-        namespace Namespace
-        element "maction"
-
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "actiontype", to: :actiontype
-        map_attribute "selection", to: :selection
-      end
+      include Base::Maction
     end
+    Configuration.register_model(Maction, id: :maction)
   end
 end

data/lib/mml/v3/maligngroup.rb

@@ -3,18 +3,8 @@
 module Mml
   module V3
     class Maligngroup < Lutaml::Model::Serializable
-      attribute :mathcolor, :string
-      attribute :mathbackground, :string
-      attribute :groupalign, :string
-
-      xml do
-        namespace Namespace
-        element "maligngroup"
-
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "groupalign", to: :groupalign
-      end
+      include Base::Maligngroup
     end
+    Configuration.register_model(Maligngroup, id: :maligngroup)
   end
 end