omml 0.2.1 → 0.2.3

data/lib/omml/models/ct_markup_range.rb

@@ -13,7 +13,5 @@ module Omml
         map_attribute :displacedByCustomXml, to: :displaced_by_custom_xml
       end
     end
-
-    Omml::Configuration.register_model(CTMarkupRange)
   end
 end

data/lib/omml/models/ct_math_pr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTMathPr < Lutaml::Model::Serializable
+    class CTMathPr < Base
       attribute :math_font, :ct_string, collection: 0..1
       attribute :brk_bin, :ct_break_bin, collection: 0..1
       attribute :brk_bin_sub, :ct_break_bin_sub, collection: 0..1
@@ -47,7 +47,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTMathPr)
   end
 end

data/lib/omml/models/ct_mc.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTMC < Lutaml::Model::Serializable
+    class CTMC < Base
       attribute :mc_pr, :ct_mc_pr, collection: 0..1
 
       xml do
@@ -15,7 +15,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTMC)
   end
 end

data/lib/omml/models/ct_mc_pr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTMCPr < Lutaml::Model::Serializable
+    class CTMCPr < Base
       attribute :count, :ct_integer255, collection: 0..1
       attribute :mc_jc, :ct_x_align, collection: 0..1
 
@@ -17,7 +17,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTMCPr)
   end
 end

data/lib/omml/models/ct_mcs.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTMCS < Lutaml::Model::Serializable
+    class CTMCS < Base
       attribute :mc, :ct_mc, collection: 1..Float::INFINITY
 
       xml do
@@ -15,7 +15,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTMCS)
   end
 end

data/lib/omml/models/ct_move_bookmark.rb

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

data/lib/omml/models/ct_mr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTMR < Lutaml::Model::Serializable
+    class CTMR < Base
       attribute :e, :ct_o_math_arg, collection: 1..Float::INFINITY
 
       xml do
@@ -15,7 +15,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTMR)
   end
 end

data/lib/omml/models/ct_nary.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTNary < Lutaml::Model::Serializable
+    class CTNary < Base
       attribute :nary_pr, :ct_nary_pr, collection: 0..1
       attribute :sub, :ct_o_math_arg
       attribute :sup, :ct_o_math_arg
@@ -21,7 +21,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTNary)
   end
 end

data/lib/omml/models/ct_nary_pr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTNaryPr < Lutaml::Model::Serializable
+    class CTNaryPr < Base
       attribute :chr, :ct_char, collection: 0..1
       attribute :lim_loc, :ct_lim_loc, collection: 0..1
       attribute :grow, :ct_on_off, collection: 0..1
@@ -25,7 +25,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTNaryPr)
   end
 end

data/lib/omml/models/ct_non_visual_drawing_props.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTNonVisualDrawingProps < Lutaml::Model::Serializable
+    class CTNonVisualDrawingProps < Base
       attribute :hlink_click, :ct_hyperlink, collection: 0..1
       attribute :hlink_hover, :ct_hyperlink, collection: 0..1
       attribute :ext_lst, :ct_office_art_extension_list, collection: 0..1
@@ -27,7 +27,5 @@ module Omml
         map_attribute :hidden, to: :hidden
       end
     end
-
-    Omml::Configuration.register_model(CTNonVisualDrawingProps)
   end
 end

data/lib/omml/models/ct_non_visual_graphic_frame_properties.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTNonVisualGraphicFrameProperties < Lutaml::Model::Serializable
+    class CTNonVisualGraphicFrameProperties < Base
       attribute :graphic_frame_locks, :ct_graphical_object_frame_locking,
                 collection: 0..1
       attribute :ext_lst, :ct_office_art_extension_list, collection: 0..1
@@ -18,7 +18,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTNonVisualGraphicFrameProperties)
   end
 end

data/lib/omml/models/ct_o_math.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTOMath < Lutaml::Model::Serializable
+    class CTOMath < Base
       import_model_attributes :eg_o_math_elements
 
       xml do
@@ -16,7 +16,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTOMath)
   end
 end

data/lib/omml/models/ct_o_math_arg.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTOMathArg < Lutaml::Model::Serializable
+    class CTOMathArg < Base
       attribute :arg_pr, :ct_o_math_arg_pr, collection: 0..1
       attribute :t, :ct_text, collection: 0..1
       import_model_attributes :eg_o_math_elements
@@ -22,7 +22,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTOMathArg)
   end
 end

data/lib/omml/models/ct_o_math_arg_pr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTOMathArgPr < Lutaml::Model::Serializable
+    class CTOMathArgPr < Base
       attribute :arg_sz, :ct_integer2, collection: 0..1
 
       xml do
@@ -15,7 +15,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTOMathArgPr)
   end
 end

data/lib/omml/models/ct_o_math_jc.rb

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

data/lib/omml/models/ct_o_math_para.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTOMathPara < Lutaml::Model::Serializable
+    class CTOMathPara < Base
       attribute :o_math_para_pr, :ct_o_math_para_pr, collection: 0..1
       attribute :o_math, :ct_o_math, collection: 1..Float::INFINITY
       attribute :r, :ct_r, collection: 0..Float::INFINITY
@@ -20,7 +20,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTOMathPara)
   end
 end

data/lib/omml/models/ct_o_math_para_pr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTOMathParaPr < Lutaml::Model::Serializable
+    class CTOMathParaPr < Base
       attribute :jc, :ct_o_math_jc, collection: 0..1
 
       xml do
@@ -15,7 +15,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTOMathParaPr)
   end
 end

data/lib/omml/models/ct_object.rb

@@ -19,7 +19,5 @@ module Omml
         map_attribute :dyaOrig, to: :dya_orig
       end
     end
-
-    Omml::Configuration.register_model(CTObject)
   end
 end

data/lib/omml/models/ct_office_art_extension.rb

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

data/lib/omml/models/ct_office_art_extension_list.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTOfficeArtExtensionList < Lutaml::Model::Serializable
+    class CTOfficeArtExtensionList < Base
       import_model_attributes :eg_office_art_extension_list
 
       xml do
@@ -15,7 +15,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTOfficeArtExtensionList)
   end
 end

data/lib/omml/models/ct_on_off.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTOnOff < Lutaml::Model::Serializable
+    class CTOnOff < 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(CTOnOff)
   end
 end

data/lib/omml/models/ct_p_tab.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTPTab < Lutaml::Model::Serializable
+    class CTPTab < Base
       attribute :alignment, :st_p_tab_alignment
       attribute :relative_to, :st_p_tab_relative_to
       attribute :leader, :st_p_tab_leader
@@ -17,7 +17,5 @@ module Omml
         map_attribute :leader, to: :leader
       end
     end
-
-    Omml::Configuration.register_model(CTPTab)
   end
 end

data/lib/omml/models/ct_perm.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTPerm < Lutaml::Model::Serializable
+    class CTPerm < Base
       attribute :id, :st_string
       attribute :displaced_by_custom_xml, :st_displaced_by_custom_xml
 
@@ -15,7 +15,5 @@ module Omml
         map_attribute :displacedByCustomXml, to: :displaced_by_custom_xml
       end
     end
-
-    Omml::Configuration.register_model(CTPerm)
   end
 end

data/lib/omml/models/ct_perm_start.rb

@@ -19,7 +19,5 @@ module Omml
         map_attribute :colLast, to: :col_last
       end
     end
-
-    Omml::Configuration.register_model(CTPermStart)
   end
 end

data/lib/omml/models/ct_phant.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTPhant < Lutaml::Model::Serializable
+    class CTPhant < Base
       attribute :phant_pr, :ct_phant_pr, collection: 0..1
       attribute :e, :ct_o_math_arg
 
@@ -17,7 +17,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTPhant)
   end
 end

data/lib/omml/models/ct_phant_pr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTPhantPr < Lutaml::Model::Serializable
+    class CTPhantPr < Base
       attribute :show, :ct_on_off, collection: 0..1
       attribute :zero_wid, :ct_on_off, collection: 0..1
       attribute :zero_asc, :ct_on_off, collection: 0..1
@@ -25,7 +25,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTPhantPr)
   end
 end

data/lib/omml/models/ct_picture.rb

@@ -17,7 +17,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTPicture)
   end
 end

data/lib/omml/models/ct_picture_base.rb

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

data/lib/omml/models/ct_placeholder.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTPlaceholder < Lutaml::Model::Serializable
+    class CTPlaceholder < Base
       attribute :doc_part, :ct_string
 
       xml do
@@ -15,7 +15,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTPlaceholder)
   end
 end

data/lib/omml/models/ct_point2_d.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTPoint2D < Lutaml::Model::Serializable
+    class CTPoint2D < Base
       attribute :x, :st_coordinate
       attribute :y, :st_coordinate
 
@@ -15,7 +15,5 @@ module Omml
         map_attribute :y, to: :y
       end
     end
-
-    Omml::Configuration.register_model(CTPoint2D)
   end
 end

data/lib/omml/models/ct_pos_h.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTPosH < Lutaml::Model::Serializable
+    class CTPosH < Base
       choice(min: 1, max: 1) do
         attribute :align, :st_align_h, collection: 1..1
         attribute :pos_offset, :st_position_offset, collection: 1..1
@@ -21,7 +21,5 @@ module Omml
         map_attribute :relativeFrom, to: :relative_from
       end
     end
-
-    Omml::Configuration.register_model(CTPosH)
   end
 end

data/lib/omml/models/ct_pos_v.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTPosV < Lutaml::Model::Serializable
+    class CTPosV < Base
       choice(min: 1, max: 1) do
         attribute :align, :st_align_v, collection: 1..1
         attribute :pos_offset, :st_position_offset, collection: 1..1
@@ -21,7 +21,5 @@ module Omml
         map_attribute :relativeFrom, to: :relative_from
       end
     end
-
-    Omml::Configuration.register_model(CTPosV)
   end
 end

data/lib/omml/models/ct_positive_size2_d.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTPositiveSize2D < Lutaml::Model::Serializable
+    class CTPositiveSize2D < Base
       attribute :cx, :st_positive_coordinate
       attribute :cy, :st_positive_coordinate
 
@@ -15,7 +15,5 @@ module Omml
         map_attribute :cy, to: :cy
       end
     end
-
-    Omml::Configuration.register_model(CTPositiveSize2D)
   end
 end

data/lib/omml/models/ct_proof_err.rb

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

data/lib/omml/models/ct_r.rb

@@ -2,10 +2,11 @@
 
 module Omml
   module Models
-    class CTR < Lutaml::Model::Serializable
+    class CTR < Base
       attribute :r_pr, :ct_rpr, collection: 0..1
       import_model_attributes :eg_word_r_pr
       choice(min: 0, max: Float::INFINITY) do
+        import_model_attributes :eg_word_run_inner_content
         import_model_attributes :eg_run_inner_content
       end
 
@@ -17,11 +18,10 @@ module Omml
         sequence do
           map_element :rPr, to: :r_pr
           import_model_mappings :eg_word_r_pr
+          import_model_mappings :eg_word_run_inner_content
           import_model_mappings :eg_run_inner_content
         end
       end
     end
-
-    Omml::Configuration.register_model(CTR)
   end
 end

data/lib/omml/models/ct_r_pr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTRPr < Lutaml::Model::Serializable
+    class CTRPr < Base
       import_model_attributes :eg_r_pr_content
 
       xml do
@@ -15,7 +15,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTRPr)
   end
 end

data/lib/omml/models/ct_r_pr_change.rb

@@ -15,7 +15,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTRPrChange)
   end
 end

data/lib/omml/models/ct_r_pr_original.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTRPrOriginal < Lutaml::Model::Serializable
+    class CTRPrOriginal < Base
       import_model_attributes :eg_r_pr_base
 
       xml do
@@ -15,7 +15,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTRPrOriginal)
   end
 end

data/lib/omml/models/ct_rad.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTRad < Lutaml::Model::Serializable
+    class CTRad < Base
       attribute :rad_pr, :ct_rad_pr, collection: 0..1
       attribute :deg, :ct_o_math_arg
       attribute :e, :ct_o_math_arg
@@ -19,7 +19,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTRad)
   end
 end

data/lib/omml/models/ct_rad_pr.rb

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class CTRadPr < Lutaml::Model::Serializable
+    class CTRadPr < Base
       attribute :deg_hide, :ct_on_off, collection: 0..1
       attribute :ctrl_pr, :ct_ctrl_pr, collection: 0..1
 
@@ -17,7 +17,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(CTRadPr)
   end
 end

data/lib/omml/models/ct_rel.rb

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