@stll/folio-core 0.47.7 → 0.49.0

package/dist/docx/serializer/paragraphSerializer.js

@@ -5,10 +5,11 @@ import { fieldStateAttributes } from "../fieldState.js";
 import { getParagraphPropertySource, paragraphPropertySourceMatchesEmission } from "../paragraphPropertySource.js";
 import { DATE_UTC_ATTRIBUTE } from "../trackedChangeInfo.js";
 import { toTransitionalNamespaceUri } from "../transitionalSpelling.js";
-import { captureVerbatimXml, sanitizeCapturedXmlElement } from "../verbatimCapture.js";
+import { captureVerbatimXml, createCapturedXmlSanitizer } from "../verbatimCapture.js";
 import { NAMESPACES, OOXML_NAMESPACE_SCOPE, cloneElement, getChildElements, getLocalName, parseXml } from "../xmlParser.js";
+import { writeGroupTextBoxesBack } from "./groupTextBoxWriteBack.js";
 import { markupRangeAttributes, moveBookmarkAttributes, serializeBookmarkMarker } from "./markupRangeAttributes.js";
-import { serializeRun } from "./runSerializer.js";
+import { serializeRun, serializeShapeTextBody } from "./runSerializer.js";
 import { serializeSdtWrapper } from "./sdtPropertiesSerializer.js";
 import { serializeSectionProperties } from "./sectionPropertiesSerializer.js";
 import { serializeTextFormatting } from "./textFormattingSerializer.js";
@@ -162,37 +163,35 @@ const hasInvalidParagraphMarkProperties = (root) => {
 	}
 	return false;
 };
-const replayableParagraphPropertySourceXml = (sourceXml) => {
-	return sanitizeCapturedXmlElement(sourceXml, {
-		allowedLocalNames: PARAGRAPH_PROPERTY_ROOT_NAME,
-		allowedNamespaceUris: WORDPROCESSINGML_NAMESPACE,
-		inheritedNamespaceScope: OOXML_NAMESPACE_SCOPE,
-		requiredNamespaceBindings: PARAGRAPH_APPEND_PREFIXES,
-		validate: (root) => {
-			let paragraphMarkProperties = null;
-			const seenChildren = /* @__PURE__ */ new Set();
-			let previousChildOrder = -1;
-			for (const child of getChildElements(root)) {
-				const localName = getLocalName(child.name);
-				const isWordprocessingChild = toTransitionalNamespaceUri(child.namespaceUri ?? "") === NAMESPACES.w;
-				if (isWordprocessingChild) {
-					if (RESERVED_PARAGRAPH_PROPERTY_CHILDREN.has(localName)) return false;
-					const childOrder = PARAGRAPH_PROPERTY_CHILD_ORDER.get(localName);
-					if (childOrder === void 0 || seenChildren.has(localName) || childOrder < previousChildOrder) return false;
-					seenChildren.add(localName);
-					previousChildOrder = childOrder;
-				}
-				if (localName !== "rPr" || !isWordprocessingChild) {
-					if (hasDescendantNamed(child, NAMESPACES.w, "rPr")) return false;
-					continue;
-				}
-				if (paragraphMarkProperties !== null || toTransitionalNamespaceUri(resolveNamespaceBinding(child.namespaceScope, "w") ?? "") !== NAMESPACES.w) return false;
-				paragraphMarkProperties = child;
+const replayableParagraphPropertySourceXml = createCapturedXmlSanitizer({
+	allowedLocalNames: PARAGRAPH_PROPERTY_ROOT_NAME,
+	allowedNamespaceUris: WORDPROCESSINGML_NAMESPACE,
+	inheritedNamespaceScope: OOXML_NAMESPACE_SCOPE,
+	requiredNamespaceBindings: PARAGRAPH_APPEND_PREFIXES,
+	validate: (root) => {
+		let paragraphMarkProperties = null;
+		const seenChildren = /* @__PURE__ */ new Set();
+		let previousChildOrder = -1;
+		for (const child of getChildElements(root)) {
+			const localName = getLocalName(child.name);
+			const isWordprocessingChild = toTransitionalNamespaceUri(child.namespaceUri ?? "") === NAMESPACES.w;
+			if (isWordprocessingChild) {
+				if (RESERVED_PARAGRAPH_PROPERTY_CHILDREN.has(localName)) return false;
+				const childOrder = PARAGRAPH_PROPERTY_CHILD_ORDER.get(localName);
+				if (childOrder === void 0 || seenChildren.has(localName) || childOrder < previousChildOrder) return false;
+				seenChildren.add(localName);
+				previousChildOrder = childOrder;
 			}
-			return !(paragraphMarkProperties && hasInvalidParagraphMarkProperties(paragraphMarkProperties) || hasInvalidParagraphPropertyShape(root) || hasInvalidParagraphPropertyRevision(root));
+			if (localName !== "rPr" || !isWordprocessingChild) {
+				if (hasDescendantNamed(child, NAMESPACES.w, "rPr")) return false;
+				continue;
+			}
+			if (paragraphMarkProperties !== null || toTransitionalNamespaceUri(resolveNamespaceBinding(child.namespaceScope, "w") ?? "") !== NAMESPACES.w) return false;
+			paragraphMarkProperties = child;
 		}
-	});
-};
+		return !(paragraphMarkProperties && hasInvalidParagraphMarkProperties(paragraphMarkProperties) || hasInvalidParagraphPropertyShape(root) || hasInvalidParagraphPropertyRevision(root));
+	}
+});
 const verifiedParagraphPropertySource = (formatting, source) => {
 	if (!source) return null;
 	const replayableSource = replayableParagraphPropertySourceXml(source.xml);
@@ -323,7 +322,7 @@ function serializeSimpleField(field) {
 */
 function serializeComplexField(field) {
 	const parts = [];
-	const structuralFormatting = field.formatting ?? field.fieldResult[0]?.formatting;
+	const structuralFormatting = field.formatting ?? (field.fieldResultIsFallback ? void 0 : field.fieldResult[0]?.formatting);
 	const rPrXml = structuralFormatting ? serializeTextFormatting(structuralFormatting) : "";
 	const beginAttrs = ["w:fldCharType=\"begin\"", ...fieldStateAttributes(field)];
 	parts.push(`<w:r>${rPrXml}<w:fldChar ${beginAttrs.join(" ")}/></w:r>`);
@@ -333,7 +332,7 @@ function serializeComplexField(field) {
 		parts.push(`<w:r>${rPrXml}<w:instrText${spaceAttr}>${escapeXmlText(field.instruction)}</w:instrText></w:r>`);
 	}
 	parts.push(`<w:r>${rPrXml}<w:fldChar w:fldCharType="separate"/></w:r>`);
-	parts.push(...field.fieldResult.map((run) => serializeRun(run)));
+	if (!field.fieldResultIsFallback) parts.push(...field.fieldResult.map((run) => serializeRun(run)));
 	parts.push(`<w:r>${rPrXml}<w:fldChar w:fldCharType="end"/></w:r>`);
 	return parts.join("");
 }
@@ -458,9 +457,19 @@ function serializeTrackedChange(tag, change) {
 	flushPending();
 	return segments.join("");
 }
-const TAGGED_WRAPPER_PROPERTY_NAMES = {
-	smartTag: /* @__PURE__ */ new Set(["smartTagPr"]),
-	customXml: /* @__PURE__ */ new Set(["customXmlPr"])
+/** The properties element each tagged wrapper declares ahead of its content. */
+const TAGGED_WRAPPER_PROPERTIES = {
+	smartTag: "smartTagPr",
+	customXml: "customXmlPr"
+};
+const taggedWrapperPropertiesSanitizer = (propertiesName) => createCapturedXmlSanitizer({
+	allowedLocalNames: /* @__PURE__ */ new Set([propertiesName]),
+	allowedNamespaceUris: WORDPROCESSINGML_NAMESPACE,
+	inheritedNamespaceScope: OOXML_NAMESPACE_SCOPE
+});
+const TAGGED_WRAPPER_PROPERTIES_SANITIZERS = {
+	smartTag: taggedWrapperPropertiesSanitizer(TAGGED_WRAPPER_PROPERTIES.smartTag),
+	customXml: taggedWrapperPropertiesSanitizer(TAGGED_WRAPPER_PROPERTIES.customXml)
 };
 /**
 * Emit a `w:smartTag` or a run-level `w:customXml` around content already written.
@@ -477,11 +486,7 @@ const TAGGED_WRAPPER_PROPERTY_NAMES = {
 */
 function serializeTaggedWrapper(kind, wrapper, inner) {
 	const uri = wrapper.uri === void 0 ? "" : ` w:uri="${escapeXmlAttribute(wrapper.uri)}"`;
-	const properties = sanitizeCapturedXmlElement(wrapper.propertiesXml, {
-		allowedLocalNames: TAGGED_WRAPPER_PROPERTY_NAMES[kind],
-		allowedNamespaceUris: WORDPROCESSINGML_NAMESPACE,
-		inheritedNamespaceScope: OOXML_NAMESPACE_SCOPE
-	}) ?? "";
+	const properties = TAGGED_WRAPPER_PROPERTIES_SANITIZERS[kind](wrapper.propertiesXml) ?? "";
 	return `<w:${kind}${uri} w:element="${escapeXmlAttribute(wrapper.element)}">${properties}${inner}</w:${kind}>`;
 }
 /** Emit the `<w:commentReference>` run Word places after a comment range end. */
@@ -554,7 +559,7 @@ function serializeParagraph(paragraph) {
 		sectionProperties: paragraph.sectionProperties
 	}));
 	let pendingRenderedPageBreak = paragraph.renderedPageBreakBefore === true;
-	for (const content of paragraph.content) {
+	for (const content of writeGroupTextBoxesBack(paragraph, serializeShapeTextBody)) {
 		let contentXml = serializeParagraphContent(content);
 		if (contentXml) {
 			if (pendingRenderedPageBreak) {

package/dist/docx/serializer/runSerializer.d.ts

@@ -5,6 +5,10 @@ import { document_d_exports } from "../../types/document.js";
  * to keep IDs deterministic across saves.
  */
 declare function resetAutoIdCounter(): void;
+/** Serialize text body content for shapes/textboxes */
+declare function serializeShapeTextBody(blocks: Extract<document_d_exports.BlockContent, {
+  type: "paragraph" | "table";
+}>[]): string;
 /**
  * Serialize a run to OOXML XML (w:r)
  *
@@ -44,4 +48,4 @@ declare function createBreakRun(breakType?: "page" | "column" | "textWrapping",
  */
 declare function createTabRun(formatting?: document_d_exports.TextFormatting): document_d_exports.Run;
 //#endregion
-export { createBreakRun, createEmptyRun, createTabRun, createTextRun, getRunPlainText, hasRunFormatting, resetAutoIdCounter, serializeRun, serializeRuns };
+export { createBreakRun, createEmptyRun, createTabRun, createTextRun, getRunPlainText, hasRunFormatting, resetAutoIdCounter, serializeRun, serializeRuns, serializeShapeTextBody };

package/dist/docx/serializer/runSerializer.js

@@ -8,6 +8,7 @@ import { DECORATIVE_EXTENSION_URI, DECORATIVE_NAMESPACE } from "../imageParser.j
 import { canReplayEditableImageRawXml } from "../imageRawXml.js";
 import { serializeNonVisualDrawingNames } from "../nonVisualDrawingProps.js";
 import { runHoldsPayload } from "../runPayload.js";
+import { replayableShapeAlternateContent } from "../shapeAlternateContent.js";
 import { requiredWrapPolygon, serializeWrapPolygon } from "../wrapPolygon.js";
 import { serializeParagraph } from "./paragraphSerializer.js";
 import { serializeTable } from "./tableSerializer.js";
@@ -148,7 +149,7 @@ function serializeFill(fill) {
 	if (fill.type === "gradient" && fill.gradient) {
 		const g = fill.gradient;
 		return `<a:gradFill><a:gsLst>${g.stops.map((s) => `<a:gs pos="${s.position}">${serializeDrawingColor(s.color)}</a:gs>`).join("")}</a:gsLst>${(() => {
-			if (g.type === "linear") return `<a:lin ang="${(g.angle ?? 0) * 6e4}" scaled="1"/>`;
+			if (g.type === "linear") return `<a:lin ang="${(g.angle ?? 0) * 6e4}" scaled="${g.scaled === false ? 0 : 1}"/>`;
 			let path = "shape";
 			if (g.type === "radial") path = "circle";
 			else if (g.type === "rectangular") path = "rect";
@@ -544,7 +545,7 @@ function serializeRunContent(content) {
 		case "drawing":
 			if (content.rawXml && canReplayEditableImageRawXml(content)) return content.rawXml;
 			return serializeDrawingContent(content);
-		case "shape": return serializeShapeContent(content);
+		case "shape": return replayableShapeAlternateContent(content) ?? serializeShapeContent(content);
 		default: return "";
 	}
 }
@@ -633,4 +634,4 @@ function createTabRun(formatting) {
 	};
 }
 //#endregion
-export { createBreakRun, createEmptyRun, createTabRun, createTextRun, getRunPlainText, hasRunFormatting, resetAutoIdCounter, serializeRun, serializeRuns };
+export { createBreakRun, createEmptyRun, createTabRun, createTextRun, getRunPlainText, hasRunFormatting, resetAutoIdCounter, serializeRun, serializeRuns, serializeShapeTextBody };

package/dist/docx/serializer/settingsSerializer.js

@@ -2,11 +2,29 @@ import { serializePartElement } from "./partNamespaces.js";
 import { intAttr } from "./xmlUtils.js";
 import { escapeXmlAttribute, serializeOnOffElement } from "@stll/docx-core";
 //#region src/docx/serializer/settingsSerializer.ts
+/** `w:compatSetting/@w:uri` the named application compatibility settings share. */
+const COMPAT_SETTING_URI = "http://schemas.microsoft.com/office/word";
+/**
+* Named compatibility settings written on alongside `compatibilityMode` 15 and
+* later. Layout never gates run typography on a compatibility setting and
+* never flips `w:mirrorIndents`, so declaring both on describes how the
+* package is already laid out.
+*/
+const MODERN_COMPAT_SETTINGS = ["enableOpenTypeFeatures", "doNotFlipMirrorIndents"];
+const FIRST_MODERN_COMPATIBILITY_MODE = 15;
+const compatSettingXml = (name, val) => `<w:compatSetting w:name="${name}" w:uri="${COMPAT_SETTING_URI}" w:val="${intAttr(val)}"/>`;
+const serializeCompat = (compatibilityMode) => {
+	if (compatibilityMode === void 0) return "";
+	const settings = [compatSettingXml("compatibilityMode", compatibilityMode)];
+	if (compatibilityMode >= FIRST_MODERN_COMPATIBILITY_MODE) for (const name of MODERN_COMPAT_SETTINGS) settings.push(compatSettingXml(name, 1));
+	return `<w:compat>${settings.join("")}</w:compat>`;
+};
 const serializeSettingsXml = (settings) => {
 	const parts = [
 		`<w:defaultTabStop w:val="${intAttr(settings.defaultTabStop)}"/>`,
 		serializeOnOffElement(settings.evenAndOddHeaders, "evenAndOddHeaders"),
-		serializeOnOffElement(settings.updateFields, "updateFields")
+		serializeOnOffElement(settings.updateFields, "updateFields"),
+		serializeCompat(settings.compatibilityMode)
 	];
 	if (settings.themeFontLang) {
 		const attrs = [];

package/dist/docx/settingsParser.js

@@ -1,3 +1,4 @@
+import { parseEndnoteProperties } from "./notePropertiesParser.js";
 import { WORDPROCESSINGML_NAMESPACE_URIS, findChild, findChildByNamespaceUri, findChildren, getAttribute, parseBooleanElement, parseXmlDocument } from "./xmlParser.js";
 //#region src/docx/settingsParser.ts
 /** OOXML default per §17.6.13 when `w:defaultTabStop` is absent. */
@@ -61,6 +62,8 @@ function parseSettings(xml) {
 	const wordprocessingCompat = root ? findChildByNamespaceUri(root, WORDPROCESSINGML_NAMESPACE_URIS, "compat") : null;
 	const adjustLineHeightInTable = wordprocessingCompat ? findChildByNamespaceUri(wordprocessingCompat, WORDPROCESSINGML_NAMESPACE_URIS, "adjustLineHeightInTable") : null;
 	if (adjustLineHeightInTable && parseBooleanElement(adjustLineHeightInTable)) settings.adjustLineHeightInTable = true;
+	const doNotUseIndentAsNumberingTabStop = wordprocessingCompat ? findChildByNamespaceUri(wordprocessingCompat, WORDPROCESSINGML_NAMESPACE_URIS, "doNotUseIndentAsNumberingTabStop") : null;
+	if (doNotUseIndentAsNumberingTabStop && parseBooleanElement(doNotUseIndentAsNumberingTabStop)) settings.doNotUseIndentAsNumberingTabStop = true;
 	const applyBreakingRules = compat ? findChild(compat, "w", "applyBreakingRules") : null;
 	const useLegacyEthiopicAmharicRules = applyBreakingRules !== null && parseBooleanElement(applyBreakingRules);
 	if (noLineBreaksBefore || noLineBreaksAfter || useLegacyEthiopicAmharicRules) settings.lineBreakRules = {
@@ -68,6 +71,11 @@ function parseSettings(xml) {
 		...noLineBreaksAfter ? { noLineBreaksAfter } : {},
 		...useLegacyEthiopicAmharicRules ? { useLegacyEthiopicAmharicRules: true } : {}
 	};
+	const endnotePr = root ? findChild(root, "w", "endnotePr") : null;
+	if (endnotePr) {
+		const endnoteProperties = parseEndnoteProperties(endnotePr);
+		if (Object.keys(endnoteProperties).length > 0) settings.endnotePr = endnoteProperties;
+	}
 	return settings;
 }
 function parseCompatibilityMode(compat) {

package/dist/docx/shapeAlternateContent.d.ts

@@ -0,0 +1,25 @@
+import { Shape, ShapeAlternateContent, ShapeContent } from "../types/content.js";
+import { XmlElement } from "./xmlParser.js";
+//#region src/docx/shapeAlternateContent.d.ts
+/**
+ * Capture the `mc:AlternateContent` a shape was read from, when the shape's
+ * drawing is the sole child of the branch it came from.
+ */
+declare const captureShapeAlternateContent: ({ shape, alternateContent, branch, drawing }: {
+  shape: Shape;
+  alternateContent: XmlElement;
+  branch: XmlElement;
+  drawing: XmlElement;
+}) => ShapeAlternateContent | undefined;
+/** Re-fingerprint a capture for a shape rebuilt from an unedited projection. */
+declare const refingerprintShapeAlternateContent: (shape: Shape, verbatimXml: string) => ShapeAlternateContent;
+/**
+ * The captured `mc:AlternateContent` to write in place of the shape's drawing,
+ * or undefined when the shape must be regenerated.
+ *
+ * Replay requires the modeled shape to still match the capture. An edited shape
+ * is regenerated as a bare `w:drawing` without the stale Fallback.
+ */
+declare const replayableShapeAlternateContent: (content: ShapeContent) => string | undefined;
+//#endregion
+export { captureShapeAlternateContent, refingerprintShapeAlternateContent, replayableShapeAlternateContent };

package/dist/docx/shapeAlternateContent.js

@@ -0,0 +1,52 @@
+import { canonicalJson } from "../utils/canonicalJson.js";
+import { captureVerbatimXml } from "./verbatimCapture.js";
+import { getChildElements, getLocalName } from "./xmlParser.js";
+//#region src/docx/shapeAlternateContent.ts
+/**
+* Every modeled field, text body included: the Fallback repeats the shape's
+* geometry and its text, so an edit to either makes the captured element stale.
+*/
+const shapeFingerprint = (shape) => canonicalJson(shape);
+/**
+* Whether `element` is the only child element of its `mc:Choice` or
+* `mc:Fallback` branch.
+*
+* A branch holding more than the one drawing cannot be written back by the
+* drawing's shape alone: the siblings are parsed into their own run content,
+* and replaying the whole element would write them twice.
+*/
+const isSoleBranchChild = (branch, element) => {
+	const children = getChildElements(branch);
+	return children.length === 1 && children[0] === element;
+};
+/**
+* Capture the `mc:AlternateContent` a shape was read from, when the shape's
+* drawing is the sole child of the branch it came from.
+*/
+const captureShapeAlternateContent = ({ shape, alternateContent, branch, drawing }) => {
+	if (getLocalName(alternateContent.name ?? "") !== "AlternateContent") return;
+	if (!isSoleBranchChild(branch, drawing)) return;
+	return {
+		verbatimXml: captureVerbatimXml(alternateContent),
+		verbatimFingerprint: shapeFingerprint(shape)
+	};
+};
+/** Re-fingerprint a capture for a shape rebuilt from an unedited projection. */
+const refingerprintShapeAlternateContent = (shape, verbatimXml) => ({
+	verbatimXml,
+	verbatimFingerprint: shapeFingerprint(shape)
+});
+/**
+* The captured `mc:AlternateContent` to write in place of the shape's drawing,
+* or undefined when the shape must be regenerated.
+*
+* Replay requires the modeled shape to still match the capture. An edited shape
+* is regenerated as a bare `w:drawing` without the stale Fallback.
+*/
+const replayableShapeAlternateContent = (content) => {
+	const captured = content.alternateContent;
+	if (captured === void 0) return;
+	return captured.verbatimFingerprint === shapeFingerprint(content.shape) ? captured.verbatimXml : void 0;
+};
+//#endregion
+export { captureShapeAlternateContent, refingerprintShapeAlternateContent, replayableShapeAlternateContent };

package/dist/docx/streamingXmlParser.d.ts

@@ -1,4 +1,4 @@
-import { XmlElement } from "./xmlParser.js";
+import { XmlElement, XmlNamespaceScope } from "./xmlParser.js";
 //#region src/docx/streamingXmlParser.d.ts
 type ParseXmlResult = {
   status: "parsed";
@@ -16,7 +16,11 @@ type AttributeValueSpan = {
   end: number;
 };
 type OpenTagVisitor = (element: XmlElement, attributeValueSpans: ReadonlyMap<string, AttributeValueSpan>) => ReadonlyMap<string, string> | null;
-declare const parseStreamingXml: (xml: string) => ParseXmlResult;
+/**
+ * @param inheritedNamespaceScope the bindings in scope around `xml`, for a
+ *   fragment captured out of a part whose root declared them.
+ */
+declare const parseStreamingXml: (xml: string, inheritedNamespaceScope?: XmlNamespaceScope) => ParseXmlResult;
 /** Rewrite selected decimal attribute values while preserving every other source byte. */
 declare const rewriteStreamingXmlDecimalAttributes: (xml: string, visitOpenTag: OpenTagVisitor) => {
   status: "rewritten";

package/dist/docx/streamingXmlParser.js

@@ -1,4 +1,4 @@
-import { attachXmlNamespaceContext } from "./xmlParser.js";
+import { EMPTY_NAMESPACE_SCOPE, attachXmlNamespaceContext } from "./xmlNamespaceContext.js";
 import { FOLIO_XML_RESOURCE_LIMITS } from "./xmlResourceLimits.js";
 //#region src/docx/streamingXmlParser.ts
 const BUILT_IN_ENTITIES = {
@@ -8,7 +8,7 @@ const BUILT_IN_ENTITIES = {
 	lt: "<",
 	quot: "\""
 };
-const parseStreamingXmlInternal = (xml, visitOpenTag) => {
+const parseStreamingXmlInternal = (xml, visitOpenTag, inheritedNamespaceScope = EMPTY_NAMESPACE_SCOPE) => {
 	const root = { elements: [] };
 	const stack = [];
 	const replacements = [];
@@ -39,6 +39,7 @@ const parseStreamingXmlInternal = (xml, visitOpenTag) => {
 			const close = xml.indexOf("?>", open + 2);
 			if (close === -1) return { status: "unsupported" };
 			cursor = close + 2;
+			mergeAdjacentText = false;
 			continue;
 		}
 		if (xml.startsWith("<!", open)) return { status: "unsupported" };
@@ -54,8 +55,8 @@ const parseStreamingXmlInternal = (xml, visitOpenTag) => {
 		}
 		const parsedTag = parseOpenTag(xml, open + 1, close, visitOpenTag !== void 0);
 		if (parsedTag.status === "unsupported") return parsedTag;
-		const parent = stack.at(-1)?.element ?? root;
-		attachXmlNamespaceContext(parsedTag.element, parent.namespaceScope);
+		const parent = stack.at(-1)?.element;
+		attachXmlNamespaceContext(parsedTag.element, parent === void 0 ? inheritedNamespaceScope : parent.namespaceScope);
 		const rewritten = visitOpenTag?.(parsedTag.element, parsedTag.attributeValueSpans ?? /* @__PURE__ */ new Map());
 		if (rewritten) for (const [attributeName, value] of rewritten) {
 			const span = parsedTag.attributeValueSpans?.get(attributeName);
@@ -65,7 +66,7 @@ const parseStreamingXmlInternal = (xml, visitOpenTag) => {
 				value
 			});
 		}
-		appendElement(parent, parsedTag.element);
+		appendElement(parent ?? root, parsedTag.element);
 		if (!parsedTag.selfClosing) {
 			if (stack.length >= FOLIO_XML_RESOURCE_LIMITS.maxDepth) return { status: "unsupported" };
 			stack.push({
@@ -83,8 +84,12 @@ const parseStreamingXmlInternal = (xml, visitOpenTag) => {
 		replacements
 	};
 };
-const parseStreamingXml = (xml) => {
-	const parsed = parseStreamingXmlInternal(xml);
+/**
+* @param inheritedNamespaceScope the bindings in scope around `xml`, for a
+*   fragment captured out of a part whose root declared them.
+*/
+const parseStreamingXml = (xml, inheritedNamespaceScope = EMPTY_NAMESPACE_SCOPE) => {
+	const parsed = parseStreamingXmlInternal(xml, void 0, inheritedNamespaceScope);
 	return parsed.status === "parsed" ? {
 		status: "parsed",
 		value: parsed.value

package/dist/docx/styleParser.js

@@ -407,22 +407,48 @@ function resolveStyleInheritance(style, styleMap, visited = /* @__PURE__ */ new
 	const mergedRPr = mergeStyleTextFormatting(resolvedParent.rPr, style.rPr);
 	if (mergedRPr) resolved.rPr = mergedRPr;
 	if (style.type === "table") {
-		if (resolvedParent.tblPr || style.tblPr) resolved.tblPr = {
-			...resolvedParent.tblPr,
-			...style.tblPr
-		};
+		if (resolvedParent.tblPr || style.tblPr) {
+			const tblPr = {
+				...resolvedParent.tblPr,
+				...style.tblPr
+			};
+			const borders = mergeSides(resolvedParent.tblPr?.borders, style.tblPr?.borders);
+			if (borders) tblPr.borders = borders;
+			const cellMargins = mergeSides(resolvedParent.tblPr?.cellMargins, style.tblPr?.cellMargins);
+			if (cellMargins) tblPr.cellMargins = cellMargins;
+			resolved.tblPr = tblPr;
+		}
 		if (resolvedParent.trPr || style.trPr) resolved.trPr = {
 			...resolvedParent.trPr,
 			...style.trPr
 		};
-		if (resolvedParent.tcPr || style.tcPr) resolved.tcPr = {
-			...resolvedParent.tcPr,
-			...style.tcPr
-		};
+		if (resolvedParent.tcPr || style.tcPr) {
+			const tcPr = {
+				...resolvedParent.tcPr,
+				...style.tcPr
+			};
+			const borders = mergeSides(resolvedParent.tcPr?.borders, style.tcPr?.borders);
+			if (borders) tcPr.borders = borders;
+			const margins = mergeSides(resolvedParent.tcPr?.margins, style.tcPr?.margins);
+			if (margins) tcPr.margins = margins;
+			resolved.tcPr = tcPr;
+		}
 	}
 	return resolved;
 }
 /**
+* Each child of `w:tblBorders`, `w:tcBorders`, `w:tblCellMar` and `w:tcMar` is
+* its own property, so a style that states one side inherits the others from
+* its `w:basedOn` parent (ECMA-376 §17.7.4.3).
+*/
+function mergeSides(parent, child) {
+	if (!parent || !child) return child ?? parent;
+	return {
+		...parent,
+		...child
+	};
+}
+/**
 * Parse styles.xml content
 *
 * @param stylesXml - XML content of styles.xml

package/dist/docx/tableParser.d.ts

@@ -1,6 +1,7 @@
 import { document_d_exports } from "../types/document.js";
 import { NumberingMap } from "./numberingParser.js";
 import { XmlElement } from "./xmlParser.js";
+import { PreviewLedger } from "./previewBudget.js";
 import { StyleMap } from "./styleParser.js";
 //#region src/docx/tableParser.d.ts
 /**
@@ -89,7 +90,7 @@ declare function parseConditionalFormatStyle(cnfElement: XmlElement | null): doc
  */
 declare function parseTableCellProperties(tcPrElement: XmlElement | null): document_d_exports.TableCellFormatting | undefined;
 /**
- * Parse a table cell (w:tc)
+ * Parse table cell content, including nested block controls.
  *
  * @param tcElement - The w:tc element
  * @param styles - Style definitions
@@ -97,12 +98,26 @@ declare function parseTableCellProperties(tcPrElement: XmlElement | null): docum
  * @param numbering - Numbering definitions for lists
  * @param rels - Relationships for hyperlinks
  * @param media - Media files for images
- * @returns Parsed table cell
+ * @returns Array of content blocks
  */
-declare function parseTableCell(tcElement: XmlElement, styles: StyleMap | null, theme: document_d_exports.Theme | null, numbering: NumberingMap | null, rels: document_d_exports.RelationshipMap | null, media: Map<string, document_d_exports.MediaFile> | null, options?: {
+type TableParseOptions = {
   inHeaderFooter?: boolean;
   rootXmlns?: Record<string, string>;
-}): document_d_exports.TableCell;
+  /** The ledger of the package this table belongs to; a table read on its own has none. */
+  previews?: PreviewLedger;
+};
+/**
+ * Parse a table cell (w:tc)
+ *
+ * @param tcElement - The w:tc element
+ * @param styles - Style definitions
+ * @param theme - Theme for color/font resolution
+ * @param numbering - Numbering definitions for lists
+ * @param rels - Relationships for hyperlinks
+ * @param media - Media files for images
+ * @returns Parsed table cell
+ */
+declare function parseTableCell(tcElement: XmlElement, styles: StyleMap | null, theme: document_d_exports.Theme | null, numbering: NumberingMap | null, rels: document_d_exports.RelationshipMap | null, media: Map<string, document_d_exports.MediaFile> | null, options?: TableParseOptions): document_d_exports.TableCell;
 /**
  * Parse a table row (w:tr)
  *
@@ -114,10 +129,7 @@ declare function parseTableCell(tcElement: XmlElement, styles: StyleMap | null,
  * @param media - Media files for images
  * @returns Parsed table row
  */
-declare function parseTableRow(trElement: XmlElement, styles: StyleMap | null, theme: document_d_exports.Theme | null, numbering: NumberingMap | null, rels: document_d_exports.RelationshipMap | null, media: Map<string, document_d_exports.MediaFile> | null, options?: {
-  inHeaderFooter?: boolean;
-  rootXmlns?: Record<string, string>;
-}): document_d_exports.TableRow;
+declare function parseTableRow(trElement: XmlElement, styles: StyleMap | null, theme: document_d_exports.Theme | null, numbering: NumberingMap | null, rels: document_d_exports.RelationshipMap | null, media: Map<string, document_d_exports.MediaFile> | null, options?: TableParseOptions): document_d_exports.TableRow;
 /**
  * Parse table grid (w:tblGrid) for column widths
  *
@@ -136,10 +148,7 @@ declare function parseTableGrid(tblGridElement: XmlElement | null): number[] | u
  * @param media - Media files for images
  * @returns Parsed table
  */
-declare function parseTable(tblElement: XmlElement, styles: StyleMap | null, theme: document_d_exports.Theme | null, numbering: NumberingMap | null, rels: document_d_exports.RelationshipMap | null, media: Map<string, document_d_exports.MediaFile> | null, options?: {
-  inHeaderFooter?: boolean;
-  rootXmlns?: Record<string, string>;
-}): document_d_exports.Table | undefined;
+declare function parseTable(tblElement: XmlElement, styles: StyleMap | null, theme: document_d_exports.Theme | null, numbering: NumberingMap | null, rels: document_d_exports.RelationshipMap | null, media: Map<string, document_d_exports.MediaFile> | null, options?: TableParseOptions): document_d_exports.Table | undefined;
 /**
  * Get the number of columns in a table
  *