uniword 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b3b37b9a1642f94a634c42b754630ca35cd7167ddc1415223dd65848a379c48
-  data.tar.gz: 011ddc8e381521e2d161cd0cf9fd0dd9eee791e9f28026fd63e89cf9386bfa03
+  metadata.gz: a7feae85851d80946524005c3cc6419419d492c717e559628093494ee7532cd9
+  data.tar.gz: eba8d3d3d433aa158b5a4214659e6afd0e12d74e3fada13997da066021a78f9d
 SHA512:
-  metadata.gz: 1c6c8785a7fe56480f0d7bdda19ec56e50704653016d4146c561e401c8e98b856cf99a1205411521b78cd19b701e794dfbc75c4d4c844b87e2b8fe3d44fb514e
-  data.tar.gz: 9275ea155ee7af2ee9cd0e24d6534a0124f0f8501583206fb98eb3c63e7736c280552336a47bad97a31e50b235805c5fba904d1a80c0cee9bbe6f216f7e49f02
+  metadata.gz: 940e11bb305505cd3e6acdc6e9cca98e002d151a0f75e7c8872d613353b4c5d85b424062a661572b14474c342b62db3072d2cc081cb9e924f95bb8fdf80e6c39
+  data.tar.gz: 3ca3c9bea8133f7a18e64897b687ef8dd10843c85aa2e4422dabceed5152ae5a5f9cce56fdff8999f03e734f8510b919732f9f5b5b0d5ac0e9470c8dd0db11fb

data/data/themes/office_format_scheme.xml

@@ -0,0 +1,137 @@
+<a:fmtScheme name="Office">
+  <a:fillStyleLst>
+    <a:solidFill>
+      <a:schemeClr val="phClr"/>
+    </a:solidFill>
+    <a:gradFill rotWithShape="1">
+      <a:gsLst>
+        <a:gs pos="0">
+          <a:schemeClr val="phClr">
+            <a:lumMod val="110000"/>
+            <a:satMod val="105000"/>
+            <a:tint val="67000"/>
+          </a:schemeClr>
+        </a:gs>
+        <a:gs pos="50000">
+          <a:schemeClr val="phClr">
+            <a:lumMod val="105000"/>
+            <a:satMod val="103000"/>
+            <a:tint val="73000"/>
+          </a:schemeClr>
+        </a:gs>
+        <a:gs pos="100000">
+          <a:schemeClr val="phClr">
+            <a:lumMod val="105000"/>
+            <a:satMod val="109000"/>
+            <a:tint val="81000"/>
+          </a:schemeClr>
+        </a:gs>
+      </a:gsLst>
+      <a:lin ang="5400000" scaled="0"/>
+    </a:gradFill>
+    <a:gradFill rotWithShape="1">
+      <a:gsLst>
+        <a:gs pos="0">
+          <a:schemeClr val="phClr">
+            <a:satMod val="103000"/>
+            <a:lumMod val="102000"/>
+            <a:tint val="94000"/>
+          </a:schemeClr>
+        </a:gs>
+        <a:gs pos="50000">
+          <a:schemeClr val="phClr">
+            <a:satMod val="110000"/>
+            <a:lumMod val="100000"/>
+            <a:shade val="100000"/>
+          </a:schemeClr>
+        </a:gs>
+        <a:gs pos="100000">
+          <a:schemeClr val="phClr">
+            <a:lumMod val="99000"/>
+            <a:satMod val="120000"/>
+            <a:shade val="78000"/>
+          </a:schemeClr>
+        </a:gs>
+      </a:gsLst>
+      <a:lin ang="5400000" scaled="0"/>
+    </a:gradFill>
+  </a:fillStyleLst>
+  <a:lnStyleLst>
+    <a:ln w="12700" cap="flat" cmpd="sng" algn="ctr">
+      <a:solidFill>
+        <a:schemeClr val="phClr"/>
+      </a:solidFill>
+      <a:prstDash val="solid"/>
+      <a:miter lim="800000"/>
+    </a:ln>
+    <a:ln w="19050" cap="flat" cmpd="sng" algn="ctr">
+      <a:solidFill>
+        <a:schemeClr val="phClr"/>
+      </a:solidFill>
+      <a:prstDash val="solid"/>
+      <a:miter lim="800000"/>
+    </a:ln>
+    <a:ln w="25400" cap="flat" cmpd="sng" algn="ctr">
+      <a:solidFill>
+        <a:schemeClr val="phClr"/>
+      </a:solidFill>
+      <a:prstDash val="solid"/>
+      <a:miter lim="800000"/>
+    </a:ln>
+  </a:lnStyleLst>
+  <a:effectStyleLst>
+    <a:effectStyle>
+      <a:effectLst/>
+    </a:effectStyle>
+    <a:effectStyle>
+      <a:effectLst/>
+    </a:effectStyle>
+    <a:effectStyle>
+      <a:effectLst>
+        <a:outerShdw blurRad="57150" dist="19050" dir="5400000" algn="ctr" rotWithShape="0">
+          <a:srgbClr val="000000">
+            <a:alpha val="63000"/>
+          </a:srgbClr>
+        </a:outerShdw>
+      </a:effectLst>
+    </a:effectStyle>
+  </a:effectStyleLst>
+  <a:bgFillStyleLst>
+    <a:solidFill>
+      <a:schemeClr val="phClr"/>
+    </a:solidFill>
+    <a:solidFill>
+      <a:schemeClr val="phClr">
+        <a:tint val="95000"/>
+        <a:satMod val="170000"/>
+      </a:schemeClr>
+    </a:solidFill>
+    <a:gradFill rotWithShape="1">
+      <a:gsLst>
+        <a:gs pos="0">
+          <a:schemeClr val="phClr">
+            <a:tint val="93000"/>
+            <a:satMod val="150000"/>
+            <a:shade val="98000"/>
+            <a:lumMod val="102000"/>
+          </a:schemeClr>
+        </a:gs>
+        <a:gs pos="50000">
+          <a:schemeClr val="phClr">
+            <a:tint val="98000"/>
+            <a:satMod val="130000"/>
+            <a:shade val="90000"/>
+            <a:lumMod val="103000"/>
+          </a:schemeClr>
+        </a:gs>
+        <a:gs pos="100000">
+          <a:schemeClr val="phClr">
+            <a:shade val="63000"/>
+            <a:satMod val="120000"/>
+          </a:schemeClr>
+        </a:gs>
+      </a:gsLst>
+      <a:lin ang="5400000" scaled="0"/>
+    </a:gradFill>
+  </a:bgFillStyleLst>
+</a:fmtScheme>

data/data/themes/office_theme.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office Theme"><a:themeElements><a:clrScheme name="Office"><a:dk1><a:sysClr val="windowText" lastClr="000000"/></a:dk1><a:lt1><a:sysClr val="window" lastClr="FFFFFF"/></a:lt1><a:dk2><a:srgbClr val="0E2841"/></a:dk2><a:lt2><a:srgbClr val="E8E8E8"/></a:lt2><a:accent1><a:srgbClr val="156082"/></a:accent1><a:accent2><a:srgbClr val="E97132"/></a:accent2><a:accent3><a:srgbClr val="196B24"/></a:accent3><a:accent4><a:srgbClr val="0F9ED5"/></a:accent4><a:accent5><a:srgbClr val="A02B93"/></a:accent5><a:accent6><a:srgbClr val="4EA72E"/></a:accent6><a:hlink><a:srgbClr val="467886"/></a:hlink><a:folHlink><a:srgbClr val="96607D"/></a:folHlink></a:clrScheme><a:fontScheme name="Office"><a:majorFont><a:latin typeface="Aptos Display" panose="02110004020202020204"/><a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="游ゴシック Light"/><a:font script="Hang" typeface="맑은 고딕"/><a:font script="Hans" typeface="等线 Light"/><a:font script="Hant" typeface="新細明體"/><a:font script="Arab" typeface="Times New Roman"/><a:font script="Hebr" typeface="Times New Roman"/><a:font script="Thai" typeface="Angsana New"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="MoolBoran"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Times New Roman"/><a:font script="Uigh" typeface="Microsoft Uighur"/><a:font script="Geor" typeface="Sylfaen"/><a:font script="Armn" typeface="Arial"/><a:font script="Bugi" typeface="Leelawadee UI"/><a:font script="Bopo" typeface="Microsoft JhengHei"/><a:font script="Java" typeface="Javanese Text"/><a:font script="Lisu" typeface="Segoe UI"/><a:font script="Mymr" typeface="Myanmar Text"/><a:font script="Nkoo" typeface="Ebrima"/><a:font script="Olck" typeface="Nirmala UI"/><a:font script="Osma" typeface="Ebrima"/><a:font script="Phag" typeface="Phagspa"/><a:font script="Syrn" typeface="Estrangelo Edessa"/><a:font script="Syrj" typeface="Estrangelo Edessa"/><a:font script="Syre" typeface="Estrangelo Edessa"/><a:font script="Sora" typeface="Nirmala UI"/><a:font script="Tale" typeface="Microsoft Tai Le"/><a:font script="Talu" typeface="Microsoft New Tai Lue"/><a:font script="Tfng" typeface="Ebrima"/></a:majorFont><a:minorFont><a:latin typeface="Aptos" panose="02110004020202020204"/><a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="游明朝"/><a:font script="Hang" typeface="맑은 고딕"/><a:font script="Hans" typeface="等线"/><a:font script="Hant" typeface="新細明體"/><a:font script="Arab" typeface="Arial"/><a:font script="Hebr" typeface="Arial"/><a:font script="Thai" typeface="Cordia New"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="DaunPenh"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Arial"/><a:font script="Uigh" typeface="Microsoft Uighur"/><a:font script="Geor" typeface="Sylfaen"/><a:font script="Armn" typeface="Arial"/><a:font script="Bugi" typeface="Leelawadee UI"/><a:font script="Bopo" typeface="Microsoft JhengHei"/><a:font script="Java" typeface="Javanese Text"/><a:font script="Lisu" typeface="Segoe UI"/><a:font script="Mymr" typeface="Myanmar Text"/><a:font script="Nkoo" typeface="Ebrima"/><a:font script="Olck" typeface="Nirmala UI"/><a:font script="Osma" typeface="Ebrima"/><a:font script="Phag" typeface="Phagspa"/><a:font script="Syrn" typeface="Estrangelo Edessa"/><a:font script="Syrj" typeface="Estrangelo Edessa"/><a:font script="Syre" typeface="Estrangelo Edessa"/><a:font script="Sora" typeface="Nirmala UI"/><a:font script="Tale" typeface="Microsoft Tai Le"/><a:font script="Talu" typeface="Microsoft New Tai Lue"/><a:font script="Tfng" typeface="Ebrima"/></a:minorFont></a:fontScheme><a:fmtScheme name="Office"><a:fillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:lumMod val="110000"/><a:satMod val="105000"/><a:tint val="67000"/></a:schemeClr></a:gs><a:gs pos="50000"><a:schemeClr val="phClr"><a:lumMod val="105000"/><a:satMod val="103000"/><a:tint val="73000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:lumMod val="105000"/><a:satMod val="109000"/><a:tint val="81000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="5400000" scaled="0"/></a:gradFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:satMod val="103000"/><a:lumMod val="102000"/><a:tint val="94000"/></a:schemeClr></a:gs><a:gs pos="50000"><a:schemeClr val="phClr"><a:satMod val="110000"/><a:lumMod val="100000"/><a:shade val="100000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:lumMod val="99000"/><a:satMod val="120000"/><a:shade val="78000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="5400000" scaled="0"/></a:gradFill></a:fillStyleLst><a:lnStyleLst><a:ln w="12700" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/><a:miter lim="800000"/></a:ln><a:ln w="19050" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/><a:miter lim="800000"/></a:ln><a:ln w="25400" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/><a:miter lim="800000"/></a:ln></a:lnStyleLst><a:effectStyleLst><a:effectStyle><a:effectLst/></a:effectStyle><a:effectStyle><a:effectLst/></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad="57150" dist="19050" dir="5400000" algn="ctr" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="63000"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle></a:effectStyleLst><a:bgFillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:solidFill><a:schemeClr val="phClr"><a:tint val="95000"/><a:satMod val="170000"/></a:schemeClr></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="93000"/><a:satMod val="150000"/><a:shade val="98000"/><a:lumMod val="102000"/></a:schemeClr></a:gs><a:gs pos="50000"><a:schemeClr val="phClr"><a:tint val="98000"/><a:satMod val="130000"/><a:shade val="90000"/><a:lumMod val="103000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="63000"/><a:satMod val="120000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="5400000" scaled="0"/></a:gradFill></a:bgFillStyleLst></a:fmtScheme></a:themeElements><a:objectDefaults><a:lnDef><a:spPr/><a:bodyPr/><a:lstStyle/><a:style><a:lnRef idx="2"><a:schemeClr val="accent1"/></a:lnRef><a:fillRef idx="0"><a:schemeClr val="accent1"/></a:fillRef><a:effectRef idx="1"><a:schemeClr val="accent1"/></a:effectRef><a:fontRef idx="minor"><a:schemeClr val="tx1"/></a:fontRef></a:style></a:lnDef></a:objectDefaults><a:extraClrSchemeLst/><a:extLst><a:ext uri="{05A4C25C-085E-4340-85A3-A5531E510DB2}"><thm15:themeFamily xmlns:thm15="http://schemas.microsoft.com/office/thememl/2012/main" name="Office Theme" id="{2E142A2C-CD16-42D6-873A-C26D2A0506FA}" vid="{1BDDFF52-6CD6-40A5-AB3C-68EB2F1E4D0A}"/></a:ext></a:extLst></a:theme>

data/lib/uniword/builder/footnote_builder.rb

@@ -75,7 +75,9 @@ module Uniword
       end
 
       def create_footnote_entry(id, text, &block)
-        entry = Wordprocessingml::Footnote.new(id: id.to_s, type: "normal")
+        # OOXML spec: regular footnotes must NOT have w:type.
+        # Only separator/continuationSeparator use w:type.
+        entry = Wordprocessingml::Footnote.new(id: id.to_s)
         para = ParagraphBuilder.new
         if block_given?
           block.call(para)
@@ -87,7 +89,7 @@ module Uniword
       end
 
       def create_endnote_entry(id, text, &block)
-        entry = Wordprocessingml::Endnote.new(id: id.to_s, type: "normal")
+        entry = Wordprocessingml::Endnote.new(id: id.to_s)
         para = ParagraphBuilder.new
         if block_given?
           block.call(para)

data/lib/uniword/builder/run_builder.rb

@@ -22,6 +22,11 @@ module Uniword
         self
       end
 
+      def character_style(value)
+        ensure_properties.style = Properties::RunStyleReference.new(value: value)
+        self
+      end
+
       def bold(value = true)
         ensure_properties.bold = Properties::Bold.new(value: value)
         self

data/lib/uniword/docx/package.rb

@@ -87,6 +87,7 @@ module Uniword
 
       # Non-serialized attributes (DOCX packaging helpers)
       attr_accessor :chart_parts, :bibliography_sources, :profile
+      attr_accessor :settings_rels, :embeddings
 
       # Load DOCX package from file
       #
@@ -194,6 +195,13 @@ module Uniword
           )
         end
 
+        if zip_content["word/_rels/settings.xml.rels"]
+          package.settings_rels =
+            Ooxml::Relationships::PackageRelationships.from_xml(
+              zip_content["word/_rels/settings.xml.rels"]
+            )
+        end
+
         if zip_content["word/fontTable.xml"]
           package.font_table = Uniword::Wordprocessingml::FontTable.from_xml(
             zip_content["word/fontTable.xml"]
@@ -272,6 +280,16 @@ module Uniword
         # Extract image parts from word/media/ directory
         extract_image_parts(zip_content, package, zip_path)
 
+        # Extract OLE/embedded object binaries from word/embeddings/
+        embedding_files = zip_content.keys.grep(%r{^word/embeddings/.+$})
+        if embedding_files.any?
+          package.embeddings = {}
+          embedding_files.each do |emb_path|
+            target = emb_path.sub("word/", "")
+            package.embeddings[target] = zip_content[emb_path]
+          end
+        end
+
         package
       end
 

data/lib/uniword/docx/package_serialization.rb

@@ -26,6 +26,7 @@ document_rels)
         inject_notes(content_types, document_rels)
         inject_theme(content_types, document_rels)
         inject_numbering(content_types, document_rels)
+        inject_embeddings(content_types, document_rels)
       end
 
       # Serialize all package parts to XML and add to content hash
@@ -88,6 +89,10 @@ document_rels)
           content["word/settings.xml"] =
             serialize_part(settings)
         end
+        if settings_rels
+          content["word/_rels/settings.xml.rels"] =
+            serialize_infrastructure(settings_rels)
+        end
         if font_table
           content["word/fontTable.xml"] =
             serialize_part(font_table)
@@ -131,6 +136,9 @@ document_rels)
         serialize_headers(content)
         serialize_footers(content)
         serialize_header_footer_parts(content)
+
+        # OLE/embedded object binaries
+        serialize_embeddings(content)
       end
 
       # Serialize an OOXML document part with standard encoding
@@ -409,6 +417,28 @@ document_rels)
         )
       end
 
+      def inject_embeddings(content_types, document_rels)
+        return unless embeddings && !embeddings.empty?
+
+        embeddings.each_with_index do |(target, _data), idx|
+          part_name = "/word/#{target}"
+          next if content_types.overrides.any? { |o| o.part_name == part_name }
+
+          content_types.overrides << Uniword::ContentTypes::Override.new(
+            part_name: part_name,
+            content_type: "application/vnd.openxmlformats-officedocument.oleObject",
+          )
+
+          next if document_rels.relationships.any? { |r| r.target == target }
+
+          document_rels.relationships << Ooxml::Relationships::Relationship.new(
+            id: "rIdEmbedding#{idx + 1}",
+            type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject",
+            target: target,
+          )
+        end
+      end
+
       def wire_header_reference(type, r_id)
         return unless document&.body
 
@@ -467,6 +497,14 @@ document_rels)
             serialize_part(part[:content])
         end
       end
+
+      def serialize_embeddings(content)
+        return unless embeddings && !embeddings.empty?
+
+        embeddings.each do |target, data|
+          content["word/#{target}"] = data
+        end
+      end
     end
   end
 end

data/lib/uniword/docx/reconciler.rb

@@ -28,6 +28,7 @@ module Uniword
         reconcile_section_properties
         reconcile_footnotes
         reconcile_endnotes
+        reconcile_note_references
         repair_theme
 
         # Group 2: Support parts (profile-dependent)
@@ -85,13 +86,11 @@ module Uniword
         ].compact
 
         parts.each do |part|
-          part.pending_namespace_data = nil
           part.import_declaration_plan = nil
           part.pending_plan_root_element = nil
-          # TODO: @xml_input_namespaces has no public accessor in lutaml-model.
-          # Replace with public API once lutaml-model exposes one.
-          part.instance_variable_set(:@xml_input_namespaces, nil)
         end
+
+        parts.each(&:clear_xml_parse_state!)
       end
 
       def reconcile_section_properties
@@ -174,6 +173,114 @@ module Uniword
         ensure_separators(package.endnotes, :endnote) if package.endnotes
       end
 
+      # -- Note reference consistency --
+
+      def reconcile_note_references
+        reconcile_footnote_references
+        reconcile_endnote_references
+        reconcile_note_definition_integrity
+      end
+
+      def reconcile_footnote_references
+        return unless package.document&.body
+
+        referenced = collect_note_ids(:footnote)
+        return if referenced.empty?
+
+        ensure_footnotes_part
+        defined = package.footnotes.footnote_entries.each_with_object(Set.new) do |fn, s|
+          s << fn.id
+        end
+
+        missing = referenced.to_set - defined
+        return if missing.empty?
+
+        missing.each do |id|
+          package.footnotes.footnote_entries << Wordprocessingml::Footnote.new(
+            id: id, paragraphs: [Wordprocessingml::Paragraph.new],
+          )
+        end
+        record_fix("R10",
+                   "Added #{missing.size} missing footnote definition(s) " \
+                   "for orphaned footnoteReference IDs: #{missing.sort.join(', ')}")
+      end
+
+      def reconcile_endnote_references
+        return unless package.document&.body
+
+        referenced = collect_note_ids(:endnote)
+        return if referenced.empty?
+
+        ensure_endnotes_part
+        defined = package.endnotes.endnote_entries.each_with_object(Set.new) do |en, s|
+          s << en.id
+        end
+
+        missing = referenced.to_set - defined
+        return if missing.empty?
+
+        missing.each do |id|
+          package.endnotes.endnote_entries << Wordprocessingml::Endnote.new(
+            id: id, paragraphs: [Wordprocessingml::Paragraph.new],
+          )
+        end
+        record_fix("R10",
+                   "Added #{missing.size} missing endnote definition(s) " \
+                   "for orphaned endnoteReference IDs: #{missing.sort.join(', ')}")
+      end
+
+      # Validates structural integrity of footnote/endnote definitions.
+      def reconcile_note_definition_integrity
+        strip_invalid_note_types(:footnote)
+        strip_invalid_note_types(:endnote)
+        deduplicate_note_ids(:footnote)
+        deduplicate_note_ids(:endnote)
+      end
+
+      # R15: Regular footnotes/endnotes must NOT have w:type.
+      # Only separator (id=-1) and continuationSeparator (id=0) use w:type.
+      def strip_invalid_note_types(type)
+        notes = package.public_send(:"#{type}s")
+        return unless notes
+
+        entries = notes.public_send(:"#{type}_entries")
+        invalid = entries.select do |e|
+          e.type && e.id != "-1" && e.id != "0"
+        end
+        return if invalid.empty?
+
+        invalid.each { |e| e.type = nil }
+        record_fix("R15",
+                   "Removed invalid w:type from #{invalid.size} " \
+                   "regular #{type} definition(s): " \
+                   "IDs #{invalid.map(&:id).sort.join(', ')}")
+      end
+
+      # R16: Duplicate IDs in footnotes.xml/endnotes.xml are invalid.
+      # Keeps the first occurrence, removes subsequent duplicates.
+      def deduplicate_note_ids(type)
+        notes = package.public_send(:"#{type}s")
+        return unless notes
+
+        entries = notes.public_send(:"#{type}_entries")
+        seen = Set.new
+        dupes = []
+        entries.reject! do |e|
+          if seen.include?(e.id)
+            dupes << e
+            true
+          else
+            seen << e.id
+            false
+          end
+        end
+        return if dupes.empty?
+
+        record_fix("R16",
+                   "Removed #{dupes.size} duplicate #{type} ID(s): " \
+                   "#{dupes.map(&:id).sort.join(', ')}")
+      end
+
       # -- Builders --
 
       def minimal_footnotes
@@ -216,6 +323,53 @@ module Uniword
         entries.unshift(continuation_entry(type)) unless ids.include?("0")
       end
 
+      def collect_note_ids(type)
+        ref_attr = type == :footnote ? :footnote_reference : :endnote_reference
+        ids = []
+        collect_note_ids_from_element(package.document.body, ref_attr, ids)
+        ids
+      end
+
+      def collect_note_ids_from_element(element, ref_attr, ids)
+        return unless element
+
+        collect_note_ids_from_paragraphs(element.paragraphs, ref_attr, ids)
+
+        tables = element.tables
+        return unless tables
+        tables.each do |tbl|
+          tbl.rows.each do |row|
+            row.cells.each do |cell|
+              collect_note_ids_from_paragraphs(cell.paragraphs, ref_attr, ids)
+            end
+          end
+        end
+      end
+
+      def collect_note_ids_from_paragraphs(paragraphs, ref_attr, ids)
+        return unless paragraphs
+        paragraphs.each do |p|
+          (p.runs || []).each do |r|
+            ref = r.public_send(ref_attr)
+            ids << ref.id if ref&.id
+          end
+        end
+      end
+
+      def ensure_footnotes_part
+        return if package.footnotes
+
+        package.footnotes = minimal_footnotes
+        record_fix("R9", "Created footnotes.xml for orphaned references")
+      end
+
+      def ensure_endnotes_part
+        return if package.endnotes
+
+        package.endnotes = minimal_endnotes
+        record_fix("R9", "Created endnotes.xml for orphaned references")
+      end
+
       # -- Group 2: Support parts (profile-dependent) --
 
       def reconcile_theme

data/lib/uniword/lazy_loader.rb

@@ -105,7 +105,7 @@ module Uniword
 
         # If not loaded, try to get count without loading
         # This is a hook for subclasses to override
-        send(name).size
+        public_send(name).size
       end
     end
   end

data/lib/uniword/properties/boolean_element_factory.rb

@@ -14,23 +14,16 @@ module Uniword
     end
 
     # Helper to define val= override after attribute declaration.
-    # Uses alias_method to save the generated setter, then overrides it.
     module BooleanValSetter
       def self.included(base)
-        base.class_eval do
-          alias_method :__original_val_setter=, :val= if method_defined?(:val=)
-          define_method(:val=) do |v|
-            @val = if v.nil?
-                     nil
-                   elsif v == false || v.to_s == "false"
-                     "false"
-                   elsif v == true || v.to_s == "true"
-                     nil
-                   else
-                     v
-                   end
-            value_set_for(:val)
-          end
+        base.define_method(:val=) do |v|
+          @val = case v
+                 when nil then nil
+                 when false, "false" then "false"
+                 when true, "true" then nil
+                 else v
+                 end
+          value_set_for(:val)
         end
       end
     end

data/lib/uniword/schema/schema_loader.rb

@@ -85,6 +85,6 @@ module Uniword
     end
 
     # Raised when a schema file cannot be found
-    class SchemaNotFoundError < StandardError; end
+    class SchemaNotFoundError < Uniword::Error; end
   end
 end

data/lib/uniword/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uniword
-  VERSION = "1.0.9"
+  VERSION = "1.0.10"
 end

data/lib/uniword/wordprocessingml/attached_template.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+require_relative "../properties/relationship_id"
+
+module Uniword
+  module Wordprocessingml
+    class AttachedTemplate < Lutaml::Model::Serializable
+      attribute :r_id, Properties::RelationshipIdValue
+
+      xml do
+        element "attachedTemplate"
+        namespace Uniword::Ooxml::Namespaces::WordProcessingML
+        map_attribute "id", to: :r_id
+      end
+    end
+  end
+end

data/lib/uniword/wordprocessingml/body.rb

@@ -71,48 +71,30 @@ module Uniword
       def sync_element_order
         return if element_order.nil? || element_order.empty?
 
-        # Count how many p/tbl/sdt entries exist in element_order
-        ordered_p_count = element_order.count { |e| e.name == "p" }
-        ordered_tbl_count = element_order.count { |e| e.name == "tbl" }
-        ordered_sdt_count = element_order.count { |e| e.name == "sdt" }
-        ordered_bookmark_start_count = element_order.count do |e|
-          e.name == "bookmarkStart"
-        end
-        ordered_bookmark_end_count = element_order.count do |e|
-          e.name == "bookmarkEnd"
-        end
-
-        # Add missing paragraphs
-        (paragraphs.size - ordered_p_count).times do
-          element_order << Lutaml::Xml::Element.new("Element", "p")
+        counts = element_order.each_with_object(Hash.new(0)) do |e, h|
+          h[e.name] += 1
         end
 
-        # Add missing tables
-        (tables.size - ordered_tbl_count).times do
-          element_order << Lutaml::Xml::Element.new("Element", "tbl")
-        end
+        append_missing_elements("p", paragraphs.size - counts["p"])
+        append_missing_elements("tbl", tables.size - counts["tbl"])
+        append_missing_elements("sdt",
+                                structured_document_tags.size - counts["sdt"])
+        append_missing_elements("bookmarkStart",
+                                bookmark_starts.size - counts["bookmarkStart"])
+        append_missing_elements("bookmarkEnd",
+                                bookmark_ends.size - counts["bookmarkEnd"])
 
-        # Add missing structured document tags
-        (structured_document_tags.size - ordered_sdt_count).times do
-          element_order << Lutaml::Xml::Element.new("Element", "sdt")
-        end
+        return unless section_properties && counts["sectPr"].zero?
 
-        # Add missing bookmark starts
-        (bookmark_starts.size - ordered_bookmark_start_count).times do
-          element_order << Lutaml::Xml::Element.new("Element", "bookmarkStart")
-        end
-
-        # Add missing bookmark ends
-        (bookmark_ends.size - ordered_bookmark_end_count).times do
-          element_order << Lutaml::Xml::Element.new("Element", "bookmarkEnd")
-        end
+        element_order << build_order_element("sectPr")
+      end
 
-        # Ensure section_properties is in element_order if present
-        return unless section_properties && element_order.none? do |e|
-          e.name == "sectPr"
-        end
+      def append_missing_elements(name, count)
+        count.times { element_order << build_order_element(name) }
+      end
 
-        element_order << Lutaml::Xml::Element.new("Element", "sectPr")
+      def build_order_element(name)
+        Lutaml::Xml::Element.new("Element", name)
       end
     end
   end