reamkit 1.10.0 → 1.12.0

package/dist/esm/excel/xlsx-reader.js

@@ -15,6 +15,7 @@ import { EMPTY_XLSX_STYLES, parseXlsxStyles } from "./styles-parser.js";
 import "./index.js";
 import { parseSheetDrawing } from "./sheet-drawing.js";
 import { parseTablePart } from "./table-parser.js";
+import { parsePivotTablePart } from "./pivot-table-parser.js";
 import { projectSheetDoc } from "./sheet-to-flow.js";
 //#region src/excel/xlsx-reader.ts
 var WORKBOOK_PART = "xl/workbook.xml";
@@ -79,9 +80,21 @@ function readXlsxToSheetDoc(xlsx) {
 			}
 			if (resolvedTables.length > 0) tables = resolvedTables;
 		}
-		const grid = tables ? {
+		let pivotTables;
+		{
+			const resolvedPivots = [];
+			for (const rel of pkg.getPartRelationships(resolved.path)) {
+				if (!isOoxmlRel(rel.type, "pivotTable")) continue;
+				const part = pkg.resolveRelatedPart(resolved.path, rel);
+				const parsed = part ? parsePivotTablePart(part.data) : void 0;
+				if (parsed) resolvedPivots.push(resolvePivotStyle(parsed, palette));
+			}
+			if (resolvedPivots.length > 0) pivotTables = resolvedPivots;
+		}
+		const grid = tables || pivotTables ? {
 			...worksheet,
-			tables
+			...tables ? { tables } : {},
+			...pivotTables ? { pivotTables } : {}
 		} : worksheet;
 		sheetsOut.push({
 			name: sheet.name,
@@ -132,6 +145,24 @@ function resolveTableStyle(t, palette) {
 		headerTextHex: "FFFFFF"
 	};
 }
+function resolvePivotStyle(p, palette) {
+	const m = p.styleName ? /PivotStyle(Light|Medium|Dark)(\d+)/i.exec(p.styleName) : null;
+	if (!m) return p;
+	const kind = m[1].toLowerCase();
+	const column = (Number(m[2]) - 1) % 7;
+	const base = column === 0 ? "7F7F7F" : palette.get(`accent${column}`) ?? "4472C4";
+	if (kind === "light") return {
+		...p,
+		headerHex: lighten(base, .6),
+		bandHex: lighten(base, .85)
+	};
+	return {
+		...p,
+		headerHex: base,
+		bandHex: lighten(base, .8),
+		headerTextHex: "FFFFFF"
+	};
+}
 function lighten(hex, amount) {
 	const m = /^#?([0-9a-fA-F]{6})$/.exec(hex);
 	const n = m ? parseInt(m[1], 16) : 4485828;

package/dist/esm/excel/xlsx-to-pdf.js

@@ -46,7 +46,7 @@ function prepareXlsxStyledRender(xlsx, options) {
 	if (!fonts) throw new Error("convertXlsxToPdfSync requires options.fonts or options.fontBytes");
 	const registry = FontRegistry.fromBytes(fonts);
 	const { doc: flow } = readXlsx(xlsx);
-	const { fontBytes: _ignoreA, fonts: _ignoreB, section: sectionOverride, info: callerInfo, embedSource, attachments: callerAttachments, signature: _ignoreSig, ...renderOptions } = options;
+	const { fontBytes: _ignoreA, fonts: _ignoreB, section: sectionOverride, info: callerInfo, embedSource, attachments: callerAttachments, signature: _ignoreSig, layoutProfile: _ignoreProfile, ...renderOptions } = options;
 	const section = sectionOverride ?? flow.section;
 	const info = flow.info || callerInfo ? {
 		...flow.info,

package/dist/esm/html/html-writer.js

@@ -41,6 +41,7 @@ function writeHtml(flow) {
 	for (const el of flow.body) emitBlock(out, el, ctx);
 	emitNotesSection(out, flow.footnotes, ctx.notes.footnotes, "fn", ctx);
 	emitNotesSection(out, flow.endnotes, ctx.notes.endnotes, "en", ctx);
+	emitCommentsSection(out, flow.comments, ctx.notes.comments, ctx);
 	out.push("</article>");
 	out.push("</body>");
 	out.push("</html>");
@@ -76,7 +77,10 @@ var BASE_CSS = [
 	".tab{display:inline-block;min-width:18pt}",
 	"img{vertical-align:baseline}",
 	".notes{margin-top:18pt;font-size:smaller}",
-	".notes hr{margin:0 0 6pt;border:none;border-top:0.75pt solid #000;width:144pt;margin-left:0}"
+	".notes hr{margin:0 0 6pt;border:none;border-top:0.75pt solid #000;width:144pt;margin-left:0}",
+	".comment-range{background:#fff3a3}",
+	".comment-replies{margin-left:18pt}",
+	".comments .resolved>.comment-meta::after{content:\" \\2713\";color:#3a7d3a}"
 ].join("");
 function collectReferencedAnchors(body) {
 	const out = /* @__PURE__ */ new Set();
@@ -92,10 +96,12 @@ function collectReferencedAnchors(body) {
 function collectNoteNumbers(flow) {
 	const footnotes = /* @__PURE__ */ new Map();
 	const endnotes = /* @__PURE__ */ new Map();
+	const comments = /* @__PURE__ */ new Map();
 	const visit = (els) => {
 		for (const el of els) if (el.kind === "paragraph") for (const r of el.paragraph.runs) {
 			if (r.footnoteRef !== void 0 && !footnotes.has(r.footnoteRef)) footnotes.set(r.footnoteRef, footnotes.size + 1);
 			if (r.endnoteRef !== void 0 && !endnotes.has(r.endnoteRef)) endnotes.set(r.endnoteRef, endnotes.size + 1);
+			if (r.commentRef !== void 0 && !comments.has(r.commentRef)) comments.set(r.commentRef, comments.size + 1);
 		}
 		else if (el.kind === "table") for (const row of el.table.rows) for (const cell of row.cells) visit(cell.content);
 		else if (el.kind === "shape" && el.shape.text) visit(el.shape.text.content);
@@ -103,7 +109,8 @@ function collectNoteNumbers(flow) {
 	visit(flow.body);
 	return {
 		footnotes,
-		endnotes
+		endnotes,
+		comments
 	};
 }
 function emitNotesSection(out, content, numbers, prefix, ctx) {
@@ -118,6 +125,43 @@ function emitNotesSection(out, content, numbers, prefix, ctx) {
 	}
 	out.push("</ol></section>");
 }
+function emitCommentsSection(out, comments, numbers, ctx) {
+	if (!comments || numbers.size === 0) return;
+	const ordered = [...numbers.entries()].sort((a, b) => a[1] - b[1]).map(([id]) => id);
+	const childrenOf = /* @__PURE__ */ new Map();
+	const roots = [];
+	for (const id of ordered) {
+		const parent = comments.get(id)?.parentId;
+		if (parent !== void 0 && parent !== id && numbers.has(parent)) {
+			const kids = childrenOf.get(parent);
+			if (kids) kids.push(id);
+			else childrenOf.set(parent, [id]);
+		} else roots.push(id);
+	}
+	const seen = /* @__PURE__ */ new Set();
+	const emitOne = (id) => {
+		if (seen.has(id)) return;
+		seen.add(id);
+		const c = comments.get(id);
+		const n = numbers.get(id);
+		if (!c || n === void 0) return;
+		out.push(`<li id="cm-${n}" class="${c.done ? "comment resolved" : "comment"}">`);
+		const meta = [[c.author !== void 0 ? c.author + (c.authorId ? ` <${c.authorId}>` : "") : c.authorId, c.date].filter((s) => s !== void 0 && s.length > 0).join(", "), c.done ? "Resolved" : void 0].filter((s) => s).join(" — ");
+		if (meta) out.push(`<p class="comment-meta">${textHtml(meta)}</p>`);
+		for (const el of c.content) emitBlock(out, el, ctx);
+		out.push(`<a href="#cmref-${n}">\u21a9</a>`);
+		const kids = childrenOf.get(id);
+		if (kids && kids.length > 0) {
+			out.push("<ol class=\"comment-replies\">");
+			for (const k of kids) emitOne(k);
+			out.push("</ol>");
+		}
+		out.push("</li>");
+	};
+	out.push("<section class=\"comments\"><hr/><h2>Comments</h2><ol>");
+	for (const id of roots) emitOne(id);
+	out.push("</ol></section>");
+}
 function emitBlock(out, el, ctx) {
 	if (el.kind === "paragraph") emitParagraph(out, el.paragraph, ctx);
 	else if (el.kind === "table") emitTable(out, el.table, ctx);
@@ -272,6 +316,11 @@ function runHtml(run, p, ctx) {
 		const prefix = isFoot ? "fn" : "en";
 		return `<sup><a href="#${prefix}-${n}" id="${prefix}ref-${n}">${n}</a></sup>`;
 	}
+	if (run.commentRef !== void 0) {
+		const n = ctx.notes.comments.get(run.commentRef);
+		if (n === void 0) return "";
+		return `<sup class="comment-ref"><a href="#cm-${n}" id="cmref-${n}">[${n}]</a></sup>`;
+	}
 	if (run.noteNumber) return "";
 	if (run.math !== void 0) {
 		ctx.losses.push({
@@ -293,6 +342,7 @@ function runHtml(run, p, ctx) {
 	let html = `<span${resolved.rtl ? " dir=\"rtl\"" : ""}${style ? ` style="${style}"` : ""}>${textHtml(run.text)}</span>`;
 	if (resolved.verticalAlign === "superscript") html = `<sup>${html}</sup>`;
 	else if (resolved.verticalAlign === "subscript") html = `<sub>${html}</sub>`;
+	if (run.commentRangeRefs && run.commentRangeRefs.length > 0) html = `<span class="comment-range">${html}</span>`;
 	if (run.href === void 0 && run.anchor !== void 0) return `<a href="#bm-${encodeURIComponent(run.anchor)}">${html}</a>`;
 	if (run.href !== void 0) {
 		const safe = sanitizeHref(run.href);

package/dist/esm/layout/page-doc.d.ts

@@ -17,6 +17,7 @@ export interface TextToken {
     readonly footnoteRef?: string;
     readonly anchor?: string;
     readonly listMarker?: true;
+    readonly highlight?: true;
     readonly resolvedRun: ResolvedRunProperties;
     readonly font: FontResource;
     readonly fontSizePt: number;
@@ -70,6 +71,8 @@ export interface Line {
     isLastInParagraph: boolean;
     readonly mathAscentPt?: number;
     readonly mathDescentPt?: number;
+    readonly metricHeightPt?: number;
+    readonly metricDescentPt?: number;
 }
 export interface ImageResource {
     readonly resourceName: string;

package/dist/esm/layout/styled-layout.d.ts

@@ -1,4 +1,4 @@
-import { BodyElement, Chart, DocumentInfo, Numbering, Section, SectionProperties, StyleSheet } from '../core/document-model/index.js';
+import { BodyElement, Chart, Comment, DocumentInfo, Numbering, Section, SectionProperties, StyleSheet } from '../core/document-model/index.js';
 import { FontRegistry } from '../core/font/index.js';
 import { FamilyKey } from '../core/fonts/index.js';
 import { Hyphenator } from '../core/hyphenation/index.js';
@@ -15,8 +15,10 @@ export interface PdfAProfile {
     readonly tagged: boolean;
     readonly version: '1.4' | '1.7';
 }
+export type LayoutProfile = 'ream' | 'word' | 'libreoffice';
 export interface StyledRenderOptions {
     readonly registry: FontRegistry;
+    readonly layoutProfile?: LayoutProfile;
     readonly registriesByFamily?: ReadonlyMap<FamilyKey, FontRegistry>;
     readonly embeddedFonts?: ReadonlyMap<string, FontRegistry>;
     readonly styles: StyleSheet;
@@ -26,6 +28,8 @@ export interface StyledRenderOptions {
     readonly headersFooters?: ReadonlyMap<string, ReadonlyArray<BodyElement>>;
     readonly footnotes?: ReadonlyMap<string, ReadonlyArray<BodyElement>>;
     readonly endnotes?: ReadonlyMap<string, ReadonlyArray<BodyElement>>;
+    readonly comments?: ReadonlyMap<string, Comment>;
+    readonly commentAnnotations?: boolean;
     readonly resources?: ResourceStore;
     readonly charts?: ReadonlyMap<string, Chart>;
     readonly pageWidth?: number;
@@ -51,12 +55,17 @@ export interface BookmarkPosition {
     readonly pageIdx: number;
     readonly yTopPt: number;
 }
+export interface CommentNote {
+    readonly author?: string;
+    readonly contents: string;
+}
 export interface PdfLayoutAux {
     readonly structBuilder: StructTreeBuilder | undefined;
     readonly sectionCtxs: ReadonlyArray<SectionRenderCtx>;
     readonly pdfaProfile: PdfAProfile | undefined;
     readonly tagged: boolean;
     readonly bookmarks: ReadonlyMap<string, BookmarkPosition>;
+    readonly commentNotes?: ReadonlyMap<string, CommentNote>;
 }
 export interface LaidOutPdfDocument extends LaidOutDocument {
     readonly pdf: PdfLayoutAux;

package/dist/esm/layout/styled-layout.js

@@ -7,6 +7,7 @@ import { prepareImage } from "../core/images.js";
 import { segmentLevels } from "../core/bidi/segments.js";
 import { analyzeString, hasBidiCharacters } from "../core/bidi/index.js";
 import { FORCED_BREAK, breakLines } from "../core/line-breaker/knuth-plass.js";
+import { greedyBreakLines } from "../core/line-breaker/greedy.js";
 import { applyNumbering, applyNumberingToHeadersFooters } from "../core/numbering/apply.js";
 import { DEFAULT_RESOLVED_PARAGRAPH, DEFAULT_RESOLVED_RUN } from "../core/style-cascade/types.js";
 import { resolveParagraphProperties, resolveRunProperties } from "../core/style-cascade/resolver.js";
@@ -43,9 +44,10 @@ function isOutOfFlowFloat(f) {
 	return f !== void 0 && f.wrap !== "topAndBottom";
 }
 var FOOTNOTE_RULE_WIDTH = 144;
-function assignNoteNumbers(body) {
+function assignNoteNumbers(body, commentIds) {
 	const footnotes = /* @__PURE__ */ new Map();
 	const endnotes = /* @__PURE__ */ new Map();
+	const comments = /* @__PURE__ */ new Map();
 	const paragraphFootnotes = /* @__PURE__ */ new Set();
 	const numberRun = (run, n) => ({
 		...run,
@@ -55,8 +57,17 @@ function assignNoteNumbers(body) {
 			verticalAlign: "superscript"
 		}
 	});
+	const commentMarkerRun = (run, n) => ({
+		...run,
+		text: `[${n}]`,
+		...run.commentRef !== void 0 && commentIds?.has(run.commentRef) ? { anchor: `comment-${n}` } : {},
+		properties: {
+			...run.properties,
+			verticalAlign: "superscript"
+		}
+	});
 	const mapParagraph = (paragraph) => {
-		if (!paragraph.runs.some((r) => r.footnoteRef !== void 0 || r.endnoteRef !== void 0)) return paragraph;
+		if (!paragraph.runs.some((r) => r.footnoteRef !== void 0 || r.endnoteRef !== void 0 || r.commentRef !== void 0)) return paragraph;
 		return {
 			...paragraph,
 			runs: paragraph.runs.map((run) => {
@@ -76,6 +87,14 @@ function assignNoteNumbers(body) {
 					}
 					return numberRun(run, n);
 				}
+				if (run.commentRef !== void 0) {
+					let n = comments.get(run.commentRef);
+					if (n === void 0) {
+						n = comments.size + 1;
+						comments.set(run.commentRef, n);
+					}
+					return commentMarkerRun(run, n);
+				}
 				return run;
 			})
 		};
@@ -116,7 +135,7 @@ function assignNoteNumbers(body) {
 		return el;
 	};
 	const hasRefs = (els) => els.some((el) => {
-		if (el.kind === "paragraph") return el.paragraph.runs.some((r) => r.footnoteRef !== void 0 || r.endnoteRef !== void 0);
+		if (el.kind === "paragraph") return el.paragraph.runs.some((r) => r.footnoteRef !== void 0 || r.endnoteRef !== void 0 || r.commentRef !== void 0);
 		if (el.kind === "table") return el.table.rows.some((row) => row.cells.some((c) => hasRefs(c.content)));
 		if (el.kind === "shape" && el.shape.text) return hasRefs(el.shape.text.content);
 		return false;
@@ -125,12 +144,14 @@ function assignNoteNumbers(body) {
 		body,
 		footnotes,
 		endnotes,
+		comments,
 		deferredFootnotes: []
 	};
 	return {
 		body: body.map((el) => mapElement(el, true)),
 		footnotes,
 		endnotes,
+		comments,
 		deferredFootnotes: [...footnotes.keys()].filter((id) => !paragraphFootnotes.has(id))
 	};
 }
@@ -168,9 +189,62 @@ function substituteNoteNumber(content, n) {
 		}
 	}, ...out.slice(1)];
 }
+function flattenCommentText(content) {
+	const lines = [];
+	const visit = (els) => {
+		for (const el of els) if (el.kind === "paragraph") lines.push(el.paragraph.runs.map((r) => r.text).join(""));
+		else if (el.kind === "table") for (const row of el.table.rows) for (const cell of row.cells) visit(cell.content);
+	};
+	visit(content);
+	return lines.join("\n").trim();
+}
+function buildCommentNotes(numbers, comments) {
+	const out = /* @__PURE__ */ new Map();
+	for (const [id, n] of numbers) {
+		const c = comments.get(id);
+		if (!c) continue;
+		out.set(`comment-${n}`, {
+			...c.author !== void 0 ? { author: c.author } : {},
+			contents: flattenCommentText(c.content)
+		});
+	}
+	return out;
+}
+function commentTailBlocks(comment, n, opts) {
+	const who = [comment.author, comment.date].filter((s) => s !== void 0 && s.length > 0).join(", ");
+	const inReplyTo = opts?.parentN !== void 0 ? ` (in reply to [${opts.parentN}])` : "";
+	const resolved = opts?.done ? " (resolved)" : "";
+	const labelRun = {
+		text: who ? `[${n}] ${who}${inReplyTo}${resolved}: ` : `[${n}]${inReplyTo}${resolved} `,
+		properties: {}
+	};
+	const bm = `comment-${n}`;
+	const indent = opts?.depth && opts.depth > 0 ? { indentLeft: pt(18 * opts.depth) } : {};
+	const first = comment.content[0];
+	if (first && first.kind === "paragraph") return [{
+		kind: "paragraph",
+		paragraph: {
+			...first.paragraph,
+			properties: {
+				...first.paragraph.properties,
+				...indent
+			},
+			runs: [labelRun, ...first.paragraph.runs],
+			bookmarks: [bm, ...first.paragraph.bookmarks ?? []]
+		}
+	}, ...comment.content.slice(1)];
+	return [{
+		kind: "paragraph",
+		paragraph: {
+			properties: { ...indent },
+			runs: [labelRun],
+			bookmarks: [bm]
+		}
+	}, ...comment.content];
+}
 function layoutStyledDocument(body, options) {
 	const sectionList = resolveSectionList(body, options);
-	const noteAssigned = assignNoteNumbers(applyNumbering(body, options.numbering));
+	const noteAssigned = assignNoteNumbers(applyNumbering(body, options.numbering), options.comments ? new Set(options.comments.keys()) : void 0);
 	const numberedBody = noteAssigned.body;
 	const numberedHeadersFooters = applyNumberingToHeadersFooters(options.headersFooters, options.numbering);
 	const pdfaProfile = options.pdfA ? parsePdfAProfile(options.pdfA) : void 0;
@@ -228,8 +302,35 @@ function layoutStyledDocument(body, options) {
 			});
 		}
 		for (const note of tailNotes.sort((a, b) => a.n - b.n)) for (const el of substituteNoteNumber(note.content, note.n)) blocks.push(layoutBodyElement(el, options, fontResources, imageResources, lastCtx.contentWidth, lastCtx.pageContentHeight));
+		const commentNums = noteAssigned.comments;
+		const threadDepth = (id) => {
+			let depth = 0;
+			const seen = new Set([id]);
+			let cur = options.comments?.get(id)?.parentId;
+			while (cur !== void 0 && commentNums.has(cur) && !seen.has(cur)) {
+				depth++;
+				seen.add(cur);
+				cur = options.comments?.get(cur)?.parentId;
+			}
+			return depth;
+		};
+		const commentTail = [...commentNums].map(([id, n]) => ({
+			id,
+			comment: options.comments?.get(id),
+			n
+		})).filter((e) => e.comment !== void 0).sort((a, b) => a.n - b.n);
+		for (const { id, comment, n } of commentTail) {
+			const parentId = comment.parentId;
+			const parentN = parentId !== void 0 && commentNums.has(parentId) ? commentNums.get(parentId) : void 0;
+			for (const el of commentTailBlocks(comment, n, {
+				...parentN !== void 0 ? { parentN } : {},
+				depth: threadDepth(id),
+				...comment.done ? { done: true } : {}
+			})) blocks.push(layoutBodyElement(el, options, fontResources, imageResources, lastCtx.contentWidth, lastCtx.pageContentHeight));
+		}
 	}
 	const bookmarks = /* @__PURE__ */ new Map();
+	const commentNotes = options.commentAnnotations && options.comments ? buildCommentNotes(noteAssigned.comments, options.comments) : void 0;
 	const reflowParagraph = (paragraph, width, widths) => layoutParagraphBlock(paragraph, options, fontResources, imageResources, width, widths);
 	return {
 		pages: paginateSections(blocks, sectionCtxs, structBuilder, options.language ?? "en-US", notePlan, bookmarks, reflowParagraph),
@@ -241,7 +342,8 @@ function layoutStyledDocument(body, options) {
 			sectionCtxs,
 			pdfaProfile,
 			tagged,
-			bookmarks
+			bookmarks,
+			...commentNotes ? { commentNotes } : {}
 		}
 	};
 }
@@ -755,6 +857,7 @@ function collectImageResources(body, headersFooters, options) {
 	for (const hf of headersFooters.values()) visit(hf);
 	for (const note of options.footnotes?.values() ?? []) visit(note);
 	for (const note of options.endnotes?.values() ?? []) visit(note);
+	for (const comment of options.comments?.values() ?? []) visit(comment.content);
 	const flattenAlpha = options.pdfA ? parsePdfAProfile(options.pdfA).part === 1 : false;
 	let counter = 0;
 	for (const resourceId of seen) {
@@ -915,6 +1018,7 @@ function collectFontResources(body, headersFooters, options) {
 	for (const hf of headersFooters.values()) visit(hf);
 	for (const note of options.footnotes?.values() ?? []) visit(note);
 	for (const note of options.endnotes?.values() ?? []) visit(note);
+	for (const comment of options.comments?.values() ?? []) visit(comment.content);
 	if (used.size === 0) {
 		const regular = options.registry.resolveByStyle(false, false);
 		used.set(regular.variant, {
@@ -930,7 +1034,7 @@ function collectFontResources(body, headersFooters, options) {
 		out.set(variant, {
 			resourceName,
 			parsed: info.parsed,
-			measure: createFontMeasure(info.parsed),
+			measure: createFontMeasure(info.parsed, options.layoutProfile !== "word"),
 			gids: info.gids
 		});
 	}
@@ -943,7 +1047,7 @@ function layoutParagraphBlock(paragraph, options, fontResources, imageResources,
 		...baseResolved,
 		alignment: "right"
 	} : baseResolved;
-	const lines = wrap(tokenizeParagraph(paragraph, options, fontResources, imageResources, contentWidth, baseDir), paragraphMaxWidth(resolved, contentWidth, true), paragraphMaxWidth(resolved, contentWidth, false), resolved, options.hyphenator, lineWidths);
+	const lines = wrap(tokenizeParagraph(paragraph, options, fontResources, imageResources, contentWidth, baseDir), paragraphMaxWidth(resolved, contentWidth, true), paragraphMaxWidth(resolved, contentWidth, false), resolved, options.hyphenator, options.layoutProfile ?? "ream", lineWidths);
 	let heightPt = 0;
 	for (const line of lines) heightPt += computeLineHeight(line, resolved);
 	const numbering = paragraph.properties.numbering;
@@ -1085,6 +1189,7 @@ function tokenizePlansLtr(plans) {
 			});
 			continue;
 		}
+		const highlight = (plan.run.commentRangeRefs?.length ?? 0) > 0;
 		for (const t of tokenizeText(plan.run.text)) tokens.push({
 			kind: "text",
 			text: t.text,
@@ -1093,6 +1198,7 @@ function tokenizePlansLtr(plans) {
 			...plan.run.footnoteRef !== void 0 ? { footnoteRef: plan.run.footnoteRef } : {},
 			...plan.run.anchor !== void 0 ? { anchor: plan.run.anchor } : {},
 			...plan.run.listMarker ? { listMarker: true } : {},
+			...highlight ? { highlight: true } : {},
 			resolvedRun: plan.resolvedRun,
 			font: plan.font,
 			fontSizePt: plan.fontSizePt,
@@ -1147,6 +1253,7 @@ function tokenizePlansBidi(plans, realLevels) {
 				...plan.run.footnoteRef !== void 0 ? { footnoteRef: plan.run.footnoteRef } : {},
 				...plan.run.anchor !== void 0 ? { anchor: plan.run.anchor } : {},
 				...plan.run.listMarker ? { listMarker: true } : {},
+				...(plan.run.commentRangeRefs?.length ?? 0) > 0 ? { highlight: true } : {},
 				resolvedRun: plan.resolvedRun,
 				font: plan.font,
 				fontSizePt: plan.fontSizePt,
@@ -1290,7 +1397,7 @@ function paragraphItemStream(tokens, hyphenator) {
 	});
 	return entries;
 }
-function lineFromRange(entries, start, breakIdx, availableWidthPt, isFirst, resolved) {
+function lineFromRange(entries, start, breakIdx, availableWidthPt, isFirst, resolved, profile) {
 	let st = start;
 	let et = breakIdx;
 	while (st < et && (entries[st].token === null || entries[st].token?.isSpace)) st++;
@@ -1316,6 +1423,10 @@ function lineFromRange(entries, start, breakIdx, availableWidthPt, isFirst, reso
 	let maxSize = 0;
 	let mathAscent = 0;
 	let mathDescent = 0;
+	const useMetric = profile !== "ream";
+	let metricAscent = 0;
+	let metricDescent = 0;
+	let metricLineGap = 0;
 	for (const t of lineTokens) {
 		contentWidth += t.widthPt;
 		const sz = tokenLineSize(t);
@@ -1323,8 +1434,14 @@ function lineFromRange(entries, start, breakIdx, availableWidthPt, isFirst, reso
 		if (t.kind === "math") {
 			mathAscent = Math.max(mathAscent, t.ascentPt);
 			mathDescent = Math.max(mathDescent, t.descentPt);
+		} else if (useMetric && t.kind === "text") {
+			const m = fontLeadingPt(t.font.parsed, t.fontSizePt, profile);
+			if (m.ascentPt > metricAscent) metricAscent = m.ascentPt;
+			if (m.descentPt > metricDescent) metricDescent = m.descentPt;
+			if (m.lineGapPt > metricLineGap) metricLineGap = m.lineGapPt;
 		}
 	}
+	const hasMetric = useMetric && metricAscent + metricDescent > 0;
 	return {
 		tokens: lineTokens,
 		contentWidthPt: contentWidth,
@@ -1334,21 +1451,26 @@ function lineFromRange(entries, start, breakIdx, availableWidthPt, isFirst, reso
 		resolved,
 		isLastInParagraph: false,
 		mathAscentPt: mathAscent,
-		mathDescentPt: mathDescent
+		mathDescentPt: mathDescent,
+		...hasMetric ? {
+			metricHeightPt: metricAscent + metricDescent + metricLineGap,
+			metricDescentPt: metricDescent
+		} : {}
 	};
 }
-function wrap(tokens, firstLineWidth, otherWidth, resolved, hyphenator, lineWidths) {
+function wrap(tokens, firstLineWidth, otherWidth, resolved, hyphenator, profile, lineWidths) {
 	if (tokens.length === 0) return [];
 	const widths = lineWidths ?? [firstLineWidth, otherWidth];
 	const entries = paragraphItemStream(tokens, hyphenator);
-	const { breaks } = breakLines(entries.map((e) => e.item), widths);
+	const items = entries.map((e) => e.item);
+	const breaks = profile === "ream" ? breakLines(items, widths).breaks : greedyBreakLines(items, widths);
 	const lines = [];
 	let start = 0;
 	let isFirst = true;
 	let lineIdx = 0;
 	for (const breakIdx of breaks) {
 		const width = lineIdx < widths.length ? widths[lineIdx] : widths[widths.length - 1];
-		const line = lineFromRange(entries, start, breakIdx, width, isFirst, resolved);
+		const line = lineFromRange(entries, start, breakIdx, width, isFirst, resolved, profile);
 		if (line) lines.push(line);
 		start = breakIdx + 1;
 		isFirst = false;
@@ -1357,19 +1479,38 @@ function wrap(tokens, firstLineWidth, otherWidth, resolved, hyphenator, lineWidt
 	if (lines.length > 0) lines[lines.length - 1].isLastInParagraph = true;
 	return lines;
 }
+function fontLeadingPt(parsed, sizePt, profile) {
+	const s = sizePt / parsed.unitsPerEm;
+	const vm = parsed.vmetrics;
+	if (profile === "word") return {
+		ascentPt: vm.winAscent * s,
+		descentPt: vm.winDescent * s,
+		lineGapPt: 0
+	};
+	const asc = vm.useTypoMetrics ? vm.typoAscent : parsed.ascender;
+	const desc = vm.useTypoMetrics ? vm.typoDescent : parsed.descender;
+	const gap = vm.useTypoMetrics ? vm.typoLineGap : parsed.lineGap;
+	return {
+		ascentPt: asc * s,
+		descentPt: -desc * s,
+		lineGapPt: gap * s
+	};
+}
 function computeLineHeight(line, p) {
 	const fontSize = line.maxFontSizePt || 12;
+	const natural = line.metricHeightPt ?? fontSize * 1.2;
 	const mathH = (line.mathAscentPt ?? 0) + (line.mathDescentPt ?? 0);
 	const mathNeed = mathH > 0 ? mathH * 1.05 : 0;
 	if (p.spacingLineRule === "exact" && p.spacingLine > 0) return Math.max(p.spacingLine, mathNeed);
-	if (p.spacingLineRule === "atLeast" && p.spacingLine > 0) return Math.max(fontSize * 1.2, p.spacingLine, mathNeed);
+	if (p.spacingLineRule === "atLeast" && p.spacingLine > 0) return Math.max(natural, p.spacingLine, mathNeed);
 	const lineTwips = Math.round(p.spacingLine * 20);
 	const multiple = lineTwips > 0 ? lineTwips / 240 : 1;
-	return Math.max(fontSize * 1.2 * multiple, mathNeed);
+	return Math.max(natural * multiple, mathNeed);
 }
 function lineDescent(line) {
 	const fs = line.maxFontSizePt || 12;
-	return Math.max(fs * .2, line.mathDescentPt ?? 0);
+	const base = line.metricDescentPt ?? fs * .2;
+	return Math.max(base, line.mathDescentPt ?? 0);
 }
 function alignmentOffset(alignment, lineWidth, available) {
 	if (alignment === "right") return Math.max(0, available - lineWidth);

package/dist/esm/pdf/styled-page-emitter.js

@@ -33,6 +33,7 @@ async function emitStyledPdfEncrypted(laid, options, doc, encrypt) {
 function assembleStyledPdf(laid, options, doc) {
 	const { pages: renderedPages } = laid;
 	const { structBuilder, sectionCtxs, pdfaProfile, tagged } = laid.pdf;
+	const commentNotes = !pdfaProfile && !structBuilder ? laid.pdf.commentNotes : void 0;
 	const docInfo = options.pdfUA && !options.info?.title ? {
 		...options.info,
 		title: "Untitled document"
@@ -158,6 +159,24 @@ function assembleStyledPdf(laid, options, doc) {
 					annotParentCount++;
 				}
 				annots.push(ref(annotRef.id));
+				const note = l.anchor !== void 0 ? commentNotes?.get(l.anchor) : void 0;
+				if (note) {
+					const textAnnot = doc.add(dict({
+						Type: name("Annot"),
+						Subtype: name("Text"),
+						Name: name("Comment"),
+						Rect: [
+							l.rect[0],
+							l.rect[1],
+							l.rect[2],
+							l.rect[3]
+						],
+						F: 28,
+						Contents: note.contents,
+						...note.author !== void 0 ? { T: note.author } : {}
+					}));
+					annots.push(ref(textAnnot.id));
+				}
 			}
 			if (annots.length > 0) {
 				pageEntries["Annots"] = annots;
@@ -624,6 +643,25 @@ function emitPageContent(page, tagging, gradientNames) {
 				const text = tok.bidiLevel % 2 === 1 ? reverseByCodePoint(tok.text) : tok.text;
 				return tok.font.measure.encodeTextAsCidHex(text);
 			};
+			if (line.tokens.some((t) => t.kind === "text" && t.highlight === true)) {
+				if (inBT) {
+					out.push("ET");
+					inBT = false;
+				}
+				const hlAscent = Math.max(lineFs, line.mathAscentPt ?? 0);
+				const hlDescent = Math.max(lineFs * .2, line.mathDescentPt ?? 0);
+				const [hr, hg, hb] = hexToRgb01("fff3a3");
+				out.push("q");
+				out.push(`${formatNumber(hr)} ${formatNumber(hg)} ${formatNumber(hb)} rg`);
+				let hx = originX;
+				for (const tok of line.tokens) {
+					const w = tok.widthPt + (tok.kind === "text" && tok.isSpace ? extraPerSpace : 0);
+					if (tok.kind === "text" && tok.highlight === true) out.push(`${formatNumber(hx)} ${formatNumber(baselineY - hlDescent)} ${formatNumber(w)} ${formatNumber(hlAscent + hlDescent)} re`);
+					hx += w;
+				}
+				out.push("f");
+				out.push("Q");
+			}
 			if (extraPerSpace > 0 || hasImageToken || hasMathToken || hasRtl) {
 				const order = hasRtl ? lineVisualOrder(line) : line.tokens.map((_, i) => i);
 				let x = originX;

package/dist/esm/pptx/pptx-reader.d.ts

@@ -1,4 +1,6 @@
 import { DocumentReader, ReadResult } from '../core/ir/adapters.js';
 import { FlowDoc } from '../core/ir/flow.js';
+import { PoNode } from '../core/po-helpers.js';
 export declare function readPptx(bytes: Uint8Array): ReadResult<FlowDoc>;
+export declare function parseXml(data: Uint8Array): Array<PoNode>;
 export declare const pptxReader: DocumentReader<FlowDoc>;