omml 0.2.1 → 0.2.3

data/lib/omml/models/ct_text_scale.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTTextScale < Lutaml::Model::Serializable
+    class CTTextScale < Base
       attribute :val, :st_text_scale
 
       xml do
@@ -13,7 +13,5 @@ module Omml
         map_attribute :val, to: :val
       end
     end
-
-    Omml::Configuration.register_model(CTTextScale)
   end
 end

data/lib/omml/models/ct_top_bot.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTTopBot < Lutaml::Model::Serializable
+    class CTTopBot < Base
       attribute :val, :st_top_bot
 
       xml do
@@ -13,7 +13,5 @@ module Omml
         map_attribute :val, to: :val
       end
     end
-
-    Omml::Configuration.register_model(CTTopBot)
   end
 end

data/lib/omml/models/ct_track_change.rb

@@ -15,7 +15,5 @@ module Omml
         map_attribute :date, to: :date
       end
     end
-
-    Omml::Configuration.register_model(CTTrackChange)
   end
 end

data/lib/omml/models/ct_track_change_numbering.rb

@@ -13,7 +13,5 @@ module Omml
         map_attribute :original, to: :original
       end
     end
-
-    Omml::Configuration.register_model(CTTrackChangeNumbering)
   end
 end

data/lib/omml/models/ct_twips_measure.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTTwipsMeasure < Lutaml::Model::Serializable
+    class CTTwipsMeasure < Base
       attribute :val, :st_twips_measure
 
       xml do
@@ -13,7 +13,5 @@ module Omml
         map_attribute :val, to: :val
       end
     end
-
-    Omml::Configuration.register_model(CTTwipsMeasure)
   end
 end

data/lib/omml/models/ct_un_signed_integer.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTUnSignedInteger < Lutaml::Model::Serializable
+    class CTUnSignedInteger < Base
       attribute :val, :st_un_signed_integer
 
       xml do
@@ -13,7 +13,5 @@ module Omml
         map_attribute :val, to: :val
       end
     end
-
-    Omml::Configuration.register_model(CTUnSignedInteger)
   end
 end

data/lib/omml/models/ct_underline.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTUnderline < Lutaml::Model::Serializable
+    class CTUnderline < Base
       attribute :val, :st_underline
       attribute :color, :st_hex_color
       attribute :theme_color, :st_theme_color
@@ -21,7 +21,5 @@ module Omml
         map_attribute :themeShade, to: :theme_shade
       end
     end
-
-    Omml::Configuration.register_model(CTUnderline)
   end
 end

data/lib/omml/models/ct_vertical_align_run.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTVerticalAlignRun < Lutaml::Model::Serializable
+    class CTVerticalAlignRun < Base
       attribute :val, :st_vertical_align_run
 
       xml do
@@ -13,7 +13,5 @@ module Omml
         map_attribute :val, to: :val
       end
     end
-
-    Omml::Configuration.register_model(CTVerticalAlignRun)
   end
 end

data/lib/omml/models/ct_wordprocessing_empty.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Omml
+  module Models
+    # WordprocessingML empty marker type, parallel to CTEmpty (math).
+    # Per OOXML schema, several elements inside a math run (`<m:r>`) are
+    # WordprocessingML primitives with empty content model: `<w:cr/>`,
+    # `<w:tab/>`, `<w:noBreakHyphen/>`, `<w:pgNum/>`, etc. These resolve
+    # to the wordprocessing `CT_Empty`, not the math one.
+    #
+    # The container class (`EGWordRunInnerContent`) already declares the
+    # wordprocessing namespace, but lutaml-model matches elements by the
+    # TYPE's namespace during parsing. Without this parallel type,
+    # math-namespaced CTEmpty won't match `<w:cr/>` and the element is
+    # silently dropped.
+    class CTWordprocessingEmpty < Base
+      xml do
+        element "CT_Empty"
+
+        namespace Omml::WordprocessingNamespace
+      end
+    end
+  end
+end

data/lib/omml/models/ct_wordprocessing_on_off.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTWordprocessingOnOff < Lutaml::Model::Serializable
+    class CTWordprocessingOnOff < Base
       attribute :val, :st_on_off, default: -> { "on" }
 
       xml do
@@ -13,7 +13,5 @@ module Omml
         map_attribute :val, to: :val
       end
     end
-
-    Omml::Configuration.register_model(CTWordprocessingOnOff)
   end
 end

data/lib/omml/models/ct_wordprocessing_text.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Omml
+  module Models
+    # WordprocessingML text type, parallel to CTText (math).
+    # Per OOXML schema, `<w:delText>`, `<w:instrText>`, and
+    # `<w:delInstrText>` inside a math run (`<m:r>`) resolve to the
+    # wordprocessing `CT_Text`, not the math one (`<m:t>`).
+    #
+    # Behavior is identical to CTText (string content + `xml:space`
+    # attribute); only the XML namespace differs.
+    class CTWordprocessingText < Base
+      attribute :content, :st_string
+      attribute :space, ::Lutaml::Xml::W3c::XmlSpaceType
+
+      xml do
+        element "CT_Text"
+
+        namespace Omml::WordprocessingNamespace
+
+        map_content to: :content
+        map_attribute :space, to: :space
+      end
+    end
+  end
+end

data/lib/omml/models/ct_wrap_none.rb

@@ -2,14 +2,12 @@
 
 module Omml
   module Models
-    class CTWrapNone < Lutaml::Model::Serializable
+    class CTWrapNone < Base
       xml do
         element "CT_WrapNone"
 
         namespace Omml::Namespace
       end
     end
-
-    Omml::Configuration.register_model(CTWrapNone)
   end
 end

data/lib/omml/models/ct_wrap_path.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTWrapPath < Lutaml::Model::Serializable
+    class CTWrapPath < Base
       attribute :start, :ct_point2_d, collection: 1..1
       attribute :line_to, :ct_point2_d, collection: 2..Float::INFINITY
       attribute :edited, :boolean
@@ -19,7 +19,5 @@ module Omml
         map_attribute :edited, to: :edited
       end
     end
-
-    Omml::Configuration.register_model(CTWrapPath)
   end
 end

data/lib/omml/models/ct_wrap_square.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTWrapSquare < Lutaml::Model::Serializable
+    class CTWrapSquare < Base
       attribute :effect_extent, :ct_effect_extent, collection: 0..1
       attribute :wrap_text, :st_wrap_text
       attribute :dist_t, :st_wrap_distance
@@ -25,7 +25,5 @@ module Omml
         map_attribute :distR, to: :dist_r
       end
     end
-
-    Omml::Configuration.register_model(CTWrapSquare)
   end
 end

data/lib/omml/models/ct_wrap_through.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTWrapThrough < Lutaml::Model::Serializable
+    class CTWrapThrough < Base
       attribute :wrap_polygon, :ct_wrap_path, collection: 1..1
       attribute :wrap_text, :st_wrap_text
       attribute :dist_l, :st_wrap_distance
@@ -21,7 +21,5 @@ module Omml
         map_attribute :distR, to: :dist_r
       end
     end
-
-    Omml::Configuration.register_model(CTWrapThrough)
   end
 end

data/lib/omml/models/ct_wrap_tight.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTWrapTight < Lutaml::Model::Serializable
+    class CTWrapTight < Base
       attribute :wrap_polygon, :ct_wrap_path, collection: 1..1
       attribute :wrap_text, :st_wrap_text
       attribute :dist_l, :st_wrap_distance
@@ -21,7 +21,5 @@ module Omml
         map_attribute :distR, to: :dist_r
       end
     end
-
-    Omml::Configuration.register_model(CTWrapTight)
   end
 end

data/lib/omml/models/ct_wrap_top_bottom.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTWrapTopBottom < Lutaml::Model::Serializable
+    class CTWrapTopBottom < Base
       attribute :effect_extent, :ct_effect_extent, collection: 0..1
       attribute :dist_t, :st_wrap_distance
       attribute :dist_b, :st_wrap_distance
@@ -19,7 +19,5 @@ module Omml
         map_attribute :distB, to: :dist_b
       end
     end
-
-    Omml::Configuration.register_model(CTWrapTopBottom)
   end
 end

data/lib/omml/models/ct_x_align.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTXAlign < Lutaml::Model::Serializable
+    class CTXAlign < Base
       attribute :val, :st_x_align
 
       xml do
@@ -13,7 +13,5 @@ module Omml
         map_attribute :val, to: :val
       end
     end
-
-    Omml::Configuration.register_model(CTXAlign)
   end
 end

data/lib/omml/models/ct_y_align.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTYAlign < Lutaml::Model::Serializable
+    class CTYAlign < Base
       attribute :val, :st_y_align
 
       xml do
@@ -13,7 +13,5 @@ module Omml
         map_attribute :val, to: :val
       end
     end
-
-    Omml::Configuration.register_model(CTYAlign)
   end
 end

data/lib/omml/models/groups/eg_content_run_content.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGContentRunContent < Lutaml::Model::Serializable
+    class EGContentRunContent < Base
       choice(min: 1, max: 1) do
         attribute :custom_xml, :ct_custom_xml_run
         attribute :smart_tag, :ct_smart_tag_run
@@ -20,7 +20,5 @@ module Omml
         import_model_mappings :eg_run_level_elts
       end
     end
-
-    Omml::Configuration.register_model(EGContentRunContent)
   end
 end

data/lib/omml/models/groups/eg_math_content.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGMathContent < Lutaml::Model::Serializable
+    class EGMathContent < Base
       choice(min: 1, max: 1) do
         attribute :o_math_para, :ct_o_math_para
         attribute :o_math, :ct_o_math
@@ -14,7 +14,5 @@ module Omml
         map_element :oMath, to: :o_math, render_empty: true
       end
     end
-
-    Omml::Configuration.register_model(EGMathContent)
   end
 end

data/lib/omml/models/groups/eg_o_math_elements.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGOMathElements < Lutaml::Model::Serializable
+    class EGOMathElements < Base
       choice(min: 1, max: 1) do
         import_model_attributes :eg_o_math_math_elements
         import_model_attributes :eg_run_level_elts
@@ -14,7 +14,5 @@ module Omml
         import_model_mappings :eg_run_level_elts
       end
     end
-
-    Omml::Configuration.register_model(EGOMathElements)
   end
 end

data/lib/omml/models/groups/eg_o_math_math_elements.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGOMathMathElements < Lutaml::Model::Serializable
+    class EGOMathMathElements < Base
       choice(min: 1, max: 1) do
         attribute :acc, :ct_acc, collection: 0..Float::INFINITY
         attribute :bar, :ct_bar, collection: 0..Float::INFINITY
@@ -50,7 +50,5 @@ module Omml
         map_element :r, to: :r, render_empty: true
       end
     end
-
-    Omml::Configuration.register_model(EGOMathMathElements)
   end
 end

data/lib/omml/models/groups/eg_office_art_extension_list.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGOfficeArtExtensionList < Lutaml::Model::Serializable
+    class EGOfficeArtExtensionList < Base
       attribute :ext, :ct_office_art_extension, collection: 0..Float::INFINITY
 
       xml do
@@ -10,7 +10,5 @@ module Omml
         map_element :ext, to: :ext
       end
     end
-
-    Omml::Configuration.register_model(EGOfficeArtExtensionList)
   end
 end

data/lib/omml/models/groups/eg_p_content.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGPContent < Lutaml::Model::Serializable
+    class EGPContent < Base
       choice(min: 1, max: 1) do
         import_model_attributes :eg_content_run_content
         attribute :fld_simple, :ct_simple_field, collection: 0..Float::INFINITY
@@ -18,7 +18,5 @@ module Omml
         map_element :subDoc, to: :sub_doc, render_empty: true
       end
     end
-
-    Omml::Configuration.register_model(EGPContent)
   end
 end

data/lib/omml/models/groups/eg_r_pr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGRPr < Lutaml::Model::Serializable
+    class EGRPr < Base
       attribute :r_pr, :ct_r_pr, collection: 0..1
 
       xml do
@@ -11,7 +11,5 @@ module Omml
         map_element :rPr, to: :r_pr
       end
     end
-
-    Omml::Configuration.register_model(EGRPr)
   end
 end

data/lib/omml/models/groups/eg_r_pr_base.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGRPrBase < Lutaml::Model::Serializable
+    class EGRPrBase < Base
       attribute :r_style, :ct_string, collection: 0..1
       attribute :r_fonts, :ct_fonts, collection: 0..1
       attribute :b, :ct_wordprocessing_on_off, collection: 0..1
@@ -87,7 +87,5 @@ module Omml
         map_element :oMath, to: :o_math, render_empty: true
       end
     end
-
-    Omml::Configuration.register_model(EGRPrBase)
   end
 end

data/lib/omml/models/groups/eg_r_pr_content.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGRPrContent < Lutaml::Model::Serializable
+    class EGRPrContent < Base
       import_model_attributes :eg_r_pr_base
       attribute :r_pr_change, :ct_r_pr_change, collection: 0..1
 
@@ -13,7 +13,5 @@ module Omml
         map_element :rPrChange, to: :r_pr_change
       end
     end
-
-    Omml::Configuration.register_model(EGRPrContent)
   end
 end

data/lib/omml/models/groups/eg_r_pr_math.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGRPrMath < Lutaml::Model::Serializable
+    class EGRPrMath < Base
       choice(min: 1, max: 1) do
         import_model_attributes :eg_r_pr
         attribute :ins, :ct_r_pr_change
@@ -17,7 +17,5 @@ module Omml
         map_element :del, to: :del, render_empty: true
       end
     end
-
-    Omml::Configuration.register_model(EGRPrMath)
   end
 end

data/lib/omml/models/groups/eg_range_markup_elements.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGRangeMarkupElements < Lutaml::Model::Serializable
+    class EGRangeMarkupElements < Base
       choice(min: 1, max: 1) do
         attribute :bookmark_start, :ct_bookmark
         attribute :bookmark_end, :ct_markup_range
@@ -54,7 +54,5 @@ module Omml
                     to: :custom_xml_move_to_range_end, render_empty: true
       end
     end
-
-    Omml::Configuration.register_model(EGRangeMarkupElements)
   end
 end

data/lib/omml/models/groups/eg_ruby_content.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGRubyContent < Lutaml::Model::Serializable
+    class EGRubyContent < Base
       choice(min: 1, max: 1) do
         attribute :r, :ct_r
         import_model_attributes :eg_run_level_elts
@@ -14,7 +14,5 @@ module Omml
         import_model_mappings :eg_run_level_elts
       end
     end
-
-    Omml::Configuration.register_model(EGRubyContent)
   end
 end

data/lib/omml/models/groups/eg_run_inner_content.rb

@@ -2,82 +2,19 @@
 
 module Omml
   module Models
-    class EGRunInnerContent < Lutaml::Model::Serializable
+    # Math run inner content. Per shared-math.xsd CT_R, the math schema
+    # contributes only the `t` element (CT_Text) inside a math run; all
+    # other run inner content (br, cr, tab, delText, etc.) belongs to
+    # the WordprocessingML namespace via EGWordRunInnerContent.
+    class EGRunInnerContent < Base
       choice(min: 1, max: 1) do
-        attribute :br, :string
         attribute :t, :ct_text
-        attribute :del_text, :ct_text
-        attribute :instr_text, :ct_text
-        attribute :del_instr_text, :ct_text
-        attribute :no_break_hyphen, :ct_empty
-        attribute :soft_hyphen, :ct_empty, collection: 0..1
-        attribute :day_short, :ct_empty, collection: 0..1
-        attribute :month_short, :ct_empty, collection: 0..1
-        attribute :year_short, :ct_empty, collection: 0..1
-        attribute :day_long, :ct_empty, collection: 0..1
-        attribute :month_long, :ct_empty, collection: 0..1
-        attribute :year_long, :ct_empty, collection: 0..1
-        attribute :annotation_ref, :ct_empty, collection: 0..1
-        attribute :footnote_ref, :ct_empty, collection: 0..1
-        attribute :endnote_ref, :ct_empty, collection: 0..1
-        attribute :separator, :ct_empty, collection: 0..1
-        attribute :continuation_separator, :ct_empty, collection: 0..1
-        attribute :sym, :ct_sym, collection: 0..1
-        attribute :pg_num, :ct_empty, collection: 0..1
-        attribute :cr, :ct_empty, collection: 0..1
-        attribute :tab, :ct_empty, collection: 0..1
-        attribute :object, :ct_object
-        attribute :pict, :ct_picture
-        attribute :fld_char, :ct_fld_char
-        attribute :ruby, :ct_ruby
-        attribute :footnote_reference, :ct_ftn_edn_ref
-        attribute :endnote_reference, :ct_ftn_edn_ref
-        attribute :comment_reference, :ct_markup
-        attribute :drawing, :ct_drawing
-        attribute :ptab, :ct_p_tab, collection: 0..1
-        attribute :last_rendered_page_break, :ct_empty, collection: 0..1
       end
 
       xml do
         type_name "EG_RunInnerContent"
-        map_element :br, to: :br, render_empty: true, namespace: nil
         map_element :t, to: :t, render_empty: true
-        map_element :delText, to: :del_text, render_empty: true
-        map_element :instrText, to: :instr_text, render_empty: true
-        map_element :delInstrText, to: :del_instr_text, render_empty: true
-        map_element :noBreakHyphen, to: :no_break_hyphen, render_empty: true
-        map_element :softHyphen, to: :soft_hyphen
-        map_element :dayShort, to: :day_short
-        map_element :monthShort, to: :month_short
-        map_element :yearShort, to: :year_short
-        map_element :dayLong, to: :day_long
-        map_element :monthLong, to: :month_long
-        map_element :yearLong, to: :year_long
-        map_element :annotationRef, to: :annotation_ref
-        map_element :footnoteRef, to: :footnote_ref
-        map_element :endnoteRef, to: :endnote_ref
-        map_element :separator, to: :separator
-        map_element :continuationSeparator, to: :continuation_separator
-        map_element :sym, to: :sym
-        map_element :pgNum, to: :pg_num
-        map_element :cr, to: :cr
-        map_element :tab, to: :tab
-        map_element :object, to: :object, render_empty: true
-        map_element :pict, to: :pict, render_empty: true
-        map_element :fldChar, to: :fld_char, render_empty: true
-        map_element :ruby, to: :ruby, render_empty: true
-        map_element :footnoteReference, to: :footnote_reference,
-                                        render_empty: true
-        map_element :endnoteReference, to: :endnote_reference,
-                                       render_empty: true
-        map_element :commentReference, to: :comment_reference,
-                                       render_empty: true
-        map_element :drawing, to: :drawing, render_empty: true
-        map_element :ptab, to: :ptab
-        map_element :lastRenderedPageBreak, to: :last_rendered_page_break
       end
     end
-
-    Omml::Configuration.register_model(EGRunInnerContent)
   end
 end

data/lib/omml/models/groups/eg_run_level_elts.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGRunLevelElts < Lutaml::Model::Serializable
+    class EGRunLevelElts < Base
       choice(min: 1, max: 1) do
         attribute :proof_err, :ct_proof_err, collection: 0..1
         attribute :perm_start, :ct_perm_start, collection: 0..1
@@ -28,7 +28,5 @@ module Omml
         import_model_mappings :eg_math_content
       end
     end
-
-    Omml::Configuration.register_model(EGRunLevelElts)
   end
 end

data/lib/omml/models/groups/eg_script_style.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGScriptStyle < Lutaml::Model::Serializable
+    class EGScriptStyle < Base
       attribute :scr, :ct_script, collection: 0..1
       attribute :sty, :ct_style, collection: 0..1
 
@@ -12,7 +12,5 @@ module Omml
         map_element :sty, to: :sty
       end
     end
-
-    Omml::Configuration.register_model(EGScriptStyle)
   end
 end