@stll/folio-core 0.6.0 → 0.6.1

package/dist/controller/layoutPipeline.js

@@ -1,6 +1,8 @@
 import "../layout-engine/types.js";
 import { renderPages } from "../layout-painter/renderPage.js";
 import { templatePreviewValuesKey } from "../prosemirror/plugins/templatePreviewValues.js";
+import { getMargins, getPageSize, twipsToPixels } from "../paged-layout/sectionGeometry.js";
+import { getColumns } from "../layout-bridge/sectionColumns.js";
 import { toFlowBlocks } from "../layout-bridge/convert/toFlowBlocks.js";
 import { recordLayoutComplete, recordLayoutError, recordLayoutPhase, recordLayoutStart } from "../layout-engine/layoutInstrumentation.js";
 import { buildBookmarkPageMap } from "../fields/bookmarkPages.js";
@@ -15,7 +17,6 @@ import { layoutDocument } from "../layout-engine/index.js";
 import { measureBlocks, measureSingleBlockWithoutFloatingZones } from "../layout-engine/measure/measureBlocks.js";
 import { tryBuildIncrementalMeasures } from "../paged-layout/incrementalMeasure.js";
 import { computePerBlockMeasureInputs } from "../paged-layout/sectionBlockWidths.js";
-import { getMargins, getPageSize, twipsToPixels } from "../paged-layout/sectionGeometry.js";
 import { getDocumentWatermark } from "../watermark/index.js";
 //#region src/controller/layoutPipeline.ts
 function runLayoutPipeline(deps, state, options = {}) {
@@ -98,10 +99,17 @@ function runLayoutPipeline(deps, state, options = {}) {
 			margins
 		};
 		if (columns !== void 0) bodyLayoutConfig.columns = columns;
+		const finalSectionProperties = document?.package.document.sections?.at(-1)?.properties;
+		const finalLayoutConfig = finalSectionProperties ? {
+			pageSize: getPageSize(finalSectionProperties),
+			margins: getMargins(finalSectionProperties)
+		} : bodyLayoutConfig;
+		const finalColumns = getColumns(finalSectionProperties);
+		if (finalColumns !== void 0) finalLayoutConfig.columns = finalColumns;
 		const blockMeasureInputs = computePerBlockMeasureInputs({
 			blocks: newBlocks,
 			bodyConfig: bodyLayoutConfig,
-			finalConfig: bodyLayoutConfig
+			finalConfig: finalLayoutConfig
 		});
 		const blockWidths = blockMeasureInputs.widths;
 		const previousArtifacts = session.artifacts;
@@ -144,10 +152,13 @@ function runLayoutPipeline(deps, state, options = {}) {
 					top: headerBottom
 				};
 			}
-			const finalSection = document?.package.document.sections?.at(-1);
-			if (finalSection) {
-				nextLayoutOpts.finalPageSize = getPageSize(finalSection.properties);
-				nextLayoutOpts.finalMargins = getMargins(finalSection.properties);
+			if (finalSectionProperties) {
+				nextLayoutOpts.finalPageSize = finalLayoutConfig.pageSize;
+				nextLayoutOpts.finalMargins = finalLayoutConfig.margins;
+				nextLayoutOpts.finalColumns = finalLayoutConfig.columns ?? {
+					count: 1,
+					gap: 0
+				};
 			}
 			if (columns !== void 0) nextLayoutOpts.columns = columns;
 			if (bodyBreakType !== void 0) nextLayoutOpts.bodyBreakType = bodyBreakType;

package/dist/docx/blockContentParser.js

@@ -1,9 +1,9 @@
-import { elementToXml, findChild, findDeep, getChildElements, getLocalName, mergeXmlnsDeclarations } from "./xmlParser.js";
+import { elementToXml, findChild, getChildElements, getLocalName, mergeXmlnsDeclarations } from "./xmlParser.js";
 import { parseBookmarkEnd, parseBookmarkStart } from "./bookmarkParser.js";
-import { getTextBoxContentElement, isTextBoxDrawing, parseTextBox, parseTextBoxContent } from "./textBoxParser.js";
 import { parseSdtProperties } from "./sdtProperties.js";
 import { parseParagraph } from "./paragraphParser.js";
 import { appendBookmarkMarkerToLastParagraphInBlocks, prependBookmarkMarkersToFirstParagraphInBlocks } from "./bookmarkPlacement.js";
+import { enrichParagraphTextBoxes } from "./paragraphTextBoxEnrichment.js";
 import { parseTable } from "./tableParser.js";
 import { padDecimal } from "./numberingParser.js";
 import { convertBulletToUnicode } from "./bulletMarkers.js";
@@ -100,104 +100,6 @@ const computeListMarker = (paragraph, numbering, listCounters, abstractCounters)
 	}
 	listRendering.marker = computedMarker;
 };
-const enrichParagraphTextBoxes = (paragraph, paraXml, styles, theme, numbering, rels, media) => {
-	const xmlChildren = getChildElements(paraXml);
-	let parsedIndex = 0;
-	let lastConsumedRun;
-	for (const xmlChild of xmlChildren) {
-		if (getLocalName(xmlChild.name ?? "") !== "r") {
-			if (parsedIndex < paragraph.content.length && paragraph.content[parsedIndex]?.type !== "run") parsedIndex += 1;
-			continue;
-		}
-		const { textBoxDrawings, hasNonTextBoxContent } = scanRunForTextBoxDrawings(xmlChild);
-		const parsedContent = paragraph.content[parsedIndex];
-		const parsedRun = parsedContent?.type === "run" ? parsedContent : void 0;
-		const targetRun = parsedRun ?? (hasNonTextBoxContent ? lastConsumedRun : void 0);
-		for (const runEl of textBoxDrawings) {
-			const textBox = parseTextBox(runEl);
-			if (!textBox) continue;
-			const wsp = findDeep(runEl, "wps", "wsp");
-			if (wsp) {
-				const txbxContentEl = getTextBoxContentElement(wsp);
-				if (txbxContentEl) textBox.content = parseTextBoxContent(txbxContentEl, parseParagraph, null, styles, theme, numbering, rels ?? void 0, media ?? void 0);
-			}
-			const shape = {
-				type: "shape",
-				shapeType: "textBox",
-				size: textBox.size,
-				...textBox.position !== void 0 ? { position: textBox.position } : {},
-				...textBox.wrap !== void 0 ? { wrap: textBox.wrap } : {},
-				...textBox.fill !== void 0 ? { fill: textBox.fill } : {},
-				...textBox.outline !== void 0 ? { outline: textBox.outline } : {},
-				textBody: {
-					content: textBox.content,
-					...textBox.margins !== void 0 ? { margins: textBox.margins } : {}
-				}
-			};
-			if (textBox.id) shape.id = textBox.id;
-			const shapeContent = {
-				type: "shape",
-				shape
-			};
-			if (targetRun && hasNonTextBoxContent) targetRun.content.push(shapeContent);
-			else {
-				const newRun = {
-					type: "run",
-					content: [shapeContent]
-				};
-				paragraph.content.splice(parsedIndex, 0, newRun);
-				lastConsumedRun = newRun;
-				parsedIndex += 1;
-			}
-		}
-		if (hasNonTextBoxContent && parsedRun) {
-			lastConsumedRun = parsedRun;
-			parsedIndex += 1;
-		}
-	}
-};
-const scanRunForTextBoxDrawings = (xmlRun) => {
-	const textBoxDrawings = [];
-	let hasNonTextBoxContent = false;
-	const visitDrawing = (drawingEl) => {
-		if (isTextBoxDrawing(drawingEl)) {
-			textBoxDrawings.push(drawingEl);
-			return;
-		}
-		hasNonTextBoxContent = true;
-	};
-	for (const el of getChildElements(xmlRun)) {
-		const name = getLocalName(el.name ?? "");
-		if (name === "rPr") continue;
-		if (name === "drawing") {
-			visitDrawing(el);
-			continue;
-		}
-		if (name === "AlternateContent") {
-			const branches = getChildElements(el);
-			const choice = branches.find((branch) => getLocalName(branch.name ?? "") === "Choice");
-			const fallback = branches.find((branch) => getLocalName(branch.name ?? "") === "Fallback");
-			const tryBranch = (branch) => {
-				if (!branch) return false;
-				let found = false;
-				for (const innerEl of getChildElements(branch)) if (getLocalName(innerEl.name ?? "") === "drawing") {
-					visitDrawing(innerEl);
-					found = true;
-				}
-				return found;
-			};
-			let foundInBranch = tryBranch(choice);
-			if (!foundInBranch) foundInBranch = tryBranch(fallback);
-			if (!foundInBranch) hasNonTextBoxContent = true;
-			continue;
-		}
-		hasNonTextBoxContent = true;
-	}
-	return {
-		textBoxDrawings,
-		hasNonTextBoxContent
-	};
-};
 const parseBlockContent = (parent, styles, theme, numbering, rels, media, options) => parseBlockContentWithState(parent, styles, theme, numbering, rels, media, {
 	listCounters: /* @__PURE__ */ new Map(),
 	abstractCounters: /* @__PURE__ */ new Map(),

package/dist/docx/paragraphTextBoxEnrichment.d.ts

@@ -0,0 +1,9 @@
+import { document_d_exports } from "../types/document.js";
+import { NumberingMap } from "./numberingParser.js";
+import { StyleMap } from "./styleParser.js";
+import { XmlElement } from "./xmlParser.js";
+
+//#region src/docx/paragraphTextBoxEnrichment.d.ts
+declare const enrichParagraphTextBoxes: (paragraph: document_d_exports.Paragraph, paraXml: 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) => void;
+//#endregion
+export { enrichParagraphTextBoxes };

package/dist/docx/paragraphTextBoxEnrichment.js

@@ -0,0 +1,104 @@
+import { findDeep, getChildElements, getLocalName } from "./xmlParser.js";
+import { getTextBoxContentElement, isTextBoxDrawing, parseTextBox, parseTextBoxContent } from "./textBoxParser.js";
+import { parseParagraph } from "./paragraphParser.js";
+//#region src/docx/paragraphTextBoxEnrichment.ts
+const enrichParagraphTextBoxes = (paragraph, paraXml, styles, theme, numbering, rels, media) => {
+	const xmlChildren = getChildElements(paraXml);
+	let parsedIndex = 0;
+	let lastConsumedRun;
+	for (const xmlChild of xmlChildren) {
+		if (getLocalName(xmlChild.name ?? "") !== "r") {
+			if (parsedIndex < paragraph.content.length && paragraph.content[parsedIndex]?.type !== "run") parsedIndex += 1;
+			continue;
+		}
+		const { textBoxDrawings, hasNonTextBoxContent } = scanRunForTextBoxDrawings(xmlChild);
+		const parsedContent = paragraph.content[parsedIndex];
+		const parsedRun = parsedContent?.type === "run" ? parsedContent : void 0;
+		const targetRun = parsedRun ?? (hasNonTextBoxContent ? lastConsumedRun : void 0);
+		for (const runEl of textBoxDrawings) {
+			const textBox = parseTextBox(runEl);
+			if (!textBox) continue;
+			const wsp = findDeep(runEl, "wps", "wsp");
+			if (wsp) {
+				const txbxContentEl = getTextBoxContentElement(wsp);
+				if (txbxContentEl) textBox.content = parseTextBoxContent(txbxContentEl, parseParagraph, null, styles, theme, numbering, rels ?? void 0, media ?? void 0);
+			}
+			const shape = {
+				type: "shape",
+				shapeType: "textBox",
+				size: textBox.size,
+				...textBox.position !== void 0 ? { position: textBox.position } : {},
+				...textBox.wrap !== void 0 ? { wrap: textBox.wrap } : {},
+				...textBox.fill !== void 0 ? { fill: textBox.fill } : {},
+				...textBox.outline !== void 0 ? { outline: textBox.outline } : {},
+				textBody: {
+					content: textBox.content,
+					...textBox.margins !== void 0 ? { margins: textBox.margins } : {}
+				}
+			};
+			if (textBox.id) shape.id = textBox.id;
+			const shapeContent = {
+				type: "shape",
+				shape
+			};
+			if (targetRun && hasNonTextBoxContent) targetRun.content.push(shapeContent);
+			else {
+				const newRun = {
+					type: "run",
+					content: [shapeContent]
+				};
+				paragraph.content.splice(parsedIndex, 0, newRun);
+				lastConsumedRun = newRun;
+				parsedIndex += 1;
+			}
+		}
+		if (hasNonTextBoxContent && parsedRun) {
+			lastConsumedRun = parsedRun;
+			parsedIndex += 1;
+		}
+	}
+};
+const scanRunForTextBoxDrawings = (xmlRun) => {
+	const textBoxDrawings = [];
+	let hasNonTextBoxContent = false;
+	const visitDrawing = (drawingEl) => {
+		if (isTextBoxDrawing(drawingEl)) {
+			textBoxDrawings.push(drawingEl);
+			return;
+		}
+		hasNonTextBoxContent = true;
+	};
+	for (const el of getChildElements(xmlRun)) {
+		const name = getLocalName(el.name ?? "");
+		if (name === "rPr") continue;
+		if (name === "drawing") {
+			visitDrawing(el);
+			continue;
+		}
+		if (name === "AlternateContent") {
+			const branches = getChildElements(el);
+			const choice = branches.find((branch) => getLocalName(branch.name ?? "") === "Choice");
+			const fallback = branches.find((branch) => getLocalName(branch.name ?? "") === "Fallback");
+			const tryBranch = (branch) => {
+				if (!branch) return false;
+				let found = false;
+				for (const innerEl of getChildElements(branch)) if (getLocalName(innerEl.name ?? "") === "drawing") {
+					visitDrawing(innerEl);
+					found = true;
+				}
+				return found;
+			};
+			let foundInBranch = tryBranch(choice);
+			if (!foundInBranch) foundInBranch = tryBranch(fallback);
+			if (!foundInBranch) hasNonTextBoxContent = true;
+			continue;
+		}
+		hasNonTextBoxContent = true;
+	}
+	return {
+		textBoxDrawings,
+		hasNonTextBoxContent
+	};
+};
+//#endregion
+export { enrichParagraphTextBoxes };

package/dist/docx/tableParser.js

@@ -3,6 +3,7 @@ import { parseBookmarkEnd, parseBookmarkStart } from "./bookmarkParser.js";
 import { BorderStyleSchema, FloatingTableXSpecSchema, FloatingTableYSpecSchema, ShadingPatternSchema, TableCellTextDirectionSchema, ThemeColorSlotSchema, narrowEnum } from "./parserEnums.js";
 import { parseParagraph } from "./paragraphParser.js";
 import { appendBookmarkMarkerToLastParagraphInBlocks, appendBookmarkMarkerToLastParagraphInCells, prependBookmarkMarkersToFirstParagraphInBlocks, prependBookmarkMarkersToFirstParagraphInCell } from "./bookmarkPlacement.js";
+import { enrichParagraphTextBoxes } from "./paragraphTextBoxEnrichment.js";
 //#region src/docx/tableParser.ts
 /**
 * Parse a table measurement (width, height, etc.)
@@ -489,6 +490,7 @@ function parseCellContent(tcElement, styles, theme, numbering, rels, media, opti
 		const localName = getLocalName(child.name);
 		if (localName === "p") {
 			const para = parseParagraph(child, styles, theme, numbering, rels, media, options);
+			enrichParagraphTextBoxes(para, child, styles, theme, numbering, rels, media);
 			prependPendingBookmarkMarkers(para, pendingBookmarkMarkers);
 			content.push(para);
 		} else if (localName === "tbl") {

package/dist/layout-bridge/convert/toFlowBlocks.js

@@ -6,8 +6,9 @@ import { resolveColor, resolveHighlightToCss } from "../../utils/colorResolver.j
 import { resolveShadingFill } from "../../utils/formatToStyle.js";
 import { convertBulletToUnicode } from "../../docx/bulletMarkers.js";
 import { setTextBoxGroupId } from "../../layout-engine/textBoxGroup.js";
+import { getColumns } from "../sectionColumns.js";
 import { directionIsRtl } from "../../prosemirror/paragraphDirection.js";
-import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunShadingMarkAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../../prosemirror/attrs/index.js";
+import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunShadingMarkAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../../prosemirror/attrs/index.js";
 import { autospacingMatchesBase } from "../../prosemirror/autospacingBase.js";
 import { runShadingAttrsToShading } from "../../prosemirror/conversion/runShadingMark.js";
 import { assertValidProseMirrorDocument } from "../../prosemirror/validation.js";
@@ -919,6 +920,7 @@ function convertTableCell(node, startPos, options, tableCellMargins) {
 			const block = convertParagraph(child, offset, options);
 			blocks.push(block);
 		} else if (child.type.name === "table") blocks.push(convertTable(child, offset, options));
+		else if (child.type.name === "textBox") blocks.push(convertTextBoxNode(child, offset, options));
 		offset += child.nodeSize;
 	});
 	const trailingBlock = blocks.at(-1);
@@ -1213,9 +1215,17 @@ function toFlowBlocks(doc, options = {}) {
 		}
 		switch (node.type.name) {
 			case "paragraph": {
-				const block = convertParagraph(node, pos, opts);
 				const pmAttrs = expectParagraphAttrs(node);
-				trackedPush(block);
+				const onlyChild = node.childCount === 1 ? node.firstChild : null;
+				if (onlyChild?.type.name === "hardBreak" && expectHardBreakAttrs(onlyChild).breakType === "column") {
+					const columnBreak = {
+						kind: "columnBreak",
+						id: nextBlockId(),
+						pmStart: pos,
+						pmEnd: pos + node.nodeSize
+					};
+					trackedPush(columnBreak);
+				} else trackedPush(convertParagraph(node, pos, opts));
 				const secProps = pmAttrs._sectionProperties;
 				if (secProps || pmAttrs.sectionBreakType) {
 					const sectionBreak = {
@@ -1245,16 +1255,8 @@ function toFlowBlocks(doc, options = {}) {
 							if (secProps.headerDistance !== void 0) sectionBreak.margins.header = twipsToPixels(secProps.headerDistance);
 							if (secProps.footerDistance !== void 0) sectionBreak.margins.footer = twipsToPixels(secProps.footerDistance);
 						}
-						const colCount = secProps.columnCount ?? 1;
-						if (colCount > 1) {
-							const cols = {
-								count: colCount,
-								gap: twipsToPixels(secProps.columnSpace ?? 720),
-								equalWidth: secProps.equalWidth ?? true
-							};
-							if (secProps.separator !== void 0) cols.separator = secProps.separator;
-							sectionBreak.columns = cols;
-						}
+						const columns = getColumns(secProps);
+						if (columns) sectionBreak.columns = columns;
 					}
 					trackedPush(sectionBreak);
 				}

package/dist/layout-bridge/sectionColumns.js

@@ -7,13 +7,18 @@ const DEFAULT_COLUMN_SPACE_TWIPS = 720;
 * Returns undefined for single-column (default) to avoid unnecessary paginator overhead.
 */
 function getColumns(sectionProps) {
-	const count = sectionProps?.columnCount ?? 1;
+	const authoredColumns = sectionProps?.columns;
+	const count = sectionProps?.columnCount ?? authoredColumns?.length ?? 1;
 	if (count <= 1) return void 0;
 	const columns = {
 		count,
 		gap: twipsToPixels(sectionProps?.columnSpace ?? DEFAULT_COLUMN_SPACE_TWIPS),
 		equalWidth: sectionProps?.equalWidth ?? true
 	};
+	if (sectionProps?.equalWidth === false && authoredColumns?.length === count && authoredColumns.every(({ width }) => width !== void 0)) {
+		columns.widths = authoredColumns.map(({ width }) => twipsToPixels(width ?? 0));
+		columns.gaps = authoredColumns.slice(0, -1).map(({ space }) => twipsToPixels(space ?? sectionProps.columnSpace ?? DEFAULT_COLUMN_SPACE_TWIPS));
+	}
 	if (sectionProps?.separator !== void 0) columns.separator = sectionProps.separator;
 	return columns;
 }

package/dist/layout-engine/index.js

@@ -156,7 +156,8 @@ function layoutDocument(blocks, measures, options) {
 		pageSize: finalPageSize,
 		margins: finalMargins
 	};
-	if (options.columns !== void 0) finalConfig.columns = options.columns;
+	const finalColumns = options.finalColumns ?? options.columns;
+	if (finalColumns !== void 0) finalConfig.columns = finalColumns;
 	const { configs: sectionConfigs, breakIndices } = collectSectionConfigs(blocks, bodyConfig, finalConfig);
 	const sectionBreakTypes = [...breakIndices.map((index) => blocks[index].type), options.bodyBreakType];
 	const initialConfig = sectionConfigs.at(0) ?? bodyConfig;
@@ -197,7 +198,7 @@ function layoutDocument(blocks, measures, options) {
 		const pageBeforeBlockLayout = paginator.getCurrentState().page.number;
 		switch (block.kind) {
 			case "paragraph":
-				layoutParagraph(block, measure, paginator, paginator.getContentWidth(), options.footnoteHeightById);
+				layoutParagraph(block, measure, paginator, paginator.columnWidth, options.footnoteHeightById);
 				break;
 			case "table":
 				if (block.floating) layoutFloatingTable(block, measure, paginator, paginator.getContentWidth());
@@ -428,9 +429,9 @@ function layoutTable(block, measure, paginator, footnoteHeightById) {
 		let x = paginator.getColumnX(columnIndex);
 		if (block.justification === "center") x += (paginator.columnWidth - measure.totalWidth) / 2;
 		else if (block.justification === "right") x = x + paginator.columnWidth - measure.totalWidth;
-		else if (block.indent !== void 0) {
-			const leadingCellMargin = block.rows[0]?.cells[0]?.padding?.left ?? 0;
-			x += block.indent - leadingCellMargin;
+		else {
+			const leadingCellMargin = block.rows.at(0)?.cells.at(0)?.padding?.left ?? 0;
+			x += (block.indent ?? 0) - leadingCellMargin;
 		}
 		return x;
 	};
@@ -637,8 +638,9 @@ function layoutFloatingTable(block, measure, paginator, contentWidth) {
 		else if (spec === "center") y = baseY + (contentHeight - tableHeight) / 2;
 	}
 	if (!usedExplicitY) y = paginator.ensureFits(tableHeight).cursorY;
-	const minX = margins.left;
-	const maxX = margins.left + contentWidth - tableWidth;
+	const pageAnchored = floating?.horzAnchor === "page";
+	const minX = pageAnchored ? 0 : margins.left;
+	const maxX = pageAnchored ? page.size.w - tableWidth : margins.left + contentWidth - tableWidth;
 	if (Number.isFinite(maxX)) x = Math.max(minX, Math.min(x, maxX));
 	const fragment = {
 		kind: "table",

package/dist/layout-engine/measure/measureBlocks.js

@@ -1,4 +1,4 @@
-import { DEFAULT_TEXTBOX_MARGINS, floatingTextBoxReservesBand, tableColumnsArePinned } from "../types.js";
+import { DEFAULT_TEXTBOX_MARGINS, floatingTextBoxReservesBand, isFloatingTextBoxBlock, tableColumnsArePinned } from "../types.js";
 import { findClearLineY, measureParagraph } from "./measureParagraph.js";
 import { getCachedParagraphMeasure, setCachedParagraphMeasure } from "./cache.js";
 import { getTextBoxGroupId } from "../textBoxGroup.js";
@@ -56,6 +56,7 @@ function isInlineFlowImageRun(run) {
 	return true;
 }
 function measureTableCellBlockVisualHeight(block, blockMeasure) {
+	if (block.kind === "textBox" && isFloatingTextBoxBlock(block)) return 0;
 	if (block.kind !== "paragraph" || blockMeasure.kind !== "paragraph") {
 		if ("totalHeight" in blockMeasure) return blockMeasure.totalHeight;
 		if ("height" in blockMeasure) return blockMeasure.height;
@@ -95,7 +96,7 @@ function measureTableBlock(tableBlock, contentWidth, fieldValues) {
 		columnWidths = Array.from({ length: colCount }, () => equalWidth);
 	} else if (columnWidths.length > 0 && explicitWidthPx) {
 		const totalWidth = columnWidths.reduce((sum, w) => sum + w, 0);
-		if (totalWidth > 0 && Math.abs(totalWidth - explicitWidthPx) > 1) {
+		if (!(tableBlock.layout !== "fixed" && (tableBlock.widthType === void 0 || tableBlock.widthType === "dxa") && totalWidth - explicitWidthPx > 1) && totalWidth > 0 && Math.abs(totalWidth - explicitWidthPx) > 1) {
 			const scale = explicitWidthPx / totalWidth;
 			columnWidths = columnWidths.map((w) => w * scale);
 		}

package/dist/layout-engine/paginator.d.ts

@@ -55,6 +55,8 @@ declare function createPaginator(options: PaginatorOptions): {
     count: number;
     gap: number;
     equalWidth?: boolean;
+    widths?: number[];
+    gaps?: number[];
     separator?: boolean;
   }; /** Get current state. */
   getCurrentState: () => PageState; /** Get available height in current column. */

package/dist/layout-engine/paginator.js

@@ -7,12 +7,13 @@ import { panic } from "better-result";
 * Tracks the current page, cursor position, and available space.
 * Creates new pages when content doesn't fit.
 */
-/**
-* Calculate the width of a single column.
-*/
-function calculateColumnWidth(pageWidth, leftMargin, rightMargin, columns) {
-	return (pageWidth - leftMargin - rightMargin - (columns.count - 1) * columns.gap) / columns.count;
+/** Calculate active column widths, preferring authored unequal widths. */
+function calculateColumnWidths(pageWidth, leftMargin, rightMargin, columns) {
+	if (columns.widths?.length === columns.count && columns.widths.every((width) => Number.isFinite(width) && width > 0)) return [...columns.widths];
+	const equalWidth = (pageWidth - leftMargin - rightMargin - (columns.count - 1) * columns.gap) / columns.count;
+	return Array.from({ length: columns.count }, () => equalWidth);
 }
+const gapAfterColumn = (columns, columnIndex) => columns.gaps?.[columnIndex] ?? columns.gap;
 function arePageSizesEqual(left, right) {
 	return left.w === right.w && left.h === right.h;
 }
@@ -49,9 +50,9 @@ function createPaginator(options) {
 		return arePageSizesEqual(state.page.size, pageSize) && areMarginsEqual(state.page.margins, getPageMargins(state.page.number));
 	}
 	if (getContentHeight() <= 0) panic("Paginator: page size and margins yield no content area");
-	let columnWidth = calculateColumnWidth(pageSize.w, margins.left, margins.right, columns);
-	function recalculateColumnWidth() {
-		columnWidth = calculateColumnWidth(pageSize.w, margins.left, margins.right, columns);
+	let columnWidths = calculateColumnWidths(pageSize.w, margins.left, margins.right, columns);
+	function recalculateColumnWidths() {
+		columnWidths = calculateColumnWidths(pageSize.w, margins.left, margins.right, columns);
 	}
 	function applyPendingLayout() {
 		if (pendingPageSize) pageSize = pendingPageSize;
@@ -59,7 +60,7 @@ function createPaginator(options) {
 		pendingPageSize = void 0;
 		pendingMargins = void 0;
 		if (getContentHeight() <= 0) panic("Paginator: section page size and margins yield no content area");
-		recalculateColumnWidth();
+		recalculateColumnWidths();
 	}
 	function getPageMargins(pageNumber) {
 		const pageMargins = pageNumber === 1 && options.firstPageMargins ? { ...options.firstPageMargins } : { ...margins };
@@ -75,7 +76,9 @@ function createPaginator(options) {
 	* Get X position for a given column index.
 	*/
 	function getColumnX(columnIndex) {
-		return (states.at(-1)?.page.margins.left ?? getPageMargins(1).left) + columnIndex * (columnWidth + columns.gap);
+		let x = states.at(-1)?.page.margins.left ?? getPageMargins(1).left;
+		for (let index = 0; index < columnIndex; index++) x += (columnWidths[index] ?? columnWidths[0] ?? 0) + gapAfterColumn(columns, index);
+		return x;
 	}
 	/**
 	* Create a new page and add it to the list.
@@ -274,7 +277,7 @@ function createPaginator(options) {
 	*/
 	function updateColumns(newColumns) {
 		columns = newColumns;
-		columnWidth = calculateColumnWidth(pageSize.w, margins.left, margins.right, columns);
+		recalculateColumnWidths();
 		const state = getCurrentState();
 		if (columns.count > 1) state.page.columns = { ...columns };
 		else delete state.page.columns;
@@ -290,7 +293,7 @@ function createPaginator(options) {
 		if (newPageSize) pageSize = { ...newPageSize };
 		if (newMargins) margins = { ...newMargins };
 		if (getContentHeight() <= 0) panic("Paginator: section page size and margins yield no content area");
-		recalculateColumnWidth();
+		recalculateColumnWidths();
 		pendingPageSize = void 0;
 		pendingMargins = void 0;
 	}
@@ -312,7 +315,8 @@ function createPaginator(options) {
 		states,
 		/** Column width in pixels (use getColumnWidth() for current value after updates). */
 		get columnWidth() {
-			return columnWidth;
+			const columnIndex = states.at(-1)?.columnIndex ?? 0;
+			return columnWidths[columnIndex] ?? columnWidths[0] ?? getContentWidth();
 		},
 		/** Get current column layout (returns copy to prevent external mutation). */
 		get columns() {

package/dist/layout-engine/tableRowBreak.js

@@ -1,3 +1,4 @@
+import { isFloatingTextBoxBlock } from "./types.js";
 import { measureParagraph } from "./measure/measureParagraph.js";
 import { buildTableCellFloatingZones, getTableCellContentWidth, getTableCellFloatingImages } from "./measure/tableCellFloating.js";
 //#region src/layout-engine/tableRowBreak.ts
@@ -74,6 +75,8 @@ function cellBreakGeometry(cell, measure) {
 			y = blockTop + blockMeasure.totalHeight;
 			paragraphY += blockMeasure.totalHeight;
 		} else if (blockMeasure) {
+			const block = cellBlocks?.[i];
+			if (block?.kind === "textBox" && isFloatingTextBoxBlock(block)) continue;
 			const blockHeight = getAtomicBlockHeight(blockMeasure);
 			if (blockHeight > 0) {
 				const top = y;

package/dist/layout-engine/types.d.ts

@@ -846,7 +846,9 @@ type Page = {
 type ColumnLayout = {
   count: number;
   gap: number;
-  equalWidth?: boolean; /** Draw vertical separator line between columns (w:sep). */
+  equalWidth?: boolean; /** Authored widths for unequal-width section columns. */
+  widths?: number[]; /** Authored space after each column except the last. */
+  gaps?: number[]; /** Draw vertical separator line between columns (w:sep). */
   separator?: boolean;
 };
 /**
@@ -904,7 +906,8 @@ type LayoutOptions = {
     w: number;
     h: number;
   }; /** Body-level final section margins. */
-  finalMargins?: PageMargins; /** Column configuration. */
+  finalMargins?: PageMargins; /** Body-level final section column configuration. */
+  finalColumns?: ColumnLayout; /** Column configuration. */
   columns?: ColumnLayout; /** Gap between rendered pages (for UI). */
   pageGap?: number; /** Default line height multiplier. */
   defaultLineHeight?: number; /** Header content heights by variant. */

package/dist/layout-painter/index.js

@@ -1,8 +1,8 @@
 import { FRAGMENT_CLASS_NAMES, renderFragment } from "./renderFragment.js";
 import { IMAGE_CLASS_NAMES, renderImageFragment } from "./renderImage.js";
 import { renderLine, renderParagraphFragment, sliceRunsForLine } from "./renderParagraph.js";
-import { TABLE_CLASS_NAMES, renderTableFragment } from "./renderTable.js";
 import { TEXTBOX_CLASS_NAMES, renderTextBoxFragment } from "./renderTextBox.js";
+import { TABLE_CLASS_NAMES, renderTableFragment } from "./renderTable.js";
 import { renderPage, renderPages } from "./renderPage.js";
 import { prefersReducedMotionBehavior } from "../paged-layout/scrollNavigation.js";
 import { createFeatureRegistry } from "./registry/registry.js";

package/dist/layout-painter/renderPage.js

@@ -8,8 +8,8 @@ import { renderFragment } from "./renderFragment.js";
 import { applyImageVisualAttrs, hasImageVisualAttrs, renderImageFragment } from "./renderImage.js";
 import { emuToPixels } from "./renderUtils.js";
 import { renderParagraphFragment } from "./renderParagraph.js";
-import { renderTableFragment } from "./renderTable.js";
 import { renderTextBoxFragment } from "./renderTextBox.js";
+import { renderTableFragment } from "./renderTable.js";
 import { renderWatermarkLayer } from "./renderWatermark.js";
 import { panic } from "better-result";
 //#region src/layout-painter/renderPage.ts
@@ -560,7 +560,12 @@ function renderHeaderFooterContent(content, context, options, layout) {
 				...block.pmStart !== void 0 ? { pmStart: block.pmStart } : {},
 				...block.pmEnd !== void 0 ? { pmEnd: block.pmEnd } : {}
 			}, block, measure, hfContext, { document: doc });
-			fragEl.style.top = `${cursorY}px`;
+			const textBoxTop = block.position ? resolveHeaderFooterFloatTop({
+				height: measure.height,
+				paragraphY: cursorY,
+				position: block.position
+			}, layout) : cursorY;
+			fragEl.style.top = `${textBoxTop}px`;
 			fragEl.style.left = resolveHeaderFooterFloatLeft(measure.width, block.position?.horizontal, layout);
 			if (block.wrapType === "behind") fragEl.style.zIndex = "-1";
 			containerEl.append(fragEl);

package/dist/layout-painter/renderParagraph.js

@@ -910,7 +910,9 @@ function renderLine(block, line, alignment, doc, options) {
 		if (!options.isLastLine || options.paragraphEndsWithLineBreak) {
 			const firstLineIndentPx = options.isFirstLine ? options.firstLineIndentPx ?? 0 : 0;
 			const firstLineHangingPx = Math.max(0, -firstLineIndentPx);
-			const justifyCapacityPx = options.availableWidth + firstLineHangingPx;
+			const hasVisibleListMarker = options.isFirstLine && block.attrs?.listMarker && !block.attrs.listMarkerHidden;
+			const firstLineHangingExpansionPx = hasVisibleListMarker ? Math.min(firstLineHangingPx, Math.max(0, options.leftIndentPx ?? 0)) : firstLineHangingPx;
+			const justifyCapacityPx = options.availableWidth + firstLineHangingExpansionPx;
 			const overfullPx = line.width - justifyCapacityPx;
 			const shrinkableSpaces = countShrinkableSpaces(runsForLine);
 			if (overfullPx > RIGHT_EDGE_EPSILON_PX && shrinkableSpaces > 0) {
@@ -925,7 +927,7 @@ function renderLine(block, line, alignment, doc, options) {
 				lineEl.style.textAlign = "justify";
 				lineEl.style.textAlignLast = "justify";
 			}
-			const listFirstLineOffset = options.isFirstLine && block.attrs?.listMarker && !block.attrs.listMarkerHidden ? options.firstLineIndentPx ?? 0 : 0;
+			const listFirstLineOffset = hasVisibleListMarker ? Math.max(firstLineIndentPx, -firstLineHangingExpansionPx) : 0;
 			lineEl.style.width = `${options.availableWidth - listFirstLineOffset}px`;
 		}
 	}
@@ -1249,7 +1251,6 @@ function renderParagraphFragment(fragment, block, measure, context, options = {}
 			} else if (indentLeft > 0) lineEl.style.paddingLeft = `${indentLeft}px`;
 			else if (hasFirstLine && !isFlexLine) lineEl.style.textIndent = `${indent.firstLine ?? 0}px`;
 		} else if (indentLeft > 0) lineEl.style.paddingLeft = `${indentLeft}px`;
-		else if (hasHanging && indentLeft === 0) lineEl.style.paddingLeft = `${indent.hanging ?? 0}px`;
 		if (indentRight > 0) lineEl.style.paddingRight = `${indentRight}px`;
 		if (isFirstLine && block.attrs?.listMarker && !block.attrs.listMarkerHidden) {
 			const hanging = indent?.hanging ?? 0;
@@ -1269,7 +1270,7 @@ function renderParagraphFragment(fragment, block, measure, context, options = {}
 			const markerFontSize = block.attrs.listMarkerFontSize ?? firstTextRun?.fontSize ?? block.attrs.defaultFontSize;
 			const marker = renderListMarker(block.attrs.listMarker, getListMarkerInlineWidth(block), doc, markerFontFamily, markerFontSize, block.attrs.listMarkerRevision, block.attrs.listMarkerSecondSlotOffsetTwips);
 			const markerMarginLeft = markerStart - Math.min(indentLeft, 0);
-			if (markerMarginLeft < 0 && indentLeft !== 0) marker.style.marginLeft = `${markerMarginLeft}px`;
+			if (markerMarginLeft < 0) marker.style.marginLeft = `${markerMarginLeft}px`;
 			lineEl.prepend(marker);
 		}
 		fragmentEl.append(lineEl);

package/dist/layout-painter/renderTable.js

@@ -1,8 +1,10 @@
-import { tableColumnsArePinned } from "../layout-engine/types.js";
+import { emuToPixels } from "../utils/units.js";
+import { isFloatingImageRun, isFloatingTextBoxBlock, tableColumnsArePinned } from "../layout-engine/types.js";
 import { measureParagraph } from "../layout-engine/measure/measureParagraph.js";
 import { getAutomaticTextColorForBackground } from "./documentColors.js";
 import { renderParagraphFragment } from "./renderParagraph.js";
 import { buildTableCellFloatingZones, getTableCellContentWidth, getTableCellFloatingImages } from "../layout-engine/measure/tableCellFloating.js";
+import { renderTextBoxFragment } from "./renderTextBox.js";
 //#region src/layout-painter/renderTable.ts
 /**
 * Table Renderer
@@ -26,9 +28,6 @@ const TABLE_CLASS_NAMES = {
 	tableEdgeHandleBottom: "layout-table-edge-handle-bottom",
 	tableEdgeHandleRight: "layout-table-edge-handle-right"
 };
-/**
-* Render cell content (paragraphs and nested tables)
-*/
 function renderCellContent(cell, cellMeasure, context, doc) {
 	const contentEl = doc.createElement("div");
 	contentEl.className = TABLE_CLASS_NAMES.cellContent;
@@ -37,6 +36,7 @@ function renderCellContent(cell, cellMeasure, context, doc) {
 	contentEl.style.width = `${contentWidth}px`;
 	const cellFloatingImages = getTableCellFloatingImages(cell, cellMeasure, contentWidth);
 	const floatingZones = buildTableCellFloatingZones(cellFloatingImages, contentWidth);
+	const floatingLayers = [];
 	if (cellFloatingImages.length > 0) {
 		const floatingLayer = doc.createElement("div");
 		floatingLayer.className = "layout-cell-floating-images-layer";
@@ -47,7 +47,7 @@ function renderCellContent(cell, cellMeasure, context, doc) {
 		floatingLayer.style.height = "100%";
 		floatingLayer.style.pointerEvents = "none";
 		floatingLayer.style.zIndex = "10";
-		floatingLayer.style.overflow = "hidden";
+		floatingLayer.style.overflow = "visible";
 		for (const img of cellFloatingImages) {
 			const imgContainer = doc.createElement("div");
 			imgContainer.className = "layout-cell-floating-image";
@@ -67,9 +67,11 @@ function renderCellContent(cell, cellMeasure, context, doc) {
 			imgContainer.append(imgEl);
 			floatingLayer.append(imgContainer);
 		}
-		contentEl.append(floatingLayer);
+		floatingLayers.push(floatingLayer);
 	}
 	let cumulativeY = 0;
+	let anchorParagraphY = 0;
+	let floatingTextBoxesLayer;
 	for (let i = 0; i < cell.blocks.length; i++) {
 		const block = cell.blocks[i];
 		const measure = cellMeasure.blocks[i];
@@ -103,15 +105,81 @@ function renderCellContent(cell, cellMeasure, context, doc) {
 			const spaceBefore = paragraphBlock.attrs?.spacing?.before ?? 0;
 			if (spaceBefore > 0) fragEl.style.paddingTop = `${spaceBefore}px`;
 			contentEl.append(fragEl);
+			anchorParagraphY = cumulativeY;
 			cumulativeY += paragraphMeasure.totalHeight;
 		} else if (block?.kind === "table" && measure?.kind === "table") {
 			const nestedTableEl = renderNestedTable(block, measure, context, doc);
 			nestedTableEl.style.position = "relative";
 			contentEl.append(nestedTableEl);
 			cumulativeY += measure.totalHeight;
+			anchorParagraphY = cumulativeY;
+		} else if (block?.kind === "textBox" && measure?.kind === "textBox") {
+			const textBoxBlock = block;
+			const textBoxMeasure = measure;
+			const textBoxEl = renderTextBoxFragment({
+				kind: "textBox",
+				blockId: textBoxBlock.id,
+				x: 0,
+				y: 0,
+				width: textBoxMeasure.width,
+				height: textBoxMeasure.height,
+				...textBoxBlock.pmStart !== void 0 ? { pmStart: textBoxBlock.pmStart } : {},
+				...textBoxBlock.pmEnd !== void 0 ? { pmEnd: textBoxBlock.pmEnd } : {}
+			}, textBoxBlock, textBoxMeasure, {
+				...context,
+				insideTableCell: true
+			}, { document: doc });
+			if (isFloatingTextBoxBlock(textBoxBlock)) {
+				floatingTextBoxesLayer ??= createCellFloatingTextBoxesLayer(doc);
+				textBoxEl.style.left = `${resolveCellTextBoxX(textBoxBlock, contentWidth)}px`;
+				textBoxEl.style.top = `${anchorParagraphY + resolveCellTextBoxY(textBoxBlock)}px`;
+				textBoxEl.style.pointerEvents = "auto";
+				floatingTextBoxesLayer.append(textBoxEl);
+				continue;
+			}
+			textBoxEl.style.position = "relative";
+			textBoxEl.style.left = "0";
+			textBoxEl.style.top = "0";
+			contentEl.append(textBoxEl);
+			cumulativeY += textBoxMeasure.height;
+			anchorParagraphY = cumulativeY;
 		}
 	}
-	return contentEl;
+	if (floatingTextBoxesLayer) floatingLayers.push(floatingTextBoxesLayer);
+	return {
+		content: contentEl,
+		floatingLayers
+	};
+}
+function createCellFloatingTextBoxesLayer(doc) {
+	const layer = doc.createElement("div");
+	layer.className = "layout-cell-floating-text-boxes-layer";
+	layer.style.position = "absolute";
+	layer.style.inset = "0";
+	layer.style.pointerEvents = "none";
+	layer.style.zIndex = "10";
+	layer.style.overflow = "visible";
+	return layer;
+}
+function resolveCellTextBoxX(block, contentWidth) {
+	const horizontal = block.position?.horizontal;
+	if (horizontal?.posOffset !== void 0) return emuToPixels(horizontal.posOffset);
+	if (horizontal?.align === "center") return (contentWidth - block.width) / 2;
+	if (horizontal?.align === "right" || horizontal?.align === "outside") return contentWidth - block.width;
+	return 0;
+}
+function resolveCellTextBoxY(block) {
+	const vertical = block.position?.vertical;
+	if (vertical?.posOffset !== void 0) return emuToPixels(vertical.posOffset);
+	return 0;
+}
+function tableHasFloatingCellContent(block) {
+	for (const row of block.rows) for (const cell of row.cells) for (const cellBlock of cell.blocks) {
+		if (cellBlock.kind === "textBox" && isFloatingTextBoxBlock(cellBlock)) return true;
+		if (cellBlock.kind === "paragraph" && cellBlock.runs.some((run) => run.kind === "image" && isFloatingImageRun(run))) return true;
+		if (cellBlock.kind === "table" && tableHasFloatingCellContent(cellBlock)) return true;
+	}
+	return false;
 }
 /**
 * Render a nested table (within a cell)
@@ -214,8 +282,18 @@ function renderTableCell(cell, cellMeasure, x, rowHeight, borderFlags, columnsPi
 			default: break;
 		}
 	}
-	const contentEl = renderCellContent(cell, cellMeasure, context, doc);
-	cellEl.append(contentEl);
+	const renderedContent = renderCellContent(cell, cellMeasure, context, doc);
+	if (renderedContent.floatingLayers.length > 0) {
+		renderedContent.content.style.height = "100%";
+		renderedContent.content.style.overflow = "hidden";
+		cellEl.style.overflow = "visible";
+	}
+	cellEl.append(renderedContent.content);
+	for (const floatingLayer of renderedContent.floatingLayers) {
+		floatingLayer.style.left = `${padLeft}px`;
+		floatingLayer.style.top = `${padTop}px`;
+		cellEl.append(floatingLayer);
+	}
 	if (cell.blocks.length > 0) {
 		const firstBlock = cell.blocks.at(0);
 		const lastBlock = cell.blocks.at(-1);
@@ -316,7 +394,7 @@ function renderTableFragment(fragment, block, measure, context, options = {}) {
 	tableEl.style.position = "absolute";
 	tableEl.style.width = `${fragment.width}px`;
 	tableEl.style.height = `${fragment.height}px`;
-	tableEl.style.overflow = "hidden";
+	tableEl.style.overflow = tableHasFloatingCellContent(block) ? "visible" : "hidden";
 	tableEl.dataset["blockId"] = String(fragment.blockId);
 	tableEl.dataset["fromRow"] = String(fragment.fromRow);
 	tableEl.dataset["toRow"] = String(fragment.toRow);

package/dist/paged-layout/sectionBlockWidths.js

@@ -20,8 +20,10 @@ function computePerBlockWidths({ blocks, bodyConfig, finalConfig }) {
 	}).widths;
 }
 function computePerBlockMeasureInputs({ blocks, bodyConfig, finalConfig }) {
-	function colWidth(cw, cols) {
+	function colWidth(cw, cols, columnIndex) {
 		if (cols.count <= 1) return cw;
+		const authoredWidth = cols.widths?.[columnIndex];
+		if (authoredWidth !== void 0) return authoredWidth;
 		return Math.floor((cw - (cols.count - 1) * cols.gap) / cols.count);
 	}
 	function contentWidth(config) {
@@ -29,17 +31,23 @@ function computePerBlockMeasureInputs({ blocks, bodyConfig, finalConfig }) {
 	}
 	const { configs: sectionConfigs, breakIndices } = collectSectionConfigs(blocks, bodyConfig, finalConfig);
 	let sectionIdx = 0;
+	let columnIndex = 0;
 	const widths = [];
 	const marginTops = [];
 	const pageHeights = [];
 	const marginBottoms = [];
 	for (let i = 0; i < blocks.length; i++) {
 		const config = sectionConfigs[sectionIdx] ?? finalConfig;
-		widths.push(colWidth(contentWidth(config), config.columns ?? SINGLE_COLUMN_LAYOUT));
+		const columns = config.columns ?? SINGLE_COLUMN_LAYOUT;
+		widths.push(colWidth(contentWidth(config), columns, columnIndex));
 		marginTops.push(config.margins.top);
 		pageHeights.push(config.pageSize.h);
 		marginBottoms.push(config.margins.bottom);
-		if (sectionIdx < breakIndices.length && i === breakIndices[sectionIdx]) sectionIdx++;
+		if (sectionIdx < breakIndices.length && i === breakIndices[sectionIdx]) {
+			sectionIdx++;
+			columnIndex = 0;
+		} else if (blocks[i]?.kind === "pageBreak") columnIndex = 0;
+		else if (blocks[i]?.kind === "columnBreak") columnIndex = (columnIndex + 1) % columns.count;
 	}
 	return {
 		widths,

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -1430,9 +1430,18 @@ function tableRowAttrsToFormatting(attrs) {
 function convertPMTableCell(node, documentCounts) {
 	const attrs = expectTableCellAttrs(node);
 	const content = [];
+	let previousStandaloneTextBox = null;
 	node.forEach((contentNode) => {
-		if (contentNode.type.name === "paragraph") content.push(convertPMParagraph(contentNode, documentCounts));
-		else if (contentNode.type.name === "table") content.push(convertPMTable(contentNode, documentCounts));
+		if (contentNode.type.name === "paragraph") {
+			content.push(convertPMParagraph(contentNode, documentCounts));
+			previousStandaloneTextBox = null;
+		} else if (contentNode.type.name === "table") {
+			content.push(convertPMTable(contentNode, documentCounts));
+			previousStandaloneTextBox = null;
+		} else if (contentNode.type.name === "textBox") previousStandaloneTextBox = appendTextBoxBlock(content, contentNode, {
+			pendingPageBreaks: 0,
+			previousStandaloneTextBox
+		});
 	});
 	const cell = {
 		type: "tableCell",

package/dist/prosemirror/conversion/toProseDoc.js

@@ -24,15 +24,18 @@ function toProseDoc(document, options) {
 	const styleResolver = createStyleEngine(options?.styles ?? document.package.styles);
 	const theme = options?.theme ?? document.package.theme ?? null;
 	let textBoxGroupIndex = 0;
+	const nextTextBoxGroupId = () => String(textBoxGroupIndex++);
 	const convertBodyBlocks = (blocks) => {
 		const out = [];
 		for (const block of blocks) if (block.type === "paragraph") {
 			const pbPos = paragraphPageBreakPosition(block);
 			if (pbPos === "before") out.push(schema.node("pageBreak"));
-			out.push(...convertParagraphWithTextBoxes(block, styleResolver, String(textBoxGroupIndex)));
-			textBoxGroupIndex += 1;
+			out.push(...convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId: nextTextBoxGroupId() }));
 			if (pbPos === "after") out.push(schema.node("pageBreak"));
-		} else if (block.type === "table") out.push(convertTable(block, styleResolver, theme));
+		} else if (block.type === "table") out.push(convertTable(block, styleResolver, {
+			theme,
+			nextTextBoxGroupId
+		}));
 		else out.push(convertBlockSdt(block, convertBodyBlocks));
 		return out;
 	};
@@ -535,7 +538,7 @@ function paragraphContentHasMeaningfulContent(content) {
 	if (content.type === "insertion" || content.type === "deletion" || content.type === "moveFrom" || content.type === "moveTo") return content.content.some(paragraphContentHasMeaningfulContent);
 	return true;
 }
-function convertTable(table, styleResolver, theme) {
+function convertTable(table, styleResolver, context) {
 	const rowSpanMap = calculateRowSpans(table);
 	const columnWidths = table.columnWidths;
 	const totalWidth = columnWidths?.reduce((sum, w) => sum + w, 0) ?? 0;
@@ -604,7 +607,7 @@ function convertTable(table, styleResolver, theme) {
 			})();
 		})();
 		if (bandingEnabledH && !isFirstRowStyled && !isLastRow) dataRowIndex++;
-		return convertTableRow(row, styleResolver, isFirstRowStyled, columnWidths, totalWidth, conditionalStyles, rowBandStyle, bandingEnabledV, look, resolvedTableBorders, rowIndex, totalRows, totalColumns, rowSpanMap, cellMarginsAttr, theme);
+		return convertTableRow(row, styleResolver, context, isFirstRowStyled, columnWidths, totalWidth, conditionalStyles, rowBandStyle, bandingEnabledV, look, resolvedTableBorders, rowIndex, totalRows, totalColumns, rowSpanMap, cellMarginsAttr);
 	});
 	return schema.node("table", attrs, rows);
 }
@@ -620,7 +623,7 @@ function countTableColumns(rows) {
 /**
 * Convert a TableRow to a ProseMirror table row node
 */
-function convertTableRow(row, styleResolver, isHeaderRow, columnWidths, totalWidth, conditionalStyles, rowBandStyle, bandingEnabledV, tableLook, tableBorders, rowIndex, totalRows, totalColumns, rowSpanMap, defaultCellMargins, theme) {
+function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths, totalWidth, conditionalStyles, rowBandStyle, bandingEnabledV, tableLook, tableBorders, rowIndex, totalRows, totalColumns, rowSpanMap, defaultCellMargins) {
 	const attrs = { isHeader: !!row.formatting?.header };
 	if (row.formatting?.height?.value !== void 0) attrs.height = row.formatting.height.value;
 	if (row.formatting?.heightRule) attrs.heightRule = row.formatting.heightRule;
@@ -695,7 +698,7 @@ function convertTableRow(row, styleResolver, isHeaderRow, columnWidths, totalWid
 		if (cellIsFirstRow && cellIsLastCol && (tableLook?.firstRow || rowCnf?.firstRow || cellCnf?.firstRow) && (tableLook?.lastColumn || rowCnf?.lastColumn || cellCnf?.lastColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.neCell);
 		if (cellIsLastRow && cellIsFirstCol && (tableLook?.lastRow || rowCnf?.lastRow || cellCnf?.lastRow) && (tableLook?.firstColumn || rowCnf?.firstColumn || cellCnf?.firstColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.swCell);
 		if (cellIsLastRow && cellIsLastCol && (tableLook?.lastRow || rowCnf?.lastRow || cellCnf?.lastRow) && (tableLook?.lastColumn || rowCnf?.lastColumn || cellCnf?.lastColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.seCell);
-		cells.push(convertTableCell(cell, styleResolver, isHeaderRow, gridWidth, cellConditionalStyle, tableBorders, isFirstRow, isLastRow, isFirstCol, isLastCol, calculatedRowSpan, preserveVMergeRestart, rowSpanInfo?.continuationCells, defaultCellMargins, theme));
+		cells.push(convertTableCell(cell, styleResolver, context, isHeaderRow, gridWidth, cellConditionalStyle, tableBorders, isFirstRow, isLastRow, isFirstCol, isLastCol, calculatedRowSpan, preserveVMergeRestart, rowSpanInfo?.continuationCells, defaultCellMargins));
 	}
 	return schema.node("tableRow", attrs, cells);
 }
@@ -724,7 +727,8 @@ function resolveThemedBorderColors(borders, theme) {
 /**
 * Convert a TableCell to a ProseMirror table cell node
 */
-function convertTableCell(cell, styleResolver, isHeader, gridWidthPercent, conditionalStyle, tableBorders, isFirstRow, isLastRow, isFirstCol, isLastCol, calculatedRowSpan, preserveVMergeRestart, vMergeContinuationCells, defaultCellMargins, theme) {
+function convertTableCell(cell, styleResolver, context, isHeader, gridWidthPercent, conditionalStyle, tableBorders, isFirstRow, isLastRow, isFirstCol, isLastCol, calculatedRowSpan, preserveVMergeRestart, vMergeContinuationCells, defaultCellMargins) {
+	const { theme } = context;
 	const formatting = cell.formatting;
 	const rowspan = calculatedRowSpan ?? 1;
 	let width = formatting?.width?.value;
@@ -776,8 +780,12 @@ function convertTableCell(cell, styleResolver, isHeader, gridWidthPercent, condi
 	if (preserveVMergeRestart) attrs._preserveVMergeRestart = true;
 	if (vMergeContinuationCells && vMergeContinuationCells.length > 0) attrs._docxVMergeContinuationCells = vMergeContinuationCells;
 	const contentNodes = [];
-	for (const content of cell.content) if (content.type === "paragraph") contentNodes.push(convertParagraph(content, styleResolver, void 0, conditionalStyle?.rPr, conditionalStyle?.pPr));
-	else contentNodes.push(convertTable(content, styleResolver, theme));
+	for (const content of cell.content) if (content.type === "paragraph") contentNodes.push(...convertParagraphWithTextBoxes(content, styleResolver, {
+		textBoxGroupId: context.nextTextBoxGroupId(),
+		...conditionalStyle?.rPr !== void 0 ? { extraRunFormatting: conditionalStyle.rPr } : {},
+		...conditionalStyle?.pPr !== void 0 ? { tableParagraphOverlay: conditionalStyle.pPr } : {}
+	}));
+	else contentNodes.push(convertTable(content, styleResolver, context));
 	if (contentNodes.length === 0) contentNodes.push(schema.node("paragraph", {}, []));
 	const nodeType = isHeader ? "tableHeader" : "tableCell";
 	return schema.node(nodeType, attrs, contentNodes);
@@ -1214,13 +1222,9 @@ function convertShape(shape) {
 		position
 	});
 }
-/**
-* Convert a paragraph block to PM nodes, extracting text boxes as sibling nodes.
-* Skips ghost empty paragraphs that only contained text box drawings.
-*/
-function convertParagraphWithTextBoxes(block, styleResolver, textBoxGroupId) {
+function convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId, extraRunFormatting, tableParagraphOverlay }) {
 	const textBoxes = extractTextBoxesFromParagraph(block);
-	const pmParagraph = convertParagraph(block, styleResolver);
+	const pmParagraph = convertParagraph(block, styleResolver, void 0, extraRunFormatting, tableParagraphOverlay);
 	const nodes = [];
 	const isEmptyAfterExtraction = textBoxes.length > 0 && pmParagraph.content.size === 0;
 	const keepWrapperParagraph = isEmptyAfterExtraction && hasParagraphBoundaryPayload(block, pmParagraph);
@@ -1361,12 +1365,14 @@ function headerFooterToProseDoc(content, options) {
 	const styleResolver = options?.styles ? createStyleEngine(options.styles) : null;
 	const theme = options?.theme ?? null;
 	let textBoxGroupIndex = 0;
+	const nextTextBoxGroupId = () => String(textBoxGroupIndex++);
 	const convertBlocks = (blocks) => {
 		const out = [];
-		for (const block of blocks) if (block.type === "paragraph") {
-			out.push(...convertParagraphWithTextBoxes(block, styleResolver, String(textBoxGroupIndex)));
-			textBoxGroupIndex += 1;
-		} else if (block.type === "table") out.push(convertTable(block, styleResolver, theme));
+		for (const block of blocks) if (block.type === "paragraph") out.push(...convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId: nextTextBoxGroupId() }));
+		else if (block.type === "table") out.push(convertTable(block, styleResolver, {
+			theme,
+			nextTextBoxGroupId
+		}));
 		else out.push(convertBlockSdt(block, convertBlocks));
 		return out;
 	};

package/dist/prosemirror/extensions/nodes/TableExtension.js

@@ -298,7 +298,7 @@ function buildCellWidthStyles(attrs) {
 	return styles;
 }
 const tableCellSpec = {
-	content: "(paragraph | table)+",
+	content: "(paragraph | table | textBox)+",
 	tableRole: "cell",
 	isolating: true,
 	attrs: {
@@ -351,7 +351,7 @@ const tableCellSpec = {
 	}
 };
 const tableHeaderSpec = {
-	content: "(paragraph | table)+",
+	content: "(paragraph | table | textBox)+",
 	tableRole: "header_cell",
 	isolating: true,
 	attrs: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",