@beyondwork/docx-react-component 1.0.59 → 1.0.61

package/src/io/export/serialize-settings.ts

@@ -62,6 +62,7 @@
  */
 
 import type {
+  ClrSchemeMappingSlot,
   CompatSetting,
   DocumentSettings,
 } from "../../model/canonical-document.ts";
@@ -81,6 +82,21 @@ export const WORD_SETTINGS_CONTENT_TYPE =
 const WORDPROCESSINGML_2006_MAIN_NS =
   "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
 
+const CLRSCHEME_MAPPING_EMIT_ORDER: readonly ClrSchemeMappingSlot[] = [
+  "bg1",
+  "t1",
+  "bg2",
+  "t2",
+  "accent1",
+  "accent2",
+  "accent3",
+  "accent4",
+  "accent5",
+  "accent6",
+  "hlink",
+  "followedHyperlink",
+];
+
 /**
  * Render a complete `<w:settings>` XML document from canonical
  * `DocumentSettings`. The output is the standard XML declaration plus a
@@ -89,9 +105,13 @@ const WORDPROCESSINGML_2006_MAIN_NS =
  * Emit order is OOXML-schema-friendly to maximize Word's tolerance:
  *   1. <w:evenAndOddHeaders>
  *   2. <w:zoom>
- *   3. root-level compat-adjacent flags (e.g. <w:doNotEmbedSmartTags/>)
- *   4. <w:compat> wrapping flags then compatSetting triples
- *   5. <w:themeFontLang>
+ *   3. <w:defaultTabStop>
+ *   4. <w:footnotePr>
+ *   5. <w:endnotePr>
+ *   6. root-level compat-adjacent flags (e.g. <w:doNotEmbedSmartTags/>)
+ *   7. <w:compat> wrapping flags then compatSetting triples
+ *   8. <w:themeFontLang>
+ *   9. <w:clrSchemeMapping>
  *
  * Insertion order of `compatSettings` array entries and `compatFlags` /
  * `rootCompatFlags` / `themeFontLang` keys is preserved so a byte-stable
@@ -112,9 +132,13 @@ function synthesizeSettingsXml(settings: DocumentSettings): string {
   const parts: string[] = [];
   parts.push(emitEvenAndOddHeaders(settings));
   parts.push(emitZoom(settings));
+  parts.push(emitDefaultTabStop(settings));
+  parts.push(emitFootnoteLikeProperties("w:footnotePr", settings.footnotePr));
+  parts.push(emitFootnoteLikeProperties("w:endnotePr", settings.endnotePr));
   parts.push(emitRootCompatFlags(settings));
   parts.push(emitCompatBlock(settings));
   parts.push(emitThemeFontLang(settings));
+  parts.push(emitClrSchemeMapping(settings));
 
   const body = parts.filter((p) => p.length > 0).join("");
   return [
@@ -195,6 +219,24 @@ function graftSettingsXml(
   ) {
     appendedParts.push(emitZoom(settings));
   }
+  if (
+    !emittedTopLevel.has("defaultTabStop") &&
+    settings.defaultTabStop !== undefined
+  ) {
+    appendedParts.push(emitDefaultTabStop(settings));
+  }
+  if (
+    !emittedTopLevel.has("footnotePr") &&
+    settings.footnotePr !== undefined
+  ) {
+    appendedParts.push(emitFootnoteLikeProperties("w:footnotePr", settings.footnotePr));
+  }
+  if (
+    !emittedTopLevel.has("endnotePr") &&
+    settings.endnotePr !== undefined
+  ) {
+    appendedParts.push(emitFootnoteLikeProperties("w:endnotePr", settings.endnotePr));
+  }
   // Any rootCompatFlags entries that didn't have a source counterpart.
   for (const [name, value] of pendingRootFlags) {
     appendedParts.push(emitOnOffElement(name, value));
@@ -209,6 +251,12 @@ function graftSettingsXml(
   ) {
     appendedParts.push(emitThemeFontLang(settings));
   }
+  if (
+    !emittedTopLevel.has("clrSchemeMapping") &&
+    settings.clrSchemeMapping !== undefined
+  ) {
+    appendedParts.push(emitClrSchemeMapping(settings));
+  }
 
   return (
     blueprint.prelude +
@@ -229,8 +277,12 @@ function graftSettingsXml(
 const MODELLED_TOP_LEVEL_NAMES: ReadonlySet<string> = new Set([
   "evenAndOddHeaders",
   "zoom",
+  "defaultTabStop",
+  "footnotePr",
+  "endnotePr",
   "compat",
   "themeFontLang",
+  "clrSchemeMapping",
 ]);
 
 type ChildReplacement =
@@ -282,6 +334,36 @@ function computeChildReplacement(
       const xml = emitZoom(settings);
       return xml.length > 0 ? { kind: "replace", xml } : { kind: "drop" };
     }
+    case "defaultTabStop": {
+      if (
+        emitDefaultTabStop(parseModelledChild(child.rawXml)) ===
+        emitDefaultTabStop(settings)
+      ) {
+        return { kind: "keep" };
+      }
+      const xml = emitDefaultTabStop(settings);
+      return xml.length > 0 ? { kind: "replace", xml } : { kind: "drop" };
+    }
+    case "footnotePr": {
+      if (
+        emitFootnoteLikeProperties("w:footnotePr", parseModelledChild(child.rawXml).footnotePr) ===
+        emitFootnoteLikeProperties("w:footnotePr", settings.footnotePr)
+      ) {
+        return { kind: "keep" };
+      }
+      const xml = emitFootnoteLikeProperties("w:footnotePr", settings.footnotePr);
+      return xml.length > 0 ? { kind: "replace", xml } : { kind: "drop" };
+    }
+    case "endnotePr": {
+      if (
+        emitFootnoteLikeProperties("w:endnotePr", parseModelledChild(child.rawXml).endnotePr) ===
+        emitFootnoteLikeProperties("w:endnotePr", settings.endnotePr)
+      ) {
+        return { kind: "keep" };
+      }
+      const xml = emitFootnoteLikeProperties("w:endnotePr", settings.endnotePr);
+      return xml.length > 0 ? { kind: "replace", xml } : { kind: "drop" };
+    }
     case "compat": {
       if (
         emitCompatBlock(parseModelledChild(child.rawXml)) ===
@@ -302,6 +384,16 @@ function computeChildReplacement(
       const xml = emitThemeFontLang(settings);
       return xml.length > 0 ? { kind: "replace", xml } : { kind: "drop" };
     }
+    case "clrSchemeMapping": {
+      if (
+        emitClrSchemeMapping(parseModelledChild(child.rawXml)) ===
+        emitClrSchemeMapping(settings)
+      ) {
+        return { kind: "keep" };
+      }
+      const xml = emitClrSchemeMapping(settings);
+      return xml.length > 0 ? { kind: "replace", xml } : { kind: "drop" };
+    }
   }
   // Root compat flag?
   if (ROOT_COMPAT_FLAG_NAMES.has(child.localName)) {
@@ -361,6 +453,28 @@ function emitZoom(settings: DocumentSettings): string {
   return "";
 }
 
+function emitDefaultTabStop(settings: DocumentSettings): string {
+  const { defaultTabStop } = settings;
+  if (defaultTabStop === undefined || !Number.isFinite(defaultTabStop)) return "";
+  return `<w:defaultTabStop w:val="${Math.round(defaultTabStop)}"/>`;
+}
+
+function emitFootnoteLikeProperties(
+  elementName: "w:footnotePr" | "w:endnotePr",
+  props: DocumentSettings["footnotePr"] | DocumentSettings["endnotePr"],
+): string {
+  if (!props) return "";
+  const parts: string[] = [];
+  if (props.pos) parts.push(`<w:pos w:val="${escapeXmlAttribute(props.pos)}"/>`);
+  if (props.numFmt) parts.push(`<w:numFmt w:val="${escapeXmlAttribute(props.numFmt)}"/>`);
+  if (props.numStart !== undefined && Number.isFinite(props.numStart)) {
+    parts.push(`<w:numStart w:val="${Math.round(props.numStart)}"/>`);
+  }
+  if (props.numRestart) parts.push(`<w:numRestart w:val="${escapeXmlAttribute(props.numRestart)}"/>`);
+  if (parts.length === 0) return "";
+  return `<${elementName}>${parts.join("")}</${elementName}>`;
+}
+
 function emitRootCompatFlags(settings: DocumentSettings): string {
   const flags = settings.rootCompatFlags;
   if (!flags) return "";
@@ -410,6 +524,19 @@ function emitThemeFontLang(settings: DocumentSettings): string {
   return `<w:themeFontLang${attrs}/>`;
 }
 
+function emitClrSchemeMapping(settings: DocumentSettings): string {
+  const mapping = settings.clrSchemeMapping;
+  if (!mapping) return "";
+  const attrs = CLRSCHEME_MAPPING_EMIT_ORDER
+    .map((slot) => {
+      const value = mapping[slot];
+      return value ? ` w:${slot}="${escapeXmlAttribute(value)}"` : "";
+    })
+    .join("");
+  if (attrs.length === 0) return "";
+  return `<w:clrSchemeMapping${attrs}/>`;
+}
+
 /**
  * Emit a ST_OnOff element. true → bare self-closing tag; false → explicit
  * `w:val="false"` so the parser doesn't infer the default-true. Symmetric

package/src/io/normalize/normalize-text.ts

@@ -260,13 +260,17 @@ function normalizeParagraph(
       : {}),
     ...(paragraph.indentation ? { indentation: paragraph.indentation } : {}),
     ...(paragraph.tabStops && paragraph.tabStops.length > 0 ? { tabStops: paragraph.tabStops } : {}),
-    ...(paragraph.keepNext ? { keepNext: paragraph.keepNext } : {}),
-    ...(paragraph.keepLines ? { keepLines: paragraph.keepLines } : {}),
+    ...(paragraph.keepNext !== undefined ? { keepNext: paragraph.keepNext } : {}),
+    ...(paragraph.keepLines !== undefined ? { keepLines: paragraph.keepLines } : {}),
     ...(paragraph.outlineLevel !== undefined ? { outlineLevel: paragraph.outlineLevel } : {}),
-    ...(paragraph.pageBreakBefore ? { pageBreakBefore: paragraph.pageBreakBefore } : {}),
-    ...(paragraph.bidi ? { bidi: paragraph.bidi } : {}),
+    ...(paragraph.pageBreakBefore !== undefined ? { pageBreakBefore: paragraph.pageBreakBefore } : {}),
+    ...(paragraph.widowControl !== undefined ? { widowControl: paragraph.widowControl } : {}),
+    ...(paragraph.bidi !== undefined ? { bidi: paragraph.bidi } : {}),
     ...(paragraph.borders ? { borders: paragraph.borders } : {}),
     ...(paragraph.shading ? { shading: paragraph.shading } : {}),
+    ...(paragraph.suppressLineNumbers !== undefined
+      ? { suppressLineNumbers: paragraph.suppressLineNumbers }
+      : {}),
     // A.7: preserve w14:paraId / w14:textId across import → export so
     // downstream tools that diff documents by paragraph id stay stable.
     ...(paragraph.wordExtensionIds

package/src/io/ooxml/parse-footnotes.ts

@@ -154,9 +154,13 @@ export function parseEndnotesXml(
     }
   }
 
+  const endnoteSeparators = parseFootnoteSeparators(xml);
+
   return {
     footnotes: existing?.footnotes ?? {},
     endnotes,
+    ...(existing?.footnoteSeparators ? { footnoteSeparators: existing.footnoteSeparators } : {}),
+    ...(Object.keys(endnoteSeparators).length > 0 ? { endnoteSeparators } : {}),
   };
 }
 
@@ -174,7 +178,9 @@ export function parseFootnoteSeparators(xml: string): FootnoteSeparators {
   if (!containerEl) return {};
 
   let separatorContent: string | undefined;
+  let separatorParagraphXml: string | undefined;
   let continuationSeparatorContent: string | undefined;
+  let continuationSeparatorParagraphXml: string | undefined;
 
   for (const child of containerEl.children) {
     if (child.type !== "element") continue;
@@ -186,6 +192,7 @@ export function parseFootnoteSeparators(xml: string): FootnoteSeparators {
 
     const paraEl = findChildElementOptional(child, "p");
     if (!paraEl) continue;
+    const paragraphXml = serializeElementToXml(paraEl);
 
     const runXml = paraEl.children
       .filter((c): c is XmlElementNode => c.type === "element" && localName(c.name) === "r")
@@ -194,14 +201,18 @@ export function parseFootnoteSeparators(xml: string): FootnoteSeparators {
 
     if (rawType === "separator") {
       separatorContent = runXml;
+      separatorParagraphXml = paragraphXml;
     } else {
       continuationSeparatorContent = runXml;
+      continuationSeparatorParagraphXml = paragraphXml;
     }
   }
 
   return {
     ...(separatorContent !== undefined ? { separatorContent } : {}),
+    ...(separatorParagraphXml !== undefined ? { separatorParagraphXml } : {}),
     ...(continuationSeparatorContent !== undefined ? { continuationSeparatorContent } : {}),
+    ...(continuationSeparatorParagraphXml !== undefined ? { continuationSeparatorParagraphXml } : {}),
   };
 }
 

package/src/io/ooxml/parse-headers-footers.ts

@@ -14,6 +14,7 @@ import type {
 } from "../../model/canonical-document.ts";
 import type { LegacyFormFieldNode } from "../../model/canonical-document.ts";
 import { resolveHighlightColor } from "./highlight-colors.ts";
+import type { ParseDrawingOpts } from "./parse-drawing.ts";
 import { parseFFDataFromFldChar } from "./parse-ffdata.ts";
 import { classifyFieldInstruction } from "./parse-fields.ts";
 import { parseXmlWithOffsets as parseXml } from "./xml-parser.ts";
@@ -49,6 +50,7 @@ import {
   readTableStyleId,
   readTableWidth,
 } from "./parse-tables.ts";
+import { parseDrawingFrame } from "./parse-drawing.ts";
 import { parseShapeXml, parseVmlXml } from "./parse-shapes.ts";
 
 const TAB_ALIGN_VOCAB = new Set<TabStop["align"]>(["left", "center", "right", "decimal", "num", "bar", "clear"]);
@@ -67,6 +69,8 @@ export interface ParsedHeaderFooterDocument {
   blocks: BlockNode[];
 }
 
+export type ParseHeaderFooterOpts = Omit<ParseDrawingOpts, "blockParser">;
+
 // ---- XML node types (inline, no external dep) ----
 
 interface XmlElementNode {
@@ -121,15 +125,21 @@ export function parseHeaderFooterReferences(
 /**
  * Parse a headerN.xml part (<w:hdr> root) into block nodes.
  */
-export function parseHeaderXml(xml: string): ParsedHeaderFooterDocument {
-  return parseHdrFtrXml(xml, "hdr");
+export function parseHeaderXml(
+  xml: string,
+  opts: ParseHeaderFooterOpts = { relationships: [] },
+): ParsedHeaderFooterDocument {
+  return parseHdrFtrXml(xml, "hdr", opts);
 }
 
 /**
  * Parse a footerN.xml part (<w:ftr> root) into block nodes.
  */
-export function parseFooterXml(xml: string): ParsedHeaderFooterDocument {
-  return parseHdrFtrXml(xml, "ftr");
+export function parseFooterXml(
+  xml: string,
+  opts: ParseHeaderFooterOpts = { relationships: [] },
+): ParsedHeaderFooterDocument {
+  return parseHdrFtrXml(xml, "ftr", opts);
 }
 
 // ---- Internal helpers ----
@@ -213,6 +223,7 @@ function toHeaderFooterVariant(raw: string): HeaderFooterVariant {
 function parseHdrFtrXml(
   xml: string,
   rootLocalName: "hdr" | "ftr",
+  opts: ParseHeaderFooterOpts = { relationships: [] },
 ): ParsedHeaderFooterDocument {
   currentSourceXml = xml;
   let root: XmlElementNode;
@@ -239,12 +250,12 @@ function parseHdrFtrXml(
     const name = localName(child.name);
 
     if (name === "p") {
-      blocks.push(parseParagraphElement(child, xml));
+      blocks.push(parseParagraphElement(child, xml, opts));
     } else if (name === "tbl") {
       // Simple tables (no revisions, fields, or nested tables) are promoted
       // to supported-roundtrip; structurally risky tables stay opaque.
       if (isSimpleSecondaryStoryTable(child)) {
-        blocks.push(parseSimpleTableElement(child, xml));
+        blocks.push(parseSimpleTableElement(child, xml, opts));
       } else {
         blocks.push({
           type: "opaque_block",
@@ -267,7 +278,11 @@ function parseHdrFtrXml(
   return { blocks };
 }
 
-function parseParagraphElement(pElement: XmlElementNode, sourceXml: string): ParagraphNode {
+function parseParagraphElement(
+  pElement: XmlElementNode,
+  sourceXml: string,
+  opts: ParseHeaderFooterOpts,
+): ParagraphNode {
   let styleId: string | undefined;
   let alignment: ParagraphNode["alignment"];
   let spacing: ParagraphNode["spacing"];
@@ -295,9 +310,9 @@ function parseParagraphElement(pElement: XmlElementNode, sourceXml: string): Par
       indentation = readParagraphIndentation(child);
       tabStops = readParagraphTabStops(child);
     } else if (name === "r") {
-      activeComplexField = appendRunNodes(child, children, activeComplexField, sourceXml);
+      activeComplexField = appendRunNodes(child, children, activeComplexField, sourceXml, opts);
     } else if (name === "hyperlink") {
-      children.push(parseHyperlinkElement(child));
+      children.push(parseHyperlinkElement(child, opts));
     } else if (name === "bookmarkStart" || name === "bookmarkEnd") {
       children.push(parseBookmarkElement(child));
     } else if (name === "fldSimple") {
@@ -350,6 +365,7 @@ function appendRunNodes(
   nodes: InlineNode[],
   activeComplexField: ActiveComplexField | null,
   sourceXml: string,
+  opts: ParseHeaderFooterOpts,
 ): ActiveComplexField | null {
   const marks: TextMark[] = parseRunProperties(rElement);
 
@@ -398,7 +414,7 @@ function appendRunNodes(
       continue;
     }
 
-    const inlineNode = parseRunChildNode(child, marks);
+    const inlineNode = parseRunChildNode(child, marks, opts);
     if (!inlineNode) {
       continue;
     }
@@ -420,7 +436,10 @@ function appendRunNodes(
   return activeComplexField;
 }
 
-function parseRunElement(rElement: XmlElementNode): InlineNode[] {
+function parseRunElement(
+  rElement: XmlElementNode,
+  opts: ParseHeaderFooterOpts,
+): InlineNode[] {
   const nodes: InlineNode[] = [];
   const marks: TextMark[] = parseRunProperties(rElement);
 
@@ -472,9 +491,9 @@ function parseRunElement(rElement: XmlElementNode): InlineNode[] {
       pushFieldNode(nodes, child, "complex");
     } else if (name === "drawing") {
       const drawingXml = currentSourceXml.slice(child.start, child.end);
-      const shapeResult = parseShapeXml(drawingXml);
-      if (shapeResult) {
-        nodes.push(shapeResult);
+      const drawingResult = parseDrawingInlineNode(drawingXml, opts);
+      if (drawingResult) {
+        nodes.push(drawingResult);
       }
     } else if (name === "pict") {
       const pictXml = currentSourceXml.slice(child.start, child.end);
@@ -483,17 +502,19 @@ function parseRunElement(rElement: XmlElementNode): InlineNode[] {
         nodes.push(vmlResult);
       }
     } else if (name === "AlternateContent") {
+      const alternateXml = currentSourceXml.slice(child.start, child.end);
       const drawingNode = findFirstDescendant(child, "drawing");
-      if (drawingNode) {
-        const drawingXml = currentSourceXml.slice(drawingNode.start, drawingNode.end);
-        const shapeResult = parseShapeXml(drawingXml);
-        if (shapeResult) {
-          nodes.push({
-            ...shapeResult,
-            rawXml: currentSourceXml.slice(child.start, child.end),
-          });
-          continue;
-        }
+      const legacyDrawingXml = drawingNode
+        ? currentSourceXml.slice(drawingNode.start, drawingNode.end)
+        : undefined;
+      const alternateDrawingResult = parseDrawingInlineNode(
+        alternateXml,
+        opts,
+        legacyDrawingXml,
+      );
+      if (alternateDrawingResult) {
+        nodes.push(alternateDrawingResult);
+        continue;
       }
       const pictNode = findFirstDescendant(child, "pict");
       if (pictNode) {
@@ -515,6 +536,7 @@ function parseRunElement(rElement: XmlElementNode): InlineNode[] {
 function parseRunChildNode(
   child: XmlElementNode,
   marks: TextMark[],
+  opts: ParseHeaderFooterOpts,
 ): InlineNode | null {
   const name = localName(child.name);
 
@@ -566,23 +588,21 @@ function parseRunChildNode(
   }
   if (name === "drawing") {
     const drawingXml = currentSourceXml.slice(child.start, child.end);
-    return parseShapeXml(drawingXml);
+    return parseDrawingInlineNode(drawingXml, opts);
   }
   if (name === "pict") {
     const pictXml = currentSourceXml.slice(child.start, child.end);
     return parseVmlXml(pictXml);
   }
   if (name === "AlternateContent") {
+    const alternateXml = currentSourceXml.slice(child.start, child.end);
     const drawingNode = findFirstDescendant(child, "drawing");
-    if (drawingNode) {
-      const drawingXml = currentSourceXml.slice(drawingNode.start, drawingNode.end);
-      const shapeResult = parseShapeXml(drawingXml);
-      if (shapeResult) {
-        return {
-          ...shapeResult,
-          rawXml: currentSourceXml.slice(child.start, child.end),
-        };
-      }
+    const drawingXml = drawingNode
+      ? currentSourceXml.slice(drawingNode.start, drawingNode.end)
+      : undefined;
+    const drawingResult = parseDrawingInlineNode(alternateXml, opts, drawingXml);
+    if (drawingResult) {
+      return drawingResult;
     }
     const pictNode = findFirstDescendant(child, "pict");
     if (pictNode) {
@@ -600,7 +620,10 @@ function parseRunChildNode(
   return null;
 }
 
-function parseHyperlinkElement(element: XmlElementNode): Extract<InlineNode, { type: "hyperlink" }> {
+function parseHyperlinkElement(
+  element: XmlElementNode,
+  opts: ParseHeaderFooterOpts,
+): Extract<InlineNode, { type: "hyperlink" }> {
   const href = element.attributes["w:anchor"]
     ? `#${element.attributes["w:anchor"]}`
     : element.attributes["r:id"] ?? "relationship:unknown";
@@ -608,7 +631,7 @@ function parseHyperlinkElement(element: XmlElementNode): Extract<InlineNode, { t
 
   for (const child of element.children) {
     if (child.type === "element" && localName(child.name) === "r") {
-      for (const runChild of parseRunElement(child)) {
+      for (const runChild of parseRunElement(child, opts)) {
         if (runChild.type === "text" || runChild.type === "hard_break" || runChild.type === "tab") {
           children.push(runChild);
         }
@@ -623,6 +646,46 @@ function parseHyperlinkElement(element: XmlElementNode): Extract<InlineNode, { t
   };
 }
 
+function parseDrawingInlineNode(
+  rawXml: string,
+  opts: ParseHeaderFooterOpts,
+  legacyDrawingXml?: string,
+): InlineNode | null {
+  try {
+    const frame = parseDrawingFrame(rawXml, {
+      ...opts,
+      relationships: opts.relationships ?? [],
+    });
+    if (
+      frame &&
+      !(
+        frame.content.type === "shape" &&
+        frame.content.isTextBox
+      )
+    ) {
+      return frame;
+    }
+    if (frame?.content.type !== "shape" || !frame.content.isTextBox) {
+      return frame;
+    }
+  } catch {
+    // Fall through to the legacy shape path.
+  }
+
+  const shapeXml = legacyDrawingXml ?? rawXml;
+  const legacyShape = parseShapeXml(shapeXml);
+  if (!legacyShape) {
+    return null;
+  }
+  if (legacyDrawingXml) {
+    return {
+      ...legacyShape,
+      rawXml,
+    };
+  }
+  return legacyShape;
+}
+
 function parseBookmarkElement(
   element: XmlElementNode,
 ): Extract<InlineNode, { type: "bookmark_start" | "bookmark_end" }> {
@@ -958,7 +1021,11 @@ function isSafeSecondaryStoryFieldFamily(family: string): boolean {
   );
 }
 
-function parseSimpleTableElement(tblElement: XmlElementNode, sourceXml: string): TableNode {
+function parseSimpleTableElement(
+  tblElement: XmlElementNode,
+  sourceXml: string,
+  opts: ParseHeaderFooterOpts,
+): TableNode {
   let gridColumns: number[] = [];
   const rows: TableRowNode[] = [];
   let propertiesXml: string | undefined;
@@ -998,7 +1065,7 @@ function parseSimpleTableElement(tblElement: XmlElementNode, sourceXml: string):
     } else if (name === "tblGrid") {
       gridColumns = readGridColumns(child);
     } else if (name === "tr") {
-      rows.push(parseSimpleTableRow(child, sourceXml));
+      rows.push(parseSimpleTableRow(child, sourceXml, opts));
     }
   }
 
@@ -1027,7 +1094,11 @@ function readGridColumns(tblGrid: XmlElementNode): number[] {
   return readSharedGridColumns(tblGrid);
 }
 
-function parseSimpleTableRow(trElement: XmlElementNode, sourceXml: string): TableRowNode {
+function parseSimpleTableRow(
+  trElement: XmlElementNode,
+  sourceXml: string,
+  opts: ParseHeaderFooterOpts,
+): TableRowNode {
   const cells: TableCellNode[] = [];
   let propertiesXml: string | undefined;
   let height: TableRowNode["height"];
@@ -1050,7 +1121,7 @@ function parseSimpleTableRow(trElement: XmlElementNode, sourceXml: string): Tabl
       horizontalAlignment = readRowHorizontalAlignment(child);
       cnfStyle = readRowCnfStyle(child);
     } else if (name === "tc") {
-      cells.push(parseSimpleTableCell(child, sourceXml));
+      cells.push(parseSimpleTableCell(child, sourceXml, opts));
     }
   }
 
@@ -1067,7 +1138,11 @@ function parseSimpleTableRow(trElement: XmlElementNode, sourceXml: string): Tabl
   };
 }
 
-function parseSimpleTableCell(tcElement: XmlElementNode, sourceXml: string): TableCellNode {
+function parseSimpleTableCell(
+  tcElement: XmlElementNode,
+  sourceXml: string,
+  opts: ParseHeaderFooterOpts,
+): TableCellNode {
   const children: BlockNode[] = [];
   let propertiesXml: string | undefined;
   let gridSpan: number | undefined;
@@ -1107,7 +1182,7 @@ function parseSimpleTableCell(tcElement: XmlElementNode, sourceXml: string): Tab
       margins = readCellMargins(child);
       cnfStyle = readCellCnfStyle(child);
     } else if (name === "p") {
-      children.push(parseParagraphElement(child, sourceXml));
+      children.push(parseParagraphElement(child, sourceXml, opts));
     }
   }
 

package/src/io/ooxml/parse-main-document.ts

@@ -1150,15 +1150,15 @@ function parseBodyChild(
     ...(contextualSpacing !== undefined ? { contextualSpacing } : {}),
     ...(indentation ? { indentation } : {}),
     ...(tabStops && tabStops.length > 0 ? { tabStops } : {}),
-    ...(keepNext ? { keepNext } : {}),
-    ...(keepLines ? { keepLines } : {}),
+    ...(keepNext !== undefined ? { keepNext } : {}),
+    ...(keepLines !== undefined ? { keepLines } : {}),
     ...(outlineLevel !== undefined ? { outlineLevel } : {}),
-    ...(pageBreakBefore ? { pageBreakBefore } : {}),
-    ...(widowControl ? { widowControl } : {}),
+    ...(pageBreakBefore !== undefined ? { pageBreakBefore } : {}),
+    ...(widowControl !== undefined ? { widowControl } : {}),
     ...(borders ? { borders } : {}),
     ...(shading ? { shading } : {}),
-    ...(bidi ? { bidi } : {}),
-    ...(suppressLineNumbers ? { suppressLineNumbers } : {}),
+    ...(bidi !== undefined ? { bidi } : {}),
+    ...(suppressLineNumbers !== undefined ? { suppressLineNumbers } : {}),
     ...(cnfStyle ? { cnfStyle } : {}),
     ...(wordExtensionIds ? { wordExtensionIds } : {}),
     ...(sectionProperties ? { sectionProperties } : {}),
@@ -1848,7 +1848,7 @@ function tableRequiresOpaquePreservation(rawXml: string): boolean {
   // nested tables, floating images, VML preview atoms, and bounded field
   // families already owned by the current field slice. Risky table-local
   // semantics still fail closed to preserve-only.
-  if (/<w:(ins|del|rPrChange|pPrChange|tblPrChange|trPrChange|tcPrChange|sectPrChange|cellIns|cellDel|cellMerge|smartTag|tblCellSpacing)\b/.test(rawXml)) {
+  if (/<w:(ins|del|rPrChange|pPrChange|tblPrChange|trPrChange|tcPrChange|sectPrChange|cellIns|cellDel|cellMerge|smartTag)\b/.test(rawXml)) {
     return true;
   }
 
@@ -2103,7 +2103,7 @@ function readOnOffParagraphProperty(node: XmlElementNode, name: string): boolean
   );
   if (!propNode) return undefined;
   const val = (propNode.attributes["w:val"] ?? propNode.attributes.val ?? "true").toLowerCase();
-  return val !== "false" && val !== "0" && val !== "off" ? true : undefined;
+  return val !== "false" && val !== "0" && val !== "off";
 }
 
 function readOptionalOnOffParagraphProperty(
@@ -2172,9 +2172,21 @@ function readParagraphShading(node: XmlElementNode): ParagraphShading | undefine
   const fill = shadingNode.attributes["w:fill"] ?? shadingNode.attributes.fill;
   const color = shadingNode.attributes["w:color"] ?? shadingNode.attributes.color;
   const val = shadingNode.attributes["w:val"] ?? shadingNode.attributes.val;
+  const themeFill = shadingNode.attributes["w:themeFill"] ?? shadingNode.attributes.themeFill;
+  const themeFillTint = shadingNode.attributes["w:themeFillTint"] ?? shadingNode.attributes.themeFillTint;
+  const themeFillShade = shadingNode.attributes["w:themeFillShade"] ?? shadingNode.attributes.themeFillShade;
+  const themeColor = shadingNode.attributes["w:themeColor"] ?? shadingNode.attributes.themeColor;
+  const themeColorTint = shadingNode.attributes["w:themeColorTint"] ?? shadingNode.attributes.themeColorTint;
+  const themeColorShade = shadingNode.attributes["w:themeColorShade"] ?? shadingNode.attributes.themeColorShade;
   if (fill) shading.fill = fill;
   if (color) shading.color = color;
   if (val) shading.val = val;
+  if (themeFill) shading.themeFill = themeFill;
+  if (themeFillTint) shading.themeFillTint = themeFillTint;
+  if (themeFillShade) shading.themeFillShade = themeFillShade;
+  if (themeColor) shading.themeColor = themeColor;
+  if (themeColorTint) shading.themeColorTint = themeColorTint;
+  if (themeColorShade) shading.themeColorShade = themeColorShade;
   return Object.keys(shading).length > 0 ? shading : undefined;
 }