documents.js 1.61.0 → 1.63.0

package/dist/layout/drawing.js

@@ -1,28 +1,191 @@
 import { flipY } from "../model/geometry.js";
+import { mergeByPaintOrder } from "../model/paint-order.js";
 import { convertShape } from "./slides.js";
 import { LAYOUT_FORMAT_VERSION } from "document-schema.js";
+import { rotatePointAboutCenter } from "pdf-codec";
 //#region src/layout/drawing.ts
+function isRotated(rotationDeg) {
+	return rotationDeg !== void 0 && rotationDeg !== 0;
+}
+function boxCenter(box) {
+	return {
+		x: box.xPt + box.widthPt / 2,
+		y: box.yPt + box.heightPt / 2
+	};
+}
+function rotator(flipped, rotationDeg) {
+	const center = boxCenter(flipped);
+	const ccwDeg = -rotationDeg;
+	return (point) => rotatePointAboutCenter(point, center, ccwDeg);
+}
+function boxCorners(box) {
+	return [
+		{
+			x: box.xPt,
+			y: box.yPt
+		},
+		{
+			x: box.xPt + box.widthPt,
+			y: box.yPt
+		},
+		{
+			x: box.xPt + box.widthPt,
+			y: box.yPt + box.heightPt
+		},
+		{
+			x: box.xPt,
+			y: box.yPt + box.heightPt
+		}
+	];
+}
 function convertRectVector(vector, pageHeightPt, out) {
 	const flipped = flipY(vector.frame, pageHeightPt);
+	if (!isRotated(vector.rotationDeg)) {
+		out.push({
+			kind: "rect",
+			xPt: flipped.xPt,
+			yPt: flipped.yPt,
+			widthPt: flipped.widthPt,
+			heightPt: flipped.heightPt,
+			fill: vector.fill,
+			stroke: vector.stroke,
+			sourcePath: vector.sourcePath
+		});
+		return;
+	}
+	const rotate = rotator(flipped, vector.rotationDeg);
+	const [start, ...rest] = boxCorners(flipped).map(rotate);
+	const subpath = {
+		startXPt: start.x,
+		startYPt: start.y,
+		closed: true,
+		segments: rest.map((corner) => ({
+			kind: "line",
+			xPt: corner.x,
+			yPt: corner.y
+		}))
+	};
 	out.push({
-		kind: "rect",
-		xPt: flipped.xPt,
-		yPt: flipped.yPt,
-		widthPt: flipped.widthPt,
-		heightPt: flipped.heightPt,
+		kind: "path",
+		subpaths: [subpath],
 		fill: vector.fill,
 		stroke: vector.stroke,
 		sourcePath: vector.sourcePath
 	});
 }
+const CIRCLE_CUBIC_RATIO = 4 / 3 * (Math.SQRT2 - 1);
+function ellipseCubicPoints(flipped) {
+	const cx = flipped.xPt + flipped.widthPt / 2;
+	const cy = flipped.yPt + flipped.heightPt / 2;
+	const rx = flipped.widthPt / 2;
+	const ry = flipped.heightPt / 2;
+	const kx = rx * CIRCLE_CUBIC_RATIO;
+	const ky = ry * CIRCLE_CUBIC_RATIO;
+	return {
+		start: {
+			x: cx + rx,
+			y: cy
+		},
+		arcs: [
+			{
+				c1: {
+					x: cx + rx,
+					y: cy + ky
+				},
+				c2: {
+					x: cx + kx,
+					y: cy + ry
+				},
+				to: {
+					x: cx,
+					y: cy + ry
+				}
+			},
+			{
+				c1: {
+					x: cx - kx,
+					y: cy + ry
+				},
+				c2: {
+					x: cx - rx,
+					y: cy + ky
+				},
+				to: {
+					x: cx - rx,
+					y: cy
+				}
+			},
+			{
+				c1: {
+					x: cx - rx,
+					y: cy - ky
+				},
+				c2: {
+					x: cx - kx,
+					y: cy - ry
+				},
+				to: {
+					x: cx,
+					y: cy - ry
+				}
+			},
+			{
+				c1: {
+					x: cx + kx,
+					y: cy - ry
+				},
+				c2: {
+					x: cx + rx,
+					y: cy - ky
+				},
+				to: {
+					x: cx + rx,
+					y: cy
+				}
+			}
+		]
+	};
+}
 function convertEllipseVector(vector, pageHeightPt, out) {
 	const flipped = flipY(vector.frame, pageHeightPt);
+	if (!isRotated(vector.rotationDeg)) {
+		out.push({
+			kind: "ellipse",
+			xPt: flipped.xPt,
+			yPt: flipped.yPt,
+			widthPt: flipped.widthPt,
+			heightPt: flipped.heightPt,
+			fill: vector.fill,
+			stroke: vector.stroke,
+			sourcePath: vector.sourcePath
+		});
+		return;
+	}
+	const rotate = rotator(flipped, vector.rotationDeg);
+	const { start, arcs } = ellipseCubicPoints(flipped);
+	const rotatedStart = rotate(start);
+	const segments = arcs.map((arc) => {
+		const c1 = rotate(arc.c1);
+		const c2 = rotate(arc.c2);
+		const to = rotate(arc.to);
+		return {
+			kind: "cubic",
+			c1xPt: c1.x,
+			c1yPt: c1.y,
+			c2xPt: c2.x,
+			c2yPt: c2.y,
+			xPt: to.x,
+			yPt: to.y
+		};
+	});
 	out.push({
-		kind: "ellipse",
-		xPt: flipped.xPt,
-		yPt: flipped.yPt,
-		widthPt: flipped.widthPt,
-		heightPt: flipped.heightPt,
+		kind: "path",
+		subpaths: [{
+			startXPt: rotatedStart.x,
+			startYPt: rotatedStart.y,
+			closed: true,
+			segments
+		}],
 		fill: vector.fill,
 		stroke: vector.stroke,
 		sourcePath: vector.sourcePath
@@ -47,24 +210,37 @@ function placePathPoint(frame, point, pageHeightPt) {
 	};
 }
 function convertPathVector(vector, pageHeightPt, out) {
+	const rotate = isRotated(vector.rotationDeg) ? rotator(flipY(vector.frame, pageHeightPt), vector.rotationDeg) : void 0;
+	const place = (point) => {
+		const placed = placePathPoint(vector.frame, point, pageHeightPt);
+		if (rotate === void 0) return placed;
+		const rotated = rotate({
+			x: placed.xPt,
+			y: placed.yPt
+		});
+		return {
+			xPt: rotated.x,
+			yPt: rotated.y
+		};
+	};
 	const subpaths = vector.subpaths.map((subpath) => {
-		const start = placePathPoint(vector.frame, subpath.start, pageHeightPt);
+		const start = place(subpath.start);
 		return {
 			startXPt: start.xPt,
 			startYPt: start.yPt,
 			closed: subpath.closed,
 			segments: subpath.segments.map((segment) => {
 				if (segment.kind === "line") {
-					const to = placePathPoint(vector.frame, segment.to, pageHeightPt);
+					const to = place(segment.to);
 					return {
 						kind: "line",
 						xPt: to.xPt,
 						yPt: to.yPt
 					};
 				}
-				const control1 = placePathPoint(vector.frame, segment.control1, pageHeightPt);
-				const control2 = placePathPoint(vector.frame, segment.control2, pageHeightPt);
-				const to = placePathPoint(vector.frame, segment.to, pageHeightPt);
+				const control1 = place(segment.control1);
+				const control2 = place(segment.control2);
+				const to = place(segment.to);
 				return {
 					kind: "cubic",
 					c1xPt: control1.xPt,
@@ -94,8 +270,8 @@ function convertVector(vector, pageHeightPt, out) {
 }
 function convertPage(page, measurer, images) {
 	const items = [];
-	for (const vector of page.vectors) convertVector(vector, page.size.heightPt, items);
-	for (const shape of page.shapes) convertShape(shape, page.size.heightPt, measurer, images, items);
+	for (const entry of mergeByPaintOrder(page.vectors, page.shapes)) if (entry.kind === "vector") convertVector(entry.value, page.size.heightPt, items);
+	else convertShape(entry.value, page.size.heightPt, measurer, images, items);
 	return {
 		widthPt: page.size.widthPt,
 		heightPt: page.size.heightPt,

package/dist/layout/engine.cjs

@@ -1,5 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_model_geometry = require("../model/geometry.cjs");
+const require_model_formula = require("../model/formula.cjs");
 const require_mathml_layout = require("../mathml/layout.cjs");
 const require_layout_shared = require("./shared.cjs");
 let document_schema_js = require("document-schema.js");
@@ -33,14 +34,16 @@ function layoutParagraphFlow(paragraph, section, pages, state, contentLeftXDown,
 	const fallbackRun = effectiveRuns[0];
 	const paragraphLeftXDown = contentLeftXDown + (paragraph.indentLeftPt ?? 0);
 	const paragraphWidthPt = Math.max(0, contentWidthPt - (paragraph.indentLeftPt ?? 0));
-	(0, pdf_codec.wrapRunsToWidth)(effectiveRuns, measurer, paragraphWidthPt).forEach((line, lineIndex) => {
+	const lines = (0, pdf_codec.wrapRunsToWidth)(effectiveRuns, measurer, paragraphWidthPt);
+	lines.forEach((line, lineIndex) => {
 		const lineHeightPt = require_layout_shared.lineNaturalHeightPt(line, measurer, fallbackRun) * (paragraph.lineSpacing ?? 1);
 		ensureRoom(state, section, pages, lineHeightPt, contentBottomYDown);
 		const baselineYDown = state.cursorYDown + line.ascentPt;
 		const firstLineIndentPt = lineIndex === 0 ? paragraph.indentFirstLinePt ?? 0 : 0;
 		const alignOffsetPt = require_layout_shared.alignmentOffsetPt(paragraph.alignment, paragraphWidthPt, line.widthPt);
-		for (const fragment of line.fragments) {
-			const xPt = paragraphLeftXDown + firstLineIndentPt + alignOffsetPt + fragment.xOffsetPt;
+		const justifyGapsPt = paragraph.alignment === "justify" && lineIndex < lines.length - 1 ? require_layout_shared.justifyLineGapsPt(line, paragraphWidthPt, measurer) : void 0;
+		line.fragments.forEach((fragment, fragmentIndex) => {
+			const xPt = paragraphLeftXDown + firstLineIndentPt + alignOffsetPt + fragment.xOffsetPt + (justifyGapsPt?.[fragmentIndex] ?? 0);
 			const yPt = section.pageSize.heightPt - baselineYDown;
 			const textItem = {
 				kind: "text",
@@ -67,7 +70,7 @@ function layoutParagraphFlow(paragraph, section, pages, state, contentLeftXDown,
 				};
 				state.items.push(link);
 			}
-		}
+		});
 		state.cursorYDown += lineHeightPt;
 	});
 	state.cursorYDown += paragraph.spacingAfterPt ?? 0;
@@ -78,21 +81,25 @@ function layoutParagraphInCell(paragraph, cellLeftXDown, cellWidthPt, startYDown
 	const fallbackRun = effectiveRuns[0];
 	const paragraphLeftXDown = cellLeftXDown + (paragraph.indentLeftPt ?? 0);
 	const paragraphWidthPt = Math.max(0, cellWidthPt - (paragraph.indentLeftPt ?? 0));
-	(0, pdf_codec.wrapRunsToWidth)(effectiveRuns, measurer, paragraphWidthPt).forEach((line, lineIndex) => {
+	const lines = (0, pdf_codec.wrapRunsToWidth)(effectiveRuns, measurer, paragraphWidthPt);
+	lines.forEach((line, lineIndex) => {
 		const lineHeightPt = require_layout_shared.lineNaturalHeightPt(line, measurer, fallbackRun) * (paragraph.lineSpacing ?? 1);
 		const baselineYDown = cursorYDown + line.ascentPt;
 		const firstLineIndentPt = lineIndex === 0 ? paragraph.indentFirstLinePt ?? 0 : 0;
 		const alignOffsetPt = require_layout_shared.alignmentOffsetPt(paragraph.alignment, paragraphWidthPt, line.widthPt);
-		for (const fragment of line.fragments) out.push({
-			kind: "text",
-			text: fragment.text,
-			xPt: paragraphLeftXDown + firstLineIndentPt + alignOffsetPt + fragment.xOffsetPt,
-			yPt: pageHeightPt - baselineYDown,
-			font: fragment.font,
-			sizePt: fragment.sizePt,
-			color: fragment.color,
-			underline: fragment.underline,
-			sourcePath: fragment.sourcePath
+		const justifyGapsPt = paragraph.alignment === "justify" && lineIndex < lines.length - 1 ? require_layout_shared.justifyLineGapsPt(line, paragraphWidthPt, measurer) : void 0;
+		line.fragments.forEach((fragment, fragmentIndex) => {
+			out.push({
+				kind: "text",
+				text: fragment.text,
+				xPt: paragraphLeftXDown + firstLineIndentPt + alignOffsetPt + fragment.xOffsetPt + (justifyGapsPt?.[fragmentIndex] ?? 0),
+				yPt: pageHeightPt - baselineYDown,
+				font: fragment.font,
+				sizePt: fragment.sizePt,
+				color: fragment.color,
+				underline: fragment.underline,
+				sourcePath: fragment.sourcePath
+			});
 		});
 		cursorYDown += lineHeightPt;
 	});
@@ -109,13 +116,15 @@ function layoutTableFlow(table, section, pages, state, contentLeftXDown, content
 		for (const cell of row.cells) {
 			const span = cell.colSpan ?? 1;
 			const cellWidthPt = require_layout_shared.sumColumnWidthsPt(table.columnWidthsPt, colIndex, span) * scale;
+			const cellFrameYDown = {
+				xPt: cellXDown,
+				yPt: state.cursorYDown,
+				widthPt: cellWidthPt,
+				heightPt: rowHeightPt
+			};
+			const cellSourcePath = cell.sourcePath ?? table.sourcePath;
 			if (cell.background !== void 0) {
-				const cellFrame = require_model_geometry.flipY({
-					xPt: cellXDown,
-					yPt: state.cursorYDown,
-					widthPt: cellWidthPt,
-					heightPt: rowHeightPt
-				}, section.pageSize.heightPt);
+				const cellFrame = require_model_geometry.flipY(cellFrameYDown, section.pageSize.heightPt);
 				state.items.push({
 					kind: "rect",
 					xPt: cellFrame.xPt,
@@ -123,9 +132,10 @@ function layoutTableFlow(table, section, pages, state, contentLeftXDown, content
 					widthPt: cellFrame.widthPt,
 					heightPt: cellFrame.heightPt,
 					fill: cell.background,
-					sourcePath: table.sourcePath
+					sourcePath: cellSourcePath
 				});
 			}
+			if (cell.borders !== void 0) require_layout_shared.pushCellBorderLines(cell.borders, cellFrameYDown, section.pageSize.heightPt, cellSourcePath, state.items);
 			let cellCursorYDown = state.cursorYDown;
 			for (const block of cell.blocks) if (block.kind === "paragraph") cellCursorYDown = layoutParagraphInCell(block, cellXDown, cellWidthPt, cellCursorYDown, section.pageSize.heightPt, measurer, state.items);
 			cellXDown += cellWidthPt;
@@ -155,16 +165,23 @@ function layoutImageFlow(block, section, pages, state, contentLeftXDown, content
 	state.items.push(imageItem);
 	state.cursorYDown += block.heightPt;
 }
-function layoutFormulaFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, options, formulas) {
-	const embedded = block.sourcePath === void 0 ? void 0 : options.formulas?.get(block.sourcePath);
-	if (embedded === void 0) {
-		const fallbackParagraph = block.document.kind === "wordprocessing" ? block.document.sections[0]?.blocks[0] : void 0;
-		if (fallbackParagraph?.kind === "paragraph") layoutParagraphFlow(fallbackParagraph, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer);
+function layoutFormulaFallback(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer) {
+	const formula = require_model_formula.formulaOfBlock(block);
+	if (formula === void 0) return;
+	layoutParagraphFlow({
+		kind: "paragraph",
+		runs: [{ text: require_model_formula.formulaPlaceholderText(formula) }]
+	}, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer);
+}
+function layoutFormulaFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, formulas) {
+	const formula = require_model_formula.formulaOfBlock(block);
+	if (formula === void 0 || formula.mathml.length === 0) {
+		layoutFormulaFallback(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer);
 		return;
 	}
 	const sizePt = formulaSizePtFromFrame(block.frame.heightPt);
 	const metrics = (0, pdf_codec.loadMathFont)().metricsAt(sizePt);
-	const { box } = require_mathml_layout.layoutFormula(embedded.mathml, {
+	const { box } = require_mathml_layout.layoutFormula(formula.mathml, {
 		metrics,
 		sizePt,
 		color: document_schema_js.COLOR_BLACK
@@ -194,7 +211,7 @@ function paginateSection(section, measurer, images, pages, options, formulas) {
 	} else if (block.kind === "paragraph") layoutParagraphFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer);
 	else if (block.kind === "table") layoutTableFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer);
 	else if (block.kind === "image") layoutImageFlow(block, section, pages, state, contentLeftXDown, contentBottomYDown, images);
-	else if (block.kind === "embeddedObject" && block.objectKind === "formula") layoutFormulaFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, options, formulas);
+	else if (block.kind === "embeddedObject" && block.objectKind === "formula") layoutFormulaFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, formulas);
 	flushPage(state, section, pages);
 }
 function convertWordprocessingToLayout(doc, options) {

package/dist/layout/engine.d.cts

@@ -1,10 +1,8 @@
-import { EmbeddedFormula } from "../model/formula.cjs";
 import { ContentDocument, LayoutDocument } from "document-schema.js";
 import { PositionedFormula, TextMeasurer } from "pdf-codec";
 //#region src/layout/engine.d.ts
 interface EngineLayoutOptions {
   readonly measurer: TextMeasurer;
-  readonly formulas?: ReadonlyMap<string, EmbeddedFormula>;
 }
 interface WordprocessingLayoutResult {
   readonly document: LayoutDocument;

package/dist/layout/engine.d.ts

@@ -1,10 +1,8 @@
-import { EmbeddedFormula } from "../model/formula.js";
 import { ContentDocument, LayoutDocument } from "document-schema.js";
 import { PositionedFormula, TextMeasurer } from "pdf-codec";
 //#region src/layout/engine.d.ts
 interface EngineLayoutOptions {
   readonly measurer: TextMeasurer;
-  readonly formulas?: ReadonlyMap<string, EmbeddedFormula>;
 }
 interface WordprocessingLayoutResult {
   readonly document: LayoutDocument;

package/dist/layout/engine.js

@@ -1,6 +1,7 @@
 import { flipY } from "../model/geometry.js";
+import { formulaOfBlock, formulaPlaceholderText } from "../model/formula.js";
 import { layoutFormula } from "../mathml/layout.js";
-import { alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, lineNaturalHeightPt, registerImage, sumColumnWidthsPt } from "./shared.js";
+import { alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, justifyLineGapsPt, lineNaturalHeightPt, pushCellBorderLines, registerImage, sumColumnWidthsPt } from "./shared.js";
 import { COLOR_BLACK, LAYOUT_FORMAT_VERSION } from "document-schema.js";
 import { loadMathFont, wrapRunsToWidth } from "pdf-codec";
 //#region src/layout/engine.ts
@@ -32,14 +33,16 @@ function layoutParagraphFlow(paragraph, section, pages, state, contentLeftXDown,
 	const fallbackRun = effectiveRuns[0];
 	const paragraphLeftXDown = contentLeftXDown + (paragraph.indentLeftPt ?? 0);
 	const paragraphWidthPt = Math.max(0, contentWidthPt - (paragraph.indentLeftPt ?? 0));
-	wrapRunsToWidth(effectiveRuns, measurer, paragraphWidthPt).forEach((line, lineIndex) => {
+	const lines = wrapRunsToWidth(effectiveRuns, measurer, paragraphWidthPt);
+	lines.forEach((line, lineIndex) => {
 		const lineHeightPt = lineNaturalHeightPt(line, measurer, fallbackRun) * (paragraph.lineSpacing ?? 1);
 		ensureRoom(state, section, pages, lineHeightPt, contentBottomYDown);
 		const baselineYDown = state.cursorYDown + line.ascentPt;
 		const firstLineIndentPt = lineIndex === 0 ? paragraph.indentFirstLinePt ?? 0 : 0;
 		const alignOffsetPt = alignmentOffsetPt(paragraph.alignment, paragraphWidthPt, line.widthPt);
-		for (const fragment of line.fragments) {
-			const xPt = paragraphLeftXDown + firstLineIndentPt + alignOffsetPt + fragment.xOffsetPt;
+		const justifyGapsPt = paragraph.alignment === "justify" && lineIndex < lines.length - 1 ? justifyLineGapsPt(line, paragraphWidthPt, measurer) : void 0;
+		line.fragments.forEach((fragment, fragmentIndex) => {
+			const xPt = paragraphLeftXDown + firstLineIndentPt + alignOffsetPt + fragment.xOffsetPt + (justifyGapsPt?.[fragmentIndex] ?? 0);
 			const yPt = section.pageSize.heightPt - baselineYDown;
 			const textItem = {
 				kind: "text",
@@ -66,7 +69,7 @@ function layoutParagraphFlow(paragraph, section, pages, state, contentLeftXDown,
 				};
 				state.items.push(link);
 			}
-		}
+		});
 		state.cursorYDown += lineHeightPt;
 	});
 	state.cursorYDown += paragraph.spacingAfterPt ?? 0;
@@ -77,21 +80,25 @@ function layoutParagraphInCell(paragraph, cellLeftXDown, cellWidthPt, startYDown
 	const fallbackRun = effectiveRuns[0];
 	const paragraphLeftXDown = cellLeftXDown + (paragraph.indentLeftPt ?? 0);
 	const paragraphWidthPt = Math.max(0, cellWidthPt - (paragraph.indentLeftPt ?? 0));
-	wrapRunsToWidth(effectiveRuns, measurer, paragraphWidthPt).forEach((line, lineIndex) => {
+	const lines = wrapRunsToWidth(effectiveRuns, measurer, paragraphWidthPt);
+	lines.forEach((line, lineIndex) => {
 		const lineHeightPt = lineNaturalHeightPt(line, measurer, fallbackRun) * (paragraph.lineSpacing ?? 1);
 		const baselineYDown = cursorYDown + line.ascentPt;
 		const firstLineIndentPt = lineIndex === 0 ? paragraph.indentFirstLinePt ?? 0 : 0;
 		const alignOffsetPt = alignmentOffsetPt(paragraph.alignment, paragraphWidthPt, line.widthPt);
-		for (const fragment of line.fragments) out.push({
-			kind: "text",
-			text: fragment.text,
-			xPt: paragraphLeftXDown + firstLineIndentPt + alignOffsetPt + fragment.xOffsetPt,
-			yPt: pageHeightPt - baselineYDown,
-			font: fragment.font,
-			sizePt: fragment.sizePt,
-			color: fragment.color,
-			underline: fragment.underline,
-			sourcePath: fragment.sourcePath
+		const justifyGapsPt = paragraph.alignment === "justify" && lineIndex < lines.length - 1 ? justifyLineGapsPt(line, paragraphWidthPt, measurer) : void 0;
+		line.fragments.forEach((fragment, fragmentIndex) => {
+			out.push({
+				kind: "text",
+				text: fragment.text,
+				xPt: paragraphLeftXDown + firstLineIndentPt + alignOffsetPt + fragment.xOffsetPt + (justifyGapsPt?.[fragmentIndex] ?? 0),
+				yPt: pageHeightPt - baselineYDown,
+				font: fragment.font,
+				sizePt: fragment.sizePt,
+				color: fragment.color,
+				underline: fragment.underline,
+				sourcePath: fragment.sourcePath
+			});
 		});
 		cursorYDown += lineHeightPt;
 	});
@@ -108,13 +115,15 @@ function layoutTableFlow(table, section, pages, state, contentLeftXDown, content
 		for (const cell of row.cells) {
 			const span = cell.colSpan ?? 1;
 			const cellWidthPt = sumColumnWidthsPt(table.columnWidthsPt, colIndex, span) * scale;
+			const cellFrameYDown = {
+				xPt: cellXDown,
+				yPt: state.cursorYDown,
+				widthPt: cellWidthPt,
+				heightPt: rowHeightPt
+			};
+			const cellSourcePath = cell.sourcePath ?? table.sourcePath;
 			if (cell.background !== void 0) {
-				const cellFrame = flipY({
-					xPt: cellXDown,
-					yPt: state.cursorYDown,
-					widthPt: cellWidthPt,
-					heightPt: rowHeightPt
-				}, section.pageSize.heightPt);
+				const cellFrame = flipY(cellFrameYDown, section.pageSize.heightPt);
 				state.items.push({
 					kind: "rect",
 					xPt: cellFrame.xPt,
@@ -122,9 +131,10 @@ function layoutTableFlow(table, section, pages, state, contentLeftXDown, content
 					widthPt: cellFrame.widthPt,
 					heightPt: cellFrame.heightPt,
 					fill: cell.background,
-					sourcePath: table.sourcePath
+					sourcePath: cellSourcePath
 				});
 			}
+			if (cell.borders !== void 0) pushCellBorderLines(cell.borders, cellFrameYDown, section.pageSize.heightPt, cellSourcePath, state.items);
 			let cellCursorYDown = state.cursorYDown;
 			for (const block of cell.blocks) if (block.kind === "paragraph") cellCursorYDown = layoutParagraphInCell(block, cellXDown, cellWidthPt, cellCursorYDown, section.pageSize.heightPt, measurer, state.items);
 			cellXDown += cellWidthPt;
@@ -154,16 +164,23 @@ function layoutImageFlow(block, section, pages, state, contentLeftXDown, content
 	state.items.push(imageItem);
 	state.cursorYDown += block.heightPt;
 }
-function layoutFormulaFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, options, formulas) {
-	const embedded = block.sourcePath === void 0 ? void 0 : options.formulas?.get(block.sourcePath);
-	if (embedded === void 0) {
-		const fallbackParagraph = block.document.kind === "wordprocessing" ? block.document.sections[0]?.blocks[0] : void 0;
-		if (fallbackParagraph?.kind === "paragraph") layoutParagraphFlow(fallbackParagraph, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer);
+function layoutFormulaFallback(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer) {
+	const formula = formulaOfBlock(block);
+	if (formula === void 0) return;
+	layoutParagraphFlow({
+		kind: "paragraph",
+		runs: [{ text: formulaPlaceholderText(formula) }]
+	}, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer);
+}
+function layoutFormulaFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, formulas) {
+	const formula = formulaOfBlock(block);
+	if (formula === void 0 || formula.mathml.length === 0) {
+		layoutFormulaFallback(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer);
 		return;
 	}
 	const sizePt = formulaSizePtFromFrame(block.frame.heightPt);
 	const metrics = loadMathFont().metricsAt(sizePt);
-	const { box } = layoutFormula(embedded.mathml, {
+	const { box } = layoutFormula(formula.mathml, {
 		metrics,
 		sizePt,
 		color: COLOR_BLACK
@@ -193,7 +210,7 @@ function paginateSection(section, measurer, images, pages, options, formulas) {
 	} else if (block.kind === "paragraph") layoutParagraphFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer);
 	else if (block.kind === "table") layoutTableFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer);
 	else if (block.kind === "image") layoutImageFlow(block, section, pages, state, contentLeftXDown, contentBottomYDown, images);
-	else if (block.kind === "embeddedObject" && block.objectKind === "formula") layoutFormulaFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, options, formulas);
+	else if (block.kind === "embeddedObject" && block.objectKind === "formula") layoutFormulaFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, formulas);
 	flushPage(state, section, pages);
 }
 function convertWordprocessingToLayout(doc, options) {