uniword 1.0.11 → 1.2.4

data/lib/uniword/wordprocessingml/div_borders.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Uniword
+  module Wordprocessingml
+    class DivBorders < Lutaml::Model::Serializable
+      attribute :top, DivBorder
+      attribute :left, DivBorder
+      attribute :bottom, DivBorder
+      attribute :right, DivBorder
+
+      xml do
+        element "divBdr"
+        namespace Uniword::Ooxml::Namespaces::WordProcessingML
+        mixed_content
+        map_element "top", to: :top, render_nil: false
+        map_element "left", to: :left, render_nil: false
+        map_element "bottom", to: :bottom, render_nil: false
+        map_element "right", to: :right, render_nil: false
+      end
+    end
+  end
+end

data/lib/uniword/wordprocessingml/divs_child.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Uniword
+  module Wordprocessingml
+    # Defined as a stub first to break the WebDiv ↔ DivsChild mutual recursion.
+    # The :div attribute is added after WebDiv is defined.
+    class DivsChild < Lutaml::Model::Serializable
+      xml do
+        element "divsChild"
+        namespace Uniword::Ooxml::Namespaces::WordProcessingML
+        mixed_content
+      end
+    end
+  end
+end

data/lib/uniword/wordprocessingml/document_root.rb

@@ -2,9 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "../document_input"
-require_relative "document_root/feature_facade"
-
 module Uniword
   module Wordprocessingml
     # Root element of a WordprocessingML document
@@ -12,6 +9,8 @@ module Uniword
     # Generated from OOXML schema: wordprocessingml.yml
     # Element: <w:document>
     class DocumentRoot < Lutaml::Model::Serializable
+      autoload :FeatureFacade, "#{__dir__}/document_root/feature_facade"
+
       include FeatureFacade
       include Uniword::DocumentInput
 
@@ -117,6 +116,8 @@ module Uniword
       # Round-trip parts (copied from DocxPackage during load)
       attr_accessor :settings, :font_table, :web_settings, :document_rels, :theme_rels,
                     :package_rels, :content_types, :custom_properties, :custom_xml_items
+      # Central ID allocator — preserves IDs across build/save cycle
+      attr_accessor :allocator
 
       # Writers for properties that have lazy-initialized getters
       # (removing from attr_accessor to avoid shadowing custom getters)

data/lib/uniword/wordprocessingml/endnote.rb

@@ -19,7 +19,7 @@ module Uniword
         mixed_content
 
         map_attribute "id", to: :id
-        map_attribute "type", to: :type
+        map_attribute "type", to: :type, render_nil: false
         map_element "p", to: :paragraphs, render_nil: false
       end
     end

data/lib/uniword/wordprocessingml/endnotes.rb

@@ -9,6 +9,7 @@ module Uniword
     # Generated from OOXML schema: wordprocessingml.yml
     # Element: <w:endnotes>
     class Endnotes < Lutaml::Model::Serializable
+      attribute :mc_ignorable, Uniword::Ooxml::Types::McIgnorable
       attribute :endnote_entries, Endnote, collection: true,
                                            initialize_empty: true
 
@@ -17,6 +18,9 @@ module Uniword
         namespace Uniword::Ooxml::Namespaces::WordProcessingML
         mixed_content
 
+        namespace_scope Uniword::Ooxml::Namespaces::DOCUMENT_PART_SCOPES
+
+        map_attribute "Ignorable", to: :mc_ignorable, render_nil: false
         map_element "endnote", to: :endnote_entries, render_nil: false
       end
 

data/lib/uniword/wordprocessingml/footer.rb

@@ -9,6 +9,7 @@ module Uniword
     # Generated from OOXML schema: wordprocessingml.yml
     # Element: <w:ftr>
     class Footer < Lutaml::Model::Serializable
+      attribute :mc_ignorable, Uniword::Ooxml::Types::McIgnorable
       attribute :paragraphs, Paragraph, collection: true, initialize_empty: true
       attribute :tables, Table, collection: true, initialize_empty: true
 
@@ -17,6 +18,9 @@ module Uniword
         namespace Uniword::Ooxml::Namespaces::WordProcessingML
         mixed_content
 
+        namespace_scope Uniword::Ooxml::Namespaces::DOCUMENT_PART_SCOPES
+
+        map_attribute "Ignorable", to: :mc_ignorable, render_nil: false
         map_element "p", to: :paragraphs, render_nil: false
         map_element "tbl", to: :tables, render_nil: false
       end

data/lib/uniword/wordprocessingml/footer_reference.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "../properties/relationship_id"
 
 module Uniword
   module Wordprocessingml

data/lib/uniword/wordprocessingml/footnote.rb

@@ -19,7 +19,7 @@ module Uniword
         mixed_content
 
         map_attribute "id", to: :id
-        map_attribute "type", to: :type
+        map_attribute "type", to: :type, render_nil: false
         map_element "p", to: :paragraphs, render_nil: false
       end
     end

data/lib/uniword/wordprocessingml/footnotes.rb

@@ -9,6 +9,7 @@ module Uniword
     # Generated from OOXML schema: wordprocessingml.yml
     # Element: <w:footnotes>
     class Footnotes < Lutaml::Model::Serializable
+      attribute :mc_ignorable, Uniword::Ooxml::Types::McIgnorable
       attribute :footnote_entries, Footnote, collection: true,
                                              initialize_empty: true
 
@@ -17,6 +18,9 @@ module Uniword
         namespace Uniword::Ooxml::Namespaces::WordProcessingML
         mixed_content
 
+        namespace_scope Uniword::Ooxml::Namespaces::DOCUMENT_PART_SCOPES
+
+        map_attribute "Ignorable", to: :mc_ignorable, render_nil: false
         map_element "footnote", to: :footnote_entries, render_nil: false
       end
 

data/lib/uniword/wordprocessingml/header.rb

@@ -9,6 +9,7 @@ module Uniword
     # Generated from OOXML schema: wordprocessingml.yml
     # Element: <w:hdr>
     class Header < Lutaml::Model::Serializable
+      attribute :mc_ignorable, Uniword::Ooxml::Types::McIgnorable
       attribute :paragraphs, Paragraph, collection: true, initialize_empty: true
       attribute :tables, Table, collection: true, initialize_empty: true
 
@@ -17,6 +18,9 @@ module Uniword
         namespace Uniword::Ooxml::Namespaces::WordProcessingML
         mixed_content
 
+        namespace_scope Uniword::Ooxml::Namespaces::DOCUMENT_PART_SCOPES
+
+        map_attribute "Ignorable", to: :mc_ignorable, render_nil: false
         map_element "p", to: :paragraphs, render_nil: false
         map_element "tbl", to: :tables, render_nil: false
       end

data/lib/uniword/wordprocessingml/header_reference.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "../properties/relationship_id"
 
 module Uniword
   module Wordprocessingml

data/lib/uniword/wordprocessingml/hyperlink.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "../has_run_position"
+require "uniword/ooxml/types/relationship_id"
 
 module Uniword
   module Wordprocessingml
@@ -12,7 +12,7 @@ module Uniword
     class Hyperlink < Lutaml::Model::Serializable
       include Uniword::HasRunPosition
 
-      attribute :id, :string
+      attribute :id, Ooxml::Types::RelationshipId
       attribute :anchor, :string
       attribute :tooltip, :string
       attribute :history, Uniword::Properties::HistoryValue

data/lib/uniword/wordprocessingml/instr_text.rb

@@ -9,7 +9,7 @@ module Uniword
     # Generated from OOXML schema: wordprocessingml.yml
     # Element: <w:instrText>
     class InstrText < Lutaml::Model::Serializable
-      attribute :text, :string
+      attribute :content, :string, collection: true, initialize_empty: true
       attribute :xml_space, :string
 
       xml do
@@ -17,17 +17,32 @@ module Uniword
         namespace Uniword::Ooxml::Namespaces::WordProcessingML
         mixed_content
 
+        map_content to: :content
         map_attribute "xml:space", to: :xml_space
-        map_element "text", to: :text, render_nil: false
       end
 
       def initialize(attrs = {})
-        if attrs[:text].is_a?(String) && (attrs[:text].start_with?(" ") || attrs[:text].end_with?(" ") || attrs[:text].include?("\t"))
-          attrs[:xml_space] =
-            "preserve"
+        if attrs.is_a?(Hash)
+          text_val = attrs.delete(:text) || attrs[:content]
+          if text_val.is_a?(String)
+            attrs[:xml_space] = "preserve" if Text.preserve_whitespace?(text_val)
+            attrs[:content] = [text_val] unless attrs.key?(:content)
+          end
         end
         super
       end
+
+      def text
+        content&.join
+      end
+
+      def text=(value)
+        self.content = value.is_a?(Array) ? value : [value.to_s]
+      end
+
+      def to_s
+        text.to_s
+      end
     end
   end
 end

data/lib/uniword/wordprocessingml/level.rb

@@ -66,6 +66,7 @@ module Uniword
     class Level < Lutaml::Model::Serializable
       attribute :ilvl, :integer
       attribute :tentative, :string
+      attribute :tplc, :string
       attribute :start, Start
       attribute :numFmt, NumFmt
       attribute :pStyle, PStyle
@@ -85,6 +86,7 @@ module Uniword
 
         map_attribute "ilvl", to: :ilvl
         map_attribute "tentative", to: :tentative, render_nil: false
+        map_attribute "tplc", to: :tplc, render_nil: false
         map_element "start", to: :start, render_nil: false
         map_element "numFmt", to: :numFmt, render_nil: false
         map_element "pStyle", to: :pStyle, render_nil: false

data/lib/uniword/wordprocessingml/mar_bottom.rb

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

data/lib/uniword/wordprocessingml/mar_left.rb

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

data/lib/uniword/wordprocessingml/mar_right.rb

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

data/lib/uniword/wordprocessingml/mar_top.rb

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

data/lib/uniword/wordprocessingml/num.rb

@@ -10,6 +10,7 @@ module Uniword
     # Element: <w:num>
     class Num < Lutaml::Model::Serializable
       attribute :numId, :integer
+      attribute :durable_id, :string
       attribute :abstractNumId, AbstractNumId
       attribute :lvlOverrides, LevelOverride, collection: true,
                                               initialize_empty: true
@@ -20,6 +21,9 @@ module Uniword
         mixed_content
 
         map_attribute "numId", to: :numId
+        map_attribute "durableId", to: :durable_id,
+                                   namespace: Uniword::Ooxml::Namespaces::Word2016Cid,
+                                   render_nil: false
         map_element "abstractNumId", to: :abstractNumId, render_nil: false
         map_element "lvlOverride", to: :lvlOverrides, render_nil: false
       end

data/lib/uniword/wordprocessingml/numbering.rb

@@ -18,28 +18,7 @@ module Uniword
         namespace Uniword::Ooxml::Namespaces::WordProcessingML
         mixed_content
 
-        # Force namespace declarations on root for mc:Ignorable prefixes
-        namespace_scope [
-          { namespace: Uniword::Ooxml::Namespaces::MarkupCompatibility,
-            declare: :always },
-          { namespace: Uniword::Ooxml::Namespaces::Word2010, declare: :always },
-          { namespace: Uniword::Ooxml::Namespaces::Word2012, declare: :always },
-          { namespace: Uniword::Ooxml::Namespaces::Word2015Symex,
-            declare: :always },
-          { namespace: Uniword::Ooxml::Namespaces::Word2016Cid,
-            declare: :always },
-          { namespace: Uniword::Ooxml::Namespaces::Word2018, declare: :always },
-          { namespace: Uniword::Ooxml::Namespaces::Word2018Cex,
-            declare: :always },
-          { namespace: Uniword::Ooxml::Namespaces::Word2020SdtDataHash,
-            declare: :always },
-          { namespace: Uniword::Ooxml::Namespaces::Word2024SdtFormatLock,
-            declare: :always },
-          { namespace: Uniword::Ooxml::Namespaces::Word2023Du,
-            declare: :always },
-          { namespace: Uniword::Ooxml::Namespaces::Word2010Drawing,
-            declare: :always },
-        ]
+        namespace_scope Uniword::Ooxml::Namespaces::DOCUMENT_PART_SCOPES
 
         map_element "abstractNum", to: :abstractNums, render_nil: false
         map_element "num", to: :nums, render_nil: false

data/lib/uniword/wordprocessingml/optimize_for_browser.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Uniword
+  module Wordprocessingml
+    class OptimizeForBrowser < Lutaml::Model::Serializable
+      xml do
+        element "optimizeForBrowser"
+        namespace Uniword::Ooxml::Namespaces::WordProcessingML
+      end
+    end
+  end
+end

data/lib/uniword/wordprocessingml/page_defaults.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Uniword
+  module Wordprocessingml
+    # Shared page layout defaults.
+    #
+    # Provides canonical values for page size, margins, columns, and docGrid
+    # used by both builder and reconciler.
+    module PageDefaults
+      LETTER_WIDTH  = 12_240
+      LETTER_HEIGHT = 15_840
+
+      DEFAULT_MARGINS = {
+        top: 1440, right: 1440, bottom: 1440, left: 1440,
+        header: 720, footer: 720, gutter: 0,
+      }.freeze
+
+      DEFAULT_COL_SPACE = 720
+      DEFAULT_LINE_PITCH = 360
+
+      def self.default_page_size
+        Wordprocessingml::PageSize.new(width: LETTER_WIDTH,
+                                       height: LETTER_HEIGHT)
+      end
+
+      def self.default_page_margins
+        Wordprocessingml::PageMargins.new(**DEFAULT_MARGINS)
+      end
+
+      def self.default_columns
+        Wordprocessingml::Columns.new(space: DEFAULT_COL_SPACE)
+      end
+
+      def self.default_doc_grid
+        Wordprocessingml::DocGrid.new(line_pitch: DEFAULT_LINE_PITCH)
+      end
+    end
+  end
+end

data/lib/uniword/wordprocessingml/paragraph.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
+require "omml"
 
 module Uniword
   module Wordprocessingml
@@ -21,8 +22,11 @@ module Uniword
       attribute :comment_references, CommentReference, collection: true, initialize_empty: true
       attribute :alternate_content, AlternateContent, default: nil
       attribute :sdts, StructuredDocumentTag, collection: true, initialize_empty: true
-      attribute :o_math_paras, Uniword::Math::OMathPara, collection: true, initialize_empty: true
-      attribute :o_maths, Uniword::Math::OMath, collection: true, initialize_empty: true
+      # OMML math content from the omml gem. The element name (`<m:oMath>`)
+      # is supplied by the parent mapping; CTOMath is the schema type that
+      # carries the actual math tree.
+      attribute :o_math_paras, "Omml::Models::OMathPara", collection: true, initialize_empty: true
+      attribute :o_maths, "Omml::Models::CTOMath", collection: true, initialize_empty: true
       attribute :proof_errors, ProofErr, collection: true, initialize_empty: true
       attribute :simple_fields, SimpleField, collection: true, initialize_empty: true
 
@@ -45,15 +49,15 @@ module Uniword
         namespace Uniword::Ooxml::Namespaces::WordProcessingML
         mixed_content
 
+        # W14 namespace attributes first (matches Word output order)
+        map_attribute "paraId", to: :para_id, render_nil: false
+        map_attribute "textId", to: :text_id, render_nil: false
         # Revision tracking attributes
         map_attribute "rsidR", to: :rsid_r, render_nil: false
         map_attribute "rsidRDefault", to: :rsid_r_default, render_nil: false
         map_attribute "rsidP", to: :rsid_p, render_nil: false
         map_attribute "rsidRPr", to: :rsid_r_pr, render_nil: false
         map_attribute "rsidDel", to: :rsid_del, render_nil: false
-        # W14 namespace typed attributes - namespace declared on the type class
-        map_attribute "paraId", to: :para_id, render_nil: false
-        map_attribute "textId", to: :text_id, render_nil: false
 
         map_element "pPr", to: :properties, render_nil: false
         map_element "r", to: :runs, render_nil: false
@@ -68,11 +72,10 @@ module Uniword
         map_element "AlternateContent", to: :alternate_content, render_nil: false
         map_element "sdt", to: :sdts, render_nil: false
         # oMathPara from MathML namespace - the target class declares its namespace
-        map_element "oMathPara", to: :o_math_paras,
-                                 render_nil: false
-        # Inline oMath (without oMathPara wrapper)
-        map_element "oMath", to: :o_maths,
-                             render_nil: false
+        map_element "oMathPara", to: :o_math_paras, render_nil: false
+        # Inline oMath (without oMathPara wrapper). The element name "oMath"
+        # comes from this mapping; the underlying type is omml gem's CTOMath.
+        map_element "oMath", to: :o_maths, render_nil: false
         # Proofing errors
         map_element "proofErr", to: :proof_errors, render_nil: false
         map_element "fldSimple", to: :simple_fields, render_nil: false
@@ -92,7 +95,7 @@ module Uniword
         if run_or_sdt.is_a?(StructuredDocumentTag)
           extract_sdt_text(run_or_sdt)
         else
-          run_or_sdt.text.to_s
+          run_or_sdt.text_string
         end
       end
 
@@ -100,7 +103,7 @@ module Uniword
       def extract_sdt_text(sdt)
         return "" unless sdt.content
 
-        sdt.content.runs.map { |r| r.text.to_s }.join
+        sdt.content.runs.map(&:text_string).join
       end
 
       def empty?
@@ -108,7 +111,7 @@ module Uniword
       end
 
       def style
-        properties&.style
+        Array(properties&.style).first
       end
 
       def alignment

data/lib/uniword/wordprocessingml/paragraph_properties.rb

@@ -11,9 +11,12 @@ module Uniword
     class ParagraphProperties < Lutaml::Model::Serializable
       # Pattern 0: ATTRIBUTES FIRST, then XML mappings
 
-      # Simple element attributes (OOXML w:val attributes stored in wrapper objects)
-      attribute :style, Properties::StyleReference    # w:pStyle w:val="..." (style ID reference)
-      attribute :alignment, Properties::Alignment     # w:jc w:val="..." (alignment value)
+      # Simple element attributes (OOXML w:val attributes stored in
+      # wrapper objects)
+      # w:pStyle w:val="..." (style ID references; multiple tolerated)
+      attribute :style, Properties::StyleReference, collection: true
+      # w:jc w:val="..." (alignment value)
+      attribute :alignment, Properties::Alignment
 
       # Simple element wrapper objects
       attribute :outline_level, Properties::OutlineLevel
@@ -115,11 +118,15 @@ module Uniword
 
       # YAML transform methods (instance methods - called via send on an instance)
       def yaml_style_from(instance, value)
-        instance.style = Properties::StyleReference.new(value: value) if value
+        if value
+          instance.style = [
+            Properties::StyleReference.new(value: value),
+          ]
+        end
       end
 
       def yaml_style_to(instance, _doc)
-        instance.style&.value
+        Array(instance.style).first&.value
       end
 
       def yaml_alignment_from(instance, value)
@@ -288,9 +295,6 @@ module Uniword
       # This handles cases like ParagraphProperties.new(spacing_before: 120)
       # where the flat attribute is set but the wrapper object is not
       def convert_flat_attributes!
-        # Style - convert string to StyleReference wrapper
-        self.style = Properties::StyleReference.new(value: @style) if @style.is_a?(String)
-
         # Alignment - convert string to Alignment wrapper
         self.alignment = Properties::Alignment.new(value: @alignment) if @alignment.is_a?(String)