js.documents 1.102.2 → 2.0.0

package/dist/layout/shared.cjs

@@ -5,6 +5,45 @@ let ooxml_js = require("ooxml.js");
 let document_schema_js = require("document-schema.js");
 let byte_codec = require("byte-codec");
 //#region src/layout/shared.ts
+function stampFrame(node, pageIndex, box) {
+	const frame = {
+		pageIndex,
+		xPt: box.xPt,
+		yPt: box.yPt,
+		widthPt: box.widthPt,
+		heightPt: box.heightPt
+	};
+	if (node.frames === void 0) node.frames = [frame];
+	else node.frames.push(frame);
+}
+function textBoxForFragment(item, textWidthPt, ascentPt, descentPt) {
+	return {
+		xPt: item.xPt,
+		yPt: item.yPt + descentPt,
+		widthPt: textWidthPt,
+		heightPt: ascentPt - descentPt
+	};
+}
+function stampFragmentFrame(runs, fragment, pageIndex, item, measurer, line) {
+	if (fragment.runIndex === void 0) return;
+	const run = runs[fragment.runIndex];
+	if (run === void 0) return;
+	stampFrame(run, pageIndex, textBoxForFragment(item, measurer.widthOfTextAtSize(fragment.text, fragment.font, fragment.sizePt), line.ascentPt, line.descentPt));
+}
+function packagePagesOf(pages) {
+	return pages.map((page) => ({
+		widthPt: page.widthPt,
+		heightPt: page.heightPt
+	}));
+}
+function layoutDocumentOf(metadata, pages, images) {
+	return {
+		formatVersion: document_schema_js.LAYOUT_FORMAT_VERSION,
+		metadata,
+		pages,
+		images
+	};
+}
 const NOMINAL_TEXT_SIZE_PT = 18;
 const MIN_FORMULA_SIZE_PT = 8;
 const REFERENCE_FORMULA_SIZE_PT = 12;
@@ -61,14 +100,15 @@ function runFont(run, headingBold) {
 	};
 }
 function toStyledRuns(runs, fontScale = 1, headingStyle) {
-	return runs.map((run) => ({
+	return runs.map((run, runIndex) => ({
 		text: run.text,
 		font: runFont(run, headingStyle?.bold),
 		sizePt: (run.sizePt ?? headingStyle?.sizePt ?? 18) * fontScale,
 		color: run.color ?? document_schema_js.COLOR_BLACK,
 		underline: run.underline,
 		hyperlink: run.hyperlink,
-		sourcePath: run.sourcePath
+		sourcePath: run.sourcePath,
+		runIndex
 	}));
 }
 function effectiveStyledRuns(runs, fontScale = 1, headingStyle) {
@@ -199,9 +239,14 @@ exports.estimateRowHeightPt = estimateRowHeightPt;
 exports.formulaSizePtForFrame = formulaSizePtForFrame;
 exports.headingStyleFor = headingStyleFor;
 exports.justifyLineGapsPt = justifyLineGapsPt;
+exports.layoutDocumentOf = layoutDocumentOf;
 exports.lineNaturalHeightPt = lineNaturalHeightPt;
+exports.packagePagesOf = packagePagesOf;
 exports.pushCellBorderLines = pushCellBorderLines;
 exports.registerImage = registerImage;
 exports.runFont = runFont;
+exports.stampFragmentFrame = stampFragmentFrame;
+exports.stampFrame = stampFrame;
 exports.sumColumnWidthsPt = sumColumnWidthsPt;
+exports.textBoxForFragment = textBoxForFragment;
 exports.toStyledRuns = toStyledRuns;

package/dist/layout/shared.d.cts

@@ -1,5 +1,16 @@
-import { Alignment, Box, ContentCellBorders, ContentImageBlock, ContentRun, ContentTableRow, LayoutFont, LayoutImageAsset, LayoutItem, MathFontMetrics, MathMlNode, StyledRun, TextMeasurer, WrappedLine } from "document-schema.js";
+import { SourcedFragment, SourcedRun } from "./text-layout.cjs";
+import { Alignment, Box, ContentCellBorders, ContentImageBlock, ContentRun, ContentTableRow, LayoutDocument, LayoutFont, LayoutFrame, LayoutImageAsset, LayoutItem, LayoutMetadata, LayoutPage, LayoutText, MathFontMetrics, MathMlNode, PageSize, StyledRun, TextMeasurer, WrappedLine } from "document-schema.js";
 //#region src/layout/shared.d.ts
+declare function stampFrame(node: {
+  frames?: LayoutFrame[];
+}, pageIndex: number, box: Box): void;
+declare function textBoxForFragment(item: LayoutText, textWidthPt: number, ascentPt: number, descentPt: number): Box;
+declare function stampFragmentFrame(runs: readonly ContentRun[], fragment: SourcedFragment, pageIndex: number, item: LayoutText, measurer: TextMeasurer, line: {
+  readonly ascentPt: number;
+  readonly descentPt: number;
+}): void;
+declare function packagePagesOf(pages: readonly LayoutPage[]): PageSize[];
+declare function layoutDocumentOf(metadata: LayoutMetadata, pages: LayoutPage[], images: Record<string, LayoutImageAsset>): LayoutDocument;
 declare const NOMINAL_TEXT_SIZE_PT = 18;
 declare function formulaSizePtForFrame(mathml: readonly MathMlNode[], frame: Box, mathMetricsAt: (sizePt: number) => MathFontMetrics): number;
 declare function headingStyleFor(styleId: string | undefined): {
@@ -10,11 +21,11 @@ declare function runFont(run: ContentRun, headingBold?: boolean): LayoutFont;
 declare function toStyledRuns(runs: readonly ContentRun[], fontScale?: number, headingStyle?: {
   bold: boolean;
   sizePt: number;
-}): StyledRun[];
+}): SourcedRun[];
 declare function effectiveStyledRuns(runs: readonly ContentRun[], fontScale?: number, headingStyle?: {
   bold: boolean;
   sizePt: number;
-}): StyledRun[];
+}): SourcedRun[];
 declare function lineNaturalHeightPt(line: WrappedLine, measurer: TextMeasurer, fallback: StyledRun): number;
 declare function alignmentOffsetPt(alignment: Alignment | undefined, contentWidthPt: number, lineWidthPt: number): number;
 declare function justifyLineGapsPt(line: WrappedLine, targetWidthPt: number, measurer: TextMeasurer): readonly number[];
@@ -23,4 +34,4 @@ declare function registerImage(block: ContentImageBlock, images: Record<string,
 declare function sumColumnWidthsPt(columnWidthsPt: readonly number[], startIndex: number, span: number): number;
 declare function estimateRowHeightPt(row: ContentTableRow, measurer: TextMeasurer, columnWidthsPt: readonly number[], scale: number): number;
 //#endregion
-export { NOMINAL_TEXT_SIZE_PT, alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, headingStyleFor, justifyLineGapsPt, lineNaturalHeightPt, pushCellBorderLines, registerImage, runFont, sumColumnWidthsPt, toStyledRuns };
+export { NOMINAL_TEXT_SIZE_PT, alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, headingStyleFor, justifyLineGapsPt, layoutDocumentOf, lineNaturalHeightPt, packagePagesOf, pushCellBorderLines, registerImage, runFont, stampFragmentFrame, stampFrame, sumColumnWidthsPt, textBoxForFragment, toStyledRuns };

package/dist/layout/shared.d.ts

@@ -1,5 +1,16 @@
-import { Alignment, Box, ContentCellBorders, ContentImageBlock, ContentRun, ContentTableRow, LayoutFont, LayoutImageAsset, LayoutItem, MathFontMetrics, MathMlNode, StyledRun, TextMeasurer, WrappedLine } from "document-schema.js";
+import { SourcedFragment, SourcedRun } from "./text-layout.js";
+import { Alignment, Box, ContentCellBorders, ContentImageBlock, ContentRun, ContentTableRow, LayoutDocument, LayoutFont, LayoutFrame, LayoutImageAsset, LayoutItem, LayoutMetadata, LayoutPage, LayoutText, MathFontMetrics, MathMlNode, PageSize, StyledRun, TextMeasurer, WrappedLine } from "document-schema.js";
 //#region src/layout/shared.d.ts
+declare function stampFrame(node: {
+  frames?: LayoutFrame[];
+}, pageIndex: number, box: Box): void;
+declare function textBoxForFragment(item: LayoutText, textWidthPt: number, ascentPt: number, descentPt: number): Box;
+declare function stampFragmentFrame(runs: readonly ContentRun[], fragment: SourcedFragment, pageIndex: number, item: LayoutText, measurer: TextMeasurer, line: {
+  readonly ascentPt: number;
+  readonly descentPt: number;
+}): void;
+declare function packagePagesOf(pages: readonly LayoutPage[]): PageSize[];
+declare function layoutDocumentOf(metadata: LayoutMetadata, pages: LayoutPage[], images: Record<string, LayoutImageAsset>): LayoutDocument;
 declare const NOMINAL_TEXT_SIZE_PT = 18;
 declare function formulaSizePtForFrame(mathml: readonly MathMlNode[], frame: Box, mathMetricsAt: (sizePt: number) => MathFontMetrics): number;
 declare function headingStyleFor(styleId: string | undefined): {
@@ -10,11 +21,11 @@ declare function runFont(run: ContentRun, headingBold?: boolean): LayoutFont;
 declare function toStyledRuns(runs: readonly ContentRun[], fontScale?: number, headingStyle?: {
   bold: boolean;
   sizePt: number;
-}): StyledRun[];
+}): SourcedRun[];
 declare function effectiveStyledRuns(runs: readonly ContentRun[], fontScale?: number, headingStyle?: {
   bold: boolean;
   sizePt: number;
-}): StyledRun[];
+}): SourcedRun[];
 declare function lineNaturalHeightPt(line: WrappedLine, measurer: TextMeasurer, fallback: StyledRun): number;
 declare function alignmentOffsetPt(alignment: Alignment | undefined, contentWidthPt: number, lineWidthPt: number): number;
 declare function justifyLineGapsPt(line: WrappedLine, targetWidthPt: number, measurer: TextMeasurer): readonly number[];
@@ -23,4 +34,4 @@ declare function registerImage(block: ContentImageBlock, images: Record<string,
 declare function sumColumnWidthsPt(columnWidthsPt: readonly number[], startIndex: number, span: number): number;
 declare function estimateRowHeightPt(row: ContentTableRow, measurer: TextMeasurer, columnWidthsPt: readonly number[], scale: number): number;
 //#endregion
-export { NOMINAL_TEXT_SIZE_PT, alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, headingStyleFor, justifyLineGapsPt, lineNaturalHeightPt, pushCellBorderLines, registerImage, runFont, sumColumnWidthsPt, toStyledRuns };
+export { NOMINAL_TEXT_SIZE_PT, alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, headingStyleFor, justifyLineGapsPt, layoutDocumentOf, lineNaturalHeightPt, packagePagesOf, pushCellBorderLines, registerImage, runFont, stampFragmentFrame, stampFrame, sumColumnWidthsPt, textBoxForFragment, toStyledRuns };

package/dist/layout/shared.js

@@ -1,9 +1,48 @@
 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, LAYOUT_FORMAT_VERSION } from "document-schema.js";
 import { crc32, decodePng, readJpegInfo } from "byte-codec";
 //#region src/layout/shared.ts
+function stampFrame(node, pageIndex, box) {
+	const frame = {
+		pageIndex,
+		xPt: box.xPt,
+		yPt: box.yPt,
+		widthPt: box.widthPt,
+		heightPt: box.heightPt
+	};
+	if (node.frames === void 0) node.frames = [frame];
+	else node.frames.push(frame);
+}
+function textBoxForFragment(item, textWidthPt, ascentPt, descentPt) {
+	return {
+		xPt: item.xPt,
+		yPt: item.yPt + descentPt,
+		widthPt: textWidthPt,
+		heightPt: ascentPt - descentPt
+	};
+}
+function stampFragmentFrame(runs, fragment, pageIndex, item, measurer, line) {
+	if (fragment.runIndex === void 0) return;
+	const run = runs[fragment.runIndex];
+	if (run === void 0) return;
+	stampFrame(run, pageIndex, textBoxForFragment(item, measurer.widthOfTextAtSize(fragment.text, fragment.font, fragment.sizePt), line.ascentPt, line.descentPt));
+}
+function packagePagesOf(pages) {
+	return pages.map((page) => ({
+		widthPt: page.widthPt,
+		heightPt: page.heightPt
+	}));
+}
+function layoutDocumentOf(metadata, pages, images) {
+	return {
+		formatVersion: LAYOUT_FORMAT_VERSION,
+		metadata,
+		pages,
+		images
+	};
+}
 const NOMINAL_TEXT_SIZE_PT = 18;
 const MIN_FORMULA_SIZE_PT = 8;
 const REFERENCE_FORMULA_SIZE_PT = 12;
@@ -60,14 +99,15 @@ function runFont(run, headingBold) {
 	};
 }
 function toStyledRuns(runs, fontScale = 1, headingStyle) {
-	return runs.map((run) => ({
+	return runs.map((run, runIndex) => ({
 		text: run.text,
 		font: runFont(run, headingStyle?.bold),
 		sizePt: (run.sizePt ?? headingStyle?.sizePt ?? 18) * fontScale,
 		color: run.color ?? COLOR_BLACK,
 		underline: run.underline,
 		hyperlink: run.hyperlink,
-		sourcePath: run.sourcePath
+		sourcePath: run.sourcePath,
+		runIndex
 	}));
 }
 function effectiveStyledRuns(runs, fontScale = 1, headingStyle) {
@@ -191,4 +231,4 @@ function estimateRowHeightPt(row, measurer, columnWidthsPt, scale) {
 	return max;
 }
 //#endregion
-export { NOMINAL_TEXT_SIZE_PT, alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, headingStyleFor, justifyLineGapsPt, lineNaturalHeightPt, pushCellBorderLines, registerImage, runFont, sumColumnWidthsPt, toStyledRuns };
+export { NOMINAL_TEXT_SIZE_PT, alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, headingStyleFor, justifyLineGapsPt, layoutDocumentOf, lineNaturalHeightPt, packagePagesOf, pushCellBorderLines, registerImage, runFont, stampFragmentFrame, stampFrame, sumColumnWidthsPt, textBoxForFragment, toStyledRuns };

package/dist/layout/sheets.cjs

@@ -138,14 +138,14 @@ function cellStyledRuns(cell) {
 	if (cell.runs !== void 0 && cell.runs.length > 0) {
 		const runsWithNominalSize = cell.runs.map((run) => run.sizePt === void 0 ? {
 			...run,
-			sizePt: NOMINAL_CELL_TEXT_SIZE_PT
+			sizePt: 10
 		} : run);
 		return require_layout_shared.toStyledRuns(runsWithNominalSize);
 	}
 	return [{
 		text: cell.displayText,
 		font: document_schema_js.DEFAULT_LAYOUT_FONT,
-		sizePt: NOMINAL_CELL_TEXT_SIZE_PT,
+		sizePt: 10,
 		color: document_schema_js.COLOR_BLACK
 	}];
 }
@@ -237,7 +237,7 @@ function verticalLineTopYDownPt(verticalAlignment, cellTopYDownPt, cellHeightPt,
 	if (verticalAlignment === "middle") return cellTopYDownPt + Math.max(CELL_TEXT_PADDING_PT, (cellHeightPt - lineHeightPt) / 2);
 	return cellTopYDownPt + Math.max(CELL_TEXT_PADDING_PT, cellHeightPt - CELL_TEXT_PADDING_PT - lineHeightPt);
 }
-function renderCellText(cell, frameYDown, rowCells, columnAxis, pageHeightPt, measurer, out) {
+function renderCellText(cell, frameYDown, pageIndex, rowCells, columnAxis, pageHeightPt, measurer, out) {
 	const { xPt: xLeftPt, yPt: yTopDownPt, widthPt: ownWidthPt, heightPt } = frameYDown;
 	const alignment = cell.alignment ?? defaultAlignmentForValue(cell.value.kind);
 	const numericLike = isNumericLikeValue(cell.value.kind);
@@ -289,6 +289,7 @@ function renderCellText(cell, frameYDown, rowCells, columnAxis, pageHeightPt, me
 			sourcePath: fragment.sourcePath
 		};
 		out.push(textItem);
+		require_layout_shared.stampFragmentFrame(cell.runs ?? [], fragment, pageIndex, textItem, measurer, naturalLine);
 	});
 }
 function renderHeaderLabels(gutter, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageHeightPt, measurer, out) {
@@ -382,7 +383,7 @@ function renderAnchoredFormulas(formulas, columnAxis, rowAxis, gridLeftXPt, grid
 		});
 	}
 }
-function renderAnchoredImages(sheetImages, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageHeightPt, hiddenColumnIndices, hiddenRowIndices, out, images) {
+function renderAnchoredImages(sheetImages, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageHeightPt, pageIndex, hiddenColumnIndices, hiddenRowIndices, out, images) {
 	for (const image of sheetImages) {
 		const columnPosition = columnAxis.positionByIndex.get(image.anchorColumn);
 		const rowPosition = rowAxis.positionByIndex.get(image.anchorRow);
@@ -405,6 +406,12 @@ function renderAnchoredImages(sheetImages, columnAxis, rowAxis, gridLeftXPt, gri
 			sourcePath: image.sourcePath
 		};
 		out.push(imageItem);
+		require_layout_shared.stampFrame(image, pageIndex, {
+			xPt: imageItem.xPt,
+			yPt: imageItem.yPt,
+			widthPt: imageItem.widthPt,
+			heightPt: imageItem.heightPt
+		});
 	}
 }
 function bandableIndices(start, end, repeat) {
@@ -499,9 +506,10 @@ function convertSheetToPages(sheet, measurer, signal, out, formulasOut, images,
 				if (!columnAxis.positionByIndex.has(columnIndex) || hiddenColumnIndices.has(columnIndex) || hiddenRowIndices.has(cell.row)) continue;
 				const cellFrame = resolveCellFrame(cell, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt);
 				if (cellFrame === void 0) continue;
+				require_layout_shared.stampFrame(cell, out.length, require_model_geometry.flipY(cellFrame, pageSize.heightPt));
 				renderCellBackground(cell, cellFrame, pageSize.heightPt, backgroundItems);
 				if (cell.borders !== void 0) require_layout_shared.pushCellBorderLines(cell.borders, cellFrame, pageSize.heightPt, cell.sourcePath, borderItems);
-				renderCellText(cell, cellFrame, rowCells, columnAxis, pageSize.heightPt, measurer, textItems);
+				renderCellText(cell, cellFrame, out.length, rowCells, columnAxis, pageSize.heightPt, measurer, textItems);
 			}
 		}
 		const items = [...backgroundItems];
@@ -510,7 +518,7 @@ function convertSheetToPages(sheet, measurer, signal, out, formulasOut, images,
 		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, mathMetricsAt);
-		renderAnchoredImages(sheet.images, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageSize.heightPt, hiddenColumnIndices, hiddenRowIndices, items, images);
+		renderAnchoredImages(sheet.images, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageSize.heightPt, out.length, hiddenColumnIndices, hiddenRowIndices, items, images);
 		out.push({
 			widthPt: pageSize.widthPt,
 			heightPt: pageSize.heightPt,
@@ -524,14 +532,11 @@ function convertSpreadsheetToLayout(doc, options) {
 	const images = {};
 	for (const sheet of doc.sheets) convertSheetToPages(sheet, options.measurer, options.signal, pages, formulas, images, options.mathMetricsAt);
 	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
+exports.NOMINAL_CELL_TEXT_SIZE_PT = NOMINAL_CELL_TEXT_SIZE_PT;
 exports.convertSpreadsheetToLayout = convertSpreadsheetToLayout;

package/dist/layout/sheets.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/sheets.d.ts
 interface SheetsLayoutOptions {
   readonly measurer: TextMeasurer;
@@ -8,10 +8,12 @@ interface SheetsLayoutOptions {
 interface SpreadsheetLayoutResult {
   readonly document: LayoutDocument;
   readonly formulas: readonly PositionedFormula[];
+  readonly pages: readonly PageSize[];
 }
 type SpreadsheetContentDocument = Extract<ContentDocument, {
   kind: 'spreadsheet';
 }>;
+declare const NOMINAL_CELL_TEXT_SIZE_PT = 10;
 declare function convertSpreadsheetToLayout(doc: SpreadsheetContentDocument, options: SheetsLayoutOptions): SpreadsheetLayoutResult;
 //#endregion
-export { SheetsLayoutOptions, SpreadsheetLayoutResult, convertSpreadsheetToLayout };
+export { NOMINAL_CELL_TEXT_SIZE_PT, SheetsLayoutOptions, SpreadsheetLayoutResult, convertSpreadsheetToLayout };

package/dist/layout/sheets.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/sheets.d.ts
 interface SheetsLayoutOptions {
   readonly measurer: TextMeasurer;
@@ -8,10 +8,12 @@ interface SheetsLayoutOptions {
 interface SpreadsheetLayoutResult {
   readonly document: LayoutDocument;
   readonly formulas: readonly PositionedFormula[];
+  readonly pages: readonly PageSize[];
 }
 type SpreadsheetContentDocument = Extract<ContentDocument, {
   kind: 'spreadsheet';
 }>;
+declare const NOMINAL_CELL_TEXT_SIZE_PT = 10;
 declare function convertSpreadsheetToLayout(doc: SpreadsheetContentDocument, options: SheetsLayoutOptions): SpreadsheetLayoutResult;
 //#endregion
-export { SheetsLayoutOptions, SpreadsheetLayoutResult, convertSpreadsheetToLayout };
+export { NOMINAL_CELL_TEXT_SIZE_PT, SheetsLayoutOptions, SpreadsheetLayoutResult, convertSpreadsheetToLayout };

package/dist/layout/sheets.js

@@ -1,9 +1,9 @@
 import { flipY } from "../model/geometry.js";
 import { layoutFormula } from "../mathml/layout.js";
 import { wrapRunsToWidth } from "./text-layout.js";
-import { alignmentOffsetPt, formulaSizePtForFrame, justifyLineGapsPt, lineNaturalHeightPt, pushCellBorderLines, registerImage, sumColumnWidthsPt, toStyledRuns } from "./shared.js";
+import { alignmentOffsetPt, formulaSizePtForFrame, justifyLineGapsPt, layoutDocumentOf, lineNaturalHeightPt, packagePagesOf, pushCellBorderLines, registerImage, stampFragmentFrame, stampFrame, sumColumnWidthsPt, toStyledRuns } from "./shared.js";
 import { throwIfAborted } from "../ports/abort.js";
-import { COLOR_BLACK, DEFAULT_LAYOUT_FONT, LAYOUT_FORMAT_VERSION, columnIndexToLetters, rgbHexToColor } from "document-schema.js";
+import { COLOR_BLACK, DEFAULT_LAYOUT_FONT, columnIndexToLetters, rgbHexToColor } from "document-schema.js";
 //#region src/layout/sheets.ts
 function anchoredFormulas(sheet) {
 	const resolved = [];
@@ -137,14 +137,14 @@ function cellStyledRuns(cell) {
 	if (cell.runs !== void 0 && cell.runs.length > 0) {
 		const runsWithNominalSize = cell.runs.map((run) => run.sizePt === void 0 ? {
 			...run,
-			sizePt: NOMINAL_CELL_TEXT_SIZE_PT
+			sizePt: 10
 		} : run);
 		return toStyledRuns(runsWithNominalSize);
 	}
 	return [{
 		text: cell.displayText,
 		font: DEFAULT_LAYOUT_FONT,
-		sizePt: NOMINAL_CELL_TEXT_SIZE_PT,
+		sizePt: 10,
 		color: COLOR_BLACK
 	}];
 }
@@ -236,7 +236,7 @@ function verticalLineTopYDownPt(verticalAlignment, cellTopYDownPt, cellHeightPt,
 	if (verticalAlignment === "middle") return cellTopYDownPt + Math.max(CELL_TEXT_PADDING_PT, (cellHeightPt - lineHeightPt) / 2);
 	return cellTopYDownPt + Math.max(CELL_TEXT_PADDING_PT, cellHeightPt - CELL_TEXT_PADDING_PT - lineHeightPt);
 }
-function renderCellText(cell, frameYDown, rowCells, columnAxis, pageHeightPt, measurer, out) {
+function renderCellText(cell, frameYDown, pageIndex, rowCells, columnAxis, pageHeightPt, measurer, out) {
 	const { xPt: xLeftPt, yPt: yTopDownPt, widthPt: ownWidthPt, heightPt } = frameYDown;
 	const alignment = cell.alignment ?? defaultAlignmentForValue(cell.value.kind);
 	const numericLike = isNumericLikeValue(cell.value.kind);
@@ -288,6 +288,7 @@ function renderCellText(cell, frameYDown, rowCells, columnAxis, pageHeightPt, me
 			sourcePath: fragment.sourcePath
 		};
 		out.push(textItem);
+		stampFragmentFrame(cell.runs ?? [], fragment, pageIndex, textItem, measurer, naturalLine);
 	});
 }
 function renderHeaderLabels(gutter, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageHeightPt, measurer, out) {
@@ -381,7 +382,7 @@ function renderAnchoredFormulas(formulas, columnAxis, rowAxis, gridLeftXPt, grid
 		});
 	}
 }
-function renderAnchoredImages(sheetImages, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageHeightPt, hiddenColumnIndices, hiddenRowIndices, out, images) {
+function renderAnchoredImages(sheetImages, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageHeightPt, pageIndex, hiddenColumnIndices, hiddenRowIndices, out, images) {
 	for (const image of sheetImages) {
 		const columnPosition = columnAxis.positionByIndex.get(image.anchorColumn);
 		const rowPosition = rowAxis.positionByIndex.get(image.anchorRow);
@@ -404,6 +405,12 @@ function renderAnchoredImages(sheetImages, columnAxis, rowAxis, gridLeftXPt, gri
 			sourcePath: image.sourcePath
 		};
 		out.push(imageItem);
+		stampFrame(image, pageIndex, {
+			xPt: imageItem.xPt,
+			yPt: imageItem.yPt,
+			widthPt: imageItem.widthPt,
+			heightPt: imageItem.heightPt
+		});
 	}
 }
 function bandableIndices(start, end, repeat) {
@@ -498,9 +505,10 @@ function convertSheetToPages(sheet, measurer, signal, out, formulasOut, images,
 				if (!columnAxis.positionByIndex.has(columnIndex) || hiddenColumnIndices.has(columnIndex) || hiddenRowIndices.has(cell.row)) continue;
 				const cellFrame = resolveCellFrame(cell, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt);
 				if (cellFrame === void 0) continue;
+				stampFrame(cell, out.length, flipY(cellFrame, pageSize.heightPt));
 				renderCellBackground(cell, cellFrame, pageSize.heightPt, backgroundItems);
 				if (cell.borders !== void 0) pushCellBorderLines(cell.borders, cellFrame, pageSize.heightPt, cell.sourcePath, borderItems);
-				renderCellText(cell, cellFrame, rowCells, columnAxis, pageSize.heightPt, measurer, textItems);
+				renderCellText(cell, cellFrame, out.length, rowCells, columnAxis, pageSize.heightPt, measurer, textItems);
 			}
 		}
 		const items = [...backgroundItems];
@@ -509,7 +517,7 @@ function convertSheetToPages(sheet, measurer, signal, out, formulasOut, images,
 		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, mathMetricsAt);
-		renderAnchoredImages(sheet.images, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageSize.heightPt, hiddenColumnIndices, hiddenRowIndices, items, images);
+		renderAnchoredImages(sheet.images, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageSize.heightPt, out.length, hiddenColumnIndices, hiddenRowIndices, items, images);
 		out.push({
 			widthPt: pageSize.widthPt,
 			heightPt: pageSize.heightPt,
@@ -523,14 +531,10 @@ function convertSpreadsheetToLayout(doc, options) {
 	const images = {};
 	for (const sheet of doc.sheets) convertSheetToPages(sheet, options.measurer, options.signal, pages, formulas, images, options.mathMetricsAt);
 	return {
-		document: {
-			formatVersion: LAYOUT_FORMAT_VERSION,
-			metadata: doc.metadata,
-			pages,
-			images
-		},
-		formulas
+		document: layoutDocumentOf(doc.metadata, pages, images),
+		formulas,
+		pages: packagePagesOf(pages)
 	};
 }
 //#endregion
-export { convertSpreadsheetToLayout };
+export { NOMINAL_CELL_TEXT_SIZE_PT, convertSpreadsheetToLayout };

package/dist/layout/slides.cjs

@@ -21,7 +21,7 @@ function shapePlacement(flippedFrame, rotationDeg) {
 		layoutRotationDeg: ccwDeg
 	};
 }
-function layoutParagraph(paragraph, contentLeftXDown, contentWidthPt, startYDown, slideHeightPt, placement, fontScale, spacingScale, measurer, out) {
+function layoutParagraph(paragraph, contentLeftXDown, contentWidthPt, startYDown, slideHeightPt, pageIndex, placement, fontScale, spacingScale, measurer, out) {
 	let cursorYDown = startYDown + (paragraph.spacingBeforePt ?? 0);
 	const effectiveRuns = require_layout_shared.effectiveStyledRuns(paragraph.runs, fontScale);
 	const fallbackRun = effectiveRuns[0];
@@ -53,6 +53,7 @@ function layoutParagraph(paragraph, contentLeftXDown, contentWidthPt, startYDown
 				sourcePath: fragment.sourcePath
 			};
 			out.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 linkBottomLeft = placement.place({
@@ -76,7 +77,7 @@ function layoutParagraph(paragraph, contentLeftXDown, contentWidthPt, startYDown
 	cursorYDown += paragraph.spacingAfterPt ?? 0;
 	return cursorYDown;
 }
-function layoutTable(table, contentLeftXDown, contentWidthPt, startYDown, slideHeightPt, placement, measurer, out) {
+function layoutTable(table, contentLeftXDown, contentWidthPt, startYDown, slideHeightPt, pageIndex, placement, measurer, out) {
 	let cursorYDown = startYDown;
 	const gridWidthPt = table.columnWidthsPt.reduce((sum, w) => sum + w, 0);
 	const scale = gridWidthPt > 0 ? contentWidthPt / gridWidthPt : 1;
@@ -87,25 +88,24 @@ function layoutTable(table, contentLeftXDown, contentWidthPt, startYDown, slideH
 		for (const cell of row.cells) {
 			const span = cell.colSpan ?? 1;
 			const cellWidthPt = require_layout_shared.sumColumnWidthsPt(table.columnWidthsPt, colIndex, span) * scale;
-			if (cell.background !== void 0 && placement.layoutRotationDeg === void 0) {
-				const cellFrame = require_model_geometry.flipY({
-					xPt: cellXDown,
-					yPt: cursorYDown,
-					widthPt: cellWidthPt,
-					heightPt: rowHeightPt
-				}, slideHeightPt);
-				out.push({
-					kind: "rect",
-					xPt: cellFrame.xPt,
-					yPt: cellFrame.yPt,
-					widthPt: cellFrame.widthPt,
-					heightPt: cellFrame.heightPt,
-					fill: cell.background,
-					sourcePath: table.sourcePath
-				});
-			}
+			const cellFrame = require_model_geometry.flipY({
+				xPt: cellXDown,
+				yPt: cursorYDown,
+				widthPt: cellWidthPt,
+				heightPt: rowHeightPt
+			}, slideHeightPt);
+			if (placement.layoutRotationDeg === void 0) require_layout_shared.stampFrame(cell, pageIndex, cellFrame);
+			if (cell.background !== void 0 && placement.layoutRotationDeg === void 0) out.push({
+				kind: "rect",
+				xPt: cellFrame.xPt,
+				yPt: cellFrame.yPt,
+				widthPt: cellFrame.widthPt,
+				heightPt: cellFrame.heightPt,
+				fill: cell.background,
+				sourcePath: table.sourcePath
+			});
 			let cellCursorYDown = cursorYDown;
-			for (const block of cell.blocks) if (block.kind === "paragraph") cellCursorYDown = layoutParagraph(block, cellXDown, cellWidthPt, cellCursorYDown, slideHeightPt, placement, 1, 1, measurer, out);
+			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;
 		}
@@ -129,16 +129,18 @@ function layoutShapeFormula(block, flippedFrame, formulaContext) {
 		yPt: flippedFrame.yPt,
 		box
 	});
+	require_layout_shared.stampFrame(block, formulaContext.pageIndex, flippedFrame);
 }
-function convertShape(shape, slideHeightPt, measurer, images, out, formulaContext) {
+function convertShape(shape, slideHeightPt, pageIndex, measurer, images, out, formulaContext) {
 	const flippedFrame = require_model_geometry.flipY(shape.frame, slideHeightPt);
+	require_layout_shared.stampFrame(shape, pageIndex, flippedFrame);
 	const placement = shapePlacement(flippedFrame, shape.rotationDeg);
 	const contentLeftXDown = shape.frame.xPt + shape.insetLeftPt;
 	const contentWidthPt = Math.max(0, shape.frame.widthPt - shape.insetLeftPt - shape.insetRightPt);
 	const fontScale = shape.fontScale ?? 1;
 	const spacingScale = 1 - (shape.lineSpacingReduction ?? 0);
 	let cursorYDown = shape.frame.yPt + shape.insetTopPt;
-	for (const block of shape.blocks) if (block.kind === "paragraph") cursorYDown = layoutParagraph(block, contentLeftXDown, contentWidthPt, cursorYDown, slideHeightPt, placement, fontScale, spacingScale, measurer, out);
+	for (const block of shape.blocks) if (block.kind === "paragraph") cursorYDown = layoutParagraph(block, contentLeftXDown, contentWidthPt, cursorYDown, slideHeightPt, pageIndex, placement, fontScale, spacingScale, measurer, out);
 	else if (block.kind === "image") {
 		const imageId = require_layout_shared.registerImage(block, images);
 		const placed = placement.place({
@@ -156,7 +158,13 @@ function convertShape(shape, slideHeightPt, measurer, images, out, formulaContex
 			sourcePath: block.sourcePath
 		};
 		out.push(imageItem);
-	} else if (block.kind === "table") cursorYDown = layoutTable(block, contentLeftXDown, contentWidthPt, cursorYDown, slideHeightPt, placement, measurer, out);
+		require_layout_shared.stampFrame(block, pageIndex, {
+			xPt: placed.x,
+			yPt: placed.y,
+			widthPt: imageItem.widthPt,
+			heightPt: imageItem.heightPt
+		});
+	} else if (block.kind === "table") cursorYDown = layoutTable(block, contentLeftXDown, contentWidthPt, cursorYDown, slideHeightPt, pageIndex, placement, measurer, out);
 	else if (block.kind === "embeddedObject" && block.objectKind === "formula" && formulaContext !== void 0) layoutShapeFormula(block, flippedFrame, formulaContext);
 }
 function convertSlide(slide, slideIndex, measurer, images, positioned, mathMetricsAt) {
@@ -166,7 +174,7 @@ function convertSlide(slide, slideIndex, measurer, images, positioned, mathMetri
 		positioned,
 		mathMetricsAt
 	};
-	for (const shape of slide.shapes) convertShape(shape, slide.size.heightPt, measurer, images, items, formulaContext);
+	for (const shape of slide.shapes) convertShape(shape, slide.size.heightPt, slideIndex, measurer, images, items, formulaContext);
 	return {
 		widthPt: slide.size.widthPt,
 		heightPt: slide.size.heightPt,
@@ -179,13 +187,9 @@ function convertPresentationToLayout(doc, options) {
 	const formulas = [];
 	const pages = doc.slides.map((slide, slideIndex) => convertSlide(slide, slideIndex, options.measurer, images, formulas, options.mathMetricsAt));
 	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/slides.d.cts

@@ -1,4 +1,4 @@
-import { ContentDocument, ContentShape, LayoutDocument, LayoutImageAsset, LayoutItem, MathFontMetrics, PositionedFormula, TextMeasurer } from "document-schema.js";
+import { ContentDocument, ContentShape, LayoutDocument, LayoutImageAsset, LayoutItem, MathFontMetrics, PageSize, PositionedFormula, TextMeasurer } from "document-schema.js";
 //#region src/layout/slides.d.ts
 interface SlidesLayoutOptions {
   readonly measurer: TextMeasurer;
@@ -7,6 +7,7 @@ interface SlidesLayoutOptions {
 interface PresentationLayoutResult {
   readonly document: LayoutDocument;
   readonly formulas: readonly PositionedFormula[];
+  readonly pages: readonly PageSize[];
 }
 type PresentationContentDocument = Extract<ContentDocument, {
   kind: 'presentation';
@@ -16,7 +17,7 @@ interface ShapeFormulaContext {
   readonly positioned: PositionedFormula[];
   readonly mathMetricsAt: (sizePt: number) => MathFontMetrics;
 }
-declare function convertShape(shape: ContentShape, slideHeightPt: number, measurer: TextMeasurer, images: Record<string, LayoutImageAsset>, out: LayoutItem[], formulaContext?: ShapeFormulaContext): void;
+declare function convertShape(shape: ContentShape, slideHeightPt: number, pageIndex: number, measurer: TextMeasurer, images: Record<string, LayoutImageAsset>, out: LayoutItem[], formulaContext?: ShapeFormulaContext): void;
 declare function convertPresentationToLayout(doc: PresentationContentDocument, options: SlidesLayoutOptions): PresentationLayoutResult;
 //#endregion
 export { PresentationLayoutResult, ShapeFormulaContext, SlidesLayoutOptions, convertPresentationToLayout, convertShape };

package/dist/layout/slides.d.ts

@@ -1,4 +1,4 @@
-import { ContentDocument, ContentShape, LayoutDocument, LayoutImageAsset, LayoutItem, MathFontMetrics, PositionedFormula, TextMeasurer } from "document-schema.js";
+import { ContentDocument, ContentShape, LayoutDocument, LayoutImageAsset, LayoutItem, MathFontMetrics, PageSize, PositionedFormula, TextMeasurer } from "document-schema.js";
 //#region src/layout/slides.d.ts
 interface SlidesLayoutOptions {
   readonly measurer: TextMeasurer;
@@ -7,6 +7,7 @@ interface SlidesLayoutOptions {
 interface PresentationLayoutResult {
   readonly document: LayoutDocument;
   readonly formulas: readonly PositionedFormula[];
+  readonly pages: readonly PageSize[];
 }
 type PresentationContentDocument = Extract<ContentDocument, {
   kind: 'presentation';
@@ -16,7 +17,7 @@ interface ShapeFormulaContext {
   readonly positioned: PositionedFormula[];
   readonly mathMetricsAt: (sizePt: number) => MathFontMetrics;
 }
-declare function convertShape(shape: ContentShape, slideHeightPt: number, measurer: TextMeasurer, images: Record<string, LayoutImageAsset>, out: LayoutItem[], formulaContext?: ShapeFormulaContext): void;
+declare function convertShape(shape: ContentShape, slideHeightPt: number, pageIndex: number, measurer: TextMeasurer, images: Record<string, LayoutImageAsset>, out: LayoutItem[], formulaContext?: ShapeFormulaContext): void;
 declare function convertPresentationToLayout(doc: PresentationContentDocument, options: SlidesLayoutOptions): PresentationLayoutResult;
 //#endregion
 export { PresentationLayoutResult, ShapeFormulaContext, SlidesLayoutOptions, convertPresentationToLayout, convertShape };