mml 2.2.1 → 2.3.0

data/lib/mml/v3/mtext.rb

@@ -3,36 +3,9 @@
 module Mml
   module V3
     class Mtext < Lutaml::Model::Serializable
-      attribute :value, :string
-      attribute :mathcolor, :string
-      attribute :mathbackground, :string
-      attribute :mathvariant, :string
-      attribute :mathsize, :string
-      attribute :dir, :string
-      attribute :fontfamily, :string
-      attribute :fontweight, :string
-      attribute :fontstyle, :string
-      attribute :fontsize, :string
-      attribute :color, :string
-      attribute :background, :string
-
-      xml do
-        namespace Namespace
-        element "mtext"
-
-        map_content to: :value
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "mathvariant", to: :mathvariant
-        map_attribute "mathsize", to: :mathsize
-        map_attribute "dir", to: :dir
-        map_attribute "fontfamily", to: :fontfamily
-        map_attribute "fontweight", to: :fontweight
-        map_attribute "fontstyle", to: :fontstyle
-        map_attribute "fontsize", to: :fontsize
-        map_attribute "color", to: :color
-        map_attribute "background", to: :background
-      end
+      include Base::Mtext
+      include Base::DeprecatedFontAttributes
     end
+    Configuration.register_model(Mtext, id: :mtext)
   end
 end

data/lib/mml/v3/mtr.rb

@@ -2,28 +2,9 @@
 
 module Mml
   module V3
-    autoload(:Mtd, "mml/v3/mtd")
-
     class Mtr < Lutaml::Model::Serializable
-      attribute :mathcolor, :string
-      attribute :mathbackground, :string
-      attribute :rowalign, :string
-      attribute :columnalign, :string
-      attribute :groupalign, :string
-      attribute :mtd_value, Mtd, collection: true
-
-      xml do
-        namespace Namespace
-        element "mtr"
-        mixed_content
-
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "rowalign", to: :rowalign
-        map_attribute "columnalign", to: :columnalign
-        map_attribute "groupalign", to: :groupalign
-        map_element "mtd", to: :mtd_value
-      end
+      include Base::Mtr
     end
+    Configuration.register_model(Mtr, id: :mtr)
   end
 end

data/lib/mml/v3/munder.rb

@@ -2,24 +2,9 @@
 
 module Mml
   module V3
-    class Munder < Lutaml::Model::Serializable
-      attribute :mathbackground, :string
-      attribute :accentunder, :string
-      attribute :mathcolor, :string
-      attribute :content, :string
-      attribute :align, :string
-
-      xml do
-        namespace Namespace
-        element "munder"
-        mixed_content
-
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "accentunder", to: :accentunder
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "align", to: :align
-        map_content to: :content
-      end
+    class Munder < CommonElements
+      include Base::Munder
     end
+    Configuration.register_model(Munder, id: :munder)
   end
 end

data/lib/mml/v3/munderover.rb

@@ -2,24 +2,9 @@
 
 module Mml
   module V3
-    class Munderover < Lutaml::Model::Serializable
-      attribute :mathcolor, :string
-      attribute :mathbackground, :string
-      attribute :accent, :string
-      attribute :accentunder, :string
-      attribute :align, :string
-
-      xml do
-        namespace Namespace
-        element "munderover"
-        mixed_content
-
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "accent", to: :accent
-        map_attribute "accentunder", to: :accentunder
-        map_attribute "align", to: :align
-      end
+    class Munderover < CommonElements
+      include Base::Munderover
     end
+    Configuration.register_model(Munderover, id: :munderover)
   end
 end

data/lib/mml/v3/namespace.rb

@@ -2,9 +2,6 @@
 
 module Mml
   module V3
-    class Namespace < Lutaml::Xml::Namespace
-      uri "http://www.w3.org/1998/Math/MathML"
-      prefix_default "mml"
-    end
+    Namespace = Mml::Namespace
   end
 end

data/lib/mml/v3/none.rb

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

data/lib/mml/v3/semantics.rb

@@ -2,18 +2,9 @@
 
 module Mml
   module V3
-    autoload(:Mi, "mml/v3/mi")
-
-    class Semantics < Lutaml::Model::Serializable
-      attribute :annotation, Mi, collection: true
-
-      xml do
-        namespace Namespace
-        element "semantics"
-        mixed_content
-
-        map_element :annotation, to: :annotation
-      end
+    class Semantics < CommonElements
+      include Base::Semantics
     end
+    Configuration.register_model(Semantics, id: :semantics)
   end
 end

data/lib/mml/v3.rb

@@ -1,85 +1,59 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require "mml/v3/configuration"
-
-DEFAULT_ADAPTER = :ox
-
-Moxml::Config.default_adapter = DEFAULT_ADAPTER
+require_relative "versioned_parser"
+
+Moxml::Config.default_adapter = Mml::DEFAULT_ADAPTER
+
+require_relative "v3/configuration"
+require_relative "v3/namespace"
+require_relative "v3/common_elements"
+require_relative "v3/maction"
+require_relative "v3/maligngroup"
+require_relative "v3/malignmark"
+require_relative "v3/menclose"
+require_relative "v3/merror"
+require_relative "v3/mfenced"
+require_relative "v3/mfrac"
+require_relative "v3/mfraction"
+require_relative "v3/mglyph"
+require_relative "v3/mi"
+require_relative "v3/mlongdiv"
+require_relative "v3/mn"
+require_relative "v3/mo"
+require_relative "v3/mover"
+require_relative "v3/mpadded"
+require_relative "v3/mphantom"
+require_relative "v3/mprescripts"
+require_relative "v3/mroot"
+require_relative "v3/mrow"
+require_relative "v3/ms"
+require_relative "v3/mscarries"
+require_relative "v3/mscarry"
+require_relative "v3/msgroup"
+require_relative "v3/msline"
+require_relative "v3/mspace"
+require_relative "v3/msqrt"
+require_relative "v3/msrow"
+require_relative "v3/mstack"
+require_relative "v3/mstyle"
+require_relative "v3/msub"
+require_relative "v3/msubsup"
+require_relative "v3/msup"
+require_relative "v3/mtd"
+require_relative "v3/mtable"
+require_relative "v3/mtext"
+require_relative "v3/mtr"
+require_relative "v3/mlabeledtr"
+require_relative "v3/munder"
+require_relative "v3/munderover"
+require_relative "v3/mmultiscripts"
+require_relative "v3/none"
+require_relative "v3/semantics"
+require_relative "v3/math"
 
 module Mml
   module V3
-    autoload :Namespace, "mml/v3/namespace"
-    autoload :Maction, "mml/v3/maction"
-    autoload :Maligngroup, "mml/v3/maligngroup"
-    autoload :Malignmark, "mml/v3/malignmark"
-    autoload :Math, "mml/v3/math"
-    autoload :Menclose, "mml/v3/menclose"
-    autoload :Merror, "mml/v3/merror"
-    autoload :Mfenced, "mml/v3/mfenced"
-    autoload :Mfrac, "mml/v3/mfrac"
-    autoload :Mfraction, "mml/v3/mfraction"
-    autoload :Mglyph, "mml/v3/mglyph"
-    autoload :Mi, "mml/v3/mi"
-    autoload :Mlabeledtr, "mml/v3/mlabeledtr"
-    autoload :Mlongdiv, "mml/v3/mlongdiv"
-    autoload :Mmultiscripts, "mml/v3/mmultiscripts"
-    autoload :Mn, "mml/v3/mn"
-    autoload :Mo, "mml/v3/mo"
-    autoload :Mover, "mml/v3/mover"
-    autoload :Mpadded, "mml/v3/mpadded"
-    autoload :Mphantom, "mml/v3/mphantom"
-    autoload :Mprescripts, "mml/v3/mprescripts"
-    autoload :Mroot, "mml/v3/mroot"
-    autoload :Mrow, "mml/v3/mrow"
-    autoload :Ms, "mml/v3/ms"
-    autoload :Mscarries, "mml/v3/mscarries"
-    autoload :Mscarry, "mml/v3/mscarry"
-    autoload :Msgroup, "mml/v3/msgroup"
-    autoload :Msline, "mml/v3/msline"
-    autoload :Mspace, "mml/v3/mspace"
-    autoload :Msqrt, "mml/v3/msqrt"
-    autoload :Msrow, "mml/v3/msrow"
-    autoload :Mstack, "mml/v3/mstack"
-    autoload :Mstyle, "mml/v3/mstyle"
-    autoload :Msub, "mml/v3/msub"
-    autoload :Msubsup, "mml/v3/msubsup"
-    autoload :Msup, "mml/v3/msup"
-    autoload :Mtable, "mml/v3/mtable"
-    autoload :Mtd, "mml/v3/mtd"
-    autoload :Mtext, "mml/v3/mtext"
-    autoload :Mtr, "mml/v3/mtr"
-    autoload :Munder, "mml/v3/munder"
-    autoload :Munderover, "mml/v3/munderover"
-    autoload :None, "mml/v3/none"
-    autoload :Semantics, "mml/v3/semantics"
-
-    # Ensure that the CommonAttributes class is loaded after all
-    # other classes
-    require "mml/v3/common_attributes"
-
-    def self.update_attributes
-      Configuration::COMMON_ATTRIBUTES_CLASSES.each do |klass|
-        const_get(klass).import_model(CommonAttributes)
-      end
-    end
-
-    def self.parse(input, namespace_exist: true)
-      Configuration.adapter ||= DEFAULT_ADAPTER
-
-      return parse_with_no_namespace(input) unless namespace_exist
-
-      Mml::V3::Math.from_xml(input)
-    end
-
-    def self.parse_with_no_namespace(input)
-      with_ns = Nokogiri::XML.parse(input).tap do |doc|
-        doc.root["xmlns"] = Namespace.uri
-      end.to_xml
-
-      Mml::V3::Math.from_xml(with_ns)
-    end
+    extend Mml::VersionedParser
   end
 end
-
-Mml::V3.update_attributes

data/lib/mml/v4/a.rb

@@ -2,15 +2,11 @@
 
 module Mml
   module V4
-    class A < Lutaml::Model::Serializable
+    class A < CommonElements
+      include Base::V4Attributes
+
       attribute :href, :string
       attribute :hreflang, :string
-      attribute :mathcolor, :string
-      attribute :mathbackground, :string
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :displaystyle, :string
-      attribute :scriptlevel, :integer
 
       xml do
         namespace Namespace
@@ -19,13 +15,8 @@ module Mml
 
         map_attribute "href", to: :href
         map_attribute "hreflang", to: :hreflang
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "intent", to: :intent
-        map_attribute "arg", to: :arg
-        map_attribute "displaystyle", to: :displaystyle
-        map_attribute "scriptlevel", to: :scriptlevel
       end
     end
+    Configuration.register_model(A, id: :a)
   end
 end

data/lib/mml/v4/common_elements.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Mml
+  module V4
+    class CommonElements < Mml::CommonElements
+      attribute :a_value, :a, collection: true
+
+      xml do
+        map_element "a", to: :a_value
+      end
+    end
+  end
+end

data/lib/mml/v4/configuration.rb

@@ -1,106 +1,13 @@
 # frozen_string_literal: true
 
+require_relative "../context_configuration"
+
 module Mml
   module V4
     module Configuration
-      SUPPORTED_TAGS = %i[
-        a
-        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
-        mrow
-        msub
-        msup
-        mi
-        mo
-        mn
-        ms
-      ].freeze
-
-      COMMON_ATTRIBUTES_CLASSES = %w[
-        A
-        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_v4
     end
   end
 end

data/lib/mml/v4/maction.rb

@@ -2,29 +2,14 @@
 
 module Mml
   module V4
-    class Maction < Mml::V3::Maction
-      attribute :mathcolor, :string
-      attribute :mathbackground, :string
-      attribute :actiontype, :string
-      attribute :selection, :string
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :displaystyle, :string
-      attribute :scriptlevel, :integer
+    class Maction < Lutaml::Model::Serializable
+      include Base::Maction
+      include Base::V4Attributes
 
       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
-        map_attribute "intent", to: :intent
-        map_attribute "arg", to: :arg
-        map_attribute "displaystyle", to: :displaystyle
-        map_attribute "scriptlevel", to: :scriptlevel
       end
     end
+    Configuration.register_model(Maction, id: :maction)
   end
 end

data/lib/mml/v4/maligngroup.rb

@@ -2,27 +2,14 @@
 
 module Mml
   module V4
-    class Maligngroup < Mml::V3::Maligngroup
-      attribute :mathcolor, :string
-      attribute :mathbackground, :string
-      attribute :groupalign, :string
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :displaystyle, :string
-      attribute :scriptlevel, :integer
+    class Maligngroup < Lutaml::Model::Serializable
+      include Base::Maligngroup
+      include Base::V4Attributes
 
       xml do
         namespace Namespace
-        element "maligngroup"
-
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "groupalign", to: :groupalign
-        map_attribute "intent", to: :intent
-        map_attribute "arg", to: :arg
-        map_attribute "displaystyle", to: :displaystyle
-        map_attribute "scriptlevel", to: :scriptlevel
       end
     end
+    Configuration.register_model(Maligngroup, id: :maligngroup)
   end
 end

data/lib/mml/v4/malignmark.rb

@@ -2,27 +2,14 @@
 
 module Mml
   module V4
-    class Malignmark < Mml::V3::Malignmark
-      attribute :mathcolor, :string
-      attribute :mathbackground, :string
-      attribute :edge, :string
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :displaystyle, :string
-      attribute :scriptlevel, :integer
+    class Malignmark < Lutaml::Model::Serializable
+      include Base::Malignmark
+      include Base::V4Attributes
 
       xml do
         namespace Namespace
-        element "malignmark"
-
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "edge", to: :edge
-        map_attribute "intent", to: :intent
-        map_attribute "arg", to: :arg
-        map_attribute "displaystyle", to: :displaystyle
-        map_attribute "scriptlevel", to: :scriptlevel
       end
     end
+    Configuration.register_model(Malignmark, id: :malignmark)
   end
 end

data/lib/mml/v4/math.rb

@@ -2,26 +2,16 @@
 
 module Mml
   module V4
-    class Math < Mml::V3::Math
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :displaystyle, :string
-      attribute :scriptlevel, :integer
+    class Math < CommonElements
+      include Base::Math
+      include Base::V4Attributes
 
       xml do
         namespace Namespace
-        element "math"
-        mixed_content
-
-        map_attribute :display, to: :display
-        map_attribute "intent", to: :intent
-        map_attribute "arg", to: :arg
-        map_attribute "displaystyle", to: :displaystyle
-        map_attribute "scriptlevel", to: :scriptlevel
       end
     end
+    Configuration.register_model(Math, id: :math)
 
-    # For backward compatibility, we keep MathWithNamespace as an alias to Math.
     MathWithNamespace = Math
   end
 end

data/lib/mml/v4/menclose.rb

@@ -2,28 +2,14 @@
 
 module Mml
   module V4
-    class Menclose < Mml::V3::Menclose
-      attribute :mathcolor, :string
-      attribute :mathbackground, :string
-      attribute :notation, :string
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :displaystyle, :string
-      attribute :scriptlevel, :integer
+    class Menclose < CommonElements
+      include Base::Menclose
+      include Base::V4Attributes
 
       xml do
         namespace Namespace
-        element "menclose"
-        mixed_content
-
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "notation", to: :notation
-        map_attribute "intent", to: :intent
-        map_attribute "arg", to: :arg
-        map_attribute "displaystyle", to: :displaystyle
-        map_attribute "scriptlevel", to: :scriptlevel
       end
     end
+    Configuration.register_model(Menclose, id: :menclose)
   end
 end

data/lib/mml/v4/merror.rb

@@ -2,26 +2,14 @@
 
 module Mml
   module V4
-    class Merror < Mml::V3::Merror
-      attribute :mathbackground, :string
-      attribute :mathcolor, :string
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :displaystyle, :string
-      attribute :scriptlevel, :integer
+    class Merror < CommonElements
+      include Base::Merror
+      include Base::V4Attributes
 
       xml do
         namespace Namespace
-        element "merror"
-        mixed_content
-
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "intent", to: :intent
-        map_attribute "arg", to: :arg
-        map_attribute "displaystyle", to: :displaystyle
-        map_attribute "scriptlevel", to: :scriptlevel
       end
     end
+    Configuration.register_model(Merror, id: :merror)
   end
 end