uniword 1.2.5 → 1.3.0

data/lib/uniword/docx/reconciler/tables.rb

@@ -15,7 +15,7 @@ module Uniword
           return unless tables
 
           tables.each_with_index do |tbl, idx|
-            if allocator
+            if builder_managed?
               reconcile_table_cell_order_only(tbl, idx)
             else
               reconcile_single_table(tbl, idx)
@@ -25,14 +25,16 @@ module Uniword
 
         private
 
-        # Allocator path: builders create complete tables.
-        # Only fix element order issues and calculate gridAfter.
+        # Builder-managed path: builders create complete tables.
+        # Only fix element order issues, default gridCol widths, and
+        # calculate gridAfter.
         def reconcile_table_cell_order_only(tbl, idx)
           tbl.rows&.each do |row|
             row.cells&.each do |cell|
               reconcile_table_cell_order(cell)
             end
           end
+          reconcile_grid_col_widths(tbl)
           reconcile_grid_after(tbl)
         end
 
@@ -79,16 +81,11 @@ module Uniword
             fixed = true
           end
 
-          tbl.grid&.columns&.each_with_index do |col, ci|
-            next if col.width
+          reconcile_grid_col_widths(tbl)
 
-            Uniword.logger&.warn do
-              "Table #{idx}: gridCol[#{ci}] has no w:w — " \
-              "table may render with incorrect column widths"
-            end
-          end
-
-          record_fix(FixCodes::TABLE_STRUCTURE_RECONCILED, "Reconciled table structure for table #{idx}") if fixed
+          record_fix(FixCodes::TABLE_STRUCTURE_RECONCILED,
+                     "Reconciled table structure for table #{idx}",
+                     part: "word/document.xml") if fixed
 
           tbl.rows&.each do |row|
             row.cells&.each do |cell|
@@ -98,10 +95,14 @@ module Uniword
                   cell_width: Uniword::Properties::CellWidth.new(w: 0, type: "auto"),
                 )
                 insert_element_order(cell, "tcPr", 0)
-                record_fix(FixCodes::TABLE_CELL_DEFAULTS, "Added missing tcPr with tcW to table cell")
+                record_fix(FixCodes::TABLE_CELL_DEFAULTS,
+                           "Added missing tcPr with tcW to table cell",
+                           part: "word/document.xml")
               elsif tc_pr.cell_width.nil?
                 tc_pr.cell_width = Uniword::Properties::CellWidth.new(w: 0, type: "auto")
-                record_fix(FixCodes::TABLE_CELL_DEFAULTS, "Added missing tcW to table cell")
+                record_fix(FixCodes::TABLE_CELL_DEFAULTS,
+                           "Added missing tcW to table cell",
+                           part: "word/document.xml")
               end
 
               reconcile_table_cell_order(cell)
@@ -111,6 +112,63 @@ module Uniword
           reconcile_grid_after(tbl)
         end
 
+        # Default missing gridCol widths to an equal share of the
+        # section's content width (page width minus left/right margins) —
+        # the same fallback Word applies, keeping the package free of
+        # width-less grids. Explicit widths are kept; width-less columns
+        # share the remaining width equally.
+        def reconcile_grid_col_widths(tbl)
+          columns = tbl.grid&.columns
+          return unless columns&.any?
+
+          missing = columns.count { |col| col.width.nil? }
+          return if missing.zero?
+
+          default_missing_widths(columns, missing)
+        end
+
+        def default_missing_widths(columns, missing)
+          width = shared_column_width(columns, missing)
+          columns.each { |col| col.width ||= width }
+          record_fix(FixCodes::TABLE_GRID_COL_WIDTHS_DEFAULTED,
+                     "Defaulted #{missing} gridCol width(s) to " \
+                     "#{width} twips",
+                     part: "word/document.xml")
+        end
+
+        # Equal content-width share for `missing` width-less columns
+        # after explicit widths take their part.
+        def shared_column_width(columns, missing)
+          content = section_content_width
+          explicit = columns.sum { |col| col.width || 0 }
+          remainder = [content - explicit, 0].max
+          (remainder.positive? ? remainder : content) / missing
+        end
+
+        # Content width (page width minus left/right margins) in twips.
+        # Tables do not track section ownership, so the body-level sectPr
+        # governs; falls back to US Letter defaults.
+        def section_content_width
+          left, right = section_side_margins
+          [section_page_width - left - right, 1].max
+        end
+
+        def section_page_width
+          sect_pr = package.document&.body&.section_properties
+          sect_pr&.page_size&.width ||
+            Wordprocessingml::PageDefaults.default_page_size.width
+        end
+
+        def section_side_margins
+          margins = section_properties_margins
+          defaults = Wordprocessingml::PageDefaults.default_page_margins
+          [margins&.left || defaults.left, margins&.right || defaults.right]
+        end
+
+        def section_properties_margins
+          package.document&.body&.section_properties&.page_margins
+        end
+
         def reconcile_table_cell_order(cell)
           order = cell.element_order
           return unless order && !order.empty?
@@ -124,7 +182,9 @@ module Uniword
           tcPr_entry = order.delete_at(tcPr_idx)
           order.insert(first_p_idx, tcPr_entry)
 
-          record_fix(FixCodes::TABLE_CELL_PR_REORDERED, "Moved tcPr before p in table cell")
+          record_fix(FixCodes::TABLE_CELL_PR_REORDERED,
+                     "Moved tcPr before p in table cell",
+                     part: "word/document.xml")
         end
 
         def reconcile_grid_after(tbl)
@@ -153,7 +213,9 @@ module Uniword
               row_props.grid_after ||= Wordprocessingml::GridAfter.new
               row_props.grid_after.value = missing
             end
-            record_fix(FixCodes::TABLE_ROW_GRID_AFTER, "Added gridAfter=#{missing} to table row (grid has #{grid_col_count} cols, row covers #{covered})")
+            record_fix(FixCodes::TABLE_ROW_GRID_AFTER,
+                       "Added gridAfter=#{missing} to table row (grid has #{grid_col_count} cols, row covers #{covered})",
+                       part: "word/document.xml")
           end
         end
       end

data/lib/uniword/docx/reconciler/theme.rb

@@ -20,7 +20,9 @@ module Uniword
             word_theme = friendly.to_word_theme
             word_theme.name = "Office Theme"
             package.theme = word_theme
-            record_fix(FixCodes::THEME_CREATED, "Created default theme with complete fmtScheme")
+            record_fix(FixCodes::THEME_CREATED,
+                       "Created default theme with complete fmtScheme",
+                       part: "word/theme/theme1.xml")
           rescue ArgumentError
             nil
           end
@@ -58,7 +60,8 @@ module Uniword
           return unless repaired
 
           record_fix(FixCodes::THEME_CREATED,
-                     "Repaired theme fmtScheme with minimum required content")
+                     "Repaired theme fmtScheme with minimum required content",
+                     part: "word/theme/theme1.xml")
         end
 
         private
@@ -100,7 +103,7 @@ module Uniword
           fills = Array(lst.solid_fills).dup
           while fills.size < 2
             fills << Drawingml::SolidFill.new(
-              scheme_color: Drawingml::SchemeColor.new(
+              scheme_clr: Drawingml::SchemeColor.new(
                 val: "accent#{fills.size + 1}"
               ),
             )
@@ -118,7 +121,7 @@ module Uniword
             lines << Drawingml::LineProperties.new(
               width: widths[idx] || 9525,
               solid_fill: Drawingml::SolidFill.new(
-                scheme_color: Drawingml::SchemeColor.new(val: "accent#{idx + 1}"),
+                scheme_clr: Drawingml::SchemeColor.new(val: "accent#{idx + 1}"),
               ),
             )
           end

data/lib/uniword/docx/reconciler.rb

@@ -9,7 +9,8 @@ module Uniword
       VALID_NOTE_TYPES = %w[separator continuationSeparator
                             footnoteSeparator continuationNotice].freeze
 
-      # Sub-modules autoloaded — no require_relative for internal code.
+      # Sub-modules autoloaded — registered below, loaded on first use.
+      autoload :Fix, "#{__dir__}/reconciler/fix"
       autoload :FixCodes, "#{__dir__}/reconciler/fix_codes"
       autoload :Helpers, "#{__dir__}/reconciler/helpers"
       autoload :Notes, "#{__dir__}/reconciler/notes"
@@ -29,10 +30,16 @@ module Uniword
       include PackageStructure
       include Body
 
-      def initialize(package, profile: nil, allocator: nil)
+      def initialize(package, profile: nil, allocator: nil,
+                     builder_managed: nil)
         @package = package
         @profile = profile
         @allocator = allocator
+        @builder_managed = if builder_managed.nil?
+                             !allocator.nil? || !package.allocator.nil?
+                           else
+                             builder_managed
+                           end
         @applied_fixes = []
       end
 
@@ -71,23 +78,40 @@ module Uniword
         reconcile_referential_integrity
       end
 
-      # Audit trail of fixes applied during reconciliation.
+      # Audit trail of repairs applied during reconciliation.
+      #
+      # @return [Array<Fix>] Fixes recorded by the most recent #reconcile
       attr_reader :applied_fixes
 
       private
 
       attr_reader :package, :profile
 
+      # The single rId/ID authority for this run. Falls back to an
+      # allocator populated from the package when the package carries
+      # none (direct Reconciler use outside Package#to_zip_content).
       def allocator
-        @allocator || package.allocator
+        @allocator ||= package.allocator ||
+          IdAllocator.populate_from_package(package)
       end
 
-      def record_fix(validity_rule, message)
-        @applied_fixes << {
-          validity_rule: validity_rule,
-          message: message,
-          timestamp: Time.now,
-        }
+      # Whether the document's IDs were managed outside the reconciler
+      # (builder-created content, or a package loaded with an explicit
+      # allocator). Builder-managed documents get light-touch repairs;
+      # legacy documents get the full normalization repertoire (ID
+      # backfill, table normalization, note renumbering). rIds flow
+      # through the allocator either way. Decided at initialize time.
+      def builder_managed?
+        @builder_managed
+      end
+
+      # Record one applied repair as a Fix value object.
+      #
+      # @param code [String] Fix code (a FixCodes constant value)
+      # @param message [String] Human-readable description of the repair
+      # @param part [String, nil] Package part the repair applies to
+      def record_fix(code, message, part: nil)
+        @applied_fixes << Fix.new(code: code, message: message, part: part)
       end
 
       def clear_stored_namespace_plans
@@ -102,15 +126,13 @@ module Uniword
           package.app_properties,
           package.footnotes,
           package.endnotes,
+          package.comments,
         ].compact
 
         (package.document&.header_footer_parts || []).each do |part|
-          parts << part[:content] if part[:content]
+          parts << part.content if part.content
         end
 
-        (package.document&.headers&.values || []).each { |h| parts << h }
-        (package.document&.footers&.values || []).each { |f| parts << f }
-
         parts.each do |part|
           part.import_declaration_plan = nil
           part.pending_plan_root_element = nil

data/lib/uniword/docx.rb

@@ -8,8 +8,18 @@ module Uniword
   # document-level reconciliation, and user-defined requirements.
   module Docx
     autoload :IdAllocator, "#{__dir__}/docx/id_allocator"
+    autoload :Part, "#{__dir__}/docx/part"
+    autoload :ChartPart, "#{__dir__}/docx/chart_part"
+    autoload :HeaderFooterPart, "#{__dir__}/docx/header_footer_part"
+    autoload :CustomXmlItem, "#{__dir__}/docx/custom_xml_item"
+    autoload :PartCollection, "#{__dir__}/docx/part_collection"
+    autoload :HeaderFooterPartCollection,
+             "#{__dir__}/docx/header_footer_part_collection"
+    autoload :HeaderFooterView, "#{__dir__}/docx/header_footer_view"
     autoload :Package, "#{__dir__}/docx/package"
     autoload :PackageDefaults, "#{__dir__}/docx/package_defaults"
+    autoload :PackageIntegrityChecker,
+             "#{__dir__}/docx/package_integrity_checker"
     autoload :PackageSerialization, "#{__dir__}/docx/package_serialization"
     autoload :Profile, "#{__dir__}/docx/profile"
     autoload :DocumentStatistics, "#{__dir__}/docx/document_statistics"

data/lib/uniword/drawingml/blip.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require "uniword/ooxml/types/relationship_id"
 
 module Uniword
   module Drawingml

data/lib/uniword/drawingml/color_scheme.rb

@@ -399,14 +399,13 @@ module Uniword
 
       # Duplicate the color scheme
       #
+      # Deep copy via XML round-trip — preserves system-color entries
+      # (dk1/lt1 as windowText/window) and every color slot, not just
+      # the standard hex values.
+      #
       # @return [ColorScheme] A deep copy of this color scheme
       def dup
-        new_scheme = ColorScheme.new(name: name)
-        THEME_COLORS.each do |color_name|
-          value = self[color_name]
-          new_scheme[color_name] = value if value
-        end
-        new_scheme
+        self.class.from_xml(to_xml)
       end
     end
   end

data/lib/uniword/drawingml/font_scheme.rb

@@ -225,16 +225,12 @@ module Uniword
 
       # Duplicate the font scheme
       #
+      # Deep copy via XML round-trip — preserves per-script font entries
+      # (Jpan/Hang/Arab/...) that the previous hand-rolled copy dropped.
+      #
       # @return [FontScheme] A deep copy of this font scheme
       def dup
-        new_scheme = FontScheme.new(name: name)
-        new_scheme.major_font = major_font
-        new_scheme.minor_font = minor_font
-        new_scheme.major_east_asian = major_east_asian if major_east_asian
-        new_scheme.major_complex_script = major_complex_script if major_complex_script
-        new_scheme.minor_east_asian = minor_east_asian if minor_east_asian
-        new_scheme.minor_complex_script = minor_complex_script if minor_complex_script
-        new_scheme
+        self.class.from_xml(to_xml)
       end
     end
   end

data/lib/uniword/drawingml/theme.rb

@@ -127,14 +127,20 @@ module Uniword
 
       # Duplicate the theme
       #
+      # Deep copy via XML round-trip: copies color scheme, font scheme,
+      # format scheme (fill/line/effect lists), and every other mapped
+      # part. The previous hand-rolled copy dropped fmt_scheme (and
+      # object_defaults/ext_lst/media_files), producing themes with
+      # empty fillStyleLst that Word rejects.
+      #
       # @return [Theme] A deep copy of this theme
       def dup
-        new_theme = Theme.new(name: name)
-        new_theme.color_scheme = color_scheme.dup if color_scheme
-        new_theme.font_scheme = font_scheme.dup if font_scheme
-        new_theme.variants = @variants.dup if @variants
-        new_theme.source_file = @source_file
-        new_theme
+        self.class.from_xml(to_xml).tap do |copy|
+          copy.variants = @variants&.dup
+          copy.source_file = @source_file
+          copy.media_files = @media_files
+          copy.raw_xml = @raw_xml
+        end
       end
 
       # Check if theme is valid

data/lib/uniword/errors.rb

@@ -54,11 +54,14 @@ module Uniword
   class ValidationError < Error
     # @param element [Element] The element that failed validation
     # @param errors [Array<String>] Array of validation error messages
-    def initialize(element, errors)
+    # @param issues [Array] Structured issues (e.g.
+    #   Validation::Report::ValidationIssue with code, part, message)
+    def initialize(element, errors, issues: [])
       element_name = element.class.name.split("::").last
       super("Validation failed for #{element_name}: #{errors.join(', ')}")
       @element = element
       @errors = errors
+      @issues = issues
     end
 
     # @return [Element] The element that failed
@@ -66,6 +69,10 @@ module Uniword
 
     # @return [Array<String>] The validation errors
     attr_reader :errors
+
+    # @return [Array] Structured issues (code, part, message) — populated
+    #   by the write-time package integrity gate
+    attr_reader :issues
   end
 
   # Raised when trying to write to a read-only document

data/lib/uniword/footer.rb

@@ -12,6 +12,10 @@ module Uniword
     attribute :tables, Wordprocessingml::Table, collection: true,
                                                 initialize_empty: true
 
+    # mc:Ignorable prefix list carried to the serialized
+    # Wordprocessingml footer part (set by the reconciler).
+    attr_accessor :mc_ignorable
+
     # Valid footer types
     TYPES = %w[default first even].freeze
 

data/lib/uniword/header.rb

@@ -12,6 +12,10 @@ module Uniword
     attribute :tables, Wordprocessingml::Table, collection: true,
                                                 initialize_empty: true
 
+    # mc:Ignorable prefix list carried to the serialized
+    # Wordprocessingml header part (set by the reconciler).
+    attr_accessor :mc_ignorable
+
     # Valid header types
     TYPES = %w[default first even].freeze
 

data/lib/uniword/hyperlink.rb

@@ -15,7 +15,7 @@ module Uniword
   #   link = Hyperlink.new(anchor: 'section1', text: 'Go to section')
   #   link.internal?  # => true
   class Hyperlink
-    REL_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink"
+    REL_TYPE = Ooxml::PartRegistry.find_by_key(:hyperlink).rel_type
 
     attr_reader :url, :anchor, :text, :tooltip
 

data/lib/uniword/image.rb

@@ -15,12 +15,6 @@ module Uniword
   class Image < Element
     extend LazyLoader
 
-    # OOXML namespace configuration for images (drawing elements)
-    xml do
-      element "drawing"
-      namespace Ooxml::Namespaces::WordProcessingML
-    end
-
     # Image relationship ID (reference to the image file in the package)
     attribute :relationship_id, :string
 
@@ -52,6 +46,12 @@ module Uniword
     # Text wrapping style (:square, :tight, :through, :none, etc.)
     attribute :text_wrapping, :string
 
+    # OOXML namespace configuration for images (drawing elements)
+    xml do
+      element "drawing"
+      namespace Ooxml::Namespaces::WordProcessingML
+    end
+
     # Image data loader (proc that loads the actual binary data)
     # This is not serialized - it's used for lazy loading
     attr_accessor :data_loader

data/lib/uniword/lazy_loader.rb

@@ -7,8 +7,7 @@ module Uniword
   # which helps reduce memory usage for large documents.
   #
   # All cached values are stored in a single Hash (`@_lazy_cache`)
-  # accessed via direct ivar reference — no instance_variable_get/set,
-  # no public_send, no remove_instance_variable.
+  # accessed via direct ivar reference inside the generated methods.
   #
   # @example Using lazy attributes
   #   class Document

data/lib/uniword/model_attribute_access.rb

@@ -7,21 +7,37 @@ module Uniword
   # getters/setters generated by lutaml-model for declared attributes.
   #
   # Validates that the attribute name exists in the model's schema before
-  # dispatching — unlike raw send() which bypasses visibility checks, this
-  # only accesses attributes that are part of the model's declared public API.
+  # dispatching through the model's public method table — only attributes
+  # that are part of the model's declared public API can be accessed.
   module ModelAttributeAccess
     # Read a declared attribute's value by name.
     # @param name [Symbol] Declared attribute name
     # @return [Object] The attribute value
+    # @raise [ArgumentError] if the attribute is not declared on the model
     def read_attribute(name)
-      __send__(name)
+      validate_declared_attribute!(name)
+      method(name).call
     end
 
     # Write a declared attribute's value by name.
     # @param name [Symbol] Declared attribute name
     # @param value [Object] The value to assign
+    # @raise [ArgumentError] if the attribute is not declared on the model
     def write_attribute(name, value)
-      __send__(:"#{name}=", value)
+      validate_declared_attribute!(name)
+      method(:"#{name}=").call(value)
+    end
+
+    private
+
+    # Validate that the attribute is declared in the model's schema.
+    # @param name [Symbol, String] Attribute name
+    # @raise [ArgumentError] if the attribute is not declared
+    def validate_declared_attribute!(name)
+      return if self.class.attributes.key?(name.to_sym)
+
+      raise ArgumentError,
+            "undeclared attribute #{name.inspect} for #{self.class}"
     end
   end
 end

data/lib/uniword/ooxml/dotx_package.rb

@@ -195,7 +195,13 @@ module Uniword
       #
       # @param document [Document] The document to save (Generated::Wordprocessingml::DocumentRoot)
       # @param path [String] Output path
-      def self.to_file(document, path, profile: nil)
+      # @param profile [Object, nil] Unused (DOCX reconciliation profile)
+      # @param validate [Boolean, nil] Run the package integrity gate before
+      #   writing; nil falls back to Uniword.configuration.validate_on_save
+      # @return [void]
+      # @raise [Uniword::ValidationError] when the gate is enabled and the
+      #   generated package content is invalid
+      def self.to_file(document, path, profile: nil, validate: nil)
         # Create package
         package = new
 
@@ -217,6 +223,9 @@ module Uniword
         # Add required OOXML infrastructure files
         add_required_files(zip_content)
 
+        # Refuse invalid output before packaging
+        package.enforce_package_integrity(zip_content, validate)
+
         # Package and save
         packager = Infrastructure::ZipPackager.new
         packager.package(zip_content, path)
@@ -225,13 +234,44 @@ module Uniword
       # Save package to file
       #
       # @param path [String] Output path
-      def to_file(path)
+      # @param validate [Boolean, nil] Run the package integrity gate before
+      #   writing; nil falls back to Uniword.configuration.validate_on_save
+      # @return [void]
+      # @raise [Uniword::ValidationError] when the gate is enabled and the
+      #   generated package content is invalid
+      def to_file(path, validate: nil)
         zip_content = to_zip_content
 
+        enforce_package_integrity(zip_content, validate)
+
         packager = Infrastructure::ZipPackager.new
         packager.package(zip_content, path)
       end
 
+      # Write-time integrity gate: refuse invalid package content.
+      #
+      # DOTX is an OPC package like DOCX, so the same
+      # Docx::PackageIntegrityChecker invariants apply.
+      #
+      # @api private
+      # @param zip_content [Hash] File paths => content
+      # @param validate [Boolean, nil] explicit override; nil reads policy
+      # @return [void]
+      # @raise [Uniword::ValidationError] listing all integrity issues
+      def enforce_package_integrity(zip_content, validate)
+        validate = Uniword.configuration.validate_on_save if validate.nil?
+        return unless validate
+
+        issues = Docx::PackageIntegrityChecker.new.check(zip_content)
+        return if issues.empty?
+
+        raise Uniword::ValidationError.new(
+          self,
+          issues.map { |issue| "#{issue.code} (#{issue.part}): #{issue.message}" },
+          issues: issues,
+        )
+      end
+
       # Generate ZIP content hash
       #
       # @return [Hash] File paths => content