documents.js 1.81.8 → 1.82.0

package/dist/layout/sheets.cjs

@@ -50,7 +50,7 @@ function columnLetters(index) {
 }
 function resolvePrintRange(sheet, formulas) {
 	if (sheet.printSettings.printRange !== void 0) return sheet.printSettings.printRange;
-	if (sheet.cells.length === 0 && formulas.length === 0) return;
+	if (sheet.cells.length === 0 && formulas.length === 0 && sheet.images.length === 0) return;
 	let startRow = Number.POSITIVE_INFINITY;
 	let startColumn = Number.POSITIVE_INFINITY;
 	let endRow = Number.NEGATIVE_INFINITY;
@@ -67,6 +67,12 @@ function resolvePrintRange(sheet, formulas) {
 		endRow = Math.max(endRow, formula.anchorRow);
 		endColumn = Math.max(endColumn, formula.anchorColumn);
 	}
+	for (const image of sheet.images) {
+		startRow = Math.min(startRow, image.anchorRow);
+		startColumn = Math.min(startColumn, image.anchorColumn);
+		endRow = Math.max(endRow, image.anchorRow);
+		endColumn = Math.max(endColumn, image.anchorColumn);
+	}
 	return {
 		startRow,
 		startColumn,
@@ -364,7 +370,7 @@ function renderAnchoredFormulas(formulas, columnAxis, rowAxis, gridLeftXPt, grid
 		const columnPosition = columnAxis.positionByIndex.get(anchored.anchorColumn);
 		const rowPosition = rowAxis.positionByIndex.get(anchored.anchorRow);
 		if (columnPosition === void 0 || rowPosition === void 0 || hiddenColumnIndices.has(anchored.anchorColumn) || hiddenRowIndices.has(anchored.anchorRow)) continue;
-		const sizePt = require_layout_shared.formulaSizePtFromFrame(anchored.frame.heightPt);
+		const sizePt = require_layout_shared.formulaSizePtForFrame(anchored.formula.mathml, anchored.frame);
 		const metrics = (0, pdf_codec.loadMathFont)().metricsAt(sizePt);
 		const { box } = require_mathml_layout.layoutFormula(anchored.formula.mathml, {
 			metrics,
@@ -386,6 +392,31 @@ function renderAnchoredFormulas(formulas, columnAxis, rowAxis, gridLeftXPt, grid
 		});
 	}
 }
+function renderAnchoredImages(sheetImages, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageHeightPt, hiddenColumnIndices, hiddenRowIndices, out, images) {
+	for (const image of sheetImages) {
+		const columnPosition = columnAxis.positionByIndex.get(image.anchorColumn);
+		const rowPosition = rowAxis.positionByIndex.get(image.anchorRow);
+		if (columnPosition === void 0 || rowPosition === void 0 || hiddenColumnIndices.has(image.anchorColumn) || hiddenRowIndices.has(image.anchorRow)) continue;
+		const imageId = require_layout_shared.registerImage(image, images);
+		const boxYDown = {
+			xPt: gridLeftXPt + columnAxis.offsetsPt[columnPosition] + image.offsetXPt,
+			yPt: gridTopYDownPt + rowAxis.offsetsPt[rowPosition] + image.offsetYPt,
+			widthPt: image.widthPt,
+			heightPt: image.heightPt
+		};
+		const flipped = require_model_geometry.flipY(boxYDown, pageHeightPt);
+		const imageItem = {
+			kind: "image",
+			imageId,
+			xPt: flipped.xPt,
+			yPt: flipped.yPt,
+			widthPt: image.widthPt,
+			heightPt: image.heightPt,
+			sourcePath: image.sourcePath
+		};
+		out.push(imageItem);
+	}
+}
 function bandableIndices(start, end, repeat) {
 	const indices = [];
 	for (let i = start; i <= end; i++) {
@@ -399,7 +430,7 @@ function rangeIndices(start, end) {
 	for (let i = start; i <= end; i++) indices.push(i);
 	return indices;
 }
-function convertSheetToPages(sheet, measurer, signal, out, formulasOut) {
+function convertSheetToPages(sheet, measurer, signal, out, formulasOut, images) {
 	require_ports_abort.throwIfAborted(signal);
 	const formulas = anchoredFormulas(sheet);
 	const range = resolvePrintRange(sheet, formulas);
@@ -489,6 +520,7 @@ function convertSheetToPages(sheet, measurer, signal, out, formulasOut) {
 		if (printSettings.headers) renderHeaderLabels(gutter, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageSize.heightPt, measurer, items);
 		items.push(...textItems);
 		renderAnchoredFormulas(formulas, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageSize.heightPt, out.length, hiddenColumnIndices, hiddenRowIndices, formulasOut);
+		renderAnchoredImages(sheet.images, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageSize.heightPt, hiddenColumnIndices, hiddenRowIndices, items, images);
 		out.push({
 			widthPt: pageSize.widthPt,
 			heightPt: pageSize.heightPt,
@@ -499,13 +531,14 @@ function convertSheetToPages(sheet, measurer, signal, out, formulasOut) {
 function convertSpreadsheetToLayout(doc, options) {
 	const pages = [];
 	const formulas = [];
-	for (const sheet of doc.sheets) convertSheetToPages(sheet, options.measurer, options.signal, pages, formulas);
+	const images = {};
+	for (const sheet of doc.sheets) convertSheetToPages(sheet, options.measurer, options.signal, pages, formulas, images);
 	return {
 		document: {
 			formatVersion: document_schema_js.LAYOUT_FORMAT_VERSION,
 			metadata: doc.metadata,
 			pages,
-			images: {}
+			images
 		},
 		formulas
 	};

package/dist/layout/sheets.js

@@ -2,7 +2,7 @@ import { flipY } from "../model/geometry.js";
 import { COLOR_BLACK as COLOR_BLACK$1, rgbHexToColor as rgbHexToColor$1 } from "../model/color.js";
 import { DEFAULT_LAYOUT_FONT } from "../model/style.js";
 import { layoutFormula } from "../mathml/layout.js";
-import { alignmentOffsetPt, formulaSizePtFromFrame, justifyLineGapsPt, lineNaturalHeightPt, pushCellBorderLines, sumColumnWidthsPt, toStyledRuns } from "./shared.js";
+import { alignmentOffsetPt, formulaSizePtForFrame, justifyLineGapsPt, lineNaturalHeightPt, pushCellBorderLines, registerImage, sumColumnWidthsPt, toStyledRuns } from "./shared.js";
 import { throwIfAborted } from "../ports/abort.js";
 import { LAYOUT_FORMAT_VERSION } from "document-schema.js";
 import { loadMathFont, wrapRunsToWidth } from "pdf-codec";
@@ -51,7 +51,7 @@ function columnLetters(index) {
 }
 function resolvePrintRange(sheet, formulas) {
 	if (sheet.printSettings.printRange !== void 0) return sheet.printSettings.printRange;
-	if (sheet.cells.length === 0 && formulas.length === 0) return;
+	if (sheet.cells.length === 0 && formulas.length === 0 && sheet.images.length === 0) return;
 	let startRow = Number.POSITIVE_INFINITY;
 	let startColumn = Number.POSITIVE_INFINITY;
 	let endRow = Number.NEGATIVE_INFINITY;
@@ -68,6 +68,12 @@ function resolvePrintRange(sheet, formulas) {
 		endRow = Math.max(endRow, formula.anchorRow);
 		endColumn = Math.max(endColumn, formula.anchorColumn);
 	}
+	for (const image of sheet.images) {
+		startRow = Math.min(startRow, image.anchorRow);
+		startColumn = Math.min(startColumn, image.anchorColumn);
+		endRow = Math.max(endRow, image.anchorRow);
+		endColumn = Math.max(endColumn, image.anchorColumn);
+	}
 	return {
 		startRow,
 		startColumn,
@@ -365,7 +371,7 @@ function renderAnchoredFormulas(formulas, columnAxis, rowAxis, gridLeftXPt, grid
 		const columnPosition = columnAxis.positionByIndex.get(anchored.anchorColumn);
 		const rowPosition = rowAxis.positionByIndex.get(anchored.anchorRow);
 		if (columnPosition === void 0 || rowPosition === void 0 || hiddenColumnIndices.has(anchored.anchorColumn) || hiddenRowIndices.has(anchored.anchorRow)) continue;
-		const sizePt = formulaSizePtFromFrame(anchored.frame.heightPt);
+		const sizePt = formulaSizePtForFrame(anchored.formula.mathml, anchored.frame);
 		const metrics = loadMathFont().metricsAt(sizePt);
 		const { box } = layoutFormula(anchored.formula.mathml, {
 			metrics,
@@ -387,6 +393,31 @@ function renderAnchoredFormulas(formulas, columnAxis, rowAxis, gridLeftXPt, grid
 		});
 	}
 }
+function renderAnchoredImages(sheetImages, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageHeightPt, hiddenColumnIndices, hiddenRowIndices, out, images) {
+	for (const image of sheetImages) {
+		const columnPosition = columnAxis.positionByIndex.get(image.anchorColumn);
+		const rowPosition = rowAxis.positionByIndex.get(image.anchorRow);
+		if (columnPosition === void 0 || rowPosition === void 0 || hiddenColumnIndices.has(image.anchorColumn) || hiddenRowIndices.has(image.anchorRow)) continue;
+		const imageId = registerImage(image, images);
+		const boxYDown = {
+			xPt: gridLeftXPt + columnAxis.offsetsPt[columnPosition] + image.offsetXPt,
+			yPt: gridTopYDownPt + rowAxis.offsetsPt[rowPosition] + image.offsetYPt,
+			widthPt: image.widthPt,
+			heightPt: image.heightPt
+		};
+		const flipped = flipY(boxYDown, pageHeightPt);
+		const imageItem = {
+			kind: "image",
+			imageId,
+			xPt: flipped.xPt,
+			yPt: flipped.yPt,
+			widthPt: image.widthPt,
+			heightPt: image.heightPt,
+			sourcePath: image.sourcePath
+		};
+		out.push(imageItem);
+	}
+}
 function bandableIndices(start, end, repeat) {
 	const indices = [];
 	for (let i = start; i <= end; i++) {
@@ -400,7 +431,7 @@ function rangeIndices(start, end) {
 	for (let i = start; i <= end; i++) indices.push(i);
 	return indices;
 }
-function convertSheetToPages(sheet, measurer, signal, out, formulasOut) {
+function convertSheetToPages(sheet, measurer, signal, out, formulasOut, images) {
 	throwIfAborted(signal);
 	const formulas = anchoredFormulas(sheet);
 	const range = resolvePrintRange(sheet, formulas);
@@ -490,6 +521,7 @@ function convertSheetToPages(sheet, measurer, signal, out, formulasOut) {
 		if (printSettings.headers) renderHeaderLabels(gutter, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageSize.heightPt, measurer, items);
 		items.push(...textItems);
 		renderAnchoredFormulas(formulas, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageSize.heightPt, out.length, hiddenColumnIndices, hiddenRowIndices, formulasOut);
+		renderAnchoredImages(sheet.images, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageSize.heightPt, hiddenColumnIndices, hiddenRowIndices, items, images);
 		out.push({
 			widthPt: pageSize.widthPt,
 			heightPt: pageSize.heightPt,
@@ -500,13 +532,14 @@ function convertSheetToPages(sheet, measurer, signal, out, formulasOut) {
 function convertSpreadsheetToLayout(doc, options) {
 	const pages = [];
 	const formulas = [];
-	for (const sheet of doc.sheets) convertSheetToPages(sheet, options.measurer, options.signal, pages, formulas);
+	const images = {};
+	for (const sheet of doc.sheets) convertSheetToPages(sheet, options.measurer, options.signal, pages, formulas, images);
 	return {
 		document: {
 			formatVersion: LAYOUT_FORMAT_VERSION,
 			metadata: doc.metadata,
 			pages,
-			images: {}
+			images
 		},
 		formulas
 	};

package/dist/layout/slides.cjs

@@ -116,7 +116,7 @@ function layoutTable(table, contentLeftXDown, contentWidthPt, startYDown, slideH
 function layoutShapeFormula(block, flippedFrame, formulaContext) {
 	const formula = require_model_formula.formulaOfBlock(block);
 	if (formula === void 0 || formula.mathml.length === 0) return;
-	const sizePt = require_layout_shared.formulaSizePtFromFrame(block.frame.heightPt);
+	const sizePt = require_layout_shared.formulaSizePtForFrame(formula.mathml, block.frame);
 	const metrics = (0, pdf_codec.loadMathFont)().metricsAt(sizePt);
 	const { box } = require_mathml_layout.layoutFormula(formula.mathml, {
 		metrics,

package/dist/layout/slides.js

@@ -1,7 +1,7 @@
 import { flipY } from "../model/geometry.js";
 import { formulaOfBlock } from "../model/formula.js";
 import { layoutFormula } from "../mathml/layout.js";
-import { alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtFromFrame, justifyLineGapsPt, lineNaturalHeightPt, registerImage, sumColumnWidthsPt } from "./shared.js";
+import { alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, justifyLineGapsPt, lineNaturalHeightPt, registerImage, sumColumnWidthsPt } from "./shared.js";
 import { COLOR_BLACK, LAYOUT_FORMAT_VERSION } from "document-schema.js";
 import { loadMathFont, rotatePointAboutCenter, wrapRunsToWidth } from "pdf-codec";
 //#region src/layout/slides.ts
@@ -115,7 +115,7 @@ function layoutTable(table, contentLeftXDown, contentWidthPt, startYDown, slideH
 function layoutShapeFormula(block, flippedFrame, formulaContext) {
 	const formula = formulaOfBlock(block);
 	if (formula === void 0 || formula.mathml.length === 0) return;
-	const sizePt = formulaSizePtFromFrame(block.frame.heightPt);
+	const sizePt = formulaSizePtForFrame(formula.mathml, block.frame);
 	const metrics = loadMathFont().metricsAt(sizePt);
 	const { box } = layoutFormula(formula.mathml, {
 		metrics,

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

@@ -5,6 +5,7 @@ const require_omml_read = require("../../omml/read.cjs");
 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");
 //#region src/ooxml/docx/embedded-objects.ts
 function isVectorOnlyRun(run, vectors) {
 	const elementChildren = run.children.filter((child) => child.type === "element");
@@ -27,60 +28,159 @@ function isEmbeddedObjectOnlyParagraph(paragraph, equations, vectors) {
 	}
 	return true;
 }
+function paragraphEmbeddings(block, paragraph, blockIndex, onMathDiagnostic) {
+	const equations = require_omml_read.collectOfficeMathElements(paragraph.children);
+	const vectors = require_ooxml_docx_vector.collectParagraphVectors(paragraph);
+	if (equations.length === 0 && vectors.length === 0) return {
+		placements: [],
+		consume: false
+	};
+	const converted = equations.map((equation) => ({
+		equation,
+		...require_omml_read.readOfficeMath(equation)
+	}));
+	const rendered = converted.filter((result) => result.mathml.length > 0);
+	if (rendered.length === 0 && vectors.length === 0) {
+		for (const result of converted) for (const diagnostic of result.diagnostics) onMathDiagnostic?.(diagnostic, { sourcePath: block.sourcePath });
+		return {
+			placements: [],
+			consume: false
+		};
+	}
+	const insertAt = blockIndex + 1;
+	const placements = [];
+	for (const result of rendered) placements.push({
+		index: insertAt,
+		build: (sourcePath) => {
+			for (const diagnostic of result.diagnostics) onMathDiagnostic?.(diagnostic, { sourcePath });
+			return require_model_formula.buildFormulaBlock({ mathml: result.mathml }, require_ooxml_docx_formula.equationFrame(result.equation), sourcePath);
+		}
+	});
+	for (const result of converted) {
+		if (result.mathml.length > 0) continue;
+		for (const diagnostic of result.diagnostics) onMathDiagnostic?.(diagnostic, { sourcePath: block.sourcePath });
+	}
+	if (vectors.length > 0) {
+		const vectorValues = vectors.map((detected) => detected.vector);
+		placements.push({
+			index: insertAt,
+			build: (sourcePath) => ({
+				...require_model_embedded_drawing.buildDrawingBlock({
+					widthPt: 0,
+					heightPt: 0
+				}, vectorValues),
+				sourcePath
+			})
+		});
+	}
+	return {
+		placements,
+		consume: isEmbeddedObjectOnlyParagraph(paragraph, equations, vectors)
+	};
+}
+function spliceContainerBlocks(blocks, containerChildren, pageSize, sourcePathPrefix, onMathDiagnostic) {
+	const paragraphElements = [];
+	require_ooxml_docx_formula.collectBodyParagraphs(containerChildren, paragraphElements);
+	const tableElements = [];
+	require_ooxml_docx_formula.collectBodyTables(containerChildren, tableElements);
+	let paragraphOrdinal = 0;
+	let tableOrdinal = 0;
+	let mutated = false;
+	const placements = [];
+	const consumedIndices = /* @__PURE__ */ new Set();
+	const rebuiltBlocks = blocks.map((block, blockIndex) => {
+		if (block.kind === "paragraph") {
+			const paragraph = paragraphElements[paragraphOrdinal];
+			paragraphOrdinal += 1;
+			if (paragraph === void 0) return block;
+			const { placements: paragraphPlacements, consume } = paragraphEmbeddings(block, paragraph, blockIndex, onMathDiagnostic);
+			if (paragraphPlacements.length > 0) placements.push(...paragraphPlacements);
+			if (consume) {
+				consumedIndices.add(blockIndex);
+				mutated = true;
+			}
+			return block;
+		}
+		if (block.kind === "table") {
+			const tableElement = tableElements[tableOrdinal];
+			tableOrdinal += 1;
+			if (tableElement === void 0) return block;
+			const rebuilt = rebuildTable(block, tableElement, pageSize, `${sourcePathPrefix}[${blockIndex}]`, onMathDiagnostic);
+			if (rebuilt !== block) mutated = true;
+			return rebuilt;
+		}
+		return block;
+	});
+	if (!mutated && placements.length === 0) return [...blocks];
+	return require_model_block_splice.spliceBlocks(rebuiltBlocks, placements, consumedIndices, (position) => `${sourcePathPrefix}[${position}]`);
+}
+function rebuildTable(table, tblElement, pageSize, blockPath, onMathDiagnostic) {
+	const rowElements = (0, ooxml_js.childrenWithTag)(tblElement, "w:tr");
+	let changed = false;
+	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];
+			if (cellElement === void 0) return cell;
+			const blocks = spliceContainerBlocks(cell.blocks, cellElement.children, pageSize, `${blockPath}.rows[${rowIndex}].cells[${cellIndex}].blocks`, onMathDiagnostic);
+			if (blocks === cell.blocks) return cell;
+			changed = true;
+			return {
+				...cell,
+				blocks
+			};
+		});
+		return changed ? {
+			...row,
+			cells
+		} : row;
+	});
+	return changed ? {
+		...table,
+		rows
+	} : table;
+}
 function spliceDocxEmbeddedObjects(sections, bodyChildren, onMathDiagnostic) {
 	const paragraphElements = [];
 	require_ooxml_docx_formula.collectBodyParagraphs(bodyChildren, paragraphElements);
+	const tableElements = [];
+	require_ooxml_docx_formula.collectBodyTables(bodyChildren, tableElements);
 	let paragraphOrdinal = 0;
+	let tableOrdinal = 0;
 	const out = [];
 	for (const [sectionIndex, section] of sections.entries()) {
 		const placements = [];
 		const consumedIndices = /* @__PURE__ */ new Set();
-		section.blocks.forEach((block, blockIndex) => {
-			if (block.kind !== "paragraph") return;
-			const paragraph = paragraphElements[paragraphOrdinal];
-			paragraphOrdinal += 1;
-			if (paragraph === void 0) return;
-			const equations = require_omml_read.collectOfficeMathElements(paragraph.children);
-			const vectors = require_ooxml_docx_vector.collectParagraphVectors(paragraph);
-			if (equations.length === 0 && vectors.length === 0) return;
-			const converted = equations.map((equation) => ({
-				equation,
-				...require_omml_read.readOfficeMath(equation)
-			}));
-			const rendered = converted.filter((result) => result.mathml.length > 0);
-			if (rendered.length === 0 && vectors.length === 0) {
-				for (const result of converted) for (const diagnostic of result.diagnostics) onMathDiagnostic?.(diagnostic, { sourcePath: block.sourcePath });
-				return;
-			}
-			const insertAt = blockIndex + 1;
-			if (isEmbeddedObjectOnlyParagraph(paragraph, equations, vectors)) consumedIndices.add(blockIndex);
-			for (const result of rendered) placements.push({
-				index: insertAt,
-				build: (sourcePath) => {
-					for (const diagnostic of result.diagnostics) onMathDiagnostic?.(diagnostic, { sourcePath });
-					return require_model_formula.buildFormulaBlock({ mathml: result.mathml }, require_ooxml_docx_formula.equationFrame(result.equation), sourcePath);
+		let mutated = false;
+		const rebuiltBlocks = section.blocks.map((block, blockIndex) => {
+			if (block.kind === "paragraph") {
+				const paragraph = paragraphElements[paragraphOrdinal];
+				paragraphOrdinal += 1;
+				if (paragraph === void 0) return block;
+				const { placements: paragraphPlacements, consume } = paragraphEmbeddings(block, paragraph, blockIndex, onMathDiagnostic);
+				if (paragraphPlacements.length > 0) placements.push(...paragraphPlacements);
+				if (consume) {
+					consumedIndices.add(blockIndex);
+					mutated = true;
 				}
-			});
-			for (const result of converted) {
-				if (result.mathml.length > 0) continue;
-				for (const diagnostic of result.diagnostics) onMathDiagnostic?.(diagnostic, { sourcePath: block.sourcePath });
+				return block;
 			}
-			if (vectors.length > 0) {
-				const vectorValues = vectors.map((detected) => detected.vector);
-				placements.push({
-					index: insertAt,
-					build: (sourcePath) => ({
-						...require_model_embedded_drawing.buildDrawingBlock(section.pageSize, vectorValues),
-						sourcePath
-					})
-				});
+			if (block.kind === "table") {
+				const tableElement = tableElements[tableOrdinal];
+				tableOrdinal += 1;
+				if (tableElement === void 0) return block;
+				const rebuilt = rebuildTable(block, tableElement, section.pageSize, `sections[${sectionIndex}].blocks`, onMathDiagnostic);
+				if (rebuilt !== block) mutated = true;
+				return rebuilt;
 			}
+			return block;
 		});
-		if (placements.length === 0 && consumedIndices.size === 0) {
+		if (placements.length === 0 && consumedIndices.size === 0 && !mutated) {
 			out.push(section);
 			continue;
 		}
-		const blocks = require_model_block_splice.spliceBlocks(section.blocks, placements, consumedIndices, (position) => `sections[${sectionIndex}].blocks[${position}]`);
+		const blocks = require_model_block_splice.spliceBlocks(rebuiltBlocks, placements, consumedIndices, (position) => `sections[${sectionIndex}].blocks[${position}]`);
 		out.push({
 			...section,
 			blocks

package/dist/ooxml/docx/embedded-objects.d.cts

@@ -1,4 +1,4 @@
-import { t as OmmlDiagnosticSink } from "../../formula-DFc2Ofsk.cjs";
+import { t as OmmlDiagnosticSink } from "../../formula-_8feXQH7.cjs";
 import { ContentSection } from "document-schema.js";
 import { XmlNode } from "ooxml.js";
 //#region src/ooxml/docx/embedded-objects.d.ts

package/dist/ooxml/docx/embedded-objects.d.ts

@@ -1,4 +1,4 @@
-import { t as OmmlDiagnosticSink } from "../../formula-B_4mdCuK.js";
+import { t as OmmlDiagnosticSink } from "../../formula-DDSYieJg.js";
 import { XmlNode } from "ooxml.js";
 import { ContentSection } from "document-schema.js";
 //#region src/ooxml/docx/embedded-objects.d.ts

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

@@ -3,7 +3,8 @@ import { buildFormulaBlock } from "../../model/formula.js";
 import { collectOfficeMathElements, readOfficeMath } from "../../omml/read.js";
 import { spliceBlocks } from "../../model/block-splice.js";
 import { collectParagraphVectors } from "./vector.js";
-import { PARAGRAPH_NON_CONTENT_TAGS, collectBodyParagraphs, equationFrame } from "./formula.js";
+import { PARAGRAPH_NON_CONTENT_TAGS, collectBodyParagraphs, collectBodyTables, equationFrame } from "./formula.js";
+import { childrenWithTag } from "ooxml.js";
 //#region src/ooxml/docx/embedded-objects.ts
 function isVectorOnlyRun(run, vectors) {
 	const elementChildren = run.children.filter((child) => child.type === "element");
@@ -26,60 +27,159 @@ function isEmbeddedObjectOnlyParagraph(paragraph, equations, vectors) {
 	}
 	return true;
 }
+function paragraphEmbeddings(block, paragraph, blockIndex, onMathDiagnostic) {
+	const equations = collectOfficeMathElements(paragraph.children);
+	const vectors = collectParagraphVectors(paragraph);
+	if (equations.length === 0 && vectors.length === 0) return {
+		placements: [],
+		consume: false
+	};
+	const converted = equations.map((equation) => ({
+		equation,
+		...readOfficeMath(equation)
+	}));
+	const rendered = converted.filter((result) => result.mathml.length > 0);
+	if (rendered.length === 0 && vectors.length === 0) {
+		for (const result of converted) for (const diagnostic of result.diagnostics) onMathDiagnostic?.(diagnostic, { sourcePath: block.sourcePath });
+		return {
+			placements: [],
+			consume: false
+		};
+	}
+	const insertAt = blockIndex + 1;
+	const placements = [];
+	for (const result of rendered) placements.push({
+		index: insertAt,
+		build: (sourcePath) => {
+			for (const diagnostic of result.diagnostics) onMathDiagnostic?.(diagnostic, { sourcePath });
+			return buildFormulaBlock({ mathml: result.mathml }, equationFrame(result.equation), sourcePath);
+		}
+	});
+	for (const result of converted) {
+		if (result.mathml.length > 0) continue;
+		for (const diagnostic of result.diagnostics) onMathDiagnostic?.(diagnostic, { sourcePath: block.sourcePath });
+	}
+	if (vectors.length > 0) {
+		const vectorValues = vectors.map((detected) => detected.vector);
+		placements.push({
+			index: insertAt,
+			build: (sourcePath) => ({
+				...buildDrawingBlock({
+					widthPt: 0,
+					heightPt: 0
+				}, vectorValues),
+				sourcePath
+			})
+		});
+	}
+	return {
+		placements,
+		consume: isEmbeddedObjectOnlyParagraph(paragraph, equations, vectors)
+	};
+}
+function spliceContainerBlocks(blocks, containerChildren, pageSize, sourcePathPrefix, onMathDiagnostic) {
+	const paragraphElements = [];
+	collectBodyParagraphs(containerChildren, paragraphElements);
+	const tableElements = [];
+	collectBodyTables(containerChildren, tableElements);
+	let paragraphOrdinal = 0;
+	let tableOrdinal = 0;
+	let mutated = false;
+	const placements = [];
+	const consumedIndices = /* @__PURE__ */ new Set();
+	const rebuiltBlocks = blocks.map((block, blockIndex) => {
+		if (block.kind === "paragraph") {
+			const paragraph = paragraphElements[paragraphOrdinal];
+			paragraphOrdinal += 1;
+			if (paragraph === void 0) return block;
+			const { placements: paragraphPlacements, consume } = paragraphEmbeddings(block, paragraph, blockIndex, onMathDiagnostic);
+			if (paragraphPlacements.length > 0) placements.push(...paragraphPlacements);
+			if (consume) {
+				consumedIndices.add(blockIndex);
+				mutated = true;
+			}
+			return block;
+		}
+		if (block.kind === "table") {
+			const tableElement = tableElements[tableOrdinal];
+			tableOrdinal += 1;
+			if (tableElement === void 0) return block;
+			const rebuilt = rebuildTable(block, tableElement, pageSize, `${sourcePathPrefix}[${blockIndex}]`, onMathDiagnostic);
+			if (rebuilt !== block) mutated = true;
+			return rebuilt;
+		}
+		return block;
+	});
+	if (!mutated && placements.length === 0) return [...blocks];
+	return spliceBlocks(rebuiltBlocks, placements, consumedIndices, (position) => `${sourcePathPrefix}[${position}]`);
+}
+function rebuildTable(table, tblElement, pageSize, blockPath, onMathDiagnostic) {
+	const rowElements = childrenWithTag(tblElement, "w:tr");
+	let changed = false;
+	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];
+			if (cellElement === void 0) return cell;
+			const blocks = spliceContainerBlocks(cell.blocks, cellElement.children, pageSize, `${blockPath}.rows[${rowIndex}].cells[${cellIndex}].blocks`, onMathDiagnostic);
+			if (blocks === cell.blocks) return cell;
+			changed = true;
+			return {
+				...cell,
+				blocks
+			};
+		});
+		return changed ? {
+			...row,
+			cells
+		} : row;
+	});
+	return changed ? {
+		...table,
+		rows
+	} : table;
+}
 function spliceDocxEmbeddedObjects(sections, bodyChildren, onMathDiagnostic) {
 	const paragraphElements = [];
 	collectBodyParagraphs(bodyChildren, paragraphElements);
+	const tableElements = [];
+	collectBodyTables(bodyChildren, tableElements);
 	let paragraphOrdinal = 0;
+	let tableOrdinal = 0;
 	const out = [];
 	for (const [sectionIndex, section] of sections.entries()) {
 		const placements = [];
 		const consumedIndices = /* @__PURE__ */ new Set();
-		section.blocks.forEach((block, blockIndex) => {
-			if (block.kind !== "paragraph") return;
-			const paragraph = paragraphElements[paragraphOrdinal];
-			paragraphOrdinal += 1;
-			if (paragraph === void 0) return;
-			const equations = collectOfficeMathElements(paragraph.children);
-			const vectors = collectParagraphVectors(paragraph);
-			if (equations.length === 0 && vectors.length === 0) return;
-			const converted = equations.map((equation) => ({
-				equation,
-				...readOfficeMath(equation)
-			}));
-			const rendered = converted.filter((result) => result.mathml.length > 0);
-			if (rendered.length === 0 && vectors.length === 0) {
-				for (const result of converted) for (const diagnostic of result.diagnostics) onMathDiagnostic?.(diagnostic, { sourcePath: block.sourcePath });
-				return;
-			}
-			const insertAt = blockIndex + 1;
-			if (isEmbeddedObjectOnlyParagraph(paragraph, equations, vectors)) consumedIndices.add(blockIndex);
-			for (const result of rendered) placements.push({
-				index: insertAt,
-				build: (sourcePath) => {
-					for (const diagnostic of result.diagnostics) onMathDiagnostic?.(diagnostic, { sourcePath });
-					return buildFormulaBlock({ mathml: result.mathml }, equationFrame(result.equation), sourcePath);
+		let mutated = false;
+		const rebuiltBlocks = section.blocks.map((block, blockIndex) => {
+			if (block.kind === "paragraph") {
+				const paragraph = paragraphElements[paragraphOrdinal];
+				paragraphOrdinal += 1;
+				if (paragraph === void 0) return block;
+				const { placements: paragraphPlacements, consume } = paragraphEmbeddings(block, paragraph, blockIndex, onMathDiagnostic);
+				if (paragraphPlacements.length > 0) placements.push(...paragraphPlacements);
+				if (consume) {
+					consumedIndices.add(blockIndex);
+					mutated = true;
 				}
-			});
-			for (const result of converted) {
-				if (result.mathml.length > 0) continue;
-				for (const diagnostic of result.diagnostics) onMathDiagnostic?.(diagnostic, { sourcePath: block.sourcePath });
+				return block;
 			}
-			if (vectors.length > 0) {
-				const vectorValues = vectors.map((detected) => detected.vector);
-				placements.push({
-					index: insertAt,
-					build: (sourcePath) => ({
-						...buildDrawingBlock(section.pageSize, vectorValues),
-						sourcePath
-					})
-				});
+			if (block.kind === "table") {
+				const tableElement = tableElements[tableOrdinal];
+				tableOrdinal += 1;
+				if (tableElement === void 0) return block;
+				const rebuilt = rebuildTable(block, tableElement, section.pageSize, `sections[${sectionIndex}].blocks`, onMathDiagnostic);
+				if (rebuilt !== block) mutated = true;
+				return rebuilt;
 			}
+			return block;
 		});
-		if (placements.length === 0 && consumedIndices.size === 0) {
+		if (placements.length === 0 && consumedIndices.size === 0 && !mutated) {
 			out.push(section);
 			continue;
 		}
-		const blocks = spliceBlocks(section.blocks, placements, consumedIndices, (position) => `sections[${sectionIndex}].blocks[${position}]`);
+		const blocks = spliceBlocks(rebuiltBlocks, placements, consumedIndices, (position) => `sections[${sectionIndex}].blocks[${position}]`);
 		out.push({
 			...section,
 			blocks