mml 2.3.0 → 2.3.2

data/lib/mml/v3/linear_algebra.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Mml
+  module V3
+    class Vector < CommonElements
+      include Base::Content::Vector
+    end
+    Configuration.register_model(Vector, id: :vector)
+
+    class Matrix < CommonElements
+      include Base::Content::Matrix
+    end
+    Configuration.register_model(Matrix, id: :matrix)
+
+    class Matrixrow < CommonElements
+      include Base::Content::Matrixrow
+    end
+    Configuration.register_model(Matrixrow, id: :matrixrow)
+
+    class Determinant < Lutaml::Model::Serializable
+      include Base::Content::Determinant
+    end
+    Configuration.register_model(Determinant, id: :determinant)
+
+    class Transpose < Lutaml::Model::Serializable
+      include Base::Content::Transpose
+    end
+    Configuration.register_model(Transpose, id: :transpose)
+
+    class Selector < Lutaml::Model::Serializable
+      include Base::Content::Selector
+    end
+    Configuration.register_model(Selector, id: :selector)
+
+    class Vectorproduct < Lutaml::Model::Serializable
+      include Base::Content::Vectorproduct
+    end
+    Configuration.register_model(Vectorproduct, id: :vectorproduct)
+
+    class Scalarproduct < Lutaml::Model::Serializable
+      include Base::Content::Scalarproduct
+    end
+    Configuration.register_model(Scalarproduct, id: :scalarproduct)
+
+    class Outerproduct < Lutaml::Model::Serializable
+      include Base::Content::Outerproduct
+    end
+    Configuration.register_model(Outerproduct, id: :outerproduct)
+  end
+end

data/lib/mml/v3/logic.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Mml
+  module V3
+    class And < Lutaml::Model::Serializable
+      include Base::Content::And
+    end
+    Configuration.register_model(And, id: :and)
+
+    class Or < Lutaml::Model::Serializable
+      include Base::Content::Or
+    end
+    Configuration.register_model(Or, id: :or)
+
+    class Xor < Lutaml::Model::Serializable
+      include Base::Content::Xor
+    end
+    Configuration.register_model(Xor, id: :xor)
+
+    class Not < Lutaml::Model::Serializable
+      include Base::Content::Not
+    end
+    Configuration.register_model(Not, id: :not)
+
+    class Exists < Lutaml::Model::Serializable
+      include Base::Content::Exists
+    end
+    Configuration.register_model(Exists, id: :exists)
+
+    class Forall < Lutaml::Model::Serializable
+      include Base::Content::Forall
+    end
+    Configuration.register_model(Forall, id: :forall)
+
+    class Implies < Lutaml::Model::Serializable
+      include Base::Content::Implies
+    end
+    Configuration.register_model(Implies, id: :implies)
+  end
+end

data/lib/mml/v3/maction.rb

@@ -2,7 +2,7 @@
 
 module Mml
   module V3
-    class Maction < Lutaml::Model::Serializable
+    class Maction < CommonElements
       include Base::Maction
     end
     Configuration.register_model(Maction, id: :maction)

data/lib/mml/v3/math.rb

@@ -4,10 +4,16 @@ module Mml
   module V3
     class Math < CommonElements
       include Base::Math
+      include Base::V3Common
+
+      attribute :overflow, :string
+
+      xml do
+        map_attribute "overflow", to: :overflow
+      end
     end
     Configuration.register_model(Math, id: :math)
 
-    # For backward compatibility, we keep MathWithNamespace as an alias to Math.
     MathWithNamespace = Math
   end
 end

data/lib/mml/v3/mi.rb

@@ -4,6 +4,7 @@ module Mml
   module V3
     class Mi < Lutaml::Model::Serializable
       include Base::Mi
+      include Base::V3Common
       include Base::DeprecatedFontAttributes
     end
     Configuration.register_model(Mi, id: :mi)

data/lib/mml/v3/mn.rb

@@ -4,6 +4,7 @@ module Mml
   module V3
     class Mn < Lutaml::Model::Serializable
       include Base::Mn
+      include Base::V3Common
       include Base::DeprecatedFontAttributes
     end
     Configuration.register_model(Mn, id: :mn)

data/lib/mml/v3/mo.rb

@@ -4,6 +4,7 @@ module Mml
   module V3
     class Mo < Lutaml::Model::Serializable
       include Base::Mo
+      include Base::V3Common
       include Base::DeprecatedFontAttributes
       include Base::V3Only::OperatorAttributes
     end

data/lib/mml/v3/mrow.rb

@@ -4,6 +4,7 @@ module Mml
   module V3
     class Mrow < CommonElements
       include Base::Mrow
+      include Base::V3Common
     end
     Configuration.register_model(Mrow, id: :mrow)
   end

data/lib/mml/v3/ms.rb

@@ -4,6 +4,7 @@ module Mml
   module V3
     class Ms < CommonElements
       include Base::Ms
+      include Base::V3Common
       include Base::DeprecatedFontAttributes
     end
     Configuration.register_model(Ms, id: :ms)

data/lib/mml/v3/mstyle.rb

@@ -4,6 +4,7 @@ module Mml
   module V3
     class Mstyle < CommonElements
       include Base::Mstyle
+      include Base::V3Common
       include Base::DeprecatedFontAttributes
       include Base::V3Only::StyleAttributes
     end

data/lib/mml/v3/mtext.rb

@@ -4,6 +4,7 @@ module Mml
   module V3
     class Mtext < Lutaml::Model::Serializable
       include Base::Mtext
+      include Base::V3Common
       include Base::DeprecatedFontAttributes
     end
     Configuration.register_model(Mtext, id: :mtext)

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/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

@@ -52,6 +52,31 @@ 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
     extend Mml::VersionedParser

data/lib/mml/v4/a.rb

@@ -5,18 +5,19 @@ module Mml
     class A < CommonElements
       include Base::V4Attributes
 
-      attribute :href, :string
       attribute :hreflang, :string
+      attribute :width, :string
+      attribute :height, :string
 
       xml do
         namespace Namespace
         element "a"
         mixed_content
 
-        map_attribute "href", to: :href
         map_attribute "hreflang", to: :hreflang
+        map_attribute "width", to: :width
+        map_attribute "height", to: :height
       end
     end
-    Configuration.register_model(A, id: :a)
   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

data/lib/mml/v4/common_elements.rb

@@ -3,10 +3,43 @@
 module Mml
   module V4
     class CommonElements < Mml::CommonElements
+      def self.lutaml_default_register
+        :mml_v4
+      end
+
       attribute :a_value, :a, collection: true
+      attribute :annotation_xml_value, :"annotation-xml", collection: true
+      attribute :annotation_value, :annotation, collection: true
+      attribute :cbytes_value, :cbytes, collection: true
+      attribute :cerror_value, :cerror, collection: true
+      attribute :cs_value, :cs, collection: true
+      attribute :declare_value, :declare, collection: true
+      attribute :domainofapplication_value, :domainofapplication,
+                collection: true
+      attribute :factorof_value, :factorof, collection: true
+      attribute :fn_value, :fn, collection: true
+      attribute :limit_value, :limit, collection: true
+      attribute :logbase_value, :logbase, collection: true
+      attribute :reln_value, :reln, collection: true
+      attribute :share_value, :share, collection: true
+      attribute :tendsto_value, :tendsto, collection: true
 
       xml do
         map_element "a", to: :a_value
+        map_element "annotation-xml", to: :annotation_xml_value
+        map_element "annotation", to: :annotation_value
+        map_element "cbytes", to: :cbytes_value
+        map_element "cerror", to: :cerror_value
+        map_element "cs", to: :cs_value
+        map_element "declare", to: :declare_value
+        map_element "domainofapplication", to: :domainofapplication_value
+        map_element "factorof", to: :factorof_value
+        map_element "fn", to: :fn_value
+        map_element "limit", to: :limit_value
+        map_element "logbase", to: :logbase_value
+        map_element "reln", to: :reln_value
+        map_element "share", to: :share_value
+        map_element "tendsto", to: :tendsto_value
       end
     end
   end