omml 0.2.1 → 0.2.3

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

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

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

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+module Omml
+  module Models
+    # WordprocessingML run inner content elements referenced from CT_R via
+    # <xsd:group ref="w:EG_RunInnerContent" /> in shared-math.xsd.
+    #
+    # Every element here belongs to the WordprocessingML namespace regardless
+    # of its containing parent. Per the global rule "define your own types",
+    # Omml owns these wordprocessing stubs so the gem is self-contained;
+    # consumers (e.g. Uniword) substitute their own wordprocessing classes
+    # via the register substitution mechanism.
+    class EGWordRunInnerContent < Base
+      choice(min: 1, max: 1) do
+        attribute :br, :ct_br
+        attribute :del_text, :ct_wordprocessing_text
+        attribute :instr_text, :ct_wordprocessing_text
+        attribute :del_instr_text, :ct_wordprocessing_text
+        attribute :no_break_hyphen, :ct_wordprocessing_empty
+        attribute :soft_hyphen, :ct_wordprocessing_empty, collection: 0..1
+        attribute :day_short, :ct_wordprocessing_empty, collection: 0..1
+        attribute :month_short, :ct_wordprocessing_empty, collection: 0..1
+        attribute :year_short, :ct_wordprocessing_empty, collection: 0..1
+        attribute :day_long, :ct_wordprocessing_empty, collection: 0..1
+        attribute :month_long, :ct_wordprocessing_empty, collection: 0..1
+        attribute :year_long, :ct_wordprocessing_empty, collection: 0..1
+        attribute :annotation_ref, :ct_wordprocessing_empty, collection: 0..1
+        attribute :footnote_ref, :ct_wordprocessing_empty, collection: 0..1
+        attribute :endnote_ref, :ct_wordprocessing_empty, collection: 0..1
+        attribute :separator, :ct_wordprocessing_empty, collection: 0..1
+        attribute :continuation_separator, :ct_wordprocessing_empty,
+                  collection: 0..1
+        attribute :sym, :ct_sym, collection: 0..1
+        attribute :pg_num, :ct_wordprocessing_empty, collection: 0..1
+        attribute :cr, :ct_wordprocessing_empty, collection: 0..1
+        attribute :tab, :ct_wordprocessing_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_wordprocessing_empty,
+                  collection: 0..1
+      end
+
+      xml do
+        type_name "EG_WordRunInnerContent"
+        namespace Omml::WordprocessingNamespace
+
+        map_element :br, to: :br, 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
+  end
+end

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

@@ -2,7 +2,7 @@
 
 module Omml
   module Models
-    class EGWrapType < Lutaml::Model::Serializable
+    class EGWrapType < Base
       choice(min: 1, max: 1) do
         attribute :wrap_none, :ct_wrap_none, collection: 1..1
         attribute :wrap_square, :ct_wrap_square, collection: 1..1
@@ -21,7 +21,5 @@ module Omml
                                        render_empty: true
       end
     end
-
-    Omml::Configuration.register_model(EGWrapType)
   end
 end

data/lib/omml/models/groups.rb

@@ -1,19 +1 @@
 # frozen_string_literal: true
-
-require_relative "groups/eg_math_content"
-require_relative "groups/eg_o_math_math_elements"
-require_relative "groups/eg_office_art_extension_list"
-require_relative "groups/eg_r_pr"
-require_relative "groups/eg_r_pr_base"
-require_relative "groups/eg_range_markup_elements"
-require_relative "groups/eg_run_inner_content"
-require_relative "groups/eg_script_style"
-require_relative "groups/eg_word_r_pr"
-require_relative "groups/eg_wrap_type"
-require_relative "groups/eg_r_pr_content"
-require_relative "groups/eg_r_pr_math"
-require_relative "groups/eg_run_level_elts"
-require_relative "groups/eg_content_run_content"
-require_relative "groups/eg_o_math_elements"
-require_relative "groups/eg_p_content"
-require_relative "groups/eg_ruby_content"

data/lib/omml/models/o_math.rb

@@ -3,7 +3,7 @@
 module Omml
   module Models
     # Root element wrapper for the generated CTOMath content model.
-    class OMath < Lutaml::Model::Serializable
+    class OMath < Base
       import_model_attributes :eg_o_math_elements
 
       xml do
@@ -15,7 +15,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(OMath, id: :o_math)
   end
 end

data/lib/omml/models/o_math_para.rb

@@ -3,7 +3,7 @@
 module Omml
   module Models
     # Root element wrapper for the generated CTOMathPara content model.
-    class OMathPara < Lutaml::Model::Serializable
+    class OMathPara < 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
@@ -19,7 +19,5 @@ module Omml
         end
       end
     end
-
-    Omml::Configuration.register_model(OMathPara, id: :o_math_para)
   end
 end

data/lib/omml/models/registerable.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Omml
+  module Models
+    # Mixed into simple-type classes that need to know their active register
+    # when resolving dependent types (e.g. `STAdjCoordinate` delegates to
+    # either `STCoordinate` or `STGeomGuideName` depending on the value).
+    #
+    # `Omml::Configuration.register_model` calls `register=` on classes that
+    # include this module, mirroring the role of upstream's
+    # `set_register_context` on `Lutaml::Model::Serializable`.
+    module Registerable
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        attr_accessor :register
+      end
+    end
+  end
+end

data/lib/omml/models/simple_types/enum_string.rb

@@ -3,6 +3,11 @@
 module Omml
   module Models
     class EnumString < Lutaml::Model::Type::String
+      def self.inherited(subclass)
+        super
+        Omml::Configuration.register_model(subclass)
+      end
+
       def self.cast(value, options = {})
         return if value.nil?
 

data/lib/omml/models/simple_types/hex_binary.rb

@@ -9,7 +9,6 @@ module Omml
         super(value, options.merge(pattern: /(?-mix:([0-9a-fA-F]{2})*)/))
       end
     end
-
     Omml::Configuration.register_model(HexBinary)
   end
 end

data/lib/omml/models/simple_types/st_adj_coordinate.rb

@@ -3,6 +3,8 @@
 module Omml
   module Models
     class STAdjCoordinate < Lutaml::Model::Type::Value
+      include Registerable
+
       def self.cast(value, options = {})
         return if value.nil?
 
@@ -18,7 +20,6 @@ module Omml
 
       private_class_method :cast_value
     end
-
     Omml::Configuration.register_model(STAdjCoordinate)
   end
 end

data/lib/omml/models/simple_types/st_align_h.rb

@@ -11,7 +11,5 @@ module Omml
         outside
       ].freeze
     end
-
-    Omml::Configuration.register_model(STAlignH)
   end
 end

data/lib/omml/models/simple_types/st_align_v.rb

@@ -11,7 +11,5 @@ module Omml
         outside
       ].freeze
     end
-
-    Omml::Configuration.register_model(STAlignV)
   end
 end

data/lib/omml/models/simple_types/st_border.rb

@@ -197,7 +197,5 @@ module Omml
         zigZagStitch
       ].freeze
     end
-
-    Omml::Configuration.register_model(STBorder)
   end
 end

data/lib/omml/models/simple_types/st_br_clear.rb

@@ -10,7 +10,5 @@ module Omml
         all
       ].freeze
     end
-
-    Omml::Configuration.register_model(STBrClear)
   end
 end

data/lib/omml/models/simple_types/st_br_type.rb

@@ -9,7 +9,5 @@ module Omml
         textWrapping
       ].freeze
     end
-
-    Omml::Configuration.register_model(STBrType)
   end
 end

data/lib/omml/models/simple_types/st_break_bin.rb

@@ -9,7 +9,5 @@ module Omml
         repeat
       ].freeze
     end
-
-    Omml::Configuration.register_model(STBreakBin)
   end
 end

data/lib/omml/models/simple_types/st_break_bin_sub.rb

@@ -9,7 +9,5 @@ module Omml
         +-
       ].freeze
     end
-
-    Omml::Configuration.register_model(STBreakBinSub)
   end
 end

data/lib/omml/models/simple_types/st_calendar_type.rb

@@ -16,7 +16,5 @@ module Omml
         gregorianXlitFrench
       ].freeze
     end
-
-    Omml::Configuration.register_model(STCalendarType)
   end
 end

data/lib/omml/models/simple_types/st_combine_brackets.rb

@@ -11,7 +11,5 @@ module Omml
         curly
       ].freeze
     end
-
-    Omml::Configuration.register_model(STCombineBrackets)
   end
 end

data/lib/omml/models/simple_types/st_coordinate.rb

@@ -10,7 +10,6 @@ module Omml
                                    min: -27_273_042_329_600))
       end
     end
-
     Omml::Configuration.register_model(STCoordinate)
   end
 end

data/lib/omml/models/simple_types/st_displaced_by_custom_xml.rb

@@ -8,7 +8,5 @@ module Omml
         prev
       ].freeze
     end
-
-    Omml::Configuration.register_model(STDisplacedByCustomXml)
   end
 end

data/lib/omml/models/simple_types/st_ed_grp.rb

@@ -13,7 +13,5 @@ module Omml
         current
       ].freeze
     end
-
-    Omml::Configuration.register_model(STEdGrp)
   end
 end

data/lib/omml/models/simple_types/st_em.rb

@@ -11,7 +11,5 @@ module Omml
         underDot
       ].freeze
     end
-
-    Omml::Configuration.register_model(STEm)
   end
 end

data/lib/omml/models/simple_types/st_f_type.rb

@@ -10,7 +10,5 @@ module Omml
         noBar
       ].freeze
     end
-
-    Omml::Configuration.register_model(STFType)
   end
 end

data/lib/omml/models/simple_types/st_ff_text_type.rb

@@ -12,7 +12,5 @@ module Omml
         calculated
       ].freeze
     end
-
-    Omml::Configuration.register_model(STFFTextType)
   end
 end

data/lib/omml/models/simple_types/st_fld_char_type.rb

@@ -9,7 +9,5 @@ module Omml
         end
       ].freeze
     end
-
-    Omml::Configuration.register_model(STFldCharType)
   end
 end

data/lib/omml/models/simple_types/st_geom_guide_name.rb

@@ -4,7 +4,5 @@ module Omml
   module Models
     class STGeomGuideName < Token
     end
-
-    Omml::Configuration.register_model(STGeomGuideName)
   end
 end

data/lib/omml/models/simple_types/st_hex_color.rb

@@ -3,6 +3,8 @@
 module Omml
   module Models
     class STHexColor < Lutaml::Model::Type::Value
+      include Registerable
+
       def self.cast(value, options = {})
         return if value.nil?
 
@@ -18,7 +20,6 @@ module Omml
 
       private_class_method :cast_value
     end
-
     Omml::Configuration.register_model(STHexColor)
   end
 end

data/lib/omml/models/simple_types/st_highlight_color.rb

@@ -23,7 +23,5 @@ module Omml
         none
       ].freeze
     end
-
-    Omml::Configuration.register_model(STHighlightColor)
   end
 end

data/lib/omml/models/simple_types/st_hint.rb

@@ -9,7 +9,5 @@ module Omml
         cs
       ].freeze
     end
-
-    Omml::Configuration.register_model(STHint)
   end
 end

data/lib/omml/models/simple_types/st_info_text_type.rb

@@ -8,7 +8,5 @@ module Omml
         autoText
       ].freeze
     end
-
-    Omml::Configuration.register_model(STInfoTextType)
   end
 end

data/lib/omml/models/simple_types/st_integer2.rb

@@ -9,7 +9,6 @@ module Omml
         super(value, options.merge(max: 2, min: -2))
       end
     end
-
     Omml::Configuration.register_model(STInteger2)
   end
 end

data/lib/omml/models/simple_types/st_integer255.rb

@@ -9,7 +9,6 @@ module Omml
         super(value, options.merge(max: 255, min: 1))
       end
     end
-
     Omml::Configuration.register_model(STInteger255)
   end
 end

data/lib/omml/models/simple_types/st_jc.rb

@@ -10,7 +10,5 @@ module Omml
         centerGroup
       ].freeze
     end
-
-    Omml::Configuration.register_model(STJc)
   end
 end

data/lib/omml/models/simple_types/st_lang.rb

@@ -3,6 +3,8 @@
 module Omml
   module Models
     class STLang < Lutaml::Model::Type::Value
+      include Registerable
+
       def self.cast(value, options = {})
         return if value.nil?
 
@@ -18,7 +20,6 @@ module Omml
 
       private_class_method :cast_value
     end
-
     Omml::Configuration.register_model(STLang)
   end
 end

data/lib/omml/models/simple_types/st_lim_loc.rb

@@ -8,7 +8,5 @@ module Omml
         subSup
       ].freeze
     end
-
-    Omml::Configuration.register_model(STLimLoc)
   end
 end

data/lib/omml/models/simple_types/st_lock.rb

@@ -10,7 +10,5 @@ module Omml
         sdtContentLocked
       ].freeze
     end
-
-    Omml::Configuration.register_model(STLock)
   end
 end

data/lib/omml/models/simple_types/st_on_off.rb

@@ -12,7 +12,5 @@ module Omml
         false
       ].freeze
     end
-
-    Omml::Configuration.register_model(STOnOff)
   end
 end

data/lib/omml/models/simple_types/st_p_tab_alignment.rb

@@ -9,7 +9,5 @@ module Omml
         right
       ].freeze
     end
-
-    Omml::Configuration.register_model(STPTabAlignment)
   end
 end

data/lib/omml/models/simple_types/st_p_tab_leader.rb

@@ -11,7 +11,5 @@ module Omml
         middleDot
       ].freeze
     end
-
-    Omml::Configuration.register_model(STPTabLeader)
   end
 end

data/lib/omml/models/simple_types/st_p_tab_relative_to.rb

@@ -8,7 +8,5 @@ module Omml
         indent
       ].freeze
     end
-
-    Omml::Configuration.register_model(STPTabRelativeTo)
   end
 end

data/lib/omml/models/simple_types/st_positive_coordinate.rb

@@ -9,7 +9,6 @@ module Omml
         super(value, options.merge(max: 27_273_042_316_900, min: 0))
       end
     end
-
     Omml::Configuration.register_model(STPositiveCoordinate)
   end
 end

data/lib/omml/models/simple_types/st_proof_err.rb

@@ -10,7 +10,5 @@ module Omml
         gramEnd
       ].freeze
     end
-
-    Omml::Configuration.register_model(STProofErr)
   end
 end

data/lib/omml/models/simple_types/st_rel_from_h.rb

@@ -14,7 +14,5 @@ module Omml
         outsideMargin
       ].freeze
     end
-
-    Omml::Configuration.register_model(STRelFromH)
   end
 end

data/lib/omml/models/simple_types/st_rel_from_v.rb

@@ -14,7 +14,5 @@ module Omml
         outsideMargin
       ].freeze
     end
-
-    Omml::Configuration.register_model(STRelFromV)
   end
 end

data/lib/omml/models/simple_types/st_ruby_align.rb

@@ -12,7 +12,5 @@ module Omml
         rightVertical
       ].freeze
     end
-
-    Omml::Configuration.register_model(STRubyAlign)
   end
 end

data/lib/omml/models/simple_types/st_script.rb

@@ -12,7 +12,5 @@ module Omml
         monospace
       ].freeze
     end
-
-    Omml::Configuration.register_model(STScript)
   end
 end

data/lib/omml/models/simple_types/st_sdt_date_mapping_type.rb

@@ -9,7 +9,5 @@ module Omml
         dateTime
       ].freeze
     end
-
-    Omml::Configuration.register_model(STSdtDateMappingType)
   end
 end

data/lib/omml/models/simple_types/st_shd.rb

@@ -44,7 +44,5 @@ module Omml
         pct95
       ].freeze
     end
-
-    Omml::Configuration.register_model(STShd)
   end
 end

data/lib/omml/models/simple_types/st_shp.rb

@@ -8,7 +8,5 @@ module Omml
         match
       ].freeze
     end
-
-    Omml::Configuration.register_model(STShp)
   end
 end

data/lib/omml/models/simple_types/st_spacing_rule.rb

@@ -9,7 +9,6 @@ module Omml
         super(value, options.merge(max: 4, min: 0))
       end
     end
-
     Omml::Configuration.register_model(STSpacingRule)
   end
 end

data/lib/omml/models/simple_types/st_style.rb

@@ -10,7 +10,5 @@ module Omml
         bi
       ].freeze
     end
-
-    Omml::Configuration.register_model(STStyle)
   end
 end

data/lib/omml/models/simple_types/st_text_effect.rb

@@ -13,7 +13,5 @@ module Omml
         none
       ].freeze
     end
-
-    Omml::Configuration.register_model(STTextEffect)
   end
 end

data/lib/omml/models/simple_types/st_text_scale.rb

@@ -9,7 +9,6 @@ module Omml
         super(value, options.merge(max: 600, min: 0))
       end
     end
-
     Omml::Configuration.register_model(STTextScale)
   end
 end