mml 2.2.0 → 2.3.0

data/lib/mml/v4/msub.rb

@@ -2,28 +2,14 @@
 
 module Mml
   module V4
-    class Msub < Mml::V3::Msub
-      attribute :mathbackground, :string
-      attribute :subscriptshift, :string
-      attribute :mathcolor, :string
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :displaystyle, :string
-      attribute :scriptlevel, :integer
+    class Msub < CommonElements
+      include Base::Msub
+      include Base::V4Attributes
 
       xml do
         namespace Namespace
-        element "msub"
-        mixed_content
-
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "subscriptshift", to: :subscriptshift
-        map_attribute "mathcolor", to: :mathcolor
-        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(Msub, id: :msub)
   end
 end

data/lib/mml/v4/msubsup.rb

@@ -2,30 +2,14 @@
 
 module Mml
   module V4
-    class Msubsup < Mml::V3::Msubsup
-      attribute :mathcolor, :string
-      attribute :mathbackground, :string
-      attribute :subscriptshift, :string
-      attribute :superscriptshift, :string
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :displaystyle, :string
-      attribute :scriptlevel, :integer
+    class Msubsup < CommonElements
+      include Base::Msubsup
+      include Base::V4Attributes
 
       xml do
         namespace Namespace
-        element "msubsup"
-        mixed_content
-
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "subscriptshift", to: :subscriptshift
-        map_attribute "superscriptshift", to: :superscriptshift
-        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(Msubsup, id: :msubsup)
   end
 end

data/lib/mml/v4/msup.rb

@@ -2,28 +2,14 @@
 
 module Mml
   module V4
-    class Msup < Mml::V3::Msup
-      attribute :mathcolor, :string
-      attribute :mathbackground, :string
-      attribute :superscriptshift, :string
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :displaystyle, :string
-      attribute :scriptlevel, :integer
+    class Msup < CommonElements
+      include Base::Msup
+      include Base::V4Attributes
 
       xml do
         namespace Namespace
-        element "msup"
-        mixed_content
-
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "superscriptshift", to: :superscriptshift
-        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(Msup, id: :msup)
   end
 end

data/lib/mml/v4/mtable.rb

@@ -2,65 +2,14 @@
 
 module Mml
   module V4
-    autoload(:Mlabeledtr, "mml/v4/mlabeledtr")
-    autoload(:Mtr, "mml/v4/mtr")
-    class Mtable < Mml::V3::Mtable
-      attribute :mathcolor, :string
-      attribute :mathbackground, :string
-      attribute :align, :string
-      attribute :rowalign, :string
-      attribute :columnalign, :string
-      attribute :groupalign, :string
-      attribute :alignmentscope, :string
-      attribute :columnwidth, :string
-      attribute :width, :string
-      attribute :rowspacing, :string
-      attribute :columnspacing, :string
-      attribute :rowlines, :string
-      attribute :columnlines, :string
-      attribute :frame, :string
-      attribute :framespacing, :string
-      attribute :equalrows, :string
-      attribute :equalcolumns, :string
-      attribute :displaystyle, :string
-      attribute :side, :string
-      attribute :minlabelspacing, :string
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :scriptlevel, :integer
-      attribute :mlabeledtr_value, Mlabeledtr, collection: true
-      attribute :mtr_value, Mtr, collection: true
+    class Mtable < Lutaml::Model::Serializable
+      include Base::Mtable
+      include Base::V4Attributes
 
       xml do
         namespace Namespace
-        element "mtable"
-        mixed_content
-
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "align", to: :align
-        map_attribute "rowalign", to: :rowalign
-        map_attribute "columnalign", to: :columnalign
-        map_attribute "alignmentscope", to: :alignmentscope
-        map_attribute "columnwidth", to: :columnwidth
-        map_attribute "width", to: :width
-        map_attribute "rowspacing", to: :rowspacing
-        map_attribute "columnspacing", to: :columnspacing
-        map_attribute "rowlines", to: :rowlines
-        map_attribute "columnlines", to: :columnlines
-        map_attribute "frame", to: :frame
-        map_attribute "framespacing", to: :framespacing
-        map_attribute "equalrows", to: :equalrows
-        map_attribute "equalcolumns", to: :equalcolumns
-        map_attribute "displaystyle", to: :displaystyle
-        map_attribute "side", to: :side
-        map_attribute "minlabelspacing", to: :minlabelspacing
-        map_attribute "intent", to: :intent
-        map_attribute "arg", to: :arg
-        map_attribute "scriptlevel", to: :scriptlevel
-        map_element "mlabeledtr", to: :mlabeledtr_value
-        map_element "mtr", to: :mtr_value
       end
     end
+    Configuration.register_model(Mtable, id: :mtable)
   end
 end

data/lib/mml/v4/mtd.rb

@@ -2,30 +2,14 @@
 
 module Mml
   module V4
-    class Mtd < Mml::V3::Mtd
-      attribute :mathcolor, :string
-      attribute :mathbackground, :string
-      attribute :rowalign, :string
-      attribute :columnalign, :string
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :displaystyle, :string
-      attribute :scriptlevel, :integer
+    class Mtd < CommonElements
+      include Base::Mtd
+      include Base::V4Attributes
 
       xml do
         namespace Namespace
-        element "mtd"
-        mixed_content
-
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "rowalign", to: :rowalign
-        map_attribute "columnalign", to: :columnalign
-        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(Mtd, id: :mtd)
   end
 end

data/lib/mml/v4/mtext.rb

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

data/lib/mml/v4/mtr.rb

@@ -2,35 +2,14 @@
 
 module Mml
   module V4
-    autoload(:Mtd, "mml/v4/mtd")
-
-    class Mtr < Mml::V3::Mtr
-      attribute :mathcolor, :string
-      attribute :mathbackground, :string
-      attribute :rowalign, :string
-      attribute :columnalign, :string
-      attribute :groupalign, :string
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :displaystyle, :string
-      attribute :scriptlevel, :integer
-      attribute :mtd_value, Mtd, collection: true
+    class Mtr < Lutaml::Model::Serializable
+      include Base::Mtr
+      include Base::V4Attributes
 
       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 "intent", to: :intent
-        map_attribute "arg", to: :arg
-        map_attribute "displaystyle", to: :displaystyle
-        map_attribute "scriptlevel", to: :scriptlevel
-        map_element "mtd", to: :mtd_value
       end
     end
+    Configuration.register_model(Mtr, id: :mtr)
   end
 end

data/lib/mml/v4/munder.rb

@@ -2,32 +2,14 @@
 
 module Mml
   module V4
-    class Munder < Mml::V3::Munder
-      attribute :mathbackground, :string
-      attribute :accentunder, :string
-      attribute :mathcolor, :string
-      attribute :content, :string
-      attribute :align, :string
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :displaystyle, :string
-      attribute :scriptlevel, :integer
+    class Munder < CommonElements
+      include Base::Munder
+      include Base::V4Attributes
 
       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_attribute "intent", to: :intent
-        map_attribute "arg", to: :arg
-        map_attribute "displaystyle", to: :displaystyle
-        map_attribute "scriptlevel", to: :scriptlevel
-        map_content to: :content
       end
     end
+    Configuration.register_model(Munder, id: :munder)
   end
 end

data/lib/mml/v4/munderover.rb

@@ -2,32 +2,14 @@
 
 module Mml
   module V4
-    class Munderover < Mml::V3::Munderover
-      attribute :mathcolor, :string
-      attribute :mathbackground, :string
-      attribute :accent, :string
-      attribute :accentunder, :string
-      attribute :align, :string
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :displaystyle, :string
-      attribute :scriptlevel, :integer
+    class Munderover < CommonElements
+      include Base::Munderover
+      include Base::V4Attributes
 
       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
-        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(Munderover, id: :munderover)
   end
 end

data/lib/mml/v4/namespace.rb

@@ -2,9 +2,6 @@
 
 module Mml
   module V4
-    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/v4/none.rb

@@ -2,21 +2,16 @@
 
 module Mml
   module V4
-    class None < Mml::V3::None
-      attribute :mathcolor, :string
-      attribute :mathbackground, :string
-      attribute :intent, :string
-      attribute :arg, :string
+    # @deprecated V4 spec marks <none> as deprecated.
+    #   Use an empty <mrow> instead for MathML Core compatibility.
+    class None < Lutaml::Model::Serializable
+      include Base::None
+      include Base::V4Attributes
 
       xml do
         namespace Namespace
-        element "none"
-
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "intent", to: :intent
-        map_attribute "arg", to: :arg
       end
     end
+    Configuration.register_model(None, id: :none)
   end
 end

data/lib/mml/v4/semantics.rb

@@ -2,22 +2,14 @@
 
 module Mml
   module V4
-    autoload(:Mi, "mml/v4/mi")
-
-    class Semantics < Mml::V3::Semantics
-      attribute :annotation, Mi, collection: true
-      attribute :displaystyle, :string
-      attribute :scriptlevel, :integer
+    class Semantics < CommonElements
+      include Base::Semantics
+      include Base::V4Attributes
 
       xml do
         namespace Namespace
-        element "semantics"
-        mixed_content
-
-        map_element :annotation, to: :annotation
-        map_attribute "displaystyle", to: :displaystyle
-        map_attribute "scriptlevel", to: :scriptlevel
       end
     end
+    Configuration.register_model(Semantics, id: :semantics)
   end
 end

data/lib/mml/v4.rb

@@ -1,81 +1,59 @@
 # frozen_string_literal: true
 
-require "mml/v4/configuration"
+require "lutaml/model"
+require_relative "versioned_parser"
+Moxml::Config.default_adapter = Mml::DEFAULT_ADAPTER
+
+require_relative "v4/configuration"
+require_relative "v4/namespace"
+require_relative "v4/common_elements"
+require_relative "v4/a"
+require_relative "v4/maction"
+require_relative "v4/maligngroup"
+require_relative "v4/malignmark"
+require_relative "v4/menclose"
+require_relative "v4/merror"
+require_relative "v4/mfenced"
+require_relative "v4/mfrac"
+require_relative "v4/mfraction"
+require_relative "v4/mglyph"
+require_relative "v4/mi"
+require_relative "v4/mlongdiv"
+require_relative "v4/mn"
+require_relative "v4/mo"
+require_relative "v4/mover"
+require_relative "v4/mpadded"
+require_relative "v4/mphantom"
+require_relative "v4/mprescripts"
+require_relative "v4/mroot"
+require_relative "v4/mrow"
+require_relative "v4/ms"
+require_relative "v4/mscarries"
+require_relative "v4/mscarry"
+require_relative "v4/msgroup"
+require_relative "v4/msline"
+require_relative "v4/mspace"
+require_relative "v4/msqrt"
+require_relative "v4/msrow"
+require_relative "v4/mstack"
+require_relative "v4/mstyle"
+require_relative "v4/msub"
+require_relative "v4/msubsup"
+require_relative "v4/msup"
+require_relative "v4/mtd"
+require_relative "v4/mtable"
+require_relative "v4/mtext"
+require_relative "v4/mtr"
+require_relative "v4/mlabeledtr"
+require_relative "v4/munder"
+require_relative "v4/munderover"
+require_relative "v4/mmultiscripts"
+require_relative "v4/none"
+require_relative "v4/semantics"
+require_relative "v4/math"
 
 module Mml
   module V4
-    autoload :Namespace, "mml/v4/namespace"
-    autoload :A, "mml/v4/a"
-    autoload :Maction, "mml/v4/maction"
-    autoload :Maligngroup, "mml/v4/maligngroup"
-    autoload :Malignmark, "mml/v4/malignmark"
-    autoload :Math, "mml/v4/math"
-    autoload :Menclose, "mml/v4/menclose"
-    autoload :Merror, "mml/v4/merror"
-    autoload :Mfenced, "mml/v4/mfenced"
-    autoload :Mfrac, "mml/v4/mfrac"
-    autoload :Mfraction, "mml/v4/mfraction"
-    autoload :Mglyph, "mml/v4/mglyph"
-    autoload :Mi, "mml/v4/mi"
-    autoload :Mlabeledtr, "mml/v4/mlabeledtr"
-    autoload :Mlongdiv, "mml/v4/mlongdiv"
-    autoload :Mmultiscripts, "mml/v4/mmultiscripts"
-    autoload :Mn, "mml/v4/mn"
-    autoload :Mo, "mml/v4/mo"
-    autoload :Mover, "mml/v4/mover"
-    autoload :Mpadded, "mml/v4/mpadded"
-    autoload :Mphantom, "mml/v4/mphantom"
-    autoload :Mprescripts, "mml/v4/mprescripts"
-    autoload :Mroot, "mml/v4/mroot"
-    autoload :Mrow, "mml/v4/mrow"
-    autoload :Ms, "mml/v4/ms"
-    autoload :Mscarries, "mml/v4/mscarries"
-    autoload :Mscarry, "mml/v4/mscarry"
-    autoload :Msgroup, "mml/v4/msgroup"
-    autoload :Msline, "mml/v4/msline"
-    autoload :Mspace, "mml/v4/mspace"
-    autoload :Msqrt, "mml/v4/msqrt"
-    autoload :Msrow, "mml/v4/msrow"
-    autoload :Mstack, "mml/v4/mstack"
-    autoload :Mstyle, "mml/v4/mstyle"
-    autoload :Msub, "mml/v4/msub"
-    autoload :Msubsup, "mml/v4/msubsup"
-    autoload :Msup, "mml/v4/msup"
-    autoload :Mtable, "mml/v4/mtable"
-    autoload :Mtd, "mml/v4/mtd"
-    autoload :Mtext, "mml/v4/mtext"
-    autoload :Mtr, "mml/v4/mtr"
-    autoload :Munder, "mml/v4/munder"
-    autoload :Munderover, "mml/v4/munderover"
-    autoload :None, "mml/v4/none"
-    autoload :Semantics, "mml/v4/semantics"
-
-    # Ensure that the CommonAttributes class is loaded after all
-    # other classes
-    require "mml/v4/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::V4::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::V4::Math.from_xml(with_ns)
-    end
+    extend Mml::VersionedParser
   end
 end
-
-Mml::V4.update_attributes

data/lib/mml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mml
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

data/lib/mml/versioned_parser.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Mml
+  module VersionedParser
+    # Shared parse entrypoint for versioned modules.
+    def parse(input, namespace_exist: true,
+              context: Mml::UNSPECIFIED_CONTEXT, register: nil)
+      self::Configuration.adapter ||= Mml::DEFAULT_ADAPTER
+      context_id = parse_context_id(context, register)
+      root_class = Lutaml::Model::GlobalContext.resolve_type(
+        :math,
+        context_id,
+      )
+
+      root_class.from_xml(
+        xml_input(input, namespace_exist),
+        register: context_id,
+      )
+    end
+
+    # Namespace-less MathML is normalized before handing it to lutaml-model.
+    def parse_with_no_namespace(input)
+      adapter = self::Configuration.adapter || Mml::DEFAULT_ADAPTER
+      Moxml.new(adapter).parse(input).tap do |doc|
+        doc.root.add_namespace(nil, self::Namespace.uri)
+      end.to_xml
+    end
+
+    # Version modules keep their own default context id.
+    def parse_context_id(context, register)
+      Mml::ContextOptions.normalize_context_option(
+        context: context,
+        register: register,
+        default_context: self::Configuration.context_id,
+        warning_source: "#{name}.parse",
+      )
+    end
+
+    # Keep the main parse flow readable by separating namespace normalization.
+    def xml_input(input, namespace_exist)
+      return input if namespace_exist
+
+      parse_with_no_namespace(input)
+    end
+  end
+end