uniword 1.0.11 → 1.2.4

data/lib/uniword/wordprocessingml/run.rb

@@ -10,9 +10,9 @@ module Uniword
     # Element: <w:r>
     class Run < Lutaml::Model::Serializable
       attribute :properties, RunProperties
-      attribute :text, Text
+      attribute :text, Text, collection: true
       attribute :tab, Tab
-      attribute :break, Break
+      attribute :break, Break, collection: true
       attribute :drawings, Drawing, collection: true, initialize_empty: true
       attribute :pictures, Picture, collection: true, initialize_empty: true
       attribute :alternate_content, AlternateContent, default: nil
@@ -25,6 +25,8 @@ module Uniword
       attribute :no_break_hyphen, NoBreakHyphen
       attribute :sym, Symbol
       attribute :last_rendered_page_break, LastRenderedPageBreak
+      attribute :separator_char, SeparatorChar
+      attribute :continuation_separator_char, ContinuationSeparatorChar
 
       # Revision tracking attributes
       attribute :rsid_r, :string          # Revision ID for run
@@ -61,6 +63,9 @@ module Uniword
         map_element "sym", to: :sym, render_nil: false
         map_element "lastRenderedPageBreak", to: :last_rendered_page_break,
                                              render_nil: false
+        map_element "separator", to: :separator_char, render_nil: false
+        map_element "continuationSeparator", to: :continuation_separator_char,
+                                             render_nil: false
       end
 
       # Initialize with text normalization
@@ -78,15 +83,24 @@ module Uniword
         visitor.visit_run(self)
       end
 
+      # Combined string content of all text elements in the run
+      #
+      # @return [String] Concatenated content of every w:t element
+      def text_string
+        Array(text).join
+      end
+
       # Substitute text in run
       #
       # @param pattern [Regexp, String] Pattern to match
       # @param replacement [String] Replacement text
       # @return [self] For method chaining
       def substitute(pattern, replacement)
-        return self unless text
-
-        self.text = text.to_s.gsub(pattern, replacement)
+        Array(text).each do |t|
+          content = t.content.to_s.gsub(pattern, replacement)
+          t.content = content
+          t.xml_space = Text.preserve_whitespace?(content) ? "preserve" : nil
+        end
         self
       end
 
@@ -96,10 +110,12 @@ module Uniword
       # @yield [MatchData] Block receives match data object
       # @return [self] For method chaining
       def substitute_with_block(pattern, &block)
-        return self unless text
-
-        self.text = text.to_s.gsub(pattern) do |_match_str|
-          yield(Regexp.last_match)
+        Array(text).each do |t|
+          content = t.content.to_s.gsub(pattern) do |_match_str|
+            yield(Regexp.last_match)
+          end
+          t.content = content
+          t.xml_space = Text.preserve_whitespace?(content) ? "preserve" : nil
         end
         self
       end
@@ -108,7 +124,7 @@ module Uniword
       #
       # @return [String] Human-readable representation
       def inspect
-        text_preview = text.to_s
+        text_preview = text_string
         text_preview = "#{text_preview[0, 37]}..." if text_preview.length > 40
 
         flags = []
@@ -167,36 +183,16 @@ module Uniword
 
       private
 
-      # Merge two RunProperties objects with override taking precedence
+      # Merge two RunProperties objects with override taking precedence.
       #
-      # Creates a new RunProperties where each attribute is taken from
-      # `override` if set, otherwise from `base`.
+      # Delegates to RunProperties#merged_over which uses the model's
+      # declared attributes — fully model-driven, no dynamic dispatch.
       #
       # @param base [RunProperties] Base (inherited) properties
       # @param override [RunProperties] Override (explicit) properties
       # @return [RunProperties] Merged properties
       def merge_properties(base, override)
-        merged = RunProperties.new
-
-        RunProperties.attributes.each_key do |attr_name|
-          override_val = override.public_send(attr_name)
-          base_val = base.public_send(attr_name)
-
-          use_override = if override_val.is_a?(Lutaml::Model::Serializable)
-                           override_val.class.attributes.any? do |k, _|
-                             !override_val.using_default?(k)
-                           end
-                         else
-                           !override_val.nil?
-                         end
-
-          value = use_override ? override_val : base_val
-          next unless value
-
-          merged.public_send(:"#{attr_name}=", value)
-        end
-
-        merged
+        override.merged_over(base)
       end
 
       # Get inherited run properties from paragraph style chain
@@ -209,7 +205,7 @@ module Uniword
         return nil unless parent_paragraph
 
         paragraph = parent_paragraph
-        style_id = paragraph.style
+        style_id = paragraph.style&.to_s
 
         return nil unless style_id
         return nil unless paragraph.parent_document
@@ -240,7 +236,7 @@ module Uniword
       # Create Text object with xml:space="preserve" when needed
       def create_text_object(string)
         text_obj = Text.new(content: string)
-        text_obj.xml_space = "preserve" if string.start_with?(" ") || string.end_with?(" ") || string.include?("\t")
+        text_obj.xml_space = "preserve" if Text.preserve_whitespace?(string)
         text_obj
       end
     end

data/lib/uniword/wordprocessingml/run_properties/merging.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Uniword
+  module Wordprocessingml
+    class RunProperties < Lutaml::Model::Serializable
+      # Merge semantics for RunProperties.
+      #
+      # Provides style-inheritance merging where override properties take
+      # precedence over base properties. Uses the model's declared attributes
+      # via read_attribute/write_attribute — fully model-driven.
+      module Merging
+        # Merge with another RunProperties, using self as override.
+        #
+        # For each declared attribute: if self has a non-default value,
+        # use it; otherwise use the other's value.
+        #
+        # @param base [RunProperties] Base (inherited) properties
+        # @return [RunProperties] New merged properties
+        def merged_over(base)
+          merged = RunProperties.new
+
+          self.class.attributes.each_key do |attr_name|
+            override_val = read_attribute(attr_name)
+            base_val = base.read_attribute(attr_name)
+
+            use_override = if override_val.is_a?(Lutaml::Model::Serializable)
+                             override_val.class.attributes.any? do |k, _|
+                               !override_val.using_default?(k)
+                             end
+                           else
+                             !override_val.nil?
+                           end
+
+            value = use_override ? override_val : base_val
+            next unless value
+
+            merged.write_attribute(attr_name, value)
+          end
+
+          merged
+        end
+      end
+    end
+  end
+end

data/lib/uniword/wordprocessingml/run_properties.rb

@@ -2,11 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "run_properties/yaml_transforms"
-require_relative "run_properties/predicates"
-require_relative "run_properties/accessors"
-require_relative "run_properties/conversion"
-
 module Uniword
   module Wordprocessingml
     # Run (character) formatting properties
@@ -14,9 +9,17 @@ module Uniword
     # Represents w:rPr element containing character-level formatting.
     # Used in StyleSets and run elements.
     class RunProperties < Lutaml::Model::Serializable
+      autoload :YamlTransforms, "#{__dir__}/run_properties/yaml_transforms"
+      autoload :Predicates, "#{__dir__}/run_properties/predicates"
+      autoload :Accessors, "#{__dir__}/run_properties/accessors"
+      autoload :Conversion, "#{__dir__}/run_properties/conversion"
+      autoload :Merging, "#{__dir__}/run_properties/merging"
+
+      include Uniword::ModelAttributeAccess
       include YamlTransforms
       include Predicates
       include Accessors
+      include Merging
       prepend Conversion
 
       # Pattern 0: ATTRIBUTES FIRST, then XML mappings

data/lib/uniword/wordprocessingml/section_properties.rb

@@ -48,13 +48,13 @@ module Uniword
         map_attribute "paraId", to: :para_id, render_nil: false
         map_attribute "textId", to: :text_id, render_nil: false
 
-        map_element "pgSz", to: :page_size, render_nil: false
-        map_element "pgMar", to: :page_margins, render_nil: false
-        map_element "cols", to: :columns, render_nil: false
         map_element "headerReference", to: :header_references, render_nil: false
         map_element "footerReference", to: :footer_references, render_nil: false
+        map_element "pgSz", to: :page_size, render_nil: false
+        map_element "pgMar", to: :page_margins, render_nil: false
         map_attribute "val", to: :type
         map_element "pgNumType", to: :page_numbering, render_nil: false
+        map_element "cols", to: :columns, render_nil: false
         map_element "docGrid", to: :doc_grid, render_nil: false
         map_element "footnotePr", to: :footnote_pr, render_nil: false
         map_element "titlePg", to: :title_pg, render_nil: false

data/lib/uniword/wordprocessingml/separator_char.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Uniword
+  module Wordprocessingml
+    class SeparatorChar < Lutaml::Model::Serializable
+      xml do
+        element "separator"
+        namespace Uniword::Ooxml::Namespaces::WordProcessingML
+      end
+    end
+
+    class ContinuationSeparatorChar < Lutaml::Model::Serializable
+      xml do
+        element "continuationSeparator"
+        namespace Uniword::Ooxml::Namespaces::WordProcessingML
+      end
+    end
+  end
+end

data/lib/uniword/wordprocessingml/settings.rb

@@ -106,40 +106,42 @@ module Uniword
         ]
 
         map_attribute "Ignorable", to: :mc_ignorable, render_nil: false
+        # Element order MUST match OOXML CT_Settings schema sequence.
+        # Out-of-order elements cause Word "unreadable content" errors.
         map_element "zoom", to: :zoom, render_nil: false
         map_element "doNotDisplayPageBoundaries",
                     to: :do_not_display_page_boundaries, render_nil: false
-        map_element "compat", to: :compat, render_nil: false
+        map_element "mirrorMargins", to: :mirror_margins, render_nil: false
+        map_element "attachedTemplate", to: :attached_template,
+                                        render_nil: false
         map_element "proofState", to: :proof_state, render_nil: false
         map_element "stylePaneFormatFilter", to: :style_pane_format_filter,
                                              render_nil: false
+        map_element "stylePaneSortMethod", to: :style_pane_sort_method,
+                                           render_nil: false
         map_element "defaultTabStop", to: :default_tab_stop, render_nil: false
+        map_element "hyphenationZone", to: :hyphenation_zone,
+                                       render_nil: false
+        map_element "evenAndOddHeaders", to: :even_and_odd_headers,
+                                         render_nil: false
         map_element "characterSpacingControl", to: :character_spacing_control,
                                                render_nil: false
+        map_element "footnotePr", to: :footnote_pr, render_nil: false
+        map_element "endnotePr", to: :endnote_pr, render_nil: false
+        map_element "compat", to: :compat, render_nil: false
+        map_element "docVars", to: :doc_vars, render_nil: false
         map_element "rsids", to: :rsids, render_nil: false
         map_element "mathPr", to: :math_pr, render_nil: false
         map_element "themeFontLang", to: :theme_font_lang, render_nil: false
         map_element "clrSchemeMapping", to: :clr_scheme_mapping,
                                         render_nil: false
+        map_element "doNotIncludeSubdocsInStats",
+                    to: :do_not_include_subdocs_in_stats, render_nil: false
+        map_element "hdrShapeDefaults", to: :hdr_shape_defaults,
+                                        render_nil: false
         map_element "shapeDefaults", to: :shape_defaults, render_nil: false
         map_element "decimalSymbol", to: :decimal_symbol, render_nil: false
         map_element "listSeparator", to: :list_separator, render_nil: false
-        map_element "attachedTemplate", to: :attached_template,
-                                        render_nil: false
-        map_element "footnotePr", to: :footnote_pr, render_nil: false
-        map_element "endnotePr", to: :endnote_pr, render_nil: false
-        map_element "hdrShapeDefaults", to: :hdr_shape_defaults,
-                                        render_nil: false
-        map_element "evenAndOddHeaders", to: :even_and_odd_headers,
-                                         render_nil: false
-        map_element "mirrorMargins", to: :mirror_margins, render_nil: false
-        map_element "doNotIncludeSubdocsInStats",
-                    to: :do_not_include_subdocs_in_stats, render_nil: false
-        map_element "hyphenationZone", to: :hyphenation_zone,
-                                       render_nil: false
-        map_element "stylePaneSortMethod", to: :style_pane_sort_method,
-                                           render_nil: false
-        map_element "docVars", to: :doc_vars, render_nil: false
         # Both w14:docId and w15:docId use the same element name 'docId'
         # Separate map_element entries needed for namespace-aware matching
         # The namespace_scope ensures w14 and w15 namespaces are declared on root

data/lib/uniword/wordprocessingml/styles/style_definition.rb

@@ -25,7 +25,7 @@ module Uniword
       def resolve_inheritance(library = nil)
         return properties unless @base_style && library
 
-        base_def = library.public_send(style_type, @base_style)
+        base_def = library.lookup(style_type, @base_style)
         base_props = base_def.resolve_inheritance(library)
 
         merge_properties(base_props, properties)

data/lib/uniword/wordprocessingml/styles/style_library.rb

@@ -106,6 +106,22 @@ module Uniword
           raise(ArgumentError, "Table style not found: #{style_name}")
       end
 
+      # Lookup a style by kind. Single dispatch point for all style types.
+      # @param kind [Symbol] One of :paragraph_style, :character_style,
+      #                      :list_style, :table_style, :semantic_style
+      # @param name [String, Symbol] Style name
+      def lookup(kind, name)
+        case kind
+        when :paragraph_style then paragraph_style(name)
+        when :character_style then character_style(name)
+        when :list_style      then list_style(name)
+        when :table_style     then table_style(name)
+        when :semantic_style  then semantic_style(name)
+        else
+          raise ArgumentError, "Unknown style kind: #{kind.inspect}"
+        end
+      end
+
       # Get semantic style definition
       #
       # @param style_name [String, Symbol] Style name

data/lib/uniword/wordprocessingml/table_defaults.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Uniword
+  module Wordprocessingml
+    # Shared table structure defaults.
+    #
+    # Provides canonical values for table look, grid, and cell width defaults
+    # used by both builder and reconciler.
+    module TableDefaults
+      DEFAULT_TABLE_LOOK = Properties::TableLook.new(
+        val: "04A0",
+        first_row: 1,
+        last_row: 0,
+        first_column: 1,
+        last_column: 0,
+        no_h_band: 0,
+        no_v_band: 1,
+      ).freeze
+
+      def self.default_table_look
+        Properties::TableLook.new(
+          val: DEFAULT_TABLE_LOOK.val,
+          first_row: DEFAULT_TABLE_LOOK.first_row,
+          last_row: DEFAULT_TABLE_LOOK.last_row,
+          first_column: DEFAULT_TABLE_LOOK.first_column,
+          last_column: DEFAULT_TABLE_LOOK.last_column,
+          no_h_band: DEFAULT_TABLE_LOOK.no_h_band,
+          no_v_band: DEFAULT_TABLE_LOOK.no_v_band,
+        )
+      end
+
+      def self.fill_missing_table_look(look)
+        look.val ||= DEFAULT_TABLE_LOOK.val
+        look.first_row ||= DEFAULT_TABLE_LOOK.first_row
+        look.last_row ||= DEFAULT_TABLE_LOOK.last_row
+        look.first_column ||= DEFAULT_TABLE_LOOK.first_column
+        look.last_column ||= DEFAULT_TABLE_LOOK.last_column
+        look.no_h_band ||= DEFAULT_TABLE_LOOK.no_h_band
+        look.no_v_band ||= DEFAULT_TABLE_LOOK.no_v_band
+        look
+      end
+    end
+  end
+end

data/lib/uniword/wordprocessingml/text.rb

@@ -35,12 +35,18 @@ module Uniword
         else
           content_str = value.to_s
           text_obj = new(content: content_str)
-          # Preserve whitespace for XML serialization
-          text_obj.xml_space = "preserve" if content_str.start_with?(" ") || content_str.end_with?(" ") || content_str.include?("\t")
+          text_obj.xml_space = "preserve" if preserve_whitespace?(content_str)
           text_obj
         end
       end
 
+      # Whether the content requires xml:space="preserve" per OOXML spec.
+      # Leading/trailing spaces, tabs, and newlines all need preservation.
+      def self.preserve_whitespace?(content)
+        content.start_with?(" ") || content.end_with?(" ") ||
+          content.include?("\t") || content.include?("\n")
+      end
+
       # Get the actual text value
       def text
         content

data/lib/uniword/wordprocessingml/web_div.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Uniword
+  module Wordprocessingml
+    class WebDiv < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :body_div, BodyDiv
+      attribute :mar_left, MarLeft
+      attribute :mar_right, MarRight
+      attribute :mar_top, MarTop
+      attribute :mar_bottom, MarBottom
+      attribute :div_bdr, DivBorders
+      attribute :divs_child, DivsChild
+
+      xml do
+        element "div"
+        namespace Uniword::Ooxml::Namespaces::WordProcessingML
+        mixed_content
+        map_attribute "id", to: :id
+        map_element "bodyDiv", to: :body_div, render_nil: false
+        map_element "marLeft", to: :mar_left, render_nil: false
+        map_element "marRight", to: :mar_right, render_nil: false
+        map_element "marTop", to: :mar_top, render_nil: false
+        map_element "marBottom", to: :mar_bottom, render_nil: false
+        map_element "divBdr", to: :div_bdr, render_nil: false
+        map_element "divsChild", to: :divs_child, render_nil: false
+      end
+    end
+  end
+end
+
+# Reopen DivsChild to add the recursive WebDiv reference
+Uniword::Wordprocessingml::DivsChild.class_eval do
+  attribute :div, Uniword::Wordprocessingml::WebDiv, collection: true
+
+  xml do
+    map_element "div", to: :div, render_nil: false
+  end
+end

data/lib/uniword/wordprocessingml/web_divs.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Uniword
+  module Wordprocessingml
+    class WebDivs < Lutaml::Model::Serializable
+      attribute :div, WebDiv, collection: true
+
+      xml do
+        element "divs"
+        namespace Uniword::Ooxml::Namespaces::WordProcessingML
+        mixed_content
+        map_element "div", to: :div, render_nil: false
+      end
+    end
+  end
+end

data/lib/uniword/wordprocessingml/web_encoding.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Uniword
+  module Wordprocessingml
+    class WebEncoding < Lutaml::Model::Serializable
+      attribute :val, :string
+
+      xml do
+        element "encoding"
+        namespace Uniword::Ooxml::Namespaces::WordProcessingML
+        map_attribute "val", to: :val
+      end
+    end
+  end
+end

data/lib/uniword/wordprocessingml/web_settings.rb

@@ -4,35 +4,17 @@ require "lutaml/model"
 
 module Uniword
   module Wordprocessingml
-    # Optimize for browser marker element
-    # Presence = true, Absence = false
-    class OptimizeForBrowser < Lutaml::Model::Serializable
-      xml do
-        element "optimizeForBrowser"
-        namespace Uniword::Ooxml::Namespaces::WordProcessingML
-      end
-    end
-
-    # Allow PNG marker element
-    # Presence = true, Absence = false
-    class AllowPng < Lutaml::Model::Serializable
-      xml do
-        element "allowPNG"
-        namespace Uniword::Ooxml::Namespaces::WordProcessingML
-      end
-    end
-
-    # Web settings (word/webSettings.xml)
-    #
-    # Contains settings related to web publishing
     class WebSettings < Lutaml::Model::Serializable
       attribute :mc_ignorable, Ooxml::Types::McIgnorable
       attribute :optimize_for_browser, OptimizeForBrowser
       attribute :allow_png, AllowPng
+      attribute :divs, WebDivs
+      attribute :web_encoding, WebEncoding
 
       xml do
         element "webSettings"
         namespace Uniword::Ooxml::Namespaces::WordProcessingML
+        mixed_content
 
         namespace_scope [
           { namespace: Uniword::Ooxml::Namespaces::MarkupCompatibility,
@@ -60,6 +42,8 @@ module Uniword
         map_element "optimizeForBrowser", to: :optimize_for_browser,
                                           render_nil: false
         map_element "allowPNG", to: :allow_png, render_nil: false
+        map_element "divs", to: :divs, render_nil: false
+        map_element "encoding", to: :web_encoding, render_nil: false
       end
     end
   end

data/lib/uniword/wordprocessingml/zoom.rb

@@ -9,12 +9,14 @@ module Uniword
     # Generated from OOXML schema: wordprocessingml.yml
     # Element: <w:zoom>
     class Zoom < Lutaml::Model::Serializable
+      attribute :val, :string
       attribute :percent, :integer
 
       xml do
         element "zoom"
         namespace Uniword::Ooxml::Namespaces::WordProcessingML
 
+        map_attribute "val", to: :val
         map_attribute "percent", to: :percent
       end
     end

data/lib/uniword/wordprocessingml.rb

@@ -34,6 +34,9 @@ module Uniword
     autoload :LastRenderedPageBreak,
              "uniword/wordprocessingml/last_rendered_page_break"
     autoload :CarriageReturn, "uniword/wordprocessingml/carriage_return"
+    autoload :SeparatorChar, "uniword/wordprocessingml/separator_char"
+    autoload :ContinuationSeparatorChar,
+             "uniword/wordprocessingml/separator_char"
     autoload :SimpleField, "uniword/wordprocessingml/simple_field"
     autoload :TextBoxContent, "uniword/wordprocessingml/text_box_content"
     autoload :Object, "uniword/wordprocessingml/object"
@@ -129,7 +132,23 @@ module Uniword
     autoload :Font, "uniword/wordprocessingml/font"
     autoload :Fonts, "uniword/wordprocessingml/fonts"
     autoload :FontTable, "uniword/wordprocessingml/font_table"
+
+    # Web settings
     autoload :WebSettings, "uniword/wordprocessingml/web_settings"
+    autoload :OptimizeForBrowser,
+             "uniword/wordprocessingml/optimize_for_browser"
+    autoload :AllowPng, "uniword/wordprocessingml/allow_png"
+    autoload :DivBorder, "uniword/wordprocessingml/div_border"
+    autoload :DivBorders, "uniword/wordprocessingml/div_borders"
+    autoload :MarLeft, "uniword/wordprocessingml/mar_left"
+    autoload :MarRight, "uniword/wordprocessingml/mar_right"
+    autoload :MarTop, "uniword/wordprocessingml/mar_top"
+    autoload :MarBottom, "uniword/wordprocessingml/mar_bottom"
+    autoload :BodyDiv, "uniword/wordprocessingml/body_div"
+    autoload :DivsChild, "uniword/wordprocessingml/divs_child"
+    autoload :WebDiv, "uniword/wordprocessingml/web_div"
+    autoload :WebDivs, "uniword/wordprocessingml/web_divs"
+    autoload :WebEncoding, "uniword/wordprocessingml/web_encoding"
 
     # Numbering
     autoload :AbstractNum, "uniword/wordprocessingml/abstract_num"
@@ -231,5 +250,9 @@ module Uniword
     # Mail merge
     autoload :Recipients, "uniword/wordprocessingml/recipients"
     autoload :RecipientData, "uniword/wordprocessingml/recipient_data"
+
+    # Shared defaults
+    autoload :PageDefaults, "uniword/wordprocessingml/page_defaults"
+    autoload :TableDefaults, "uniword/wordprocessingml/table_defaults"
   end
 end

data/lib/uniword.rb

@@ -39,8 +39,20 @@ Lutaml::Model::Config.xml_adapter_type = :nokogiri
 #
 # @see DocumentFactory Factory for reading documents
 module Uniword
+  # Wire Uniword into Omml's context system so Omml::Models types resolve
+  # correctly when used as attribute types on Uniword's serializable classes
+  # (Paragraph#o_maths typed as Omml::Models::CTOMath, etc.).
+  # register_in creates a :uniword context with all Omml models registered
+  # directly, falling back to :default for Uniword's own types. Setting
+  # Config.default_register means from_xml/to_xml calls without an explicit
+  # register: argument use :uniword automatically.
+  require "omml"
+  Omml::Configuration.register_in(:uniword)
+  Lutaml::Model::Config.default_register = :uniword
+
   # Version constant
   autoload :VERSION, "uniword/version"
+  autoload :ModelAttributeAccess, "uniword/model_attribute_access"
 
   # === Namespace Modules (autoload) ===
   # All autoloads MUST be inside the module they're registering constants for
@@ -125,6 +137,17 @@ module Uniword
   autoload :GenerateCLI, "uniword/cli/generate_cli"
   autoload :DiffCLI, "uniword/cli/diff_cli"
   autoload :TemplateCLI, "uniword/cli/template_cli"
+  autoload :CLIHelpers, "uniword/cli/helpers"
+  autoload :StyleSetCLI, "uniword/cli/styleset_cli"
+  autoload :ResourcesCLI, "uniword/cli/resources_cli"
+  autoload :ThemeCLI, "uniword/cli/theme_cli"
+  autoload :ReviewCLI, "uniword/cli/review_cli"
+  autoload :TocCLI, "uniword/cli/toc_cli"
+  autoload :ImagesCLI, "uniword/cli/images_cli"
+  autoload :SpellcheckCLI, "uniword/cli/spellcheck_cli"
+  autoload :HeadersCLI, "uniword/cli/headers_cli"
+  autoload :WatermarkCLI, "uniword/cli/watermark_cli"
+  autoload :ProtectCLI, "uniword/cli/protect_cli"
 
   # Diff (document comparison)
   autoload :Diff, "uniword/diff"
@@ -132,6 +155,10 @@ module Uniword
   # Review (comments and tracked changes)
   autoload :Review, "uniword/review"
 
+  # Shared tagging modules
+  autoload :HasRunPosition, "uniword/has_run_position"
+  autoload :DocumentInput, "uniword/document_input"
+
   # Spellcheck (spell and grammar checking)
   autoload :Spellcheck, "uniword/spellcheck"