mml 2.3.0 → 2.3.2

data/lib/mml/base/mlabeledtr.rb

@@ -7,15 +7,14 @@ module Mml
       # Use fully qualified names (e.g., Mml::Namespace).
       def self.included(klass)
         klass.class_eval do
+          include CommonAttributes
+
           attribute :mathbackground, :string
           attribute :columnalign, :string
           attribute :mathcolor, :string
           attribute :rowalign, :string
-          attribute :id, :string
           attribute :mtd_value, :mtd, collection: true
 
-          attribute :groupalign, :string
-
           xml do
             namespace Mml::Namespace
             element "mlabeledtr"
@@ -25,10 +24,7 @@ module Mml
             map_attribute "columnalign", to: :columnalign
             map_attribute "mathcolor", to: :mathcolor
             map_attribute "rowalign", to: :rowalign
-            map_attribute "id", to: :id
             map_element "mtd", to: :mtd_value
-
-            map_attribute "groupalign", to: :groupalign
           end
         end
       end

data/lib/mml/base/mn.rb

@@ -12,18 +12,19 @@ module Mml
           attribute :mathbackground, :string
           attribute :mathvariant, :string
           attribute :mathsize, :string
-          attribute :dir, :string
+          attribute :mglyph_value, :mglyph, collection: true
 
           xml do
             namespace Mml::Namespace
             element "mn"
+            mixed_content
 
             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_element "mglyph", to: :mglyph_value
           end
         end
       end

data/lib/mml/base/mo.rb

@@ -12,7 +12,6 @@ module Mml
           attribute :mathbackground, :string
           attribute :mathvariant, :string
           attribute :mathsize, :string
-          attribute :dir, :string
           attribute :form, :string
           attribute :lspace, :string
           attribute :rspace, :string
@@ -20,6 +19,7 @@ module Mml
           attribute :symmetric, :string
           attribute :maxsize, :string
           attribute :minsize, :string
+          attribute :fence, :string
           attribute :largeop, :string
           attribute :movablelimits, :string
           attribute :accent, :string
@@ -41,20 +41,20 @@ module Mml
             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 "fence", to: :fence
             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 "mathsize", to: :mathsize
             map_attribute "lineleading", to: :lineleading
             map_attribute "indentalign", to: :indentalign
             map_attribute "indentshift", to: :indentshift

data/lib/mml/base/mrow.rb

@@ -10,7 +10,6 @@ module Mml
           attribute :mathbackground, :string
           attribute :mathcolor, :string
           attribute :content, :string
-          attribute :dir, :string
 
           xml do
             namespace Mml::Namespace
@@ -18,7 +17,6 @@ module Mml
             mixed_content
 
             map_content to: :content
-            map_attribute "dir", to: :dir
             map_attribute "mathcolor", to: :mathcolor
             map_attribute "mathbackground", to: :mathbackground
           end

data/lib/mml/base/ms.rb

@@ -8,13 +8,12 @@ module Mml
       def self.included(klass)
         klass.class_eval do
           attribute :mathbackground, :string
-          attribute :mathvariant, :string
           attribute :mathcolor, :string
           attribute :mathsize, :string
+          attribute :mathvariant, :string
           attribute :lquote, :string
           attribute :rquote, :string
           attribute :value, :string
-          attribute :dir, :string
 
           xml do
             namespace Mml::Namespace
@@ -23,12 +22,11 @@ module Mml
 
             map_content to: :value
             map_attribute "mathbackground", to: :mathbackground
-            map_attribute "mathvariant", to: :mathvariant
             map_attribute "mathcolor", to: :mathcolor
             map_attribute "mathsize", to: :mathsize
-            map_attribute "lquote", to: :lquote
-            map_attribute "rquote", to: :rquote
-            map_attribute "dir", to: :dir
+            map_attribute "mathvariant", to: :mathvariant
+            map_attribute "lquote", to: :lquote, render_empty: true
+            map_attribute "rquote", to: :rquote, render_empty: true
           end
         end
       end

data/lib/mml/base/mscarries.rb

@@ -7,7 +7,7 @@ module Mml
       # Use fully qualified names (e.g., Mml::Namespace).
       def self.included(klass)
         klass.class_eval do
-          attribute :scriptsizemultiplier, :integer
+          attribute :scriptsizemultiplier, :float
           attribute :mathbackground, :string
           attribute :mathcolor, :string
           attribute :position, :integer

data/lib/mml/base/mspace.rb

@@ -10,7 +10,6 @@ module Mml
           attribute :mathcolor, :string
           attribute :mathbackground, :string
           attribute :mathvariant, :string
-          attribute :mathsize, :string
           attribute :dir, :string
           attribute :width, :string
           attribute :height, :string
@@ -31,7 +30,6 @@ module Mml
             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 "width", to: :width
             map_attribute "height", to: :height

data/lib/mml/base/mstyle.rb

@@ -7,8 +7,8 @@ module Mml
       # Use fully qualified names (e.g., Mml::Namespace).
       def self.included(klass)
         klass.class_eval do
-          attribute :mathcolor, :string
-          attribute :mathbackground, :string
+          include UniversalPresentationAttributes
+
           attribute :scriptsizemultiplier, :integer
           attribute :scriptminsize, :string
           attribute :infixlinebreakstyle, :string
@@ -29,7 +29,6 @@ module Mml
           attribute :crossout, :string
           attribute :denomalign, :string
           attribute :depth, :string
-          attribute :dir, :string
           attribute :edge, :string
           attribute :equalcolumns, :string
           attribute :equalrows, :string
@@ -56,7 +55,6 @@ module Mml
           attribute :longdivstyle, :string
           attribute :lquote, :string
           attribute :lspace, :string
-          attribute :mathsize, :string
           attribute :mathvariant, :string
           attribute :maxsize, :string
           attribute :minsize, :string
@@ -82,6 +80,7 @@ module Mml
           attribute :superscriptshift, :string
           attribute :symmetric, :string
           attribute :valign, :string
+          attribute :voffset, :string
           attribute :width, :string
           attribute :veryverythinmathspace, :string
           attribute :verythinmathspace, :string
@@ -97,8 +96,6 @@ module Mml
             element "mstyle"
             mixed_content
 
-            map_attribute "mathcolor", to: :mathcolor
-            map_attribute "mathbackground", to: :mathbackground
             map_attribute "scriptsizemultiplier", to: :scriptsizemultiplier
             map_attribute "scriptminsize", to: :scriptminsize
             map_attribute "infixlinebreakstyle", to: :infixlinebreakstyle
@@ -119,7 +116,6 @@ module Mml
             map_attribute "crossout", to: :crossout
             map_attribute "denomalign", to: :denomalign
             map_attribute "depth", to: :depth
-            map_attribute "dir", to: :dir
             map_attribute "edge", to: :edge
             map_attribute "equalcolumns", to: :equalcolumns
             map_attribute "equalrows", to: :equalrows
@@ -146,7 +142,6 @@ module Mml
             map_attribute "longdivstyle", to: :longdivstyle
             map_attribute "lquote", to: :lquote
             map_attribute "lspace", to: :lspace
-            map_attribute "mathsize", to: :mathsize
             map_attribute "mathvariant", to: :mathvariant
             map_attribute "maxsize", to: :maxsize
             map_attribute "minsize", to: :minsize
@@ -172,6 +167,7 @@ module Mml
             map_attribute "superscriptshift", to: :superscriptshift
             map_attribute "symmetric", to: :symmetric
             map_attribute "valign", to: :valign
+            map_attribute "voffset", to: :voffset
             map_attribute "width", to: :width
             map_attribute "veryverythinmathspace", to: :veryverythinmathspace
             map_attribute "verythinmathspace", to: :verythinmathspace

data/lib/mml/base/mtable.rb

@@ -13,6 +13,9 @@ module Mml
           attribute :rowalign, :string
           attribute :columnalign, :string
           attribute :alignmentscope, :string
+          attribute :groupalign, :string
+          attribute :displaystyle, :string
+          attribute :scriptlevel, :string
           attribute :columnwidth, :string
           attribute :width, :string
           attribute :rowspacing, :string
@@ -23,6 +26,7 @@ module Mml
           attribute :framespacing, :string
           attribute :equalrows, :string
           attribute :equalcolumns, :string
+          attribute :side, :string
           attribute :mlabeledtr_value, :mlabeledtr, collection: true
           attribute :mtr_value, :mtr, collection: true
 
@@ -37,6 +41,9 @@ module Mml
             map_attribute "rowalign", to: :rowalign
             map_attribute "columnalign", to: :columnalign
             map_attribute "alignmentscope", to: :alignmentscope
+            map_attribute "groupalign", to: :groupalign
+            map_attribute "displaystyle", to: :displaystyle
+            map_attribute "scriptlevel", to: :scriptlevel
             map_attribute "columnwidth", to: :columnwidth
             map_attribute "width", to: :width
             map_attribute "rowspacing", to: :rowspacing
@@ -47,6 +54,7 @@ module Mml
             map_attribute "framespacing", to: :framespacing
             map_attribute "equalrows", to: :equalrows
             map_attribute "equalcolumns", to: :equalcolumns
+            map_attribute "side", to: :side
             map_element "mlabeledtr", to: :mlabeledtr_value
             map_element "mtr", to: :mtr_value
           end

data/lib/mml/base/mtd.rb

@@ -11,6 +11,9 @@ module Mml
           attribute :mathbackground, :string
           attribute :rowalign, :string
           attribute :columnalign, :string
+          attribute :groupalign, :string
+          attribute :rowspan, :integer
+          attribute :columnspan, :integer
 
           xml do
             namespace Mml::Namespace
@@ -21,6 +24,9 @@ module Mml
             map_attribute "mathbackground", to: :mathbackground
             map_attribute "rowalign", to: :rowalign
             map_attribute "columnalign", to: :columnalign
+            map_attribute "groupalign", to: :groupalign
+            map_attribute "rowspan", to: :rowspan
+            map_attribute "columnspan", to: :columnspan
           end
         end
       end

data/lib/mml/base/mtext.rb

@@ -12,7 +12,6 @@ module Mml
           attribute :mathbackground, :string
           attribute :mathvariant, :string
           attribute :mathsize, :string
-          attribute :dir, :string
 
           xml do
             namespace Mml::Namespace
@@ -23,7 +22,6 @@ module Mml
             map_attribute "mathbackground", to: :mathbackground
             map_attribute "mathvariant", to: :mathvariant
             map_attribute "mathsize", to: :mathsize
-            map_attribute "dir", to: :dir
           end
         end
       end

data/lib/mml/base/semantics.rb

@@ -7,14 +7,16 @@ module Mml
       # Use fully qualified names (e.g., Mml::Namespace).
       def self.included(klass)
         klass.class_eval do
-          attribute :annotation, :mi, collection: true
+          attribute :definition_url, :string
+          attribute :semantics_encoding, :string
 
           xml do
             namespace Mml::Namespace
             element "semantics"
             mixed_content
 
-            map_element :annotation, to: :annotation
+            map_attribute "definitionURL", to: :definition_url
+            map_attribute "encoding", to: :semantics_encoding
           end
         end
       end

data/lib/mml/base/universal_presentation_attributes.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Mml
+  module Base
+    # Universal MathML presentation attributes allowed on all presentation elements.
+    # These exist in MathML 3 and later (displaystyle, scriptlevel were introduced in v3).
+    module UniversalPresentationAttributes
+      def self.included(klass)
+        klass.class_eval do
+          include CommonAttributes
+
+          attribute :displaystyle, :string
+          attribute :scriptlevel, :string
+          attribute :mathcolor, :string
+          attribute :mathbackground, :string
+          attribute :mathsize, :string
+
+          xml do
+            namespace Mml::Namespace
+            map_attribute "displaystyle", to: :displaystyle
+            map_attribute "scriptlevel", to: :scriptlevel
+            map_attribute "mathcolor", to: :mathcolor
+            map_attribute "mathbackground", to: :mathbackground
+            map_attribute "mathsize", to: :mathsize
+          end
+        end
+      end
+    end
+
+    # V4-only attributes not present in V3.
+    module V4OnlyAttributes
+      def self.included(klass)
+        klass.class_eval do
+          attribute :intent, :string
+          attribute :arg, :string
+
+          xml do
+            namespace Mml::Namespace
+            map_attribute "intent", to: :intent
+            map_attribute "arg", to: :arg
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mml/base/v3_common.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Mml
+  module Base
+    # V3-specific attributes that apply to multiple element types.
+    # Includes dir attribute (v3+) and displaystyle/scriptlevel (v3+).
+    module V3Common
+      def self.included(klass)
+        klass.class_eval do
+          attribute :dir, :string
+          include V3PresentationAttributes
+        end
+      end
+    end
+  end
+end

data/lib/mml/base/v3_presentation_attributes.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Mml
+  module Base
+    # V3 presentation attributes (displaystyle, scriptlevel).
+    # These are universal in MathML 3 and later.
+    module V3PresentationAttributes
+      def self.included(klass)
+        klass.class_eval do
+          include UniversalPresentationAttributes
+        end
+      end
+    end
+  end
+end

data/lib/mml/base/v4_attributes.rb

@@ -2,27 +2,13 @@
 
 module Mml
   module Base
-    # Universal MathML 4 attributes (V4-only, not in V3).
-    # intent, arg, displaystyle, scriptlevel, mathcolor, mathbackground.
+    # V4 attributes module (for backward compatibility).
+    # Now composes UniversalPresentationAttributes + V4OnlyAttributes.
     module V4Attributes
       def self.included(klass)
         klass.class_eval do
-          attribute :intent, :string
-          attribute :arg, :string
-          attribute :displaystyle, :string
-          attribute :scriptlevel, :integer
-          attribute :mathcolor, :string
-          attribute :mathbackground, :string
-
-          xml do
-            namespace Mml::Namespace
-            map_attribute "intent", to: :intent
-            map_attribute "arg", to: :arg
-            map_attribute "displaystyle", to: :displaystyle
-            map_attribute "scriptlevel", to: :scriptlevel
-            map_attribute "mathcolor", to: :mathcolor
-            map_attribute "mathbackground", to: :mathbackground
-          end
+          include UniversalPresentationAttributes
+          include V4OnlyAttributes
         end
       end
     end

data/lib/mml/base.rb

@@ -43,9 +43,20 @@ module Mml
     autoload :Munderover, "#{__dir__}/base/munderover"
     autoload :None, "#{__dir__}/base/none"
     autoload :Semantics, "#{__dir__}/base/semantics"
+    autoload :CommonAttributes, "#{__dir__}/base/common_attributes"
+    autoload :UniversalPresentationAttributes,
+             "#{__dir__}/base/universal_presentation_attributes"
+    autoload :V3Common, "#{__dir__}/base/v3_common"
+    autoload :V3PresentationAttributes,
+             "#{__dir__}/base/v3_presentation_attributes"
+    autoload :V4OnlyAttributes,
+             "#{__dir__}/base/universal_presentation_attributes"
     autoload :V4Attributes, "#{__dir__}/base/v4_attributes"
     autoload :DeprecatedFontAttributes,
              "#{__dir__}/base/deprecated_font_attributes"
     autoload :V3Only, "#{__dir__}/base/v3_only"
+    autoload :Content, "#{__dir__}/base/content_loader"
+    autoload :Declare, "#{__dir__}/base/content/declare"
+    autoload :Share, "#{__dir__}/base/content/share"
   end
 end