mml 2.2.1 → 2.3.0

data/lib/mml/v4/mfenced.rb

@@ -2,35 +2,14 @@
 
 module Mml
   module V4
-    class Mfenced < Mml::V3::Mfenced
-      attribute :mathbackground, :string
-      attribute :separators, :string
-      attribute :mathcolor, :string
-      attribute :content, :string
-      attribute :close, :string
-      attribute :open, :string
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :displaystyle, :string
-      attribute :scriptlevel, :integer
+    class Mfenced < CommonElements
+      include Base::Mfenced
+      include Base::V4Attributes
 
       xml do
         namespace Namespace
-        element "mfenced"
-        mixed_content
-
-        map_content to: :content
-
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "separators", to: :separators
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "close", to: :close
-        map_attribute "open", to: :open
-        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(Mfenced, id: :mfenced)
   end
 end

data/lib/mml/v4/mfrac.rb

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

data/lib/mml/v4/mfraction.rb

@@ -2,30 +2,14 @@
 
 module Mml
   module V4
-    class Mfraction < Mml::V3::Mfraction
-      attribute :mathcolor, :string
-      attribute :mathbackground, :string
-      attribute :linethickness, :string
-      attribute :numalign, :string
-      attribute :denomalign, :string
-      attribute :bevelled, :string
-      attribute :intent, :string
-      attribute :arg, :string
+    class Mfraction < CommonElements
+      include Base::Mfraction
+      include Base::V4Attributes
 
       xml do
         namespace Namespace
-        element "mfraction"
-        mixed_content
-
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "linethickness", to: :linethickness
-        map_attribute "numalign", to: :numalign
-        map_attribute "denomalign", to: :denomalign
-        map_attribute "bevelled", to: :bevelled
-        map_attribute "intent", to: :intent
-        map_attribute "arg", to: :arg
       end
     end
+    Configuration.register_model(Mfraction, id: :mfraction)
   end
 end

data/lib/mml/v4/mglyph.rb

@@ -2,45 +2,14 @@
 
 module Mml
   module V4
-    class Mglyph < Mml::V3::Mglyph
-      attribute :alt, :string
-      attribute :src, :string
-      attribute :width, :string
-      attribute :color, :string
-      attribute :index, :integer
-      attribute :height, :string
-      attribute :valign, :string
-      attribute :mathsize, :string
-      attribute :fontsize, :string
-      attribute :fontstyle, :string
-      attribute :mathcolor, :string
-      attribute :fontfamily, :string
-      attribute :fontweight, :string
-      attribute :background, :string
-      attribute :mathvariant, :string
-      attribute :mathbackground, :string
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :displaystyle, :string
-      attribute :scriptlevel, :integer
+    class Mglyph < Lutaml::Model::Serializable
+      include Base::Mglyph
+      include Base::V4Attributes
 
       xml do
         namespace Namespace
-        element "mglyph"
-
-        map_attribute "src", to: :src
-        map_attribute "alt", to: :alt
-        map_attribute "index", to: :index
-        map_attribute "width", to: :width
-        map_attribute "height", to: :height
-        map_attribute "valign", to: :valign
-        map_attribute "mathvariant", to: :mathvariant
-        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(Mglyph, id: :mglyph)
   end
 end

data/lib/mml/v4/mi.rb

@@ -2,40 +2,14 @@
 
 module Mml
   module V4
-    class Mi < Mml::V3::Mi
-      attribute :dir, :string
-      attribute :value, :string
-      attribute :color, :string
-      attribute :mathsize, :string
-      attribute :fontsize, :string
-      attribute :fontstyle, :string
-      attribute :mathcolor, :string
-      attribute :background, :string
-      attribute :fontfamily, :string
-      attribute :fontweight, :string
-      attribute :mathvariant, :string
-      attribute :mathbackground, :string
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :displaystyle, :string
-      attribute :scriptlevel, :integer
+    class Mi < Lutaml::Model::Serializable
+      include Base::Mi
+      include Base::V4Attributes
 
       xml do
         namespace Namespace
-        element "mi"
-
-        map_content to: :value
-        map_attribute "dir", to: :dir
-        map_attribute "color", to: :color
-        map_attribute "mathsize", to: :mathsize
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "mathvariant", to: :mathvariant
-        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(Mi, id: :mi)
   end
 end

data/lib/mml/v4/mlabeledtr.rb

@@ -2,33 +2,16 @@
 
 module Mml
   module V4
-    autoload(:Mtd, "mml/v4/mtd")
-
-    class Mlabeledtr < Mml::V3::Mlabeledtr
-      attribute :mathbackground, :string
-      attribute :columnalign, :string
-      attribute :groupalign, :string
-      attribute :mathcolor, :string
-      attribute :rowalign, :string
-      attribute :id, :string
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :mtd_value, Mtd, collection: true
+    # @deprecated V4 spec removes <mlabeledtr> from the default schema.
+    #   It is valid only in the mathml4-legacy schema for legacy content.
+    class Mlabeledtr < Lutaml::Model::Serializable
+      include Base::Mlabeledtr
+      include Base::V4Attributes
 
       xml do
         namespace Namespace
-        element "mlabeledtr"
-        mixed_content
-
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "columnalign", to: :columnalign
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "rowalign", to: :rowalign
-        map_attribute "id", to: :id
-        map_attribute "intent", to: :intent
-        map_attribute "arg", to: :arg
-        map_element "mtd", to: :mtd_value
       end
     end
+    Configuration.register_model(Mlabeledtr, id: :mlabeledtr)
   end
 end

data/lib/mml/v4/mlongdiv.rb

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

data/lib/mml/v4/mmultiscripts.rb

@@ -2,34 +2,14 @@
 
 module Mml
   module V4
-    autoload(:Mprescripts, "mml/v4/mprescripts")
-
-    class Mmultiscripts < Mml::V3::Mmultiscripts
-      attribute :mathcolor, :string
-      attribute :mathbackground, :string
-      attribute :subscriptshift, :string
-      attribute :superscriptshift, :string
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :displaystyle, :string
-      attribute :scriptlevel, :integer
-      attribute :mprescripts_value, Mprescripts
+    class Mmultiscripts < CommonElements
+      include Base::Mmultiscripts
+      include Base::V4Attributes
 
       xml do
         namespace Namespace
-        element "mmultiscripts"
-        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
-        map_element "mprescripts", to: :mprescripts_value
       end
     end
+    Configuration.register_model(Mmultiscripts, id: :mmultiscripts)
   end
 end

data/lib/mml/v4/mn.rb

@@ -2,39 +2,14 @@
 
 module Mml
   module V4
-    class Mn < Mml::V3::Mn
-      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 Mn < Lutaml::Model::Serializable
+      include Base::Mn
+      include Base::V4Attributes
 
       xml do
         namespace Namespace
-        element "mn"
-
-        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(Mn, id: :mn)
   end
 end

data/lib/mml/v4/mo.rb

@@ -2,85 +2,14 @@
 
 module Mml
   module V4
-    class Mo < Mml::V3::Mo
-      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 :form, :string
-      attribute :fence, :string
-      attribute :separator, :string
-      attribute :lspace, :string
-      attribute :rspace, :string
-      attribute :stretchy, :string
-      attribute :symmetric, :string
-      attribute :maxsize, :string
-      attribute :minsize, :string
-      attribute :largeop, :string
-      attribute :movablelimits, :string
-      attribute :accent, :string
-      attribute :linebreak, :string
-      attribute :lineleading, :string
-      attribute :linebreakstyle, :string
-      attribute :linebreakmultchar, :string
-      attribute :indentalign, :string
-      attribute :indentshift, :string
-      attribute :indenttarget, :string
-      attribute :indentalignfirst, :string
-      attribute :indentshiftfirst, :string
-      attribute :indentalignlast, :string
-      attribute :indentshiftlast, :string
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :displaystyle, :string
-      attribute :scriptlevel, :integer
+    class Mo < Lutaml::Model::Serializable
+      include Base::Mo
+      include Base::V4Attributes
 
-      # rubocop:disable Metrics/BlockLength
       xml do
         namespace Namespace
-        element "mo"
-
-        map_content to: :value
-        map_attribute "dir", to: :dir
-        map_attribute "form", to: :form
-        map_attribute "accent", to: :accent
-        map_attribute "lspace", to: :lspace
-        map_attribute "rspace", to: :rspace
-        map_attribute "maxsize", to: :maxsize
-        map_attribute "minsize", to: :minsize
-        map_attribute "largeop", to: :largeop
-        map_attribute "stretchy", to: :stretchy
-        map_attribute "mathsize", to: :mathsize
-        map_attribute "linebreak", to: :linebreak
-        map_attribute "symmetric", to: :symmetric
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "mathvariant", to: :mathvariant
-        map_attribute "lineleading", to: :lineleading
-        map_attribute "indentalign", to: :indentalign
-        map_attribute "indentshift", to: :indentshift
-        map_attribute "indenttarget", to: :indenttarget
-        map_attribute "movablelimits", to: :movablelimits
-        map_attribute "linebreakstyle", to: :linebreakstyle
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "indentalignlast", to: :indentalignlast
-        map_attribute "indentshiftlast", to: :indentshiftlast
-        map_attribute "indentalignfirst", to: :indentalignfirst
-        map_attribute "indentshiftfirst", to: :indentshiftfirst
-        map_attribute "linebreakmultchar", to: :linebreakmultchar
-        map_attribute "intent", to: :intent
-        map_attribute "arg", to: :arg
-        map_attribute "displaystyle", to: :displaystyle
-        map_attribute "scriptlevel", to: :scriptlevel
       end
-      # rubocop:enable Metrics/BlockLength
     end
+    Configuration.register_model(Mo, id: :mo)
   end
 end

data/lib/mml/v4/mover.rb

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

data/lib/mml/v4/mpadded.rb

@@ -2,36 +2,14 @@
 
 module Mml
   module V4
-    class Mpadded < Mml::V3::Mpadded
-      attribute :mathbackground, :string
-      attribute :mathcolor, :string
-      attribute :voffset, :string
-      attribute :height, :string
-      attribute :lspace, :string
-      attribute :depth, :string
-      attribute :width, :string
-      attribute :intent, :string
-      attribute :arg, :string
-      attribute :displaystyle, :string
-      attribute :scriptlevel, :integer
+    class Mpadded < CommonElements
+      include Base::Mpadded
+      include Base::V4Attributes
 
       xml do
         namespace Namespace
-        element "mpadded"
-        mixed_content
-
-        map_attribute "mathbackground", to: :mathbackground
-        map_attribute "mathcolor", to: :mathcolor
-        map_attribute "voffset", to: :voffset
-        map_attribute "height", to: :height
-        map_attribute "lspace", to: :lspace
-        map_attribute "depth", to: :depth
-        map_attribute "width", to: :width
-        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(Mpadded, id: :mpadded)
   end
 end

data/lib/mml/v4/mphantom.rb

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

data/lib/mml/v4/mprescripts.rb

@@ -2,21 +2,14 @@
 
 module Mml
   module V4
-    class Mprescripts < Mml::V3::Mprescripts
-      attribute :mathcolor, :string
-      attribute :mathbackground, :string
-      attribute :intent, :string
-      attribute :arg, :string
+    class Mprescripts < Lutaml::Model::Serializable
+      include Base::Mprescripts
+      include Base::V4Attributes
 
       xml do
         namespace Namespace
-        element "mprescripts"
-
-        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(Mprescripts, id: :mprescripts)
   end
 end

data/lib/mml/v4/mroot.rb

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

data/lib/mml/v4/mrow.rb

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