mml 2.0.3 → 2.2.0

data/lib/mml/v4/mtext.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Mml
+  module V4
+    class Mtext < Mml::V3::Mtext
+      attribute :value, :string
+      attribute :mathcolor, :string
+      attribute :mathbackground, :string
+      attribute :mathvariant, :string
+      attribute :mathsize, :string
+      attribute :dir, :string
+      attribute :fontfamily, :string
+      attribute :fontweight, :string
+      attribute :fontstyle, :string
+      attribute :fontsize, :string
+      attribute :color, :string
+      attribute :background, :string
+      attribute :intent, :string
+      attribute :arg, :string
+      attribute :displaystyle, :string
+      attribute :scriptlevel, :integer
+
+      xml do
+        namespace Namespace
+        element "mtext"
+
+        map_content to: :value
+        map_attribute "mathcolor", to: :mathcolor
+        map_attribute "mathbackground", to: :mathbackground
+        map_attribute "mathvariant", to: :mathvariant
+        map_attribute "mathsize", to: :mathsize
+        map_attribute "dir", to: :dir
+        map_attribute "intent", to: :intent
+        map_attribute "arg", to: :arg
+        map_attribute "displaystyle", to: :displaystyle
+        map_attribute "scriptlevel", to: :scriptlevel
+      end
+    end
+  end
+end

data/lib/mml/v4/mtr.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Mml
+  module V4
+    autoload(:Mtd, "mml/v4/mtd")
+
+    class Mtr < Mml::V3::Mtr
+      attribute :mathcolor, :string
+      attribute :mathbackground, :string
+      attribute :rowalign, :string
+      attribute :columnalign, :string
+      attribute :groupalign, :string
+      attribute :intent, :string
+      attribute :arg, :string
+      attribute :displaystyle, :string
+      attribute :scriptlevel, :integer
+      attribute :mtd_value, Mtd, collection: true
+
+      xml do
+        namespace Namespace
+        element "mtr"
+        mixed_content
+
+        map_attribute "mathcolor", to: :mathcolor
+        map_attribute "mathbackground", to: :mathbackground
+        map_attribute "rowalign", to: :rowalign
+        map_attribute "columnalign", to: :columnalign
+        map_attribute "intent", to: :intent
+        map_attribute "arg", to: :arg
+        map_attribute "displaystyle", to: :displaystyle
+        map_attribute "scriptlevel", to: :scriptlevel
+        map_element "mtd", to: :mtd_value
+      end
+    end
+  end
+end

data/lib/mml/v4/munder.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Mml
+  module V4
+    class Munder < Mml::V3::Munder
+      attribute :mathbackground, :string
+      attribute :accentunder, :string
+      attribute :mathcolor, :string
+      attribute :content, :string
+      attribute :align, :string
+      attribute :intent, :string
+      attribute :arg, :string
+      attribute :displaystyle, :string
+      attribute :scriptlevel, :integer
+
+      xml do
+        namespace Namespace
+        element "munder"
+        mixed_content
+
+        map_attribute "mathbackground", to: :mathbackground
+        map_attribute "accentunder", to: :accentunder
+        map_attribute "mathcolor", to: :mathcolor
+        map_attribute "align", to: :align
+        map_attribute "intent", to: :intent
+        map_attribute "arg", to: :arg
+        map_attribute "displaystyle", to: :displaystyle
+        map_attribute "scriptlevel", to: :scriptlevel
+        map_content to: :content
+      end
+    end
+  end
+end

data/lib/mml/v4/munderover.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Mml
+  module V4
+    class Munderover < Mml::V3::Munderover
+      attribute :mathcolor, :string
+      attribute :mathbackground, :string
+      attribute :accent, :string
+      attribute :accentunder, :string
+      attribute :align, :string
+      attribute :intent, :string
+      attribute :arg, :string
+      attribute :displaystyle, :string
+      attribute :scriptlevel, :integer
+
+      xml do
+        namespace Namespace
+        element "munderover"
+        mixed_content
+
+        map_attribute "mathcolor", to: :mathcolor
+        map_attribute "mathbackground", to: :mathbackground
+        map_attribute "accent", to: :accent
+        map_attribute "accentunder", to: :accentunder
+        map_attribute "align", to: :align
+        map_attribute "intent", to: :intent
+        map_attribute "arg", to: :arg
+        map_attribute "displaystyle", to: :displaystyle
+        map_attribute "scriptlevel", to: :scriptlevel
+      end
+    end
+  end
+end

data/lib/mml/v4/namespace.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Mml
+  module V4
+    class Namespace < Lutaml::Xml::Namespace
+      uri "http://www.w3.org/1998/Math/MathML"
+      prefix_default "mml"
+    end
+  end
+end

data/lib/mml/v4/none.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Mml
+  module V4
+    class None < Mml::V3::None
+      attribute :mathcolor, :string
+      attribute :mathbackground, :string
+      attribute :intent, :string
+      attribute :arg, :string
+
+      xml do
+        namespace Namespace
+        element "none"
+
+        map_attribute "mathcolor", to: :mathcolor
+        map_attribute "mathbackground", to: :mathbackground
+        map_attribute "intent", to: :intent
+        map_attribute "arg", to: :arg
+      end
+    end
+  end
+end

data/lib/mml/v4/opal_setup.rb.erb

@@ -0,0 +1,6 @@
+<%
+  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 %>

data/lib/mml/v4/semantics.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Mml
+  module V4
+    autoload(:Mi, "mml/v4/mi")
+
+    class Semantics < Mml::V3::Semantics
+      attribute :annotation, Mi, collection: true
+      attribute :displaystyle, :string
+      attribute :scriptlevel, :integer
+
+      xml do
+        namespace Namespace
+        element "semantics"
+        mixed_content
+
+        map_element :annotation, to: :annotation
+        map_attribute "displaystyle", to: :displaystyle
+        map_attribute "scriptlevel", to: :scriptlevel
+      end
+    end
+  end
+end

data/lib/mml/v4/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Mml
+  module V4
+    VERSION = "2.1.0"
+  end
+end

data/lib/mml/v4.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require "mml/v4/configuration"
+
+module Mml
+  module V4
+    autoload :Namespace, "mml/v4/namespace"
+    autoload :A, "mml/v4/a"
+    autoload :Maction, "mml/v4/maction"
+    autoload :Maligngroup, "mml/v4/maligngroup"
+    autoload :Malignmark, "mml/v4/malignmark"
+    autoload :Math, "mml/v4/math"
+    autoload :Menclose, "mml/v4/menclose"
+    autoload :Merror, "mml/v4/merror"
+    autoload :Mfenced, "mml/v4/mfenced"
+    autoload :Mfrac, "mml/v4/mfrac"
+    autoload :Mfraction, "mml/v4/mfraction"
+    autoload :Mglyph, "mml/v4/mglyph"
+    autoload :Mi, "mml/v4/mi"
+    autoload :Mlabeledtr, "mml/v4/mlabeledtr"
+    autoload :Mlongdiv, "mml/v4/mlongdiv"
+    autoload :Mmultiscripts, "mml/v4/mmultiscripts"
+    autoload :Mn, "mml/v4/mn"
+    autoload :Mo, "mml/v4/mo"
+    autoload :Mover, "mml/v4/mover"
+    autoload :Mpadded, "mml/v4/mpadded"
+    autoload :Mphantom, "mml/v4/mphantom"
+    autoload :Mprescripts, "mml/v4/mprescripts"
+    autoload :Mroot, "mml/v4/mroot"
+    autoload :Mrow, "mml/v4/mrow"
+    autoload :Ms, "mml/v4/ms"
+    autoload :Mscarries, "mml/v4/mscarries"
+    autoload :Mscarry, "mml/v4/mscarry"
+    autoload :Msgroup, "mml/v4/msgroup"
+    autoload :Msline, "mml/v4/msline"
+    autoload :Mspace, "mml/v4/mspace"
+    autoload :Msqrt, "mml/v4/msqrt"
+    autoload :Msrow, "mml/v4/msrow"
+    autoload :Mstack, "mml/v4/mstack"
+    autoload :Mstyle, "mml/v4/mstyle"
+    autoload :Msub, "mml/v4/msub"
+    autoload :Msubsup, "mml/v4/msubsup"
+    autoload :Msup, "mml/v4/msup"
+    autoload :Mtable, "mml/v4/mtable"
+    autoload :Mtd, "mml/v4/mtd"
+    autoload :Mtext, "mml/v4/mtext"
+    autoload :Mtr, "mml/v4/mtr"
+    autoload :Munder, "mml/v4/munder"
+    autoload :Munderover, "mml/v4/munderover"
+    autoload :None, "mml/v4/none"
+    autoload :Semantics, "mml/v4/semantics"
+
+    # Ensure that the CommonAttributes class is loaded after all
+    # other classes
+    require "mml/v4/common_attributes"
+
+    def self.update_attributes
+      Configuration::COMMON_ATTRIBUTES_CLASSES.each do |klass|
+        const_get(klass).import_model(CommonAttributes)
+      end
+    end
+
+    def self.parse(input, namespace_exist: true)
+      Configuration.adapter ||= DEFAULT_ADAPTER
+
+      return parse_with_no_namespace(input) unless namespace_exist
+
+      Mml::V4::Math.from_xml(input)
+    end
+
+    def self.parse_with_no_namespace(input)
+      with_ns = Nokogiri::XML.parse(input).tap do |doc|
+        doc.root["xmlns"] = Namespace.uri
+      end.to_xml
+
+      Mml::V4::Math.from_xml(with_ns)
+    end
+  end
+end
+
+Mml::V4.update_attributes

data/lib/mml/version.rb

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

data/lib/mml.rb

@@ -1,56 +1,38 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-require "mml/configuration"
-if RUBY_ENGINE == "opal"
-  require_relative "mml/opal_setup"
-else
-  lib_path = File.join(__dir__, "mml", "*.rb")
-  Dir[lib_path].each do |file|
-    basename = File.basename(file, ".rb")
-    next if basename == "common_attributes"
-
-    require_relative "mml/#{basename}"
-  end
-end
-# Ensure that the CommonAttributes class is loaded after all
-# other classes
-require "mml/common_attributes"
-
-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
+require "mml/v3"
 
 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)
+  # Delegate undefined constants to Mml::V3 for backward compatibility.
+  # Lazily loads Mml::V4 when referenced.
+  def self.const_missing(name)
+    if name == :V4
+      require "mml/v4"
+      Mml::V4
+    elsif Mml::V3.const_defined?(name)
+      Mml::V3.const_get(name)
+    else
+      raise NameError, "uninitialized constant Mml::#{name}"
     end
   end
 
-  def parse(input, namespace_exist: true)
-    Configuration.adapter = DEFAULT_ADAPTER unless Configuration.adapter
+  module_function
 
-    if namespace_exist
-      Mml::MathWithNamespace.from_xml(input)
-    else
-      Mml::MathWithNilNamespace.from_xml(input)
+  def parse(input, namespace_exist: true, version: 3)
+    case version
+    when 3 then Mml::V3.parse(input, namespace_exist: namespace_exist)
+    when 4
+      require "mml/v4"
+      Mml::V4.parse(input, namespace_exist: namespace_exist)
+    else raise Error, "Unsupported MathML version: #{version}"
     end
   end
-end
 
-Mml.update_attributes
+  # Backward compatibility: Mml aliases Mml::V3
+  Configuration = Mml::V3::Configuration
+
+  # Explicitly define Math to avoid collision with Ruby built-in Math module
+  Math = Mml::V3::Math
+end

data/mml.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "lutaml-model"
+  spec.add_dependency "lutaml-model", "~> 0.8.0"
   spec.add_dependency "moxml"
   spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mml
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-29 00:00:00.000000000 Z
+date: 2026-03-31 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.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: moxml
   requirement: !ruby/object:Gem::Requirement
@@ -60,53 +60,105 @@ 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
-- lib/mml/malignmark.rb
-- lib/mml/math_with_namespace.rb
-- lib/mml/math_with_nil_namespace.rb
-- lib/mml/menclose.rb
-- lib/mml/merror.rb
-- lib/mml/mfenced.rb
-- lib/mml/mfrac.rb
-- lib/mml/mfraction.rb
-- lib/mml/mglyph.rb
-- lib/mml/mi.rb
-- lib/mml/mlabeledtr.rb
-- lib/mml/mlongdiv.rb
-- lib/mml/mmultiscripts.rb
-- lib/mml/mn.rb
-- lib/mml/mo.rb
-- lib/mml/mover.rb
-- lib/mml/mpadded.rb
-- lib/mml/mphantom.rb
-- lib/mml/mprescripts.rb
-- lib/mml/mroot.rb
-- lib/mml/mrow.rb
-- lib/mml/ms.rb
-- lib/mml/mscarries.rb
-- lib/mml/mscarry.rb
-- lib/mml/msgroup.rb
-- lib/mml/msline.rb
-- lib/mml/mspace.rb
-- lib/mml/msqrt.rb
-- lib/mml/msrow.rb
-- lib/mml/mstack.rb
-- lib/mml/mstyle.rb
-- lib/mml/msub.rb
-- lib/mml/msubsup.rb
-- lib/mml/msup.rb
-- lib/mml/mtable.rb
-- lib/mml/mtd.rb
-- lib/mml/mtext.rb
-- lib/mml/mtr.rb
-- lib/mml/munder.rb
-- lib/mml/munderover.rb
-- lib/mml/none.rb
-- lib/mml/opal_setup.rb.erb
-- lib/mml/semantics.rb
+- lib/mml/v3.rb
+- lib/mml/v3/common_attributes.rb
+- lib/mml/v3/configuration.rb
+- lib/mml/v3/maction.rb
+- lib/mml/v3/maligngroup.rb
+- lib/mml/v3/malignmark.rb
+- lib/mml/v3/math.rb
+- lib/mml/v3/menclose.rb
+- lib/mml/v3/merror.rb
+- lib/mml/v3/mfenced.rb
+- lib/mml/v3/mfrac.rb
+- lib/mml/v3/mfraction.rb
+- lib/mml/v3/mglyph.rb
+- lib/mml/v3/mi.rb
+- lib/mml/v3/mlabeledtr.rb
+- lib/mml/v3/mlongdiv.rb
+- lib/mml/v3/mmultiscripts.rb
+- lib/mml/v3/mn.rb
+- lib/mml/v3/mo.rb
+- lib/mml/v3/mover.rb
+- lib/mml/v3/mpadded.rb
+- lib/mml/v3/mphantom.rb
+- lib/mml/v3/mprescripts.rb
+- lib/mml/v3/mroot.rb
+- lib/mml/v3/mrow.rb
+- lib/mml/v3/ms.rb
+- lib/mml/v3/mscarries.rb
+- lib/mml/v3/mscarry.rb
+- lib/mml/v3/msgroup.rb
+- lib/mml/v3/msline.rb
+- lib/mml/v3/mspace.rb
+- lib/mml/v3/msqrt.rb
+- lib/mml/v3/msrow.rb
+- lib/mml/v3/mstack.rb
+- lib/mml/v3/mstyle.rb
+- lib/mml/v3/msub.rb
+- lib/mml/v3/msubsup.rb
+- lib/mml/v3/msup.rb
+- lib/mml/v3/mtable.rb
+- lib/mml/v3/mtd.rb
+- lib/mml/v3/mtext.rb
+- lib/mml/v3/mtr.rb
+- lib/mml/v3/munder.rb
+- lib/mml/v3/munderover.rb
+- lib/mml/v3/namespace.rb
+- lib/mml/v3/none.rb
+- lib/mml/v3/opal_setup.rb.erb
+- lib/mml/v3/semantics.rb
+- lib/mml/v3/version.rb
+- lib/mml/v4.rb
+- lib/mml/v4/a.rb
+- lib/mml/v4/common_attributes.rb
+- lib/mml/v4/configuration.rb
+- lib/mml/v4/maction.rb
+- lib/mml/v4/maligngroup.rb
+- lib/mml/v4/malignmark.rb
+- lib/mml/v4/math.rb
+- lib/mml/v4/menclose.rb
+- lib/mml/v4/merror.rb
+- lib/mml/v4/mfenced.rb
+- lib/mml/v4/mfrac.rb
+- lib/mml/v4/mfraction.rb
+- lib/mml/v4/mglyph.rb
+- lib/mml/v4/mi.rb
+- lib/mml/v4/mlabeledtr.rb
+- lib/mml/v4/mlongdiv.rb
+- lib/mml/v4/mmultiscripts.rb
+- lib/mml/v4/mn.rb
+- lib/mml/v4/mo.rb
+- lib/mml/v4/mover.rb
+- lib/mml/v4/mpadded.rb
+- lib/mml/v4/mphantom.rb
+- lib/mml/v4/mprescripts.rb
+- lib/mml/v4/mroot.rb
+- lib/mml/v4/mrow.rb
+- lib/mml/v4/ms.rb
+- lib/mml/v4/mscarries.rb
+- lib/mml/v4/mscarry.rb
+- lib/mml/v4/msgroup.rb
+- lib/mml/v4/msline.rb
+- lib/mml/v4/mspace.rb
+- lib/mml/v4/msqrt.rb
+- lib/mml/v4/msrow.rb
+- lib/mml/v4/mstack.rb
+- lib/mml/v4/mstyle.rb
+- lib/mml/v4/msub.rb
+- lib/mml/v4/msubsup.rb
+- lib/mml/v4/msup.rb
+- lib/mml/v4/mtable.rb
+- lib/mml/v4/mtd.rb
+- lib/mml/v4/mtext.rb
+- lib/mml/v4/mtr.rb
+- lib/mml/v4/munder.rb
+- lib/mml/v4/munderover.rb
+- lib/mml/v4/namespace.rb
+- lib/mml/v4/none.rb
+- lib/mml/v4/opal_setup.rb.erb
+- lib/mml/v4/semantics.rb
+- lib/mml/v4/version.rb
 - lib/mml/version.rb
 - mml.gemspec
 - sig/mml.rbs

data/lib/mml/common_attributes.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Mml
-  Mml::Configuration::SUPPORTED_TAGS.each do |tag|
-    # `autoload` is `require`, not `require_relative`
-    autoload(tag.to_s.capitalize.to_sym, "mml/#{tag}.rb")
-  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