mml 2.2.1 → 2.3.1

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/relations.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Mml
+  module V3
+    class Eq < Lutaml::Model::Serializable
+      include Base::Content::Eq
+    end
+    Configuration.register_model(Eq, id: :eq)
+
+    class Neq < Lutaml::Model::Serializable
+      include Base::Content::Neq
+    end
+    Configuration.register_model(Neq, id: :neq)
+
+    class Leq < Lutaml::Model::Serializable
+      include Base::Content::Leq
+    end
+    Configuration.register_model(Leq, id: :leq)
+
+    class Lt < Lutaml::Model::Serializable
+      include Base::Content::Lt
+    end
+    Configuration.register_model(Lt, id: :lt)
+
+    class Geq < Lutaml::Model::Serializable
+      include Base::Content::Geq
+    end
+    Configuration.register_model(Geq, id: :geq)
+
+    class Gt < Lutaml::Model::Serializable
+      include Base::Content::Gt
+    end
+    Configuration.register_model(Gt, id: :gt)
+
+    class Equivalent < Lutaml::Model::Serializable
+      include Base::Content::Equivalent
+    end
+    Configuration.register_model(Equivalent, id: :equivalent)
+
+    class Approx < Lutaml::Model::Serializable
+      include Base::Content::Approx
+    end
+    Configuration.register_model(Approx, id: :approx)
+
+    class Factorof < Lutaml::Model::Serializable
+      include Base::Content::Factorof
+    end
+    Configuration.register_model(Factorof, id: :factorof)
+  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/sets.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Mml
+  module V3
+    class Set < CommonElements
+      include Base::Content::Set
+    end
+    Configuration.register_model(Set, id: :set)
+
+    class Mlist < CommonElements
+      include Base::Content::List
+    end
+    Configuration.register_model(Mlist, id: :list)
+
+    class Union < Lutaml::Model::Serializable
+      include Base::Content::Union
+    end
+    Configuration.register_model(Union, id: :union)
+
+    class Intersect < Lutaml::Model::Serializable
+      include Base::Content::Intersect
+    end
+    Configuration.register_model(Intersect, id: :intersect)
+
+    class In < Lutaml::Model::Serializable
+      include Base::Content::In
+    end
+    Configuration.register_model(In, id: :in)
+
+    class Notin < Lutaml::Model::Serializable
+      include Base::Content::Notin
+    end
+    Configuration.register_model(Notin, id: :notin)
+
+    class Subset < Lutaml::Model::Serializable
+      include Base::Content::Subset
+    end
+    Configuration.register_model(Subset, id: :subset)
+
+    class Prsubset < Lutaml::Model::Serializable
+      include Base::Content::Prsubset
+    end
+    Configuration.register_model(Prsubset, id: :prsubset)
+
+    class Notsubset < Lutaml::Model::Serializable
+      include Base::Content::Notsubset
+    end
+    Configuration.register_model(Notsubset, id: :notsubset)
+
+    class Notprsubset < Lutaml::Model::Serializable
+      include Base::Content::Notprsubset
+    end
+    Configuration.register_model(Notprsubset, id: :notprsubset)
+
+    class Setdiff < Lutaml::Model::Serializable
+      include Base::Content::Setdiff
+    end
+    Configuration.register_model(Setdiff, id: :setdiff)
+
+    class Card < Lutaml::Model::Serializable
+      include Base::Content::Card
+    end
+    Configuration.register_model(Card, id: :card)
+
+    class Cartesianproduct < Lutaml::Model::Serializable
+      include Base::Content::Cartesianproduct
+    end
+    Configuration.register_model(Cartesianproduct, id: :cartesianproduct)
+  end
+end

data/lib/mml/v3/statistics.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Mml
+  module V3
+    class Mean < Lutaml::Model::Serializable
+      include Base::Content::Mean
+    end
+    Configuration.register_model(Mean, id: :mean)
+
+    class Sdev < Lutaml::Model::Serializable
+      include Base::Content::Sdev
+    end
+    Configuration.register_model(Sdev, id: :sdev)
+
+    class Variance < Lutaml::Model::Serializable
+      include Base::Content::Variance
+    end
+    Configuration.register_model(Variance, id: :variance)
+
+    class Median < Lutaml::Model::Serializable
+      include Base::Content::Median
+    end
+    Configuration.register_model(Median, id: :median)
+
+    class Mode < Lutaml::Model::Serializable
+      include Base::Content::Mode
+    end
+    Configuration.register_model(Mode, id: :mode)
+
+    class Moment < Lutaml::Model::Serializable
+      include Base::Content::Moment
+    end
+    Configuration.register_model(Moment, id: :moment)
+
+    class Momentabout < CommonElements
+      include Base::Content::Momentabout
+    end
+    Configuration.register_model(Momentabout, id: :momentabout)
+  end
+end

data/lib/mml/v3/vector_calculus.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Mml
+  module V3
+    class Divergence < Lutaml::Model::Serializable
+      include Base::Content::Divergence
+    end
+    Configuration.register_model(Divergence, id: :divergence)
+
+    class Grad < Lutaml::Model::Serializable
+      include Base::Content::Grad
+    end
+    Configuration.register_model(Grad, id: :grad)
+
+    class Curl < Lutaml::Model::Serializable
+      include Base::Content::Curl
+    end
+    Configuration.register_model(Curl, id: :curl)
+
+    class Laplacian < Lutaml::Model::Serializable
+      include Base::Content::Laplacian
+    end
+    Configuration.register_model(Laplacian, id: :laplacian)
+  end
+end

data/lib/mml/v3.rb

@@ -1,85 +1,84 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require "mml/v3/configuration"
+require_relative "versioned_parser"
 
-DEFAULT_ADAPTER = :ox
+Moxml::Config.default_adapter = Mml::DEFAULT_ADAPTER
 
-Moxml::Config.default_adapter = 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"
+
+# Content elements - must be eagerly loaded for Configuration.register_model
+require_relative "v3/apply"
+require_relative "v3/cbytes"
+require_relative "v3/cerror"
+require_relative "v3/cs"
+require_relative "v3/ci"
+require_relative "v3/cn"
+require_relative "v3/csymbol"
+require_relative "v3/annotation_xml"
+require_relative "v3/annotation"
+require_relative "v3/constructs"
+require_relative "v3/bind"
+require_relative "v3/arith"
+require_relative "v3/logic"
+require_relative "v3/relations"
+require_relative "v3/sets"
+require_relative "v3/calculus"
+require_relative "v3/vector_calculus"
+require_relative "v3/functions"
+require_relative "v3/elementary_functions"
+require_relative "v3/constants"
+require_relative "v3/linear_algebra"
+require_relative "v3/statistics"
+require_relative "v3/deprecated_content"
 
 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,12 +15,6 @@ 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
   end

data/lib/mml/v4/annotation.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Mml
+  module V4
+    class Annotation < CommonElements
+      include Base::Content::Annotation
+    end
+    Configuration.register_model(Annotation, id: :annotation)
+  end
+end

data/lib/mml/v4/annotation_xml.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Mml
+  module V4
+    class AnnotationXml < CommonElements
+      include Base::Content::AnnotationXml
+      include Base::V4Attributes
+
+      xml do
+        namespace Namespace
+      end
+    end
+  end
+end

data/lib/mml/v4/apply.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Mml
+  module V4
+    class Apply < CommonElements
+      include Base::Content::Apply
+    end
+  end
+end

data/lib/mml/v4/arith.rb

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+module Mml
+  module V4
+    class Abs < Lutaml::Model::Serializable
+      include Base::Content::Abs
+    end
+
+    class Conjugate < Lutaml::Model::Serializable
+      include Base::Content::Conjugate
+    end
+
+    class Arg < Lutaml::Model::Serializable
+      include Base::Content::Arg
+    end
+
+    class Real < Lutaml::Model::Serializable
+      include Base::Content::Real
+    end
+
+    class Imaginary < Lutaml::Model::Serializable
+      include Base::Content::Imaginary
+    end
+
+    class Floor < Lutaml::Model::Serializable
+      include Base::Content::Floor
+    end
+
+    class Ceiling < Lutaml::Model::Serializable
+      include Base::Content::Ceiling
+    end
+
+    class Quotient < Lutaml::Model::Serializable
+      include Base::Content::Quotient
+    end
+
+    class Divide < Lutaml::Model::Serializable
+      include Base::Content::Divide
+    end
+
+    class Rem < Lutaml::Model::Serializable
+      include Base::Content::Rem
+    end
+
+    class Minus < Lutaml::Model::Serializable
+      include Base::Content::Minus
+    end
+
+    class Plus < Lutaml::Model::Serializable
+      include Base::Content::Plus
+    end
+
+    class Times < Lutaml::Model::Serializable
+      include Base::Content::Times
+    end
+
+    class Power < Lutaml::Model::Serializable
+      include Base::Content::Power
+    end
+
+    class Root < Lutaml::Model::Serializable
+      include Base::Content::Root
+    end
+
+    class Max < Lutaml::Model::Serializable
+      include Base::Content::Max
+    end
+
+    class Min < Lutaml::Model::Serializable
+      include Base::Content::Min
+    end
+
+    class Gcd < Lutaml::Model::Serializable
+      include Base::Content::Gcd
+    end
+
+    class Lcm < Lutaml::Model::Serializable
+      include Base::Content::Lcm
+    end
+
+    class Sum < Lutaml::Model::Serializable
+      include Base::Content::Sum
+    end
+
+    class Product < Lutaml::Model::Serializable
+      include Base::Content::Product
+    end
+
+    class Factorial < Lutaml::Model::Serializable
+      include Base::Content::Factorial
+    end
+  end
+end

data/lib/mml/v4/calculus.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Mml
+  module V4
+    class Diff < Lutaml::Model::Serializable
+      include Base::Content::Diff
+    end
+
+    class Partialdiff < Lutaml::Model::Serializable
+      include Base::Content::Partialdiff
+    end
+
+    class Int < Lutaml::Model::Serializable
+      include Base::Content::Int
+    end
+
+    class Lowlimit < Lutaml::Model::Serializable
+      include Base::Content::Lowlimit
+    end
+
+    class Uplimit < Lutaml::Model::Serializable
+      include Base::Content::Uplimit
+    end
+  end
+end

data/lib/mml/v4/cbytes.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Mml
+  module V4
+    class Cbytes < Lutaml::Model::Serializable
+      include Base::Content::Cbytes
+    end
+  end
+end

data/lib/mml/v4/cerror.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Mml
+  module V4
+    class Cerror < CommonElements
+      include Base::Content::Cerror
+    end
+  end
+end

data/lib/mml/v4/ci.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Mml
+  module V4
+    class Ci < Lutaml::Model::Serializable
+      include Base::Content::Ci
+    end
+  end
+end

data/lib/mml/v4/cn.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Mml
+  module V4
+    class Cn < Lutaml::Model::Serializable
+      include Base::Content::Cn
+    end
+  end
+end