js.documents 7.20.35 → 8.0.0

package/dist/layout/reconstruct.cjs

@@ -5,6 +5,7 @@ const require_layout_shared = require("./shared.cjs");
 const require_layout_cell_typing = require("./cell-typing.cjs");
 const require_ports_abort = require("../ports/abort.cjs");
 const require_layout_lattice = require("./lattice.cjs");
+let document_schema_js = require("document-schema.js");
 let pdf_codec_fonts = require("pdf-codec/fonts");
 let pdf_codec_afm_widths = require("pdf-codec/afm-widths");
 let pdf_codec_text_group = require("pdf-codec/text-group");
@@ -1278,17 +1279,12 @@ function recoverTable(page, pageIndex) {
 	if (consumedText.size === 0) return;
 	const columnWidthsPt = [];
 	for (let j = 0; j < columnCount; j++) columnWidthsPt.push(lattice.columnBoundariesAscPt[j + 1] - lattice.columnBoundariesAscPt[j]);
-	const rows = [];
+	const positionedRows = [];
 	for (let i = 0; i < rowCount; i++) {
-		const cells = [];
-		let j = 0;
-		while (j < columnCount) {
+		const positioned = [];
+		for (let j = 0; j < columnCount; j++) {
 			const region = regionAt[i][j];
-			if (region.rowStart !== i) {
-				cells.push({ blocks: [] });
-				j = region.colEnd;
-				continue;
-			}
+			if (region.rowStart !== i || region.colStart !== j) continue;
 			const colSpan = region.colEnd - region.colStart;
 			const rowSpan = region.rowEnd - region.rowStart;
 			const cell = {
@@ -1306,14 +1302,17 @@ function recoverTable(page, pageIndex) {
 				widthPt: cellRightXPt - cellLeftXPt,
 				heightPt: cellTopYPt - cellBottomYPt
 			});
-			cells.push(cell);
-			j = region.colEnd;
+			positioned.push({
+				columnIndex: j,
+				cell
+			});
 		}
-		rows.push({
-			cells,
+		positionedRows.push({
+			cells: positioned,
 			heightPt: lattice.rowBoundariesDescPt[i] - lattice.rowBoundariesDescPt[i + 1]
 		});
 	}
+	const rows = (0, document_schema_js.denseTableRows)(positionedRows, columnCount);
 	const leftXPt = lattice.columnBoundariesAscPt[0];
 	const rightXPt = lattice.columnBoundariesAscPt[columnCount];
 	const topYPt = lattice.rowBoundariesDescPt[0];

package/dist/layout/reconstruct.js

@@ -4,6 +4,7 @@ import { stampFrame } from "./shared.js";
 import { inferCellValue } from "./cell-typing.js";
 import { throwIfAborted } from "../ports/abort.js";
 import { detectGridLattice, findColumnIndex, findRowIndex } from "./lattice.js";
+import { denseTableRows } from "document-schema.js";
 import { resolveStandardFont } from "pdf-codec/fonts";
 import { STANDARD_METRICS } from "pdf-codec/afm-widths";
 import { runGapPt, runsShareBaseline } from "pdf-codec/text-group";
@@ -1277,17 +1278,12 @@ function recoverTable(page, pageIndex) {
 	if (consumedText.size === 0) return;
 	const columnWidthsPt = [];
 	for (let j = 0; j < columnCount; j++) columnWidthsPt.push(lattice.columnBoundariesAscPt[j + 1] - lattice.columnBoundariesAscPt[j]);
-	const rows = [];
+	const positionedRows = [];
 	for (let i = 0; i < rowCount; i++) {
-		const cells = [];
-		let j = 0;
-		while (j < columnCount) {
+		const positioned = [];
+		for (let j = 0; j < columnCount; j++) {
 			const region = regionAt[i][j];
-			if (region.rowStart !== i) {
-				cells.push({ blocks: [] });
-				j = region.colEnd;
-				continue;
-			}
+			if (region.rowStart !== i || region.colStart !== j) continue;
 			const colSpan = region.colEnd - region.colStart;
 			const rowSpan = region.rowEnd - region.rowStart;
 			const cell = {
@@ -1305,14 +1301,17 @@ function recoverTable(page, pageIndex) {
 				widthPt: cellRightXPt - cellLeftXPt,
 				heightPt: cellTopYPt - cellBottomYPt
 			});
-			cells.push(cell);
-			j = region.colEnd;
+			positioned.push({
+				columnIndex: j,
+				cell
+			});
 		}
-		rows.push({
-			cells,
+		positionedRows.push({
+			cells: positioned,
 			heightPt: lattice.rowBoundariesDescPt[i] - lattice.rowBoundariesDescPt[i + 1]
 		});
 	}
+	const rows = denseTableRows(positionedRows, columnCount);
 	const leftXPt = lattice.columnBoundariesAscPt[0];
 	const rightXPt = lattice.columnBoundariesAscPt[columnCount];
 	const topYPt = lattice.rowBoundariesDescPt[0];

package/dist/layout/shared.cjs

@@ -212,24 +212,31 @@ function registerImage(block, images) {
 	}
 	return imageId;
 }
+/** The sum of `span` consecutive entries of `columnWidthsPt` from `startIndex`, stopping at the end of the array: a span reaching past the last entry (a spreadsheet merge running off the edge of the printed band, or a table whose declared grid is narrower than a cell claims) contributes only the entries that exist. */
 function sumColumnWidthsPt(columnWidthsPt, startIndex, span) {
-	let sum = 0;
-	for (let i = startIndex; i < startIndex + span && i < columnWidthsPt.length; i++) sum += columnWidthsPt[i] ?? 0;
-	return sum;
+	return columnWidthsPt.slice(startIndex, startIndex + span).reduce((sum, widthPt) => sum + widthPt, 0);
 }
-function estimateRowHeightPt(row, measurer, columnWidthsPt, scale) {
+/**
+* Pairs each row of `table` with the boxes of its anchor cells. Only anchors are boxed: a position a merged region covers is part of that region's own anchor cell, so laying it out as well would draw a second, empty cell over the region. An anchor's column is its position in the row, and its width is the sum of the column widths it spans, all multiplied by `scale`.
+*/
+function tableAnchorBoxes(table, scale) {
+	const positionsByRow = (0, document_schema_js.walkTableGrid)(table);
+	return table.rows.map((row, rowIndex) => ({
+		row,
+		anchors: positionsByRow[rowIndex].flatMap((position) => position.anchorRowIndex === void 0 ? [{
+			cell: position.cell,
+			xOffsetPt: sumColumnWidthsPt(table.columnWidthsPt, 0, position.columnIndex) * scale,
+			widthPt: sumColumnWidthsPt(table.columnWidthsPt, position.columnIndex, (0, document_schema_js.tableCellColumnSpan)(position.cell)) * scale
+		}] : [])
+	}));
+}
+function estimateRowHeightPt(anchors, measurer) {
 	let max = FALLBACK_ROW_HEIGHT_PT;
-	let colIndex = 0;
-	for (const cell of row.cells) {
-		const span = cell.colSpan ?? 1;
-		const cellWidthPt = sumColumnWidthsPt(columnWidthsPt, colIndex, span) * scale;
-		for (const block of cell.blocks) {
-			if (block.kind !== "paragraph") continue;
-			const runs = effectiveStyledRuns(block.runs, 1, headingStyleFor(block.styleId));
-			const lines = require_layout_text_layout.wrapRunsToWidth(runs, measurer, cellWidthPt);
-			for (const line of lines) max = Math.max(max, lineNaturalHeightPt(line, measurer, runs[0]));
-		}
-		colIndex += span;
+	for (const { cell, widthPt } of anchors) for (const block of cell.blocks) {
+		if (block.kind !== "paragraph") continue;
+		const runs = effectiveStyledRuns(block.runs, 1, headingStyleFor(block.styleId));
+		const lines = require_layout_text_layout.wrapRunsToWidth(runs, measurer, widthPt);
+		for (const line of lines) max = Math.max(max, lineNaturalHeightPt(line, measurer, runs[0]));
 	}
 	return max;
 }
@@ -251,5 +258,6 @@ exports.runFont = runFont;
 exports.stampFragmentFrame = stampFragmentFrame;
 exports.stampFrame = stampFrame;
 exports.sumColumnWidthsPt = sumColumnWidthsPt;
+exports.tableAnchorBoxes = tableAnchorBoxes;
 exports.textBoxForFragment = textBoxForFragment;
 exports.toStyledRuns = toStyledRuns;

package/dist/layout/shared.d.cts

@@ -1,5 +1,5 @@
 import { SourcedFragment, SourcedRun } from "./text-layout.cjs";
-import { Alignment, Box, ContentCellBorders, ContentImageBlock, ContentRun, ContentTableRow, LayoutFont, LayoutFrame, LayoutMetadata, MathFontMetrics, MathMlNode, PageSize, StyledRun, TextMeasurer, WrappedLine } from "document-schema.js";
+import { Alignment, Box, ContentCellBorders, ContentImageBlock, ContentRun, ContentTable, ContentTableCell, ContentTableRow, LayoutFont, LayoutFrame, LayoutMetadata, MathFontMetrics, MathMlNode, PageSize, StyledRun, TextMeasurer, WrappedLine } from "document-schema.js";
 import { LayoutDocument, LayoutImageAsset, LayoutItem, LayoutPage, LayoutText } from "pdf-codec";
 //#region src/layout/shared.d.ts
 declare function stampFrame(node: {
@@ -36,7 +36,23 @@ declare function alignmentOffsetPt(alignment: Alignment | undefined, contentWidt
 declare function justifyLineGapsPt(line: WrappedLine, targetWidthPt: number, measurer: TextMeasurer): readonly number[];
 declare function pushCellBorderLines(borders: ContentCellBorders, frameYDown: Box, pageHeightPt: number, sourcePath: string | undefined, out: LayoutItem[]): void;
 declare function registerImage(block: ContentImageBlock, images: Record<string, LayoutImageAsset>): string;
+/** The sum of `span` consecutive entries of `columnWidthsPt` from `startIndex`, stopping at the end of the array: a span reaching past the last entry (a spreadsheet merge running off the edge of the printed band, or a table whose declared grid is narrower than a cell claims) contributes only the entries that exist. */
 declare function sumColumnWidthsPt(columnWidthsPt: readonly number[], startIndex: number, span: number): number;
-declare function estimateRowHeightPt(row: ContentTableRow, measurer: TextMeasurer, columnWidthsPt: readonly number[], scale: number): number;
+/** One anchor cell of a laid-out table row: the cell itself, its left edge measured from the table's left edge, and its width, both already scaled. */
+interface TableAnchorBox {
+  readonly cell: ContentTableCell;
+  readonly xOffsetPt: number;
+  readonly widthPt: number;
+}
+/** One table row paired with the boxes of the anchor cells that are laid out in it. */
+interface TableRowAnchorBoxes {
+  readonly row: ContentTableRow;
+  readonly anchors: readonly TableAnchorBox[];
+}
+/**
+ * Pairs each row of `table` with the boxes of its anchor cells. Only anchors are boxed: a position a merged region covers is part of that region's own anchor cell, so laying it out as well would draw a second, empty cell over the region. An anchor's column is its position in the row, and its width is the sum of the column widths it spans, all multiplied by `scale`.
+ */
+declare function tableAnchorBoxes(table: ContentTable, scale: number): TableRowAnchorBoxes[];
+declare function estimateRowHeightPt(anchors: readonly TableAnchorBox[], measurer: TextMeasurer): number;
 //#endregion
-export { HEADING_STYLES, NOMINAL_TEXT_SIZE_PT, alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, headingStyleFor, justifyLineGapsPt, layoutDocumentOf, lineNaturalHeightPt, packagePagesOf, pushCellBorderLines, registerImage, runFont, stampFragmentFrame, stampFrame, sumColumnWidthsPt, textBoxForFragment, toStyledRuns };
+export { HEADING_STYLES, NOMINAL_TEXT_SIZE_PT, TableAnchorBox, TableRowAnchorBoxes, alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, headingStyleFor, justifyLineGapsPt, layoutDocumentOf, lineNaturalHeightPt, packagePagesOf, pushCellBorderLines, registerImage, runFont, stampFragmentFrame, stampFrame, sumColumnWidthsPt, tableAnchorBoxes, textBoxForFragment, toStyledRuns };

package/dist/layout/shared.d.ts

@@ -1,5 +1,5 @@
 import { SourcedFragment, SourcedRun } from "./text-layout.js";
-import { Alignment, Box, ContentCellBorders, ContentImageBlock, ContentRun, ContentTableRow, LayoutFont, LayoutFrame, LayoutMetadata, MathFontMetrics, MathMlNode, PageSize, StyledRun, TextMeasurer, WrappedLine } from "document-schema.js";
+import { Alignment, Box, ContentCellBorders, ContentImageBlock, ContentRun, ContentTable, ContentTableCell, ContentTableRow, LayoutFont, LayoutFrame, LayoutMetadata, MathFontMetrics, MathMlNode, PageSize, StyledRun, TextMeasurer, WrappedLine } from "document-schema.js";
 import { LayoutDocument, LayoutImageAsset, LayoutItem, LayoutPage, LayoutText } from "pdf-codec";
 //#region src/layout/shared.d.ts
 declare function stampFrame(node: {
@@ -36,7 +36,23 @@ declare function alignmentOffsetPt(alignment: Alignment | undefined, contentWidt
 declare function justifyLineGapsPt(line: WrappedLine, targetWidthPt: number, measurer: TextMeasurer): readonly number[];
 declare function pushCellBorderLines(borders: ContentCellBorders, frameYDown: Box, pageHeightPt: number, sourcePath: string | undefined, out: LayoutItem[]): void;
 declare function registerImage(block: ContentImageBlock, images: Record<string, LayoutImageAsset>): string;
+/** The sum of `span` consecutive entries of `columnWidthsPt` from `startIndex`, stopping at the end of the array: a span reaching past the last entry (a spreadsheet merge running off the edge of the printed band, or a table whose declared grid is narrower than a cell claims) contributes only the entries that exist. */
 declare function sumColumnWidthsPt(columnWidthsPt: readonly number[], startIndex: number, span: number): number;
-declare function estimateRowHeightPt(row: ContentTableRow, measurer: TextMeasurer, columnWidthsPt: readonly number[], scale: number): number;
+/** One anchor cell of a laid-out table row: the cell itself, its left edge measured from the table's left edge, and its width, both already scaled. */
+interface TableAnchorBox {
+  readonly cell: ContentTableCell;
+  readonly xOffsetPt: number;
+  readonly widthPt: number;
+}
+/** One table row paired with the boxes of the anchor cells that are laid out in it. */
+interface TableRowAnchorBoxes {
+  readonly row: ContentTableRow;
+  readonly anchors: readonly TableAnchorBox[];
+}
+/**
+ * Pairs each row of `table` with the boxes of its anchor cells. Only anchors are boxed: a position a merged region covers is part of that region's own anchor cell, so laying it out as well would draw a second, empty cell over the region. An anchor's column is its position in the row, and its width is the sum of the column widths it spans, all multiplied by `scale`.
+ */
+declare function tableAnchorBoxes(table: ContentTable, scale: number): TableRowAnchorBoxes[];
+declare function estimateRowHeightPt(anchors: readonly TableAnchorBox[], measurer: TextMeasurer): number;
 //#endregion
-export { HEADING_STYLES, NOMINAL_TEXT_SIZE_PT, alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, headingStyleFor, justifyLineGapsPt, layoutDocumentOf, lineNaturalHeightPt, packagePagesOf, pushCellBorderLines, registerImage, runFont, stampFragmentFrame, stampFrame, sumColumnWidthsPt, textBoxForFragment, toStyledRuns };
+export { HEADING_STYLES, NOMINAL_TEXT_SIZE_PT, TableAnchorBox, TableRowAnchorBoxes, alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, headingStyleFor, justifyLineGapsPt, layoutDocumentOf, lineNaturalHeightPt, packagePagesOf, pushCellBorderLines, registerImage, runFont, stampFragmentFrame, stampFrame, sumColumnWidthsPt, tableAnchorBoxes, textBoxForFragment, toStyledRuns };

package/dist/layout/shared.js

@@ -1,7 +1,7 @@
 import { layoutFormula } from "../mathml/layout.js";
 import { wrapRunsToWidth } from "./text-layout.js";
 import { base64ToBytes } from "ooxml.js";
-import { COLOR_BLACK, DEFAULT_LAYOUT_FONT } from "document-schema.js";
+import { COLOR_BLACK, DEFAULT_LAYOUT_FONT, tableCellColumnSpan, walkTableGrid } from "document-schema.js";
 import { crc32, decodePng, readJpegInfo } from "byte-codec";
 import { LAYOUT_FORMAT_VERSION } from "pdf-codec/layout";
 //#region src/layout/shared.ts
@@ -211,26 +211,33 @@ function registerImage(block, images) {
 	}
 	return imageId;
 }
+/** The sum of `span` consecutive entries of `columnWidthsPt` from `startIndex`, stopping at the end of the array: a span reaching past the last entry (a spreadsheet merge running off the edge of the printed band, or a table whose declared grid is narrower than a cell claims) contributes only the entries that exist. */
 function sumColumnWidthsPt(columnWidthsPt, startIndex, span) {
-	let sum = 0;
-	for (let i = startIndex; i < startIndex + span && i < columnWidthsPt.length; i++) sum += columnWidthsPt[i] ?? 0;
-	return sum;
+	return columnWidthsPt.slice(startIndex, startIndex + span).reduce((sum, widthPt) => sum + widthPt, 0);
+}
+/**
+* Pairs each row of `table` with the boxes of its anchor cells. Only anchors are boxed: a position a merged region covers is part of that region's own anchor cell, so laying it out as well would draw a second, empty cell over the region. An anchor's column is its position in the row, and its width is the sum of the column widths it spans, all multiplied by `scale`.
+*/
+function tableAnchorBoxes(table, scale) {
+	const positionsByRow = walkTableGrid(table);
+	return table.rows.map((row, rowIndex) => ({
+		row,
+		anchors: positionsByRow[rowIndex].flatMap((position) => position.anchorRowIndex === void 0 ? [{
+			cell: position.cell,
+			xOffsetPt: sumColumnWidthsPt(table.columnWidthsPt, 0, position.columnIndex) * scale,
+			widthPt: sumColumnWidthsPt(table.columnWidthsPt, position.columnIndex, tableCellColumnSpan(position.cell)) * scale
+		}] : [])
+	}));
 }
-function estimateRowHeightPt(row, measurer, columnWidthsPt, scale) {
+function estimateRowHeightPt(anchors, measurer) {
 	let max = FALLBACK_ROW_HEIGHT_PT;
-	let colIndex = 0;
-	for (const cell of row.cells) {
-		const span = cell.colSpan ?? 1;
-		const cellWidthPt = sumColumnWidthsPt(columnWidthsPt, colIndex, span) * scale;
-		for (const block of cell.blocks) {
-			if (block.kind !== "paragraph") continue;
-			const runs = effectiveStyledRuns(block.runs, 1, headingStyleFor(block.styleId));
-			const lines = wrapRunsToWidth(runs, measurer, cellWidthPt);
-			for (const line of lines) max = Math.max(max, lineNaturalHeightPt(line, measurer, runs[0]));
-		}
-		colIndex += span;
+	for (const { cell, widthPt } of anchors) for (const block of cell.blocks) {
+		if (block.kind !== "paragraph") continue;
+		const runs = effectiveStyledRuns(block.runs, 1, headingStyleFor(block.styleId));
+		const lines = wrapRunsToWidth(runs, measurer, widthPt);
+		for (const line of lines) max = Math.max(max, lineNaturalHeightPt(line, measurer, runs[0]));
 	}
 	return max;
 }
 //#endregion
-export { HEADING_STYLES, NOMINAL_TEXT_SIZE_PT, alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, headingStyleFor, justifyLineGapsPt, layoutDocumentOf, lineNaturalHeightPt, packagePagesOf, pushCellBorderLines, registerImage, runFont, stampFragmentFrame, stampFrame, sumColumnWidthsPt, textBoxForFragment, toStyledRuns };
+export { HEADING_STYLES, NOMINAL_TEXT_SIZE_PT, alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, headingStyleFor, justifyLineGapsPt, layoutDocumentOf, lineNaturalHeightPt, packagePagesOf, pushCellBorderLines, registerImage, runFont, stampFragmentFrame, stampFrame, sumColumnWidthsPt, tableAnchorBoxes, textBoxForFragment, toStyledRuns };

package/dist/layout/slides.cjs

@@ -81,13 +81,10 @@ function layoutTable(table, contentLeftXDown, contentWidthPt, startYDown, slideH
 	let cursorYDown = startYDown;
 	const gridWidthPt = table.columnWidthsPt.reduce((sum, w) => sum + w, 0);
 	const scale = gridWidthPt > 0 ? contentWidthPt / gridWidthPt : 1;
-	for (const row of table.rows) {
-		const rowHeightPt = row.heightPt ?? require_layout_shared.estimateRowHeightPt(row, measurer, table.columnWidthsPt, scale);
-		let cellXDown = contentLeftXDown;
-		let colIndex = 0;
-		for (const cell of row.cells) {
-			const span = cell.colSpan ?? 1;
-			const cellWidthPt = require_layout_shared.sumColumnWidthsPt(table.columnWidthsPt, colIndex, span) * scale;
+	for (const { row, anchors } of require_layout_shared.tableAnchorBoxes(table, scale)) {
+		const rowHeightPt = row.heightPt ?? require_layout_shared.estimateRowHeightPt(anchors, measurer);
+		for (const { cell, xOffsetPt, widthPt: cellWidthPt } of anchors) {
+			const cellXDown = contentLeftXDown + xOffsetPt;
 			const cellFrame = require_model_geometry.flipY({
 				xPt: cellXDown,
 				yPt: cursorYDown,
@@ -107,8 +104,6 @@ function layoutTable(table, contentLeftXDown, contentWidthPt, startYDown, slideH
 			});
 			let cellCursorYDown = cursorYDown;
 			for (const block of cell.blocks) if (block.kind === "paragraph") cellCursorYDown = layoutParagraph(block, cellXDown, cellWidthPt, cellCursorYDown, slideHeightPt, pageIndex, placement, 1, 1, measurer, out);
-			cellXDown += cellWidthPt;
-			colIndex += span;
 		}
 		cursorYDown += rowHeightPt;
 	}

package/dist/layout/slides.js

@@ -2,7 +2,7 @@ import { flipY, rotatePointAboutCenter } from "../model/geometry.js";
 import { formulaOfBlock } from "../model/formula.js";
 import { layoutFormula } from "../mathml/layout.js";
 import { wrapRunsToWidth } from "./text-layout.js";
-import { alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, justifyLineGapsPt, layoutDocumentOf, lineNaturalHeightPt, packagePagesOf, registerImage, stampFragmentFrame, stampFrame, sumColumnWidthsPt } from "./shared.js";
+import { alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, justifyLineGapsPt, layoutDocumentOf, lineNaturalHeightPt, packagePagesOf, registerImage, stampFragmentFrame, stampFrame, tableAnchorBoxes } from "./shared.js";
 import { COLOR_BLACK, resolveCellFillColor } from "document-schema.js";
 //#region src/layout/slides.ts
 function shapePlacement(flippedFrame, rotationDeg) {
@@ -80,13 +80,10 @@ function layoutTable(table, contentLeftXDown, contentWidthPt, startYDown, slideH
 	let cursorYDown = startYDown;
 	const gridWidthPt = table.columnWidthsPt.reduce((sum, w) => sum + w, 0);
 	const scale = gridWidthPt > 0 ? contentWidthPt / gridWidthPt : 1;
-	for (const row of table.rows) {
-		const rowHeightPt = row.heightPt ?? estimateRowHeightPt(row, measurer, table.columnWidthsPt, scale);
-		let cellXDown = contentLeftXDown;
-		let colIndex = 0;
-		for (const cell of row.cells) {
-			const span = cell.colSpan ?? 1;
-			const cellWidthPt = sumColumnWidthsPt(table.columnWidthsPt, colIndex, span) * scale;
+	for (const { row, anchors } of tableAnchorBoxes(table, scale)) {
+		const rowHeightPt = row.heightPt ?? estimateRowHeightPt(anchors, measurer);
+		for (const { cell, xOffsetPt, widthPt: cellWidthPt } of anchors) {
+			const cellXDown = contentLeftXDown + xOffsetPt;
 			const cellFrame = flipY({
 				xPt: cellXDown,
 				yPt: cursorYDown,
@@ -106,8 +103,6 @@ function layoutTable(table, contentLeftXDown, contentWidthPt, startYDown, slideH
 			});
 			let cellCursorYDown = cursorYDown;
 			for (const block of cell.blocks) if (block.kind === "paragraph") cellCursorYDown = layoutParagraph(block, cellXDown, cellWidthPt, cellCursorYDown, slideHeightPt, pageIndex, placement, 1, 1, measurer, out);
-			cellXDown += cellWidthPt;
-			colIndex += span;
 		}
 		cursorYDown += rowHeightPt;
 	}

package/dist/ooxml/docx/embedded-objects.cjs

@@ -9,6 +9,7 @@ const require_model_block_splice = require("../../model/block-splice.cjs");
 const require_ooxml_docx_vector = require("./vector.cjs");
 const require_ooxml_docx_formula = require("./formula.cjs");
 let ooxml_js = require("ooxml.js");
+let document_schema_js = require("document-schema.js");
 //#region src/ooxml/docx/embedded-objects.ts
 function isVectorOnlyRun(run, vectors) {
 	const elementChildren = run.children.filter((child) => child.type === "element");
@@ -153,7 +154,7 @@ function spliceContainerBlocks(blocks, containerChildren, pageSize, sourcePathPr
 			paragraphOrdinal += 1;
 			if (paragraph === void 0) return block;
 			const { placements: paragraphPlacements, consume } = paragraphEmbeddings(block, paragraph, blockIndex, rels, pkg, onMathDiagnostic);
-			if (paragraphPlacements.length > 0) placements.push(...paragraphPlacements);
+			placements.push(...paragraphPlacements);
 			if (consume) consumedIndices.add(blockIndex);
 			return block;
 		}
@@ -165,18 +166,27 @@ function spliceContainerBlocks(blocks, containerChildren, pageSize, sourcePathPr
 		}
 		return block;
 	});
-	if (!(consumedIndices.size > 0 || rebuiltBlocks.some((block, index) => block !== blocks[index])) && placements.length === 0) return [...blocks];
+	if (!(consumedIndices.size > 0 || rebuiltBlocks.some((block, index) => block !== blocks[index])) && placements.length === 0) return blocks;
 	return require_model_block_splice.spliceBlocks(rebuiltBlocks, placements, consumedIndices, (position) => `${sourcePathPrefix}[${position}]`);
 }
+function isBackedByTableCellElement(position) {
+	return position.anchorRowIndex === void 0 || position.columnIndex === position.anchorColumnIndex;
+}
 function rebuildTable(table, tblElement, pageSize, blockPath, rels, pkg, onMathDiagnostic) {
 	const rowElements = (0, ooxml_js.childrenWithTag)(tblElement, "w:tr");
+	const positionsByRow = (0, document_schema_js.walkTableGrid)(table);
 	const rows = table.rows.map((row, rowIndex) => {
 		const rowElement = rowElements[rowIndex];
 		const cellElements = rowElement === void 0 ? [] : (0, ooxml_js.childrenWithTag)(rowElement, "w:tc");
-		const cells = row.cells.map((cell, cellIndex) => {
-			const cellElement = cellElements[cellIndex];
+		const cellElementByColumn = /* @__PURE__ */ new Map();
+		positionsByRow[rowIndex].filter(isBackedByTableCellElement).forEach((position, ordinal) => {
+			const cellElement = cellElements[ordinal];
+			if (cellElement !== void 0) cellElementByColumn.set(position.columnIndex, cellElement);
+		});
+		const cells = row.cells.map((cell, columnIndex) => {
+			const cellElement = cellElementByColumn.get(columnIndex);
 			if (cellElement === void 0) return cell;
-			const blocks = spliceContainerBlocks(cell.blocks, cellElement.children, pageSize, `${blockPath}.rows[${rowIndex}].cells[${cellIndex}].blocks`, rels, pkg, onMathDiagnostic);
+			const blocks = spliceContainerBlocks(cell.blocks, cellElement.children, pageSize, `${blockPath}.rows[${rowIndex}].cells[${columnIndex}].blocks`, rels, pkg, onMathDiagnostic);
 			return blocks === cell.blocks ? cell : {
 				...cell,
 				blocks
@@ -210,7 +220,7 @@ function spliceDocxEmbeddedObjects(sections, bodyChildren, pkg, onMathDiagnostic
 				paragraphOrdinal += 1;
 				if (paragraph === void 0) return block;
 				const { placements: paragraphPlacements, consume } = paragraphEmbeddings(block, paragraph, blockIndex, rels, pkg, onMathDiagnostic);
-				if (paragraphPlacements.length > 0) placements.push(...paragraphPlacements);
+				placements.push(...paragraphPlacements);
 				if (consume) consumedIndices.add(blockIndex);
 				return block;
 			}
@@ -218,7 +228,7 @@ function spliceDocxEmbeddedObjects(sections, bodyChildren, pkg, onMathDiagnostic
 				const tableElement = tableElements[tableOrdinal];
 				tableOrdinal += 1;
 				if (tableElement === void 0) return block;
-				return rebuildTable(block, tableElement, section.pageSize, `sections[${sectionIndex}].blocks`, rels, pkg, onMathDiagnostic);
+				return rebuildTable(block, tableElement, section.pageSize, `sections[${sectionIndex}].blocks[${blockIndex}]`, rels, pkg, onMathDiagnostic);
 			}
 			return block;
 		});

package/dist/ooxml/docx/embedded-objects.js

@@ -8,6 +8,7 @@ import { spliceBlocks } from "../../model/block-splice.js";
 import { collectParagraphVectors } from "./vector.js";
 import { PARAGRAPH_NON_CONTENT_TAGS, collectBodyParagraphs, collectBodyTables, equationFrame } from "./formula.js";
 import { attr, base64ToBytes, childrenWithTag, elementsWithTag, resolveRelationships } from "ooxml.js";
+import { walkTableGrid } from "document-schema.js";
 //#region src/ooxml/docx/embedded-objects.ts
 function isVectorOnlyRun(run, vectors) {
 	const elementChildren = run.children.filter((child) => child.type === "element");
@@ -152,7 +153,7 @@ function spliceContainerBlocks(blocks, containerChildren, pageSize, sourcePathPr
 			paragraphOrdinal += 1;
 			if (paragraph === void 0) return block;
 			const { placements: paragraphPlacements, consume } = paragraphEmbeddings(block, paragraph, blockIndex, rels, pkg, onMathDiagnostic);
-			if (paragraphPlacements.length > 0) placements.push(...paragraphPlacements);
+			placements.push(...paragraphPlacements);
 			if (consume) consumedIndices.add(blockIndex);
 			return block;
 		}
@@ -164,18 +165,27 @@ function spliceContainerBlocks(blocks, containerChildren, pageSize, sourcePathPr
 		}
 		return block;
 	});
-	if (!(consumedIndices.size > 0 || rebuiltBlocks.some((block, index) => block !== blocks[index])) && placements.length === 0) return [...blocks];
+	if (!(consumedIndices.size > 0 || rebuiltBlocks.some((block, index) => block !== blocks[index])) && placements.length === 0) return blocks;
 	return spliceBlocks(rebuiltBlocks, placements, consumedIndices, (position) => `${sourcePathPrefix}[${position}]`);
 }
+function isBackedByTableCellElement(position) {
+	return position.anchorRowIndex === void 0 || position.columnIndex === position.anchorColumnIndex;
+}
 function rebuildTable(table, tblElement, pageSize, blockPath, rels, pkg, onMathDiagnostic) {
 	const rowElements = childrenWithTag(tblElement, "w:tr");
+	const positionsByRow = walkTableGrid(table);
 	const rows = table.rows.map((row, rowIndex) => {
 		const rowElement = rowElements[rowIndex];
 		const cellElements = rowElement === void 0 ? [] : childrenWithTag(rowElement, "w:tc");
-		const cells = row.cells.map((cell, cellIndex) => {
-			const cellElement = cellElements[cellIndex];
+		const cellElementByColumn = /* @__PURE__ */ new Map();
+		positionsByRow[rowIndex].filter(isBackedByTableCellElement).forEach((position, ordinal) => {
+			const cellElement = cellElements[ordinal];
+			if (cellElement !== void 0) cellElementByColumn.set(position.columnIndex, cellElement);
+		});
+		const cells = row.cells.map((cell, columnIndex) => {
+			const cellElement = cellElementByColumn.get(columnIndex);
 			if (cellElement === void 0) return cell;
-			const blocks = spliceContainerBlocks(cell.blocks, cellElement.children, pageSize, `${blockPath}.rows[${rowIndex}].cells[${cellIndex}].blocks`, rels, pkg, onMathDiagnostic);
+			const blocks = spliceContainerBlocks(cell.blocks, cellElement.children, pageSize, `${blockPath}.rows[${rowIndex}].cells[${columnIndex}].blocks`, rels, pkg, onMathDiagnostic);
 			return blocks === cell.blocks ? cell : {
 				...cell,
 				blocks
@@ -209,7 +219,7 @@ function spliceDocxEmbeddedObjects(sections, bodyChildren, pkg, onMathDiagnostic
 				paragraphOrdinal += 1;
 				if (paragraph === void 0) return block;
 				const { placements: paragraphPlacements, consume } = paragraphEmbeddings(block, paragraph, blockIndex, rels, pkg, onMathDiagnostic);
-				if (paragraphPlacements.length > 0) placements.push(...paragraphPlacements);
+				placements.push(...paragraphPlacements);
 				if (consume) consumedIndices.add(blockIndex);
 				return block;
 			}
@@ -217,7 +227,7 @@ function spliceDocxEmbeddedObjects(sections, bodyChildren, pkg, onMathDiagnostic
 				const tableElement = tableElements[tableOrdinal];
 				tableOrdinal += 1;
 				if (tableElement === void 0) return block;
-				return rebuildTable(block, tableElement, section.pageSize, `sections[${sectionIndex}].blocks`, rels, pkg, onMathDiagnostic);
+				return rebuildTable(block, tableElement, section.pageSize, `sections[${sectionIndex}].blocks[${blockIndex}]`, rels, pkg, onMathDiagnostic);
 			}
 			return block;
 		});

package/dist/{table-COmzfIOe.d.cts → table-DvKlZmG0.d.cts}

@@ -29,6 +29,15 @@ declare class OdtTableCell {
   get borders(): ContentCellBorders | undefined;
   set borders(value: ContentCellBorders | undefined);
 }
+declare class OdtCoveredTableCell {
+  private readonly node;
+  private readonly pkg;
+  constructor(node: XmlElement, pkg: Package);
+  get background(): Color | undefined;
+  set background(value: Color | undefined);
+  get borders(): ContentCellBorders | undefined;
+  set borders(value: ContentCellBorders | undefined);
+}
 declare class OdtTableRow {
   private readonly node;
   private readonly pkg;
@@ -37,7 +46,7 @@ declare class OdtTableRow {
   get heightPt(): number | undefined;
   set heightPt(value: number | undefined);
   appendCell(): OdtTableCell;
-  appendCoveredCell(): void;
+  appendCoveredCell(): OdtCoveredTableCell;
   private gridCells;
   mergeCellsHorizontally(startColumnIndex: number, colSpan: number): OdtTableCell;
   markCellCovered(columnIndex: number): void;
@@ -58,4 +67,4 @@ declare class OdtTable {
 }
 declare function buildTable(pkg: Package, init: TableInit): XmlElement;
 //#endregion
-export { TableInit as a, readCellDecoration as c, OdtTableRow as i, OdtTable as n, buildCellStyle as o, OdtTableCell as r, buildTable as s, CellDecoration as t };
+export { OdtTableRow as a, buildTable as c, OdtTableCell as i, readCellDecoration as l, OdtCoveredTableCell as n, TableInit as o, OdtTable as r, buildCellStyle as s, CellDecoration as t };

package/dist/{table-BmMyqRML.d.ts → table-qWkzpadC.d.ts}

@@ -29,6 +29,15 @@ declare class OdtTableCell {
   get borders(): ContentCellBorders | undefined;
   set borders(value: ContentCellBorders | undefined);
 }
+declare class OdtCoveredTableCell {
+  private readonly node;
+  private readonly pkg;
+  constructor(node: XmlElement, pkg: Package);
+  get background(): Color | undefined;
+  set background(value: Color | undefined);
+  get borders(): ContentCellBorders | undefined;
+  set borders(value: ContentCellBorders | undefined);
+}
 declare class OdtTableRow {
   private readonly node;
   private readonly pkg;
@@ -37,7 +46,7 @@ declare class OdtTableRow {
   get heightPt(): number | undefined;
   set heightPt(value: number | undefined);
   appendCell(): OdtTableCell;
-  appendCoveredCell(): void;
+  appendCoveredCell(): OdtCoveredTableCell;
   private gridCells;
   mergeCellsHorizontally(startColumnIndex: number, colSpan: number): OdtTableCell;
   markCellCovered(columnIndex: number): void;
@@ -58,4 +67,4 @@ declare class OdtTable {
 }
 declare function buildTable(pkg: Package, init: TableInit): XmlElement;
 //#endregion
-export { TableInit as a, readCellDecoration as c, OdtTableRow as i, OdtTable as n, buildCellStyle as o, OdtTableCell as r, buildTable as s, CellDecoration as t };
+export { OdtTableRow as a, buildTable as c, OdtTableCell as i, readCellDecoration as l, OdtCoveredTableCell as n, TableInit as o, OdtTable as r, buildCellStyle as s, CellDecoration as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js.documents",
-  "version": "7.20.35",
+  "version": "8.0.0",
   "description": "Bidirectional docx/pptx <-> PDF conversion and a read+write editable OOXML document model, built on ooxml.js and Zod 4 codecs.",
   "type": "module",
   "repository": {
@@ -77,21 +77,21 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "archive-codec": "1.11.7",
+    "archive-codec": "1.11.8",
     "byte-codec": "1.6.3",
-    "doc-codec": "3.0.1",
-    "document-schema.js": "7.11.5",
-    "epub-codec": "2.0.1",
+    "doc-codec": "4.0.0",
+    "document-schema.js": "7.12.0",
+    "epub-codec": "3.0.0",
     "fflate": "0.8.3",
-    "markdown-codec": "7.0.1",
-    "odf.js": "8.0.1",
-    "ooxml.js": "9.1.2",
-    "pdf-codec": "5.1.0",
-    "ppt-codec": "2.0.1",
-    "rtf-codec": "5.0.1",
+    "markdown-codec": "8.0.0",
+    "odf.js": "8.0.2",
+    "ooxml.js": "10.0.0",
+    "pdf-codec": "5.2.1",
+    "ppt-codec": "2.0.2",
+    "rtf-codec": "6.0.0",
     "temml": "0.13.4",
-    "wpd-codec": "4.0.1",
-    "xls-codec": "4.15.12",
+    "wpd-codec": "5.0.0",
+    "xls-codec": "4.15.13",
     "zod": "4.4.3"
   },
   "devDependencies": {