@stll/folio-core 0.47.7 → 0.48.0

package/dist/docx/tableParser.js

@@ -1,10 +1,11 @@
 import { NO_MODELLED_ATTRIBUTES, attributeRemainder } from "./attributeRemainder.js";
 import { parseBookmarkEnd, parseBookmarkStart } from "./bookmarkParser.js";
 import { parseBorderSpec } from "./borderParser.js";
-import { CAPTURE, dispatchChildren, keptUnless, ownedElsewhere, sequencePositions, withPreservedChildren } from "./containerChildren.js";
+import { CAPTURE, dispatchChildrenWithContext, keptUnless, ownedElsewhere, sequencePositions, withPreservedChildren } from "./containerChildren.js";
 import { parseParagraph } from "./paragraphParser.js";
 import { enrichParagraphTextBoxes } from "./paragraphTextBoxEnrichment.js";
 import { FloatingTableXSpecSchema, FloatingTableYSpecSchema, TableAlignmentSchema, TextDirectionSchema, narrowEnum } from "./parserEnums.js";
+import { standalonePreviewLedger } from "./previewBudget.js";
 import { captureSdtSiblingMarkers, parseSdtProperties } from "./sdtProperties.js";
 import { parseShading } from "./shadingParser.js";
 import { findChildAnySpelling } from "./strictNames.js";
@@ -216,38 +217,38 @@ const withSourceXml = (formatting, element) => ({
 * handler maps over the same names would be two answers to the same question,
 * and the one folio would notice is the day they stop agreeing.
 */
-const sharedTablePropertyHandlers = (formatting) => ({
-	tblW: (child) => {
+const SHARED_TABLE_PROPERTY_HANDLERS = {
+	tblW: (child, formatting) => {
 		const width = parseWidth(child);
 		if (width) formatting.width = width;
 		return keptUnless(width !== void 0);
 	},
-	jc: (child) => {
+	jc: (child, formatting) => {
 		const justification = narrowEnum(getAttribute(child, "w", "val"), TableAlignmentSchema);
 		if (justification !== void 0) formatting.justification = justification;
 		return keptUnless(justification !== void 0);
 	},
-	tblCellSpacing: (child) => {
+	tblCellSpacing: (child, formatting) => {
 		const cellSpacing = parseWidth(child);
 		if (cellSpacing) formatting.cellSpacing = cellSpacing;
 		return keptUnless(cellSpacing !== void 0);
 	},
-	tblInd: (child) => {
+	tblInd: (child, formatting) => {
 		const indent = parseWidth(child);
 		if (indent) formatting.indent = indent;
 		return keptUnless(indent !== void 0);
 	},
-	tblBorders: (child) => {
+	tblBorders: (child, formatting) => {
 		const borders = parseTableBorders(child);
 		if (borders) formatting.borders = borders;
 		return keptUnless(borders !== void 0);
 	},
-	shd: (child) => {
+	shd: (child, formatting) => {
 		const shading = parseShading(child);
 		if (shading) formatting.shading = shading;
 		return keptUnless(shading !== void 0);
 	},
-	tblLayout: (child) => {
+	tblLayout: (child, formatting) => {
 		const layout = getAttribute(child, "w", "type");
 		if (layout === "fixed" || layout === "autofit") {
 			formatting.layout = layout;
@@ -255,17 +256,17 @@ const sharedTablePropertyHandlers = (formatting) => ({
 		}
 		return CAPTURE;
 	},
-	tblCellMar: (child) => {
+	tblCellMar: (child, formatting) => {
 		const cellMargins = parseCellMargins(child);
 		if (cellMargins) formatting.cellMargins = cellMargins;
 		return keptUnless(cellMargins !== void 0);
 	},
-	tblLook: (child) => {
+	tblLook: (child, formatting) => {
 		const look = parseTableLook(child);
 		if (look) formatting.look = look;
 		return keptUnless(look !== void 0);
 	}
-});
+};
 /**
 * The children the table walks skip, and the reader that takes each instead.
 *
@@ -358,58 +359,60 @@ const TABLE_CHILD_OWNERS = {
 		reader: "tableParser#parseTableGrid"
 	})
 };
+const TABLE_PROPERTY_HANDLERS = {
+	...SHARED_TABLE_PROPERTY_HANDLERS,
+	tblStyle: (child, formatting) => {
+		const styleId = getAttribute(child, "w", "val");
+		if (styleId) formatting.styleId = styleId;
+		return keptUnless(Boolean(styleId));
+	},
+	tblpPr: (child, formatting) => {
+		const floating = parseFloatingTableProperties(child);
+		if (floating) formatting.floating = floating;
+		return keptUnless(floating !== void 0);
+	},
+	tblOverlap: (child, formatting) => {
+		const overlap = getAttribute(child, "w", "val");
+		if (overlap === "never" || overlap === "overlap") {
+			formatting.overlap = overlap;
+			return;
+		}
+		return CAPTURE;
+	},
+	bidiVisual: (child, formatting) => {
+		formatting.bidi = parseBooleanElement(child);
+	},
+	tblStyleRowBandSize: (child, formatting) => {
+		const size = parseNumericAttribute(child, "w", "val");
+		if (size !== void 0) formatting.rowBandSize = size;
+		return keptUnless(size !== void 0);
+	},
+	tblStyleColBandSize: (child, formatting) => {
+		const size = parseNumericAttribute(child, "w", "val");
+		if (size !== void 0) formatting.columnBandSize = size;
+		return keptUnless(size !== void 0);
+	},
+	tblCaption: (child, formatting) => {
+		const caption = getAttribute(child, "w", "val");
+		if (caption !== null) formatting.caption = caption;
+		return keptUnless(caption !== null);
+	},
+	tblDescription: (child, formatting) => {
+		const description = getAttribute(child, "w", "val");
+		if (description !== null) formatting.description = description;
+		return keptUnless(description !== null);
+	},
+	tblPrChange: TABLE_PROPERTY_CHANGE_OWNER
+};
 function parseTableProperties(tblPrElement) {
 	if (!tblPrElement) return;
 	const formatting = {};
-	const preserved = dispatchChildren({
+	const preserved = dispatchChildrenWithContext({
 		element: tblPrElement,
 		container: "table-properties",
-		handlers: {
-			...sharedTablePropertyHandlers(formatting),
-			tblStyle: (child) => {
-				const styleId = getAttribute(child, "w", "val");
-				if (styleId) formatting.styleId = styleId;
-				return keptUnless(Boolean(styleId));
-			},
-			tblpPr: (child) => {
-				const floating = parseFloatingTableProperties(child);
-				if (floating) formatting.floating = floating;
-				return keptUnless(floating !== void 0);
-			},
-			tblOverlap: (child) => {
-				const overlap = getAttribute(child, "w", "val");
-				if (overlap === "never" || overlap === "overlap") {
-					formatting.overlap = overlap;
-					return;
-				}
-				return CAPTURE;
-			},
-			bidiVisual: (child) => {
-				formatting.bidi = parseBooleanElement(child);
-			},
-			tblStyleRowBandSize: (child) => {
-				const size = parseNumericAttribute(child, "w", "val");
-				if (size !== void 0) formatting.rowBandSize = size;
-				return keptUnless(size !== void 0);
-			},
-			tblStyleColBandSize: (child) => {
-				const size = parseNumericAttribute(child, "w", "val");
-				if (size !== void 0) formatting.columnBandSize = size;
-				return keptUnless(size !== void 0);
-			},
-			tblCaption: (child) => {
-				const caption = getAttribute(child, "w", "val");
-				if (caption !== null) formatting.caption = caption;
-				return keptUnless(caption !== null);
-			},
-			tblDescription: (child) => {
-				const description = getAttribute(child, "w", "val");
-				if (description !== null) formatting.description = description;
-				return keptUnless(description !== null);
-			},
-			tblPrChange: TABLE_PROPERTY_CHANGE_OWNER
-		},
-		capturePosition: sequencePositions("table-properties", tblPrElement)
+		handlers: TABLE_PROPERTY_HANDLERS,
+		capturePosition: sequencePositions("table-properties", tblPrElement),
+		context: formatting
 	});
 	if (preserved) formatting.preserved = preserved;
 	if (Object.keys(formatting).length === 0) return;
@@ -440,6 +443,10 @@ function parseTablePropertyChanges(tblPrElement, currentFormatting) {
 	});
 	return changes.length > 0 ? changes : void 0;
 }
+const TABLE_PROPERTY_EXCEPTION_HANDLERS = {
+	...SHARED_TABLE_PROPERTY_HANDLERS,
+	tblPrExChange: TABLE_PROPERTY_EXCEPTION_CHANGE_OWNER
+};
 /**
 * Parse a row's table property exceptions (`w:tblPrEx`).
 *
@@ -451,14 +458,12 @@ function parseTablePropertyChanges(tblPrElement, currentFormatting) {
 function parseTablePropertyExceptions(tblPrExElement) {
 	if (!tblPrExElement) return;
 	const formatting = {};
-	const preserved = dispatchChildren({
+	const preserved = dispatchChildrenWithContext({
 		element: tblPrExElement,
 		container: "table-property-exceptions",
-		handlers: {
-			...sharedTablePropertyHandlers(formatting),
-			tblPrExChange: TABLE_PROPERTY_EXCEPTION_CHANGE_OWNER
-		},
-		capturePosition: sequencePositions("table-property-exceptions", tblPrExElement)
+		handlers: TABLE_PROPERTY_EXCEPTION_HANDLERS,
+		capturePosition: sequencePositions("table-property-exceptions", tblPrExElement),
+		context: formatting
 	});
 	if (preserved) formatting.preserved = preserved;
 	return withSourceXml(formatting, tblPrExElement);
@@ -551,6 +556,62 @@ function parseTableCellVerticalMergeRevisionValue(value) {
 	if (value === "cont") return "continue";
 	if (value === "rest") return "rest";
 }
+const ROW_PROPERTY_HANDLERS = {
+	cnfStyle: (child, formatting) => {
+		const conditionalFormat = parseConditionalFormatStyle(child);
+		if (conditionalFormat) formatting.conditionalFormat = conditionalFormat;
+		return keptUnless(conditionalFormat !== void 0);
+	},
+	divId: CAPTURE,
+	gridBefore: (child, formatting) => {
+		const gridBefore = parseNumericAttribute(child, "w", "val");
+		if (gridBefore !== void 0 && gridBefore > 0) formatting.gridBefore = gridBefore;
+		return keptUnless(gridBefore !== void 0 && gridBefore > 0);
+	},
+	gridAfter: (child, formatting) => {
+		const gridAfter = parseNumericAttribute(child, "w", "val");
+		if (gridAfter !== void 0 && gridAfter > 0) formatting.gridAfter = gridAfter;
+		return keptUnless(gridAfter !== void 0 && gridAfter > 0);
+	},
+	wBefore: (child, formatting) => {
+		const widthBefore = parseTableMeasurement(child);
+		if (widthBefore) formatting.widthBefore = widthBefore;
+		return keptUnless(widthBefore !== void 0);
+	},
+	wAfter: (child, formatting) => {
+		const widthAfter = parseTableMeasurement(child);
+		if (widthAfter) formatting.widthAfter = widthAfter;
+		return keptUnless(widthAfter !== void 0);
+	},
+	cantSplit: (child, formatting) => {
+		formatting.cantSplit = parseBooleanElement(child);
+	},
+	trHeight: (child, formatting) => {
+		const heightVal = parseNumericAttribute(child, "w", "val");
+		if (heightVal === void 0 || heightVal <= 0) return CAPTURE;
+		formatting.height = {
+			value: heightVal,
+			type: "dxa"
+		};
+		const hRule = getAttribute(child, "w", "hRule");
+		if (hRule === "auto" || hRule === "atLeast" || hRule === "exact") formatting.heightRule = hRule;
+	},
+	tblHeader: (child, formatting) => {
+		formatting.header = parseBooleanElement(child);
+	},
+	tblCellSpacing: CAPTURE,
+	jc: (child, formatting) => {
+		const justification = narrowEnum(getAttribute(child, "w", "val"), TableAlignmentSchema);
+		if (justification !== void 0) formatting.justification = justification;
+		return keptUnless(justification !== void 0);
+	},
+	hidden: (child, formatting) => {
+		formatting.hidden = parseBooleanElement(child);
+	},
+	ins: ROW_INSERTION_OWNER,
+	del: ROW_DELETION_OWNER,
+	trPrChange: ROW_PROPERTY_CHANGE_OWNER
+};
 /**
 * Parse table row properties (w:trPr)
 *
@@ -560,66 +621,12 @@ function parseTableCellVerticalMergeRevisionValue(value) {
 function parseTableRowProperties(trPrElement) {
 	if (!trPrElement) return;
 	const formatting = {};
-	const preserved = dispatchChildren({
+	const preserved = dispatchChildrenWithContext({
 		element: trPrElement,
 		container: "row-properties",
-		handlers: {
-			cnfStyle: (child) => {
-				const conditionalFormat = parseConditionalFormatStyle(child);
-				if (conditionalFormat) formatting.conditionalFormat = conditionalFormat;
-				return keptUnless(conditionalFormat !== void 0);
-			},
-			divId: CAPTURE,
-			gridBefore: (child) => {
-				const gridBefore = parseNumericAttribute(child, "w", "val");
-				if (gridBefore !== void 0 && gridBefore > 0) formatting.gridBefore = gridBefore;
-				return keptUnless(gridBefore !== void 0 && gridBefore > 0);
-			},
-			gridAfter: (child) => {
-				const gridAfter = parseNumericAttribute(child, "w", "val");
-				if (gridAfter !== void 0 && gridAfter > 0) formatting.gridAfter = gridAfter;
-				return keptUnless(gridAfter !== void 0 && gridAfter > 0);
-			},
-			wBefore: (child) => {
-				const widthBefore = parseTableMeasurement(child);
-				if (widthBefore) formatting.widthBefore = widthBefore;
-				return keptUnless(widthBefore !== void 0);
-			},
-			wAfter: (child) => {
-				const widthAfter = parseTableMeasurement(child);
-				if (widthAfter) formatting.widthAfter = widthAfter;
-				return keptUnless(widthAfter !== void 0);
-			},
-			cantSplit: (child) => {
-				formatting.cantSplit = parseBooleanElement(child);
-			},
-			trHeight: (child) => {
-				const heightVal = parseNumericAttribute(child, "w", "val");
-				if (heightVal === void 0 || heightVal <= 0) return CAPTURE;
-				formatting.height = {
-					value: heightVal,
-					type: "dxa"
-				};
-				const hRule = getAttribute(child, "w", "hRule");
-				if (hRule === "auto" || hRule === "atLeast" || hRule === "exact") formatting.heightRule = hRule;
-			},
-			tblHeader: (child) => {
-				formatting.header = parseBooleanElement(child);
-			},
-			tblCellSpacing: CAPTURE,
-			jc: (child) => {
-				const justification = narrowEnum(getAttribute(child, "w", "val"), TableAlignmentSchema);
-				if (justification !== void 0) formatting.justification = justification;
-				return keptUnless(justification !== void 0);
-			},
-			hidden: (child) => {
-				formatting.hidden = parseBooleanElement(child);
-			},
-			ins: ROW_INSERTION_OWNER,
-			del: ROW_DELETION_OWNER,
-			trPrChange: ROW_PROPERTY_CHANGE_OWNER
-		},
-		capturePosition: sequencePositions("row-properties", trPrElement)
+		handlers: ROW_PROPERTY_HANDLERS,
+		capturePosition: sequencePositions("row-properties", trPrElement),
+		context: formatting
 	});
 	if (preserved) formatting.preserved = preserved;
 	return withSourceXml(formatting, trPrElement);
@@ -663,6 +670,72 @@ function parseConditionalFormatStyle(cnfElement) {
 	if (Object.keys(style).length === 0) return;
 	return style;
 }
+const CELL_PROPERTY_HANDLERS = {
+	cnfStyle: (child, formatting) => {
+		const conditionalFormat = parseConditionalFormatStyle(child);
+		if (conditionalFormat) formatting.conditionalFormat = conditionalFormat;
+		return keptUnless(conditionalFormat !== void 0);
+	},
+	tcW: (child, formatting) => {
+		const width = parseWidth(child);
+		if (width) formatting.width = width;
+		return keptUnless(width !== void 0);
+	},
+	gridSpan: (child, formatting) => {
+		const gridSpan = parseNumericAttribute(child, "w", "val");
+		if (gridSpan !== void 0 && gridSpan > 1) {
+			formatting.gridSpan = Math.min(gridSpan, 63);
+			return;
+		}
+		return CAPTURE;
+	},
+	hMerge: CAPTURE,
+	vMerge: (child, formatting) => {
+		formatting.vMerge = getAttribute(child, "w", "val") === "restart" ? "restart" : "continue";
+	},
+	tcBorders: (child, formatting) => {
+		const borders = parseTableCellBorders(child);
+		if (borders) formatting.borders = borders;
+		return keptUnless(borders !== void 0);
+	},
+	shd: (child, formatting) => {
+		const shading = parseShading(child);
+		if (shading) formatting.shading = shading;
+		return keptUnless(shading !== void 0);
+	},
+	noWrap: (child, formatting) => {
+		formatting.noWrap = parseBooleanElement(child);
+	},
+	tcMar: (child, formatting) => {
+		const margins = parseCellMargins(child);
+		if (margins) formatting.margins = margins;
+		return keptUnless(margins !== void 0);
+	},
+	textDirection: (child, formatting) => {
+		const textDir = narrowEnum(getAttribute(child, "w", "val"), TextDirectionSchema);
+		if (textDir) formatting.textDirection = textDir;
+		return keptUnless(textDir !== void 0);
+	},
+	tcFitText: (child, formatting) => {
+		formatting.fitText = parseBooleanElement(child);
+	},
+	vAlign: (child, formatting) => {
+		const vAlign = getAttribute(child, "w", "val");
+		if (vAlign === "top" || vAlign === "center" || vAlign === "bottom") {
+			formatting.verticalAlign = vAlign;
+			return;
+		}
+		return CAPTURE;
+	},
+	hideMark: (child, formatting) => {
+		formatting.hideMark = parseBooleanElement(child);
+	},
+	headers: CAPTURE,
+	cellIns: CELL_INSERTION_OWNER,
+	cellDel: CELL_DELETION_OWNER,
+	cellMerge: CELL_MERGE_OWNER,
+	tcPrChange: CELL_PROPERTY_CHANGE_OWNER
+};
 /**
 * Parse table cell properties (w:tcPr)
 *
@@ -672,76 +745,12 @@ function parseConditionalFormatStyle(cnfElement) {
 function parseTableCellProperties(tcPrElement) {
 	if (!tcPrElement) return;
 	const formatting = {};
-	const preserved = dispatchChildren({
+	const preserved = dispatchChildrenWithContext({
 		element: tcPrElement,
 		container: "cell-properties",
-		handlers: {
-			cnfStyle: (child) => {
-				const conditionalFormat = parseConditionalFormatStyle(child);
-				if (conditionalFormat) formatting.conditionalFormat = conditionalFormat;
-				return keptUnless(conditionalFormat !== void 0);
-			},
-			tcW: (child) => {
-				const width = parseWidth(child);
-				if (width) formatting.width = width;
-				return keptUnless(width !== void 0);
-			},
-			gridSpan: (child) => {
-				const gridSpan = parseNumericAttribute(child, "w", "val");
-				if (gridSpan !== void 0 && gridSpan > 1) {
-					formatting.gridSpan = Math.min(gridSpan, 63);
-					return;
-				}
-				return CAPTURE;
-			},
-			hMerge: CAPTURE,
-			vMerge: (child) => {
-				formatting.vMerge = getAttribute(child, "w", "val") === "restart" ? "restart" : "continue";
-			},
-			tcBorders: (child) => {
-				const borders = parseTableCellBorders(child);
-				if (borders) formatting.borders = borders;
-				return keptUnless(borders !== void 0);
-			},
-			shd: (child) => {
-				const shading = parseShading(child);
-				if (shading) formatting.shading = shading;
-				return keptUnless(shading !== void 0);
-			},
-			noWrap: (child) => {
-				formatting.noWrap = parseBooleanElement(child);
-			},
-			tcMar: (child) => {
-				const margins = parseCellMargins(child);
-				if (margins) formatting.margins = margins;
-				return keptUnless(margins !== void 0);
-			},
-			textDirection: (child) => {
-				const textDir = narrowEnum(getAttribute(child, "w", "val"), TextDirectionSchema);
-				if (textDir) formatting.textDirection = textDir;
-				return keptUnless(textDir !== void 0);
-			},
-			tcFitText: (child) => {
-				formatting.fitText = parseBooleanElement(child);
-			},
-			vAlign: (child) => {
-				const vAlign = getAttribute(child, "w", "val");
-				if (vAlign === "top" || vAlign === "center" || vAlign === "bottom") {
-					formatting.verticalAlign = vAlign;
-					return;
-				}
-				return CAPTURE;
-			},
-			hideMark: (child) => {
-				formatting.hideMark = parseBooleanElement(child);
-			},
-			headers: CAPTURE,
-			cellIns: CELL_INSERTION_OWNER,
-			cellDel: CELL_DELETION_OWNER,
-			cellMerge: CELL_MERGE_OWNER,
-			tcPrChange: CELL_PROPERTY_CHANGE_OWNER
-		},
-		capturePosition: sequencePositions("cell-properties", tcPrElement)
+		handlers: CELL_PROPERTY_HANDLERS,
+		capturePosition: sequencePositions("cell-properties", tcPrElement),
+		context: formatting
 	});
 	if (preserved) formatting.preserved = preserved;
 	return withSourceXml(formatting, tcPrElement);
@@ -762,108 +771,141 @@ const recordContentControl = (wrapped, carriers, sdtElement) => {
 function withContainerXmlns(options, element) {
 	return {
 		...options,
-		rootXmlns: mergeXmlnsDeclarations(options?.rootXmlns ?? {}, element)
+		rootXmlns: mergeXmlnsDeclarations(options?.rootXmlns ?? {}, element),
+		previews: options?.previews ?? standalonePreviewLedger()
 	};
 }
-function parseCellContent(tcElement, styles, theme, numbering, rels, media, options) {
-	const findLastFlowBlock = (blocks) => {
-		for (let index = blocks.length - 1; index >= 0; index -= 1) {
-			const block = blocks[index];
-			if (block?.type === "paragraph" || block?.type === "table") return block;
-			if (block?.type === "blockSdt") {
-				const nested = findLastFlowBlock(block.content);
-				if (nested) return nested;
-			}
+const findLastFlowBlock = (blocks) => {
+	for (let index = blocks.length - 1; index >= 0; index -= 1) {
+		const block = blocks[index];
+		if (block?.type === "paragraph" || block?.type === "table") return block;
+		if (block?.type === "blockSdt") {
+			const nested = findLastFlowBlock(block.content);
+			if (nested) return nested;
 		}
+	}
+};
+const CELL_CONTENT_UNDECLARED = { AlternateContent: (child, walk) => {
+	const selectedBranch = selectAlternateContentBranch(child);
+	if (!selectedBranch) return;
+	dispatchCellChildren(selectedBranch, {
+		...walk,
+		options: withContainerXmlns(withContainerXmlns(walk.options, child), selectedBranch)
+	});
+} };
+const CELL_CONTENT_HANDLERS = {
+	p: (child, { resources: { styles, theme, numbering, rels, media }, options, modelled }) => {
+		const para = parseParagraph(child, styles, theme, numbering, rels, media, {
+			...options,
+			runConsolidation: "deferred"
+		});
+		enrichParagraphTextBoxes(para, child, styles, theme, numbering, rels, media, parseTable, options.previews);
+		modelled.push(para);
+	},
+	tbl: (child, { resources: { styles, theme, numbering, rels, media }, options, modelled }) => {
+		const table = parseTable(child, styles, theme, numbering, rels, media, options);
+		if (!table) return;
+		modelled.push(table);
+	},
+	sdt: (child, { resources, options, modelled }) => {
+		const properties = parseSdtProperties(findWordprocessingChild(child, "sdtPr"), findWordprocessingChild(child, "sdtEndPr"));
+		const siblings = captureSdtSiblingMarkers(child);
+		if (siblings.before.length > 0) properties.rawSdtChildrenBeforeContent = siblings.before;
+		if (siblings.after.length > 0) properties.rawSdtChildrenAfterContent = siblings.after;
+		const sdtContent = findWordprocessingChild(child, "sdtContent");
+		if (!sdtContent) return CAPTURE;
+		modelled.push({
+			type: "blockSdt",
+			properties,
+			content: parseCellChildren({
+				element: sdtContent,
+				resources,
+				options: withContainerXmlns(withContainerXmlns(options, child), sdtContent),
+				requireTrailingParagraph: false
+			})
+		});
+	},
+	bookmarkStart: (child, { modelled }) => {
+		modelled.push(parseBookmarkStart(child));
+	},
+	bookmarkEnd: (child, { modelled }) => {
+		modelled.push(parseBookmarkEnd(child));
+	},
+	tcPr: CELL_PROPERTIES_OWNER,
+	sectPr: CAPTURE,
+	altChunk: CAPTURE,
+	commentRangeEnd: CAPTURE,
+	commentRangeStart: CAPTURE,
+	customXml: CAPTURE,
+	customXmlDelRangeEnd: CAPTURE,
+	customXmlDelRangeStart: CAPTURE,
+	customXmlInsRangeEnd: CAPTURE,
+	customXmlInsRangeStart: CAPTURE,
+	customXmlMoveFromRangeEnd: CAPTURE,
+	customXmlMoveFromRangeStart: CAPTURE,
+	customXmlMoveToRangeEnd: CAPTURE,
+	customXmlMoveToRangeStart: CAPTURE,
+	del: CAPTURE,
+	ins: CAPTURE,
+	moveFrom: CAPTURE,
+	moveFromRangeEnd: CAPTURE,
+	moveFromRangeStart: CAPTURE,
+	moveTo: CAPTURE,
+	moveToRangeEnd: CAPTURE,
+	moveToRangeStart: CAPTURE,
+	permEnd: CAPTURE,
+	permStart: CAPTURE,
+	proofErr: CAPTURE
+};
+/**
+* AlternateContent is transparent to the cell's block sequence. An SDT is
+* not: it owns a nested block sequence whose preservation positions must be
+* counted independently from the surrounding cell.
+*/
+const dispatchCellChildren = (childContainer, walk) => {
+	const preserved = dispatchChildrenWithContext({
+		element: childContainer,
+		container: "block-content",
+		capturePosition: () => walk.modelled.length,
+		undeclared: CELL_CONTENT_UNDECLARED,
+		handlers: CELL_CONTENT_HANDLERS,
+		context: walk
+	});
+	if (preserved?.children) walk.captured.push(...preserved.children);
+};
+const parseCellChildren = ({ element, resources, options, requireTrailingParagraph }) => {
+	const walk = {
+		resources,
+		options,
+		modelled: [],
+		captured: []
 	};
-	const parseCellChildren = (element, childOptions, requireTrailingParagraph) => {
-		const modelled = [];
-		const captured = [];
-		const dispatchCellChildren = (childContainer, nestedOptions) => {
-			const preserved = dispatchChildren({
-				element: childContainer,
-				container: "block-content",
-				capturePosition: () => modelled.length,
-				undeclared: { AlternateContent: (child) => {
-					const selectedBranch = selectAlternateContentBranch(child);
-					if (!selectedBranch) return;
-					dispatchCellChildren(selectedBranch, withContainerXmlns(withContainerXmlns(nestedOptions, child), selectedBranch));
-				} },
-				handlers: {
-					p: (child) => {
-						const para = parseParagraph(child, styles, theme, numbering, rels, media, {
-							...nestedOptions,
-							runConsolidation: "deferred"
-						});
-						enrichParagraphTextBoxes(para, child, styles, theme, numbering, rels, media, parseTable);
-						modelled.push(para);
-					},
-					tbl: (child) => {
-						const table = parseTable(child, styles, theme, numbering, rels, media, nestedOptions);
-						if (!table) return;
-						modelled.push(table);
-					},
-					sdt: (child) => {
-						const properties = parseSdtProperties(findWordprocessingChild(child, "sdtPr"), findWordprocessingChild(child, "sdtEndPr"));
-						const siblings = captureSdtSiblingMarkers(child);
-						if (siblings.before.length > 0) properties.rawSdtChildrenBeforeContent = siblings.before;
-						if (siblings.after.length > 0) properties.rawSdtChildrenAfterContent = siblings.after;
-						const sdtContent = findWordprocessingChild(child, "sdtContent");
-						if (!sdtContent) return CAPTURE;
-						modelled.push({
-							type: "blockSdt",
-							properties,
-							content: parseCellChildren(sdtContent, withContainerXmlns(withContainerXmlns(nestedOptions, child), sdtContent), false)
-						});
-					},
-					bookmarkStart: (child) => {
-						modelled.push(parseBookmarkStart(child));
-					},
-					bookmarkEnd: (child) => {
-						modelled.push(parseBookmarkEnd(child));
-					},
-					tcPr: CELL_PROPERTIES_OWNER,
-					sectPr: CAPTURE,
-					altChunk: CAPTURE,
-					commentRangeEnd: CAPTURE,
-					commentRangeStart: CAPTURE,
-					customXml: CAPTURE,
-					customXmlDelRangeEnd: CAPTURE,
-					customXmlDelRangeStart: CAPTURE,
-					customXmlInsRangeEnd: CAPTURE,
-					customXmlInsRangeStart: CAPTURE,
-					customXmlMoveFromRangeEnd: CAPTURE,
-					customXmlMoveFromRangeStart: CAPTURE,
-					customXmlMoveToRangeEnd: CAPTURE,
-					customXmlMoveToRangeStart: CAPTURE,
-					del: CAPTURE,
-					ins: CAPTURE,
-					moveFrom: CAPTURE,
-					moveFromRangeEnd: CAPTURE,
-					moveFromRangeStart: CAPTURE,
-					moveTo: CAPTURE,
-					moveToRangeEnd: CAPTURE,
-					moveToRangeStart: CAPTURE,
-					permEnd: CAPTURE,
-					permStart: CAPTURE,
-					proofErr: CAPTURE
-				}
-			});
-			if (preserved?.children) captured.push(...preserved.children);
-		};
-		dispatchCellChildren(element, childOptions);
-		if (requireTrailingParagraph) {
-			if (findLastFlowBlock(modelled)?.type !== "paragraph") modelled.push({
-				type: "paragraph",
-				content: []
-			});
-		}
-		return withPreservedChildren(modelled, { children: captured }, (xml) => ({
-			type: "preservedBlock",
-			xml
-		}));
-	};
-	return parseCellChildren(tcElement, options, true);
+	dispatchCellChildren(element, walk);
+	const { modelled, captured } = walk;
+	if (requireTrailingParagraph) {
+		if (findLastFlowBlock(modelled)?.type !== "paragraph") modelled.push({
+			type: "paragraph",
+			content: []
+		});
+	}
+	return withPreservedChildren(modelled, { children: captured }, (xml) => ({
+		type: "preservedBlock",
+		xml
+	}));
+};
+function parseCellContent(tcElement, styles, theme, numbering, rels, media, options) {
+	return parseCellChildren({
+		element: tcElement,
+		resources: {
+			styles,
+			theme,
+			numbering,
+			rels,
+			media
+		},
+		options,
+		requireTrailingParagraph: true
+	});
 }
 /**
 * Parse a table cell (w:tc)
@@ -893,6 +935,85 @@ function parseTableCell(tcElement, styles, theme, numbering, rels, media, option
 	cell.content = parseCellContent(tcElement, styles, theme, numbering, rels, media, withContainerXmlns(options, tcElement));
 	return cell;
 }
+const ROW_CONTENT_HANDLERS = {
+	tc: (child, { resources: { styles, theme, numbering, rels, media }, options, row }) => {
+		row.cells.push(parseTableCell(child, styles, theme, numbering, rels, media, options));
+	},
+	sdt: (child, walk) => {
+		const { options, row, bookmarks, preservedChildren } = walk;
+		const sdtContent = findWordprocessingChild(child, "sdtContent");
+		if (!sdtContent) return CAPTURE;
+		const firstWrapped = row.cells.length;
+		const firstCaptured = preservedChildren.length;
+		const firstBookmark = bookmarks.length;
+		const sdtOptions = withContainerXmlns(options, child);
+		dispatchRowChildren(sdtContent, {
+			...walk,
+			options: withContainerXmlns(sdtOptions, sdtContent)
+		});
+		const wrapped = row.cells.slice(firstWrapped);
+		if (wrapped.length === 0) {
+			preservedChildren.splice(firstCaptured);
+			bookmarks.splice(firstBookmark);
+			return CAPTURE;
+		}
+		recordContentControl(wrapped, [...preservedChildren.slice(firstCaptured), ...bookmarks.slice(firstBookmark)], child);
+	},
+	bookmarkStart: (child, { row, bookmarks }) => {
+		bookmarks.push({
+			index: row.cells.length,
+			marker: parseBookmarkStart(child)
+		});
+	},
+	bookmarkEnd: (child, { row, bookmarks }) => {
+		bookmarks.push({
+			index: row.cells.length,
+			marker: parseBookmarkEnd(child)
+		});
+	},
+	...ROW_CHILD_OWNERS,
+	commentRangeEnd: CAPTURE,
+	commentRangeStart: CAPTURE,
+	customXml: CAPTURE,
+	customXmlDelRangeEnd: CAPTURE,
+	customXmlDelRangeStart: CAPTURE,
+	customXmlInsRangeEnd: CAPTURE,
+	customXmlInsRangeStart: CAPTURE,
+	customXmlMoveFromRangeEnd: CAPTURE,
+	customXmlMoveFromRangeStart: CAPTURE,
+	customXmlMoveToRangeEnd: CAPTURE,
+	customXmlMoveToRangeStart: CAPTURE,
+	del: CAPTURE,
+	ins: CAPTURE,
+	moveFrom: CAPTURE,
+	moveFromRangeEnd: CAPTURE,
+	moveFromRangeStart: CAPTURE,
+	moveTo: CAPTURE,
+	moveToRangeEnd: CAPTURE,
+	moveToRangeStart: CAPTURE,
+	permEnd: CAPTURE,
+	permStart: CAPTURE,
+	proofErr: CAPTURE,
+	tr: CAPTURE
+};
+/**
+* One row's children, or a cell-level content control's.
+*
+* folio keeps the cells `w:sdt` holds as the row's own and records the
+* control on each of them, so the recursion walks the control's content
+* with the same map; the sink is the row's either way, because the control
+* holds no capture of its own.
+*/
+const dispatchRowChildren = (element, walk) => {
+	const captured = dispatchChildrenWithContext({
+		element,
+		container: "row-content",
+		capturePosition: () => walk.row.cells.length,
+		handlers: ROW_CONTENT_HANDLERS,
+		context: walk
+	});
+	if (captured?.children) walk.preservedChildren.push(...captured.children);
+};
 /**
 * Parse a table row (w:tr)
 *
@@ -921,83 +1042,21 @@ function parseTableRow(trElement, styles, theme, numbering, rels, media, options
 	if (rowPropChanges !== void 0) row.propertyChanges = rowPropChanges;
 	const rowStructChange = parseTableRowStructuralChange(trPrElement);
 	if (rowStructChange !== void 0) row.structuralChange = rowStructChange;
-	const rowOptions = withContainerXmlns(options, trElement);
 	const bookmarks = [];
 	const preservedChildren = [];
-	/**
-	* One row's children, or a cell-level content control's.
-	*
-	* folio keeps the cells `w:sdt` holds as the row's own and records the
-	* control on each of them, so the recursion walks the control's content
-	* with the same map; the sink is the row's either way, because the control
-	* holds no capture of its own.
-	*/
-	const dispatchRowChildren = (element, childOptions) => {
-		const captured = dispatchChildren({
-			element,
-			container: "row-content",
-			capturePosition: () => row.cells.length,
-			handlers: {
-				tc: (child) => {
-					row.cells.push(parseTableCell(child, styles, theme, numbering, rels, media, childOptions));
-				},
-				sdt: (child) => {
-					const sdtContent = findWordprocessingChild(child, "sdtContent");
-					if (!sdtContent) return CAPTURE;
-					const firstWrapped = row.cells.length;
-					const firstCaptured = preservedChildren.length;
-					const firstBookmark = bookmarks.length;
-					const sdtOptions = withContainerXmlns(childOptions, child);
-					dispatchRowChildren(sdtContent, withContainerXmlns(sdtOptions, sdtContent));
-					const wrapped = row.cells.slice(firstWrapped);
-					if (wrapped.length === 0) {
-						preservedChildren.splice(firstCaptured);
-						bookmarks.splice(firstBookmark);
-						return CAPTURE;
-					}
-					recordContentControl(wrapped, [...preservedChildren.slice(firstCaptured), ...bookmarks.slice(firstBookmark)], child);
-				},
-				bookmarkStart: (child) => {
-					bookmarks.push({
-						index: row.cells.length,
-						marker: parseBookmarkStart(child)
-					});
-				},
-				bookmarkEnd: (child) => {
-					bookmarks.push({
-						index: row.cells.length,
-						marker: parseBookmarkEnd(child)
-					});
-				},
-				...ROW_CHILD_OWNERS,
-				commentRangeEnd: CAPTURE,
-				commentRangeStart: CAPTURE,
-				customXml: CAPTURE,
-				customXmlDelRangeEnd: CAPTURE,
-				customXmlDelRangeStart: CAPTURE,
-				customXmlInsRangeEnd: CAPTURE,
-				customXmlInsRangeStart: CAPTURE,
-				customXmlMoveFromRangeEnd: CAPTURE,
-				customXmlMoveFromRangeStart: CAPTURE,
-				customXmlMoveToRangeEnd: CAPTURE,
-				customXmlMoveToRangeStart: CAPTURE,
-				del: CAPTURE,
-				ins: CAPTURE,
-				moveFrom: CAPTURE,
-				moveFromRangeEnd: CAPTURE,
-				moveFromRangeStart: CAPTURE,
-				moveTo: CAPTURE,
-				moveToRangeEnd: CAPTURE,
-				moveToRangeStart: CAPTURE,
-				permEnd: CAPTURE,
-				permStart: CAPTURE,
-				proofErr: CAPTURE,
-				tr: CAPTURE
-			}
-		});
-		if (captured?.children) preservedChildren.push(...captured.children);
-	};
-	dispatchRowChildren(trElement, rowOptions);
+	dispatchRowChildren(trElement, {
+		resources: {
+			styles,
+			theme,
+			numbering,
+			rels,
+			media
+		},
+		options: withContainerXmlns(options, trElement),
+		row,
+		bookmarks,
+		preservedChildren
+	});
 	if (preservedChildren.length > 0) row.preserved = { children: preservedChildren };
 	if (bookmarks.length > 0) row.bookmarks = bookmarks;
 	const remainingAttributes = attributeRemainder({
@@ -1082,6 +1141,87 @@ function inferImplicitSingleCellRowSpans(table, rowsWithGridOffsets) {
 		};
 	}
 }
+const TABLE_CONTENT_HANDLERS = {
+	tr: (child, { resources: { styles, theme, numbering, rels, media }, options, table, rowsWithGridOffsets }) => {
+		const rowIndex = table.rows.length;
+		table.rows.push(parseTableRow(child, styles, theme, numbering, rels, media, options));
+		if (hasRowGridOffsets(child)) rowsWithGridOffsets.add(rowIndex);
+	},
+	sdt: (child, walk) => {
+		const { options, table, bookmarks, preservedChildren } = walk;
+		const sdtContent = findWordprocessingChild(child, "sdtContent");
+		if (!sdtContent) return CAPTURE;
+		const firstWrapped = table.rows.length;
+		const firstCaptured = preservedChildren.length;
+		const firstBookmark = bookmarks.length;
+		const sdtOptions = withContainerXmlns(options, child);
+		dispatchTableChildren(sdtContent, {
+			...walk,
+			options: withContainerXmlns(sdtOptions, sdtContent)
+		});
+		const wrapped = table.rows.slice(firstWrapped);
+		if (wrapped.length === 0) {
+			preservedChildren.splice(firstCaptured);
+			bookmarks.splice(firstBookmark);
+			return CAPTURE;
+		}
+		recordContentControl(wrapped, [...preservedChildren.slice(firstCaptured), ...bookmarks.slice(firstBookmark)], child);
+	},
+	...TABLE_CHILD_OWNERS,
+	bookmarkStart: (child, { table, bookmarks }) => {
+		bookmarks.push({
+			index: table.rows.length,
+			marker: parseBookmarkStart(child)
+		});
+	},
+	bookmarkEnd: (child, { table, bookmarks }) => {
+		bookmarks.push({
+			index: table.rows.length,
+			marker: parseBookmarkEnd(child)
+		});
+	},
+	commentRangeEnd: CAPTURE,
+	commentRangeStart: CAPTURE,
+	customXml: CAPTURE,
+	customXmlPr: CAPTURE,
+	customXmlDelRangeEnd: CAPTURE,
+	customXmlDelRangeStart: CAPTURE,
+	customXmlInsRangeEnd: CAPTURE,
+	customXmlInsRangeStart: CAPTURE,
+	customXmlMoveFromRangeEnd: CAPTURE,
+	customXmlMoveFromRangeStart: CAPTURE,
+	customXmlMoveToRangeEnd: CAPTURE,
+	customXmlMoveToRangeStart: CAPTURE,
+	del: CAPTURE,
+	ins: CAPTURE,
+	moveFrom: CAPTURE,
+	moveFromRangeEnd: CAPTURE,
+	moveFromRangeStart: CAPTURE,
+	moveTo: CAPTURE,
+	moveToRangeEnd: CAPTURE,
+	moveToRangeStart: CAPTURE,
+	permEnd: CAPTURE,
+	permStart: CAPTURE,
+	proofErr: CAPTURE
+};
+/**
+* One table's children, or a row-level content control's.
+*
+* folio keeps the rows `w:sdt` holds as the table's own and records the
+* control on each of them, so the recursion walks the control's content
+* with the same map; the sink is the table's either way, because the
+* control holds no capture of its own.
+*/
+const dispatchTableChildren = (element, walk) => {
+	const captured = dispatchChildrenWithContext({
+		element,
+		container: "table-content",
+		capturePosition: () => walk.table.rows.length,
+		handlers: TABLE_CONTENT_HANDLERS,
+		context: walk
+	});
+	if (captured?.children) walk.preservedChildren.push(...captured.children);
+};
 /**
 * Parse a table element (w:tbl)
 *
@@ -1114,86 +1254,23 @@ function parseTable(tblElement, styles, theme, numbering, rels, media, options)
 			...gridChange === void 0 ? {} : { gridChange }
 		};
 	}
-	const tableOptions = withContainerXmlns(options, tblElement);
 	const rowsWithGridOffsets = /* @__PURE__ */ new Set();
 	const preservedChildren = [];
 	const bookmarks = [];
-	/**
-	* One table's children, or a row-level content control's.
-	*
-	* folio keeps the rows `w:sdt` holds as the table's own and records the
-	* control on each of them, so the recursion walks the control's content
-	* with the same map; the sink is the table's either way, because the
-	* control holds no capture of its own.
-	*/
-	const dispatchTableChildren = (element, childOptions) => {
-		const captured = dispatchChildren({
-			element,
-			container: "table-content",
-			capturePosition: () => table.rows.length,
-			handlers: {
-				tr: (child) => {
-					const rowIndex = table.rows.length;
-					table.rows.push(parseTableRow(child, styles, theme, numbering, rels, media, childOptions));
-					if (hasRowGridOffsets(child)) rowsWithGridOffsets.add(rowIndex);
-				},
-				sdt: (child) => {
-					const sdtContent = findWordprocessingChild(child, "sdtContent");
-					if (!sdtContent) return CAPTURE;
-					const firstWrapped = table.rows.length;
-					const firstCaptured = preservedChildren.length;
-					const firstBookmark = bookmarks.length;
-					const sdtOptions = withContainerXmlns(childOptions, child);
-					dispatchTableChildren(sdtContent, withContainerXmlns(sdtOptions, sdtContent));
-					const wrapped = table.rows.slice(firstWrapped);
-					if (wrapped.length === 0) {
-						preservedChildren.splice(firstCaptured);
-						bookmarks.splice(firstBookmark);
-						return CAPTURE;
-					}
-					recordContentControl(wrapped, [...preservedChildren.slice(firstCaptured), ...bookmarks.slice(firstBookmark)], child);
-				},
-				...TABLE_CHILD_OWNERS,
-				bookmarkStart: (child) => {
-					bookmarks.push({
-						index: table.rows.length,
-						marker: parseBookmarkStart(child)
-					});
-				},
-				bookmarkEnd: (child) => {
-					bookmarks.push({
-						index: table.rows.length,
-						marker: parseBookmarkEnd(child)
-					});
-				},
-				commentRangeEnd: CAPTURE,
-				commentRangeStart: CAPTURE,
-				customXml: CAPTURE,
-				customXmlPr: CAPTURE,
-				customXmlDelRangeEnd: CAPTURE,
-				customXmlDelRangeStart: CAPTURE,
-				customXmlInsRangeEnd: CAPTURE,
-				customXmlInsRangeStart: CAPTURE,
-				customXmlMoveFromRangeEnd: CAPTURE,
-				customXmlMoveFromRangeStart: CAPTURE,
-				customXmlMoveToRangeEnd: CAPTURE,
-				customXmlMoveToRangeStart: CAPTURE,
-				del: CAPTURE,
-				ins: CAPTURE,
-				moveFrom: CAPTURE,
-				moveFromRangeEnd: CAPTURE,
-				moveFromRangeStart: CAPTURE,
-				moveTo: CAPTURE,
-				moveToRangeEnd: CAPTURE,
-				moveToRangeStart: CAPTURE,
-				permEnd: CAPTURE,
-				permStart: CAPTURE,
-				proofErr: CAPTURE
-			}
-		});
-		if (captured?.children) preservedChildren.push(...captured.children);
-	};
-	dispatchTableChildren(tblElement, tableOptions);
+	dispatchTableChildren(tblElement, {
+		resources: {
+			styles,
+			theme,
+			numbering,
+			rels,
+			media
+		},
+		options: withContainerXmlns(options, tblElement),
+		table,
+		rowsWithGridOffsets,
+		bookmarks,
+		preservedChildren
+	});
 	if (table.rows.length === 0) return;
 	if (preservedChildren.length > 0) table.preserved = { children: preservedChildren };
 	if (bookmarks.length > 0) table.bookmarks = bookmarks;