mml 0.4.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc9f02320e944d4ffcdb90d8d99d9fe074c5124dc913cb356d18fbd6ee0dc339
-  data.tar.gz: f42d0420abe91de5be37064cb6a11a34116206c99cb37207b803e34bd96bf34c
+  metadata.gz: 565c1e39fe3e4ac67501f0064c9685dae36c40339c12ed1d7d489a73fbdb8a73
+  data.tar.gz: 1f7fb702767b86261862c161384b6f1f44899b31923285e3af00de766daae784
 SHA512:
-  metadata.gz: f4d301a0f1cc9a4e5a83467bfa8af8a704dd4678887e0b467547ece985cbd5a6d66f746f4dcc9ca877c11c3fe0452432aad66f95dea7b104a4c0ba9bdfe9b270
-  data.tar.gz: 38ffab79e51e82dcc94b706d85f363e5905529a14fb109b8cb58e504063c3e03fbe1f18acc94f1b2133066a18f8288c7990f43779fcadc96f533e960717a15cb
+  metadata.gz: a06d4db0336c75b7c888c03c3c88fecba8bc0f4dd1622354b41d829a60ae0a5548b162bf9334320bac88984f7a77f043e909e0ff13c069d0debcff4f973ade23
+  data.tar.gz: 0b3a278522ec51b683a0be41198909fe9f3a882148d053f4d444771dfb2cfe4ab6f16ed73cb11c30b89acbeb51fe56c935216e4527c7c9a71cd2436df3d3ce81

data/lib/mml/configuration.rb

@@ -2,7 +2,7 @@
 
 module Mml
   module Configuration
-    SUPPORTED_TAGS = %i[
+    SUPPORTED_TAGS = %w[
       mmultiscripts
       maligngroup
       malignmark
@@ -42,38 +42,6 @@ module Mml
       ms
     ].freeze
 
-    COMMON_ATTRIBUTES_CLASSES = %w[
-      MathWithNilNamespace
-      MathWithNamespace
-      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
@@ -84,17 +52,15 @@ module Mml
       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.downcase
+      Lutaml::Model::Config.configure do |config|
+        require "lutaml/model/xml_adapter/#{adapter.downcase}_adapter"
+        config.xml_adapter = Lutaml::Model::XmlAdapter.const_get("#{adapter.to_s.capitalize}Adapter")
+      end
     end
 
     def class_for(class_name)

data/lib/mml/maction.rb

@@ -2,6 +2,8 @@
 
 module Mml
   class Maction < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:maction)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :actiontype, :string

data/lib/mml/maligngroup.rb

@@ -2,6 +2,8 @@
 
 module Mml
   class Maligngroup < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:maligngroup)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :groupalign, :string

data/lib/mml/malignmark.rb

@@ -2,6 +2,8 @@
 
 module Mml
   class Malignmark < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:malignmark)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :edge, :string

data/lib/mml/math_with_namespace.rb

@@ -2,13 +2,19 @@
 
 module Mml
   class MathWithNamespace < Lutaml::Model::Serializable
-    attribute :display, :string
+    model Mml::Configuration.class_for(:math)
+
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "math", mixed: true
       namespace "http://www.w3.org/1998/Math/MathML", nil
 
-      map_attribute :display, to: :display
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/math_with_nil_namespace.rb

@@ -2,12 +2,18 @@
 
 module Mml
   class MathWithNilNamespace < Lutaml::Model::Serializable
-    attribute :display, :string
+    model Mml::Configuration.class_for(:math)
+
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "math", mixed: true
 
-      map_attribute :display, to: :display
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/menclose.rb

@@ -2,9 +2,14 @@
 
 module Mml
   class Menclose < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:menclose)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :notation, :string
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "menclose", mixed: true
@@ -12,6 +17,9 @@ module Mml
       map_attribute "mathcolor", to: :mathcolor, namespace: nil
       map_attribute "mathbackground", to: :mathbackground, namespace: nil
       map_attribute "notation", to: :notation, namespace: nil
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/merror.rb

@@ -2,14 +2,22 @@
 
 module Mml
   class Merror < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:merror)
+
     attribute :mathbackground, :string
     attribute :mathcolor, :string
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "merror", mixed: true
 
       map_attribute "mathcolor", to: :mathcolor, namespace: nil
       map_attribute "mathbackground", to: :mathbackground, namespace: nil
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/mfenced.rb

@@ -2,12 +2,17 @@
 
 module Mml
   class Mfenced < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mfenced)
+
     attribute :mathbackground, :string
     attribute :separators, :string
     attribute :mathcolor, :string
     attribute :content, :string
     attribute :close, :string
     attribute :open, :string
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "mfenced", mixed: true
@@ -19,6 +24,10 @@ module Mml
       map_attribute "mathcolor", to: :mathcolor, namespace: nil
       map_attribute "close", to: :close, namespace: nil
       map_attribute "open", to: :open, namespace: nil
+
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/mfrac.rb

@@ -2,12 +2,17 @@
 
 module Mml
   class Mfrac < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mfrac)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :linethickness, :string
     attribute :numalign, :string
     attribute :denomalign, :string
     attribute :bevelled, :string
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "mfrac", mixed: true
@@ -18,6 +23,9 @@ module Mml
       map_attribute "numalign", to: :numalign, namespace: nil
       map_attribute "denomalign", to: :denomalign, namespace: nil
       map_attribute "bevelled", to: :bevelled, namespace: nil
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/mfraction.rb

@@ -2,12 +2,17 @@
 
 module Mml
   class Mfraction < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mfraction)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :linethickness, :string
     attribute :numalign, :string
     attribute :denomalign, :string
     attribute :bevelled, :string
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "mfraction", mixed: true
@@ -18,6 +23,9 @@ module Mml
       map_attribute "numalign", to: :numalign, namespace: nil
       map_attribute "denomalign", to: :denomalign, namespace: nil
       map_attribute "bevelled", to: :bevelled, namespace: nil
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/mglyph.rb

@@ -2,6 +2,8 @@
 
 module Mml
   class Mglyph < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mglyph)
+
     attribute :alt, :string
     attribute :src, :string
     attribute :width, :string

data/lib/mml/mi.rb

@@ -2,6 +2,8 @@
 
 module Mml
   class Mi < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mi)
+
     attribute :dir, :string
     attribute :value, :string
     attribute :color, :string

data/lib/mml/mlabeledtr.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module Mml
-  autoload(:Mtd, "mml/mtd")
-
   class Mlabeledtr < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mlabeledtr)
+
     attribute :mathbackground, :string
     attribute :columnalign, :string
     attribute :groupalign, :string

data/lib/mml/mlongdiv.rb

@@ -2,11 +2,16 @@
 
 module Mml
   class Mlongdiv < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mlongdiv)
+
     attribute :mathbackground, :string
     attribute :longdivstyle, :string
     attribute :mathcolor, :string
     attribute :position, :integer
     attribute :shift, :integer
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "mlongdiv", mixed: true
@@ -16,6 +21,9 @@ module Mml
       map_attribute "mathcolor", to: :mathcolor, namespace: nil
       map_attribute "position", to: :position, namespace: nil
       map_attribute "shift", to: :shift, namespace: nil
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/mml.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Mml
+  class Error < StandardError; end
+
+  module_function
+
+  def config
+    Configuration.config
+  end
+
+  def parse(input, namespace_exist: true)
+    Configuration.adapter = :ox unless Configuration.adapter
+
+    if namespace_exist
+      Mml::MathWithNamespace.from_xml(input)
+    else
+      Mml::MathWithNilNamespace.from_xml(input)
+    end
+  end
+end

data/lib/mml/mmultiscripts.rb

@@ -1,14 +1,17 @@
 # frozen_string_literal: true
 
 module Mml
-  autoload(:Mprescripts, "mml/mprescripts")
-
   class Mmultiscripts < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mmultiscripts)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :subscriptshift, :string
     attribute :superscriptshift, :string
     attribute :mprescripts_value, Mprescripts
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "mmultiscripts", mixed: true
@@ -18,6 +21,9 @@ module Mml
       map_attribute "subscriptshift", to: :subscriptshift, namespace: nil
       map_attribute "superscriptshift", to: :superscriptshift, namespace: nil
       map_element "mprescripts", to: :mprescripts_value
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/mn.rb

@@ -2,7 +2,9 @@
 
 module Mml
   class Mn < Lutaml::Model::Serializable
-    attribute :value, :string
+    model Mml::Configuration.class_for(:mn)
+
+    attribute :value, :integer
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :mathvariant, :string

data/lib/mml/mo.rb

@@ -2,6 +2,8 @@
 
 module Mml
   class Mo < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mo)
+
     attribute :value, :string
     attribute :mathcolor, :string
     attribute :mathbackground, :string

data/lib/mml/mover.rb

@@ -2,10 +2,15 @@
 
 module Mml
   class Mover < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mover)
+
     attribute :mathbackground, :string
     attribute :mathcolor, :string
     attribute :accent, :string
     attribute :align, :string
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "mover", mixed: true
@@ -14,6 +19,9 @@ module Mml
       map_attribute "mathcolor", to: :mathcolor, namespace: nil
       map_attribute "accent", to: :accent, namespace: nil
       map_attribute "align", to: :align, namespace: nil
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/mpadded.rb

@@ -2,6 +2,8 @@
 
 module Mml
   class Mpadded < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mpadded)
+
     attribute :mathbackground, :string
     attribute :mathcolor, :string
     attribute :voffset, :string
@@ -9,6 +11,9 @@ module Mml
     attribute :lspace, :string
     attribute :depth, :string
     attribute :width, :string
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "mpadded", mixed: true
@@ -20,6 +25,9 @@ module Mml
       map_attribute "lspace", to: :lspace, namespace: nil
       map_attribute "depth", to: :depth, namespace: nil
       map_attribute "width", to: :width, namespace: nil
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/mphantom.rb

@@ -2,14 +2,22 @@
 
 module Mml
   class Mphantom < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mphantom)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "mphantom", mixed: true
 
       map_attribute "mathcolor", to: :mathcolor, namespace: nil
       map_attribute "mathbackground", to: :mathbackground, namespace: nil
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/mprescripts.rb

@@ -2,6 +2,8 @@
 
 module Mml
   class Mprescripts < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mprescripts)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
 

data/lib/mml/mroot.rb

@@ -2,14 +2,22 @@
 
 module Mml
   class Mroot < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mroot)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "mroot", mixed: true
 
       map_attribute "mathcolor", to: :mathcolor, namespace: nil
       map_attribute "mathbackground", to: :mathbackground, namespace: nil
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/mrow.rb

@@ -2,12 +2,18 @@
 
 module Mml
   class Mrow < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mrow)
+
     attribute :mathbackground, :string
     attribute :mathcolor, :string
     attribute :content, :string
     attribute :intent, :string
     attribute :dir, :string
 
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
+
     xml do
       root "mrow", mixed: true
 
@@ -16,6 +22,10 @@ module Mml
       map_attribute "intent", to: :intent, namespace: nil
       map_attribute "mathcolor", to: :mathcolor, namespace: nil
       map_attribute "mathbackground", to: :mathbackground, namespace: nil
+
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/ms.rb

@@ -2,6 +2,8 @@
 
 module Mml
   class Ms < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:ms)
+
     attribute :mathbackground, :string
     attribute :mathvariant, :string
     attribute :fontfamily, :string
@@ -16,6 +18,9 @@ module Mml
     attribute :color, :string
     attribute :value, :string
     attribute :dir, :string
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize)
+    end
 
     xml do
       root "ms", mixed: true
@@ -34,6 +39,9 @@ module Mml
       map_attribute "rquote", to: :rquote, namespace: nil
       map_attribute "color", to: :color, namespace: nil
       map_attribute "dir", to: :dir, namespace: nil
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/mscarries.rb

@@ -2,12 +2,17 @@
 
 module Mml
   class Mscarries < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mscarries)
+
     attribute :scriptsizemultiplier, :integer
     attribute :mathbackground, :string
     attribute :mathcolor, :string
     attribute :position, :integer
     attribute :location, :string
     attribute :crossout, :string
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "mscarries", mixed: true
@@ -18,6 +23,9 @@ module Mml
       map_attribute "position", to: :position, namespace: nil
       map_attribute "location", to: :location, namespace: nil
       map_attribute "crossout", to: :crossout, namespace: nil
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/mscarry.rb

@@ -2,10 +2,15 @@
 
 module Mml
   class Mscarry < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mscarry)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :location, :string
     attribute :crossout, :string
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "mscarry", mixed: true
@@ -14,6 +19,9 @@ module Mml
       map_attribute "mathbackground", to: :mathbackground, namespace: nil
       map_attribute "location", to: :location, namespace: nil
       map_attribute "crossout", to: :crossout, namespace: nil
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/msgroup.rb

@@ -2,12 +2,20 @@
 
 module Mml
   class Msgroup < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:msgroup)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :position, :integer
     attribute :shift, :integer
+    attribute :mscarries_value, Mscarries, collection: true
+    attribute :msrow_value, Msrow, collection: true
     attribute :msgroup_text, :string
 
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
+
     xml do
       root "msgroup", mixed: true
 
@@ -16,6 +24,9 @@ module Mml
       map_attribute "mathbackground", to: :mathbackground, namespace: nil
       map_attribute "position", to: :position, namespace: nil
       map_attribute "shift", to: :shift, namespace: nil
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/msline.rb

@@ -2,6 +2,8 @@
 
 module Mml
   class Msline < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:msline)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :position, :integer

data/lib/mml/mspace.rb

@@ -2,6 +2,8 @@
 
 module Mml
   class Mspace < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mspace)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :mathvariant, :string

data/lib/mml/msqrt.rb

@@ -2,14 +2,23 @@
 
 module Mml
   class Msqrt < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:msqrt)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "msqrt", mixed: true
 
       map_attribute "mathcolor", to: :mathcolor, namespace: nil
       map_attribute "mathbackground", to: :mathbackground, namespace: nil
+
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/msrow.rb

@@ -2,9 +2,14 @@
 
 module Mml
   class Msrow < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:msrow)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :position, :integer
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "msrow", mixed: true
@@ -12,6 +17,10 @@ module Mml
       map_attribute "mathcolor", to: :mathcolor, namespace: nil
       map_attribute "mathbackground", to: :mathbackground, namespace: nil
       map_attribute "position", to: :position, namespace: nil
+
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/mstack.rb

@@ -2,12 +2,17 @@
 
 module Mml
   class Mstack < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mstack)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :align, :string
     attribute :stackalign, :string
     attribute :charalign, :string
     attribute :charspacing, :string
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "mstack", mixed: true
@@ -18,6 +23,9 @@ module Mml
       map_attribute "stackalign", to: :stackalign, namespace: nil
       map_attribute "charalign", to: :charalign, namespace: nil
       map_attribute "charspacing", to: :charspacing, namespace: nil
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/mstyle.rb

@@ -3,6 +3,8 @@
 module Mml
   # rubocop:disable Metrics/ClassLength
   class Mstyle < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mstyle)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :scriptlevel, :integer
@@ -99,6 +101,9 @@ module Mml
     attribute :thickmathspace, :string
     attribute :verythickmathspace, :string
     attribute :veryverythickmathspace, :string
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     # rubocop:disable Metrics/BlockLength
     xml do
@@ -200,6 +205,9 @@ module Mml
       map_attribute "thickmathspace", to: :thickmathspace, namespace: nil
       map_attribute "verythickmathspace", to: :verythickmathspace, namespace: nil
       map_attribute "veryverythickmathspace", to: :veryverythickmathspace, namespace: nil
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
     # rubocop:enable Metrics/BlockLength
   end

data/lib/mml/msub.rb

@@ -2,9 +2,14 @@
 
 module Mml
   class Msub < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:msub)
+
     attribute :mathbackground, :string
     attribute :subscriptshift, :string
     attribute :mathcolor, :string
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "msub", mixed: true
@@ -12,6 +17,9 @@ module Mml
       map_attribute "mathbackground", to: :mathbackground, namespace: nil
       map_attribute "subscriptshift", to: :subscriptshift, namespace: nil
       map_attribute "mathcolor", to: :mathcolor, namespace: nil
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/msubsup.rb

@@ -2,10 +2,15 @@
 
 module Mml
   class Msubsup < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:msubsup)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :subscriptshift, :string
     attribute :superscriptshift, :string
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "msubsup", mixed: true
@@ -14,6 +19,9 @@ module Mml
       map_attribute "mathbackground", to: :mathbackground, namespace: nil
       map_attribute "subscriptshift", to: :subscriptshift, namespace: nil
       map_attribute "superscriptshift", to: :superscriptshift, namespace: nil
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/msup.rb

@@ -2,9 +2,14 @@
 
 module Mml
   class Msup < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:msup)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :superscriptshift, :string
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "msup", mixed: true
@@ -12,6 +17,9 @@ module Mml
       map_attribute "mathcolor", to: :mathcolor, namespace: nil
       map_attribute "mathbackground", to: :mathbackground, namespace: nil
       map_attribute "superscriptshift", to: :superscriptshift, namespace: nil
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/mtable.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module Mml
-  autoload(:Mlabeledtr, "mml/mlabeledtr")
-  autoload(:Mtr, "mml/mtr")
   class Mtable < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mtable)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :align, :string

data/lib/mml/mtd.rb

@@ -2,10 +2,15 @@
 
 module Mml
   class Mtd < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mtd)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :rowalign, :string
     attribute :columnalign, :string
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "mtd", mixed: true
@@ -14,6 +19,9 @@ module Mml
       map_attribute "mathbackground", to: :mathbackground, namespace: nil
       map_attribute "rowalign", to: :rowalign, namespace: nil
       map_attribute "columnalign", to: :columnalign, namespace: nil
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/mtext.rb

@@ -2,6 +2,8 @@
 
 module Mml
   class Mtext < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mtext)
+
     attribute :value, :string
     attribute :mathcolor, :string
     attribute :mathbackground, :string

data/lib/mml/mtr.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module Mml
-  autoload(:Mtd, "mml/mtd")
-
   class Mtr < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:mtr)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :rowalign, :string

data/lib/mml/munder.rb

@@ -2,11 +2,16 @@
 
 module Mml
   class Munder < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:munder)
+
     attribute :mathbackground, :string
     attribute :accentunder, :string
     attribute :mathcolor, :string
     attribute :content, :string
     attribute :align, :string
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "munder", mixed: true
@@ -16,6 +21,9 @@ module Mml
       map_attribute "mathcolor", to: :mathcolor, namespace: nil
       map_attribute "align", to: :align, namespace: nil
       map_content to: :content
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/munderover.rb

@@ -2,11 +2,16 @@
 
 module Mml
   class Munderover < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:munderover)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
     attribute :accent, :string
     attribute :accentunder, :string
     attribute :align, :string
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "munderover", mixed: true
@@ -16,6 +21,9 @@ module Mml
       map_attribute "accent", to: :accent, namespace: nil
       map_attribute "accentunder", to: :accentunder, namespace: nil
       map_attribute "align", to: :align, namespace: nil
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/none.rb

@@ -2,6 +2,8 @@
 
 module Mml
   class None < Lutaml::Model::Serializable
+    model Mml::Configuration.class_for(:none)
+
     attribute :mathcolor, :string
     attribute :mathbackground, :string
 

data/lib/mml/semantics.rb

@@ -1,15 +1,21 @@
 # frozen_string_literal: true
 
 module Mml
-  autoload(:Mi, "mml/mi")
-
   class Semantics < Lutaml::Model::Serializable
-    attribute :annotation, Mi, collection: true
+    model Mml::Configuration.class_for(:semantics)
+
+    attribute :annotation, Mml::Mi, collection: true
+    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+      attribute :"#{tag}_value", Mml.const_get(tag.capitalize), collection: true
+    end
 
     xml do
       root "semantics", mixed: true
 
       map_element :annotation, to: :annotation
+      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
+        map_element tag.to_sym, to: :"#{tag}_value"
+      end
     end
   end
 end

data/lib/mml/version.rb

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

data/lib/mml.rb

@@ -1,49 +1,9 @@
 # frozen_string_literal: true
 
+require "zeitwerk"
 require "lutaml/model"
-require "mml/configuration"
-if RUBY_ENGINE == "opal"
-  require_relative "mml/opal_setup"
-else
-  files = Dir["lib/mml/*.rb"].reject { |file| File.basename(file, ".*") == "common_attributes" }
-  files.each { |file| require_relative "mml/#{File.basename(file, ".rb")}" }
-end
-require "mml/common_attributes"
+require_relative "mml/mml"
 
-DEFAULT_ADAPTER = if RUBY_ENGINE == "opal"
-                    require "lutaml/model/xml_adapter/oga_adapter"
-                    :oga
-                  else
-                    require "lutaml/model/xml_adapter/ox_adapter"
-                    :ox
-                  end
-
-Moxml::Config.default_adapter = DEFAULT_ADAPTER
-
-module Mml
-  class Error < StandardError; end
-
-  module_function
-
-  def config
-    Configuration.config
-  end
-
-  def update_attributes
-    Configuration::COMMON_ATTRIBUTES_CLASSES.each do |klass|
-      const_get(klass).import_model(CommonAttributes)
-    end
-  end
-
-  def parse(input, namespace_exist: true)
-    Configuration.adapter = DEFAULT_ADAPTER unless Configuration.adapter
-
-    if namespace_exist
-      Mml::MathWithNamespace.from_xml(input)
-    else
-      Mml::MathWithNilNamespace.from_xml(input)
-    end
-  end
-end
-
-Mml.update_attributes
+loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
+loader.ignore("#{__dir__}/lib/mml.rb")
+loader.setup

data/mml.gemspec

@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "lutaml-model"
-  spec.add_runtime_dependency "moxml"
+  spec.add_runtime_dependency "lutaml-model", "~> 0.3"
+  spec.add_runtime_dependency "zeitwerk"
 end

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: mml
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-03-28 00:00:00.000000000 Z
+date: 2024-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: moxml
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,7 +59,6 @@ files:
 - bin/console
 - bin/setup
 - lib/mml.rb
-- lib/mml/common_attributes.rb
 - lib/mml/configuration.rb
 - lib/mml/maction.rb
 - lib/mml/maligngroup.rb
@@ -75,6 +74,7 @@ files:
 - lib/mml/mi.rb
 - lib/mml/mlabeledtr.rb
 - lib/mml/mlongdiv.rb
+- lib/mml/mml.rb
 - lib/mml/mmultiscripts.rb
 - lib/mml/mn.rb
 - lib/mml/mo.rb
@@ -104,7 +104,6 @@ files:
 - lib/mml/munder.rb
 - lib/mml/munderover.rb
 - lib/mml/none.rb
-- lib/mml/opal_setup.rb.erb
 - lib/mml/semantics.rb
 - lib/mml/version.rb
 - mml.gemspec
@@ -113,7 +112,7 @@ homepage: https://github.com/plurimath/mml
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -128,8 +127,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.3.27
+signing_key: 
 specification_version: 4
 summary: MathML parser by Plurimath.
 test_files: []

data/lib/mml/common_attributes.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Mml
-  Mml::Configuration::SUPPORTED_TAGS.each do |tag|
-    autoload(tag.to_s.capitalize.to_sym, tag.to_s)
-  end
-
-  class CommonAttributes < Lutaml::Model::Serializable
-    Mml::Configuration::SUPPORTED_TAGS.each do |tag|
-      attribute :"#{tag}_value", Mml.const_get(tag.to_s.capitalize), collection: true
-    end
-
-    xml do
-      no_root
-
-      Mml::Configuration::SUPPORTED_TAGS.each do |tag|
-        map_element tag, to: :"#{tag}_value"
-      end
-    end
-  end
-end

data/lib/mml/opal_setup.rb.erb

@@ -1,6 +0,0 @@
-<%
-  files = Dir["#{__dir__}/*.rb"].reject { |file| ["common_attributes", "opal_setup"].include?(File.basename(file, ".rb")) }
-  files.each do |file_name|
-%>
-  require 'mml/<%= File.basename(file_name, ".rb") %>'
-<% end %>