documents.js 1.102.2 → 2.0.0

package/dist/layout/engine.cjs

@@ -51,20 +51,26 @@ function layoutParagraphFlow(paragraph, section, pages, state, contentLeftXDown,
 	lines.forEach((line, lineIndex) => {
 		const lineHeightPt = require_layout_shared.lineNaturalHeightPt(line, measurer, fallbackRun) * (paragraph.lineSpacing ?? 1);
 		ensureRoom(state, section, pages, lineHeightPt, contentBottomYDown);
+		const pageIndex = pages.length;
 		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);
 		const justifyGapsPt = paragraph.alignment === "justify" && lineIndex < lines.length - 1 ? require_layout_shared.justifyLineGapsPt(line, paragraphWidthPt, measurer) : void 0;
-		if (lineIndex === 0 && paragraph.list !== void 0) state.items.push({
-			kind: "text",
-			text: listMarkerText(paragraph.list, listCounters),
-			xPt: paragraphLeftXDown - LIST_INDENT_STEP_PT,
-			yPt: section.pageSize.heightPt - baselineYDown,
-			font: fallbackRun.font,
-			sizePt: fallbackRun.sizePt,
-			color: fallbackRun.color,
-			sourcePath: paragraph.sourcePath
-		});
+		if (lineIndex === 0 && paragraph.list !== void 0) {
+			const markerText = listMarkerText(paragraph.list, listCounters);
+			const markerItem = {
+				kind: "text",
+				text: markerText,
+				xPt: paragraphLeftXDown - LIST_INDENT_STEP_PT,
+				yPt: section.pageSize.heightPt - baselineYDown,
+				font: fallbackRun.font,
+				sizePt: fallbackRun.sizePt,
+				color: fallbackRun.color,
+				sourcePath: paragraph.sourcePath
+			};
+			state.items.push(markerItem);
+			require_layout_shared.stampFrame(paragraph, pageIndex, require_layout_shared.textBoxForFragment(markerItem, measurer.widthOfTextAtSize(markerText, fallbackRun.font, fallbackRun.sizePt), line.ascentPt, line.descentPt));
+		}
 		line.fragments.forEach((fragment, fragmentIndex) => {
 			const xPt = paragraphLeftXDown + firstLineIndentPt + alignOffsetPt + fragment.xOffsetPt + (justifyGapsPt?.[fragmentIndex] ?? 0);
 			const yPt = section.pageSize.heightPt - baselineYDown;
@@ -80,6 +86,7 @@ function layoutParagraphFlow(paragraph, section, pages, state, contentLeftXDown,
 				sourcePath: fragment.sourcePath
 			};
 			state.items.push(textItem);
+			require_layout_shared.stampFragmentFrame(paragraph.runs, fragment, pageIndex, textItem, measurer, line);
 			if (fragment.hyperlink !== void 0) {
 				const fragmentWidthPt = measurer.widthOfTextAtSize(fragment.text, fragment.font, fragment.sizePt);
 				const link = {
@@ -98,7 +105,7 @@ function layoutParagraphFlow(paragraph, section, pages, state, contentLeftXDown,
 	});
 	state.cursorYDown += paragraph.spacingAfterPt ?? 0;
 }
-function layoutParagraphInCell(paragraph, cellLeftXDown, cellWidthPt, startYDown, pageHeightPt, measurer, out, listCounters) {
+function layoutParagraphInCell(paragraph, cellLeftXDown, cellWidthPt, startYDown, pageHeightPt, pageIndex, measurer, out, listCounters) {
 	let cursorYDown = startYDown + (paragraph.spacingBeforePt ?? 0);
 	const effectiveRuns = require_layout_shared.effectiveStyledRuns(paragraph.runs, 1, require_layout_shared.headingStyleFor(paragraph.styleId));
 	const fallbackRun = effectiveRuns[0];
@@ -112,18 +119,23 @@ function layoutParagraphInCell(paragraph, cellLeftXDown, cellWidthPt, startYDown
 		const firstLineIndentPt = lineIndex === 0 ? paragraph.indentFirstLinePt ?? 0 : 0;
 		const alignOffsetPt = require_layout_shared.alignmentOffsetPt(paragraph.alignment, paragraphWidthPt, line.widthPt);
 		const justifyGapsPt = paragraph.alignment === "justify" && lineIndex < lines.length - 1 ? require_layout_shared.justifyLineGapsPt(line, paragraphWidthPt, measurer) : void 0;
-		if (lineIndex === 0 && paragraph.list !== void 0) out.push({
-			kind: "text",
-			text: listMarkerText(paragraph.list, listCounters),
-			xPt: paragraphLeftXDown - LIST_INDENT_STEP_PT,
-			yPt: pageHeightPt - baselineYDown,
-			font: fallbackRun.font,
-			sizePt: fallbackRun.sizePt,
-			color: fallbackRun.color,
-			sourcePath: paragraph.sourcePath
-		});
+		if (lineIndex === 0 && paragraph.list !== void 0) {
+			const markerText = listMarkerText(paragraph.list, listCounters);
+			const markerItem = {
+				kind: "text",
+				text: markerText,
+				xPt: paragraphLeftXDown - LIST_INDENT_STEP_PT,
+				yPt: pageHeightPt - baselineYDown,
+				font: fallbackRun.font,
+				sizePt: fallbackRun.sizePt,
+				color: fallbackRun.color,
+				sourcePath: paragraph.sourcePath
+			};
+			out.push(markerItem);
+			require_layout_shared.stampFrame(paragraph, pageIndex, require_layout_shared.textBoxForFragment(markerItem, measurer.widthOfTextAtSize(markerText, fallbackRun.font, fallbackRun.sizePt), line.ascentPt, line.descentPt));
+		}
 		line.fragments.forEach((fragment, fragmentIndex) => {
-			out.push({
+			const textItem = {
 				kind: "text",
 				text: fragment.text,
 				xPt: paragraphLeftXDown + firstLineIndentPt + alignOffsetPt + fragment.xOffsetPt + (justifyGapsPt?.[fragmentIndex] ?? 0),
@@ -133,7 +145,9 @@ function layoutParagraphInCell(paragraph, cellLeftXDown, cellWidthPt, startYDown
 				color: fragment.color,
 				underline: fragment.underline,
 				sourcePath: fragment.sourcePath
-			});
+			};
+			out.push(textItem);
+			require_layout_shared.stampFragmentFrame(paragraph.runs, fragment, pageIndex, textItem, measurer, line);
 		});
 		cursorYDown += lineHeightPt;
 	});
@@ -145,6 +159,7 @@ function layoutTableFlow(table, section, pages, state, contentLeftXDown, content
 	for (const row of table.rows) {
 		const rowHeightPt = row.heightPt ?? require_layout_shared.estimateRowHeightPt(row, measurer, table.columnWidthsPt, scale);
 		ensureRoom(state, section, pages, rowHeightPt, contentBottomYDown);
+		const pageIndex = pages.length;
 		let cellXDown = contentLeftXDown;
 		let colIndex = 0;
 		for (const cell of row.cells) {
@@ -157,21 +172,20 @@ function layoutTableFlow(table, section, pages, state, contentLeftXDown, content
 				heightPt: rowHeightPt
 			};
 			const cellSourcePath = cell.sourcePath ?? table.sourcePath;
-			if (cell.background !== void 0) {
-				const cellFrame = require_model_geometry.flipY(cellFrameYDown, section.pageSize.heightPt);
-				state.items.push({
-					kind: "rect",
-					xPt: cellFrame.xPt,
-					yPt: cellFrame.yPt,
-					widthPt: cellFrame.widthPt,
-					heightPt: cellFrame.heightPt,
-					fill: cell.background,
-					sourcePath: cellSourcePath
-				});
-			}
+			const cellFrame = require_model_geometry.flipY(cellFrameYDown, section.pageSize.heightPt);
+			require_layout_shared.stampFrame(cell, pageIndex, cellFrame);
+			if (cell.background !== void 0) state.items.push({
+				kind: "rect",
+				xPt: cellFrame.xPt,
+				yPt: cellFrame.yPt,
+				widthPt: cellFrame.widthPt,
+				heightPt: cellFrame.heightPt,
+				fill: cell.background,
+				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, listCounters);
+			for (const block of cell.blocks) if (block.kind === "paragraph") cellCursorYDown = layoutParagraphInCell(block, cellXDown, cellWidthPt, cellCursorYDown, section.pageSize.heightPt, pageIndex, measurer, state.items, listCounters);
 			cellXDown += cellWidthPt;
 			colIndex += span;
 		}
@@ -197,6 +211,7 @@ function layoutImageFlow(block, section, pages, state, contentLeftXDown, content
 		sourcePath: block.sourcePath
 	};
 	state.items.push(imageItem);
+	require_layout_shared.stampFrame(block, pages.length, flippedFrame);
 	state.cursorYDown += block.heightPt;
 }
 function layoutFormulaFallback(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, listCounters) {
@@ -233,6 +248,7 @@ function layoutFormulaFlow(block, section, pages, state, contentLeftXDown, conte
 		yPt: flippedFrame.yPt,
 		box
 	});
+	require_layout_shared.stampFrame(block, pages.length, flippedFrame);
 	state.cursorYDown += box.heightPt;
 }
 function paginateSection(section, measurer, images, pages, options, formulas, listCounters) {
@@ -255,13 +271,9 @@ function convertWordprocessingToLayout(doc, options) {
 	const listCounters = /* @__PURE__ */ new Map();
 	for (const section of doc.sections) paginateSection(section, options.measurer, images, pages, options, formulas, listCounters);
 	return {
-		document: {
-			formatVersion: document_schema_js.LAYOUT_FORMAT_VERSION,
-			metadata: doc.metadata,
-			pages,
-			images
-		},
-		formulas
+		document: require_layout_shared.layoutDocumentOf(doc.metadata, pages, images),
+		formulas,
+		pages: require_layout_shared.packagePagesOf(pages)
 	};
 }
 //#endregion

package/dist/layout/engine.d.cts

@@ -1,4 +1,4 @@
-import { ContentDocument, LayoutDocument, MathFontMetrics, PositionedFormula, TextMeasurer } from "document-schema.js";
+import { ContentDocument, LayoutDocument, MathFontMetrics, PageSize, PositionedFormula, TextMeasurer } from "document-schema.js";
 //#region src/layout/engine.d.ts
 interface EngineLayoutOptions {
   readonly measurer: TextMeasurer;
@@ -7,6 +7,7 @@ interface EngineLayoutOptions {
 interface WordprocessingLayoutResult {
   readonly document: LayoutDocument;
   readonly formulas: readonly PositionedFormula[];
+  readonly pages: readonly PageSize[];
 }
 type WordprocessingContentDocument = Extract<ContentDocument, {
   kind: 'wordprocessing';

package/dist/layout/engine.d.ts

@@ -1,4 +1,4 @@
-import { ContentDocument, LayoutDocument, MathFontMetrics, PositionedFormula, TextMeasurer } from "document-schema.js";
+import { ContentDocument, LayoutDocument, MathFontMetrics, PageSize, PositionedFormula, TextMeasurer } from "document-schema.js";
 //#region src/layout/engine.d.ts
 interface EngineLayoutOptions {
   readonly measurer: TextMeasurer;
@@ -7,6 +7,7 @@ interface EngineLayoutOptions {
 interface WordprocessingLayoutResult {
   readonly document: LayoutDocument;
   readonly formulas: readonly PositionedFormula[];
+  readonly pages: readonly PageSize[];
 }
 type WordprocessingContentDocument = Extract<ContentDocument, {
   kind: 'wordprocessing';

package/dist/layout/engine.js

@@ -2,8 +2,8 @@ import { flipY } from "../model/geometry.js";
 import { formulaOfBlock, formulaPlaceholderText } from "../model/formula.js";
 import { layoutFormula } from "../mathml/layout.js";
 import { wrapRunsToWidth } from "./text-layout.js";
-import { alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, headingStyleFor, justifyLineGapsPt, lineNaturalHeightPt, pushCellBorderLines, registerImage, sumColumnWidthsPt } from "./shared.js";
-import { COLOR_BLACK, LAYOUT_FORMAT_VERSION } from "document-schema.js";
+import { alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, headingStyleFor, justifyLineGapsPt, layoutDocumentOf, lineNaturalHeightPt, packagePagesOf, pushCellBorderLines, registerImage, stampFragmentFrame, stampFrame, sumColumnWidthsPt, textBoxForFragment } from "./shared.js";
+import { COLOR_BLACK } from "document-schema.js";
 import { parseListNumId } from "markdown-codec";
 //#region src/layout/engine.ts
 const LIST_INDENT_STEP_PT = 18;
@@ -50,20 +50,26 @@ function layoutParagraphFlow(paragraph, section, pages, state, contentLeftXDown,
 	lines.forEach((line, lineIndex) => {
 		const lineHeightPt = lineNaturalHeightPt(line, measurer, fallbackRun) * (paragraph.lineSpacing ?? 1);
 		ensureRoom(state, section, pages, lineHeightPt, contentBottomYDown);
+		const pageIndex = pages.length;
 		const baselineYDown = state.cursorYDown + line.ascentPt;
 		const firstLineIndentPt = lineIndex === 0 ? paragraph.indentFirstLinePt ?? 0 : 0;
 		const alignOffsetPt = alignmentOffsetPt(paragraph.alignment, paragraphWidthPt, line.widthPt);
 		const justifyGapsPt = paragraph.alignment === "justify" && lineIndex < lines.length - 1 ? justifyLineGapsPt(line, paragraphWidthPt, measurer) : void 0;
-		if (lineIndex === 0 && paragraph.list !== void 0) state.items.push({
-			kind: "text",
-			text: listMarkerText(paragraph.list, listCounters),
-			xPt: paragraphLeftXDown - LIST_INDENT_STEP_PT,
-			yPt: section.pageSize.heightPt - baselineYDown,
-			font: fallbackRun.font,
-			sizePt: fallbackRun.sizePt,
-			color: fallbackRun.color,
-			sourcePath: paragraph.sourcePath
-		});
+		if (lineIndex === 0 && paragraph.list !== void 0) {
+			const markerText = listMarkerText(paragraph.list, listCounters);
+			const markerItem = {
+				kind: "text",
+				text: markerText,
+				xPt: paragraphLeftXDown - LIST_INDENT_STEP_PT,
+				yPt: section.pageSize.heightPt - baselineYDown,
+				font: fallbackRun.font,
+				sizePt: fallbackRun.sizePt,
+				color: fallbackRun.color,
+				sourcePath: paragraph.sourcePath
+			};
+			state.items.push(markerItem);
+			stampFrame(paragraph, pageIndex, textBoxForFragment(markerItem, measurer.widthOfTextAtSize(markerText, fallbackRun.font, fallbackRun.sizePt), line.ascentPt, line.descentPt));
+		}
 		line.fragments.forEach((fragment, fragmentIndex) => {
 			const xPt = paragraphLeftXDown + firstLineIndentPt + alignOffsetPt + fragment.xOffsetPt + (justifyGapsPt?.[fragmentIndex] ?? 0);
 			const yPt = section.pageSize.heightPt - baselineYDown;
@@ -79,6 +85,7 @@ function layoutParagraphFlow(paragraph, section, pages, state, contentLeftXDown,
 				sourcePath: fragment.sourcePath
 			};
 			state.items.push(textItem);
+			stampFragmentFrame(paragraph.runs, fragment, pageIndex, textItem, measurer, line);
 			if (fragment.hyperlink !== void 0) {
 				const fragmentWidthPt = measurer.widthOfTextAtSize(fragment.text, fragment.font, fragment.sizePt);
 				const link = {
@@ -97,7 +104,7 @@ function layoutParagraphFlow(paragraph, section, pages, state, contentLeftXDown,
 	});
 	state.cursorYDown += paragraph.spacingAfterPt ?? 0;
 }
-function layoutParagraphInCell(paragraph, cellLeftXDown, cellWidthPt, startYDown, pageHeightPt, measurer, out, listCounters) {
+function layoutParagraphInCell(paragraph, cellLeftXDown, cellWidthPt, startYDown, pageHeightPt, pageIndex, measurer, out, listCounters) {
 	let cursorYDown = startYDown + (paragraph.spacingBeforePt ?? 0);
 	const effectiveRuns = effectiveStyledRuns(paragraph.runs, 1, headingStyleFor(paragraph.styleId));
 	const fallbackRun = effectiveRuns[0];
@@ -111,18 +118,23 @@ function layoutParagraphInCell(paragraph, cellLeftXDown, cellWidthPt, startYDown
 		const firstLineIndentPt = lineIndex === 0 ? paragraph.indentFirstLinePt ?? 0 : 0;
 		const alignOffsetPt = alignmentOffsetPt(paragraph.alignment, paragraphWidthPt, line.widthPt);
 		const justifyGapsPt = paragraph.alignment === "justify" && lineIndex < lines.length - 1 ? justifyLineGapsPt(line, paragraphWidthPt, measurer) : void 0;
-		if (lineIndex === 0 && paragraph.list !== void 0) out.push({
-			kind: "text",
-			text: listMarkerText(paragraph.list, listCounters),
-			xPt: paragraphLeftXDown - LIST_INDENT_STEP_PT,
-			yPt: pageHeightPt - baselineYDown,
-			font: fallbackRun.font,
-			sizePt: fallbackRun.sizePt,
-			color: fallbackRun.color,
-			sourcePath: paragraph.sourcePath
-		});
+		if (lineIndex === 0 && paragraph.list !== void 0) {
+			const markerText = listMarkerText(paragraph.list, listCounters);
+			const markerItem = {
+				kind: "text",
+				text: markerText,
+				xPt: paragraphLeftXDown - LIST_INDENT_STEP_PT,
+				yPt: pageHeightPt - baselineYDown,
+				font: fallbackRun.font,
+				sizePt: fallbackRun.sizePt,
+				color: fallbackRun.color,
+				sourcePath: paragraph.sourcePath
+			};
+			out.push(markerItem);
+			stampFrame(paragraph, pageIndex, textBoxForFragment(markerItem, measurer.widthOfTextAtSize(markerText, fallbackRun.font, fallbackRun.sizePt), line.ascentPt, line.descentPt));
+		}
 		line.fragments.forEach((fragment, fragmentIndex) => {
-			out.push({
+			const textItem = {
 				kind: "text",
 				text: fragment.text,
 				xPt: paragraphLeftXDown + firstLineIndentPt + alignOffsetPt + fragment.xOffsetPt + (justifyGapsPt?.[fragmentIndex] ?? 0),
@@ -132,7 +144,9 @@ function layoutParagraphInCell(paragraph, cellLeftXDown, cellWidthPt, startYDown
 				color: fragment.color,
 				underline: fragment.underline,
 				sourcePath: fragment.sourcePath
-			});
+			};
+			out.push(textItem);
+			stampFragmentFrame(paragraph.runs, fragment, pageIndex, textItem, measurer, line);
 		});
 		cursorYDown += lineHeightPt;
 	});
@@ -144,6 +158,7 @@ function layoutTableFlow(table, section, pages, state, contentLeftXDown, content
 	for (const row of table.rows) {
 		const rowHeightPt = row.heightPt ?? estimateRowHeightPt(row, measurer, table.columnWidthsPt, scale);
 		ensureRoom(state, section, pages, rowHeightPt, contentBottomYDown);
+		const pageIndex = pages.length;
 		let cellXDown = contentLeftXDown;
 		let colIndex = 0;
 		for (const cell of row.cells) {
@@ -156,21 +171,20 @@ function layoutTableFlow(table, section, pages, state, contentLeftXDown, content
 				heightPt: rowHeightPt
 			};
 			const cellSourcePath = cell.sourcePath ?? table.sourcePath;
-			if (cell.background !== void 0) {
-				const cellFrame = flipY(cellFrameYDown, section.pageSize.heightPt);
-				state.items.push({
-					kind: "rect",
-					xPt: cellFrame.xPt,
-					yPt: cellFrame.yPt,
-					widthPt: cellFrame.widthPt,
-					heightPt: cellFrame.heightPt,
-					fill: cell.background,
-					sourcePath: cellSourcePath
-				});
-			}
+			const cellFrame = flipY(cellFrameYDown, section.pageSize.heightPt);
+			stampFrame(cell, pageIndex, cellFrame);
+			if (cell.background !== void 0) state.items.push({
+				kind: "rect",
+				xPt: cellFrame.xPt,
+				yPt: cellFrame.yPt,
+				widthPt: cellFrame.widthPt,
+				heightPt: cellFrame.heightPt,
+				fill: cell.background,
+				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, listCounters);
+			for (const block of cell.blocks) if (block.kind === "paragraph") cellCursorYDown = layoutParagraphInCell(block, cellXDown, cellWidthPt, cellCursorYDown, section.pageSize.heightPt, pageIndex, measurer, state.items, listCounters);
 			cellXDown += cellWidthPt;
 			colIndex += span;
 		}
@@ -196,6 +210,7 @@ function layoutImageFlow(block, section, pages, state, contentLeftXDown, content
 		sourcePath: block.sourcePath
 	};
 	state.items.push(imageItem);
+	stampFrame(block, pages.length, flippedFrame);
 	state.cursorYDown += block.heightPt;
 }
 function layoutFormulaFallback(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, listCounters) {
@@ -232,6 +247,7 @@ function layoutFormulaFlow(block, section, pages, state, contentLeftXDown, conte
 		yPt: flippedFrame.yPt,
 		box
 	});
+	stampFrame(block, pages.length, flippedFrame);
 	state.cursorYDown += box.heightPt;
 }
 function paginateSection(section, measurer, images, pages, options, formulas, listCounters) {
@@ -254,13 +270,9 @@ function convertWordprocessingToLayout(doc, options) {
 	const listCounters = /* @__PURE__ */ new Map();
 	for (const section of doc.sections) paginateSection(section, options.measurer, images, pages, options, formulas, listCounters);
 	return {
-		document: {
-			formatVersion: LAYOUT_FORMAT_VERSION,
-			metadata: doc.metadata,
-			pages,
-			images
-		},
-		formulas
+		document: layoutDocumentOf(doc.metadata, pages, images),
+		formulas,
+		pages: packagePagesOf(pages)
 	};
 }
 //#endregion