reamkit 1.11.0 → 1.12.0

package/dist/esm/core/converter/facade.js

@@ -2,6 +2,7 @@ import { FontRegistry } from "../font/font-registry.js";
 import { FEATURES } from "../ir/features.js";
 import { ConversionLossError } from "../ir/loss.js";
 import { layoutStyledDocument } from "../../layout/styled-layout.js";
+import { pptxReader } from "../../pptx/pptx-reader.js";
 import { docxReader } from "../../word/docx-reader.js";
 import { projectSheetDoc } from "../../excel/sheet-to-flow.js";
 import { xlsxReader } from "../../excel/xlsx-reader.js";
@@ -13,7 +14,6 @@ import { writeHtml } from "../../html/html-writer.js";
 import { writeSvg } from "../../svg/svg-writer.js";
 import { convertDocxToPdf } from "../../word/docx-to-pdf.js";
 import { convertXlsxToPdf } from "../../excel/xlsx-to-pdf.js";
-import { pptxReader } from "../../pptx/pptx-reader.js";
 import { pdfReader } from "../../pdf-reader/reader.js";
 //#region src/core/converter/facade.ts
 function toFlowDoc(doc) {

package/dist/esm/core/converter/project.js

@@ -9,6 +9,7 @@ function flowRenderOptions(flow) {
 		...flow.headersFooters ? { headersFooters: flow.headersFooters } : {},
 		...flow.footnotes ? { footnotes: flow.footnotes } : {},
 		...flow.endnotes ? { endnotes: flow.endnotes } : {},
+		...flow.comments ? { comments: flow.comments } : {},
 		resources: flow.resources,
 		...flow.charts ? { charts: flow.charts } : {},
 		...flow.embeddedFonts ? { embeddedFonts: flow.embeddedFonts } : {},

package/dist/esm/core/document-model/index.d.ts

@@ -1 +1 @@
-export type { AbstractNumbering, Alignment, Border, BorderStyle, BodyElement, CellBorders, CellMerge, DocumentInfo, CellMargins, CellProperties, CellShading, CellDataBar, CellIcon, CellIconShape, CellSparkline, Chart, ChartBlock, ChartDataPoint, ChartSeries, ChartType, CustomGeometry, CustomPathCmd, DocumentModel, FontFamilyMap, HeaderFooterReference, HeaderFooterType, ImageBlock, InlineImage, MathAccent, MathBar, MathDelimiter, MathEqArray, MathFraction, MathFunc, MathGroupChr, MathLimit, MathMatrix, MathNary, MathNode, MathRadical, MathRow, MathRun, MathScript, Numbering, NumberingFormat, NumberingInstance, NumberingLevel, NumberingReference, PageMargins, PageSize, Paragraph, ParagraphProperties, Run, RunProperties, RowProperties, Section, FloatAnchor, SectionColumns, SectionProperties, ShapeBlock, ShapeDash, ShapeFill, ShapeFillKind, ShapeGeometry, ShapeLine, ShapeTextBody, ShapeTransform, Style, StyleSheet, StyleType, Table, TableCell, TableLook, TableProperties, TableStyleCondition, TableStyleConditionType, TableStyleLayer, TableRow, UnderlineStyle, VerticalAlign, } from './types.js';
+export type { AbstractNumbering, Alignment, Border, BorderStyle, BodyElement, Comment, CellBorders, CellMerge, DocumentInfo, CellMargins, CellProperties, CellShading, CellDataBar, CellIcon, CellIconShape, CellSparkline, Chart, ChartBlock, ChartDataPoint, ChartSeries, ChartType, CustomGeometry, CustomPathCmd, DocumentModel, FontFamilyMap, HeaderFooterReference, HeaderFooterType, ImageBlock, InlineImage, MathAccent, MathBar, MathDelimiter, MathEqArray, MathFraction, MathFunc, MathGroupChr, MathLimit, MathMatrix, MathNary, MathNode, MathRadical, MathRow, MathRun, MathScript, Numbering, NumberingFormat, NumberingInstance, NumberingLevel, NumberingReference, PageMargins, PageSize, Paragraph, ParagraphProperties, Run, RunProperties, RowProperties, Section, FloatAnchor, SectionColumns, SectionProperties, ShapeBlock, ShapeDash, ShapeFill, ShapeFillKind, ShapeGeometry, ShapeLine, ShapeTextBody, ShapeTransform, Style, StyleSheet, StyleType, Table, TableCell, TableLook, TableProperties, TableStyleCondition, TableStyleConditionType, TableStyleLayer, TableRow, UnderlineStyle, VerticalAlign, } from './types.js';

package/dist/esm/core/document-model/types.d.ts

@@ -132,6 +132,8 @@ export interface Run {
     readonly anchor?: string;
     readonly footnoteRef?: string;
     readonly endnoteRef?: string;
+    readonly commentRef?: string;
+    readonly commentRangeRefs?: ReadonlyArray<string>;
     readonly noteNumber?: true;
     readonly listMarker?: true;
     readonly inlineImage?: InlineImage;
@@ -144,6 +146,27 @@ export interface Paragraph {
     readonly runs: ReadonlyArray<Run>;
     readonly bookmarks?: ReadonlyArray<string>;
 }
+export interface Comment {
+    readonly content: ReadonlyArray<BodyElement>;
+    readonly author?: string;
+    readonly initials?: string;
+    /** Raw w:date timestamp (ISO 8601), as authored — not reformatted. */
+    readonly date?: string;
+    /**
+     * The author's resolved identity (usually an email) from word/people.xml
+     * (`w15:person` → `w15:presenceInfo/@w15:userId`), matched on the author name.
+     * Absent when the file ships no people part or the author is not listed.
+     */
+    readonly authorId?: string;
+    /**
+     * Microsoft commentsExtended (w15) — the id of the comment this one replies
+     * to, forming a thread. Set only when word/commentsExtended.xml links this
+     * comment's paragraph to a parent (w15:paraIdParent). Top-level comments omit it.
+     */
+    readonly parentId?: string;
+    /** w15:done — the comment thread was marked resolved. */
+    readonly done?: boolean;
+}
 export type NumberingFormat = 'decimal' | 'lowerLetter' | 'upperLetter' | 'lowerRoman' | 'upperRoman' | 'bullet' | 'none';
 export interface NumberingReference {
     readonly numId: string;

package/dist/esm/core/ir/features.d.ts

@@ -10,6 +10,7 @@ export declare const FEATURES: {
     readonly imagesJp2: "images.jp2";
     readonly hyperlinks: "hyperlinks";
     readonly shapes: "shapes";
+    readonly smartArt: "shapes.smartArt";
     readonly charts: "charts";
     readonly math: "math";
     readonly rtl: "rtl";

package/dist/esm/core/ir/features.js

@@ -10,6 +10,7 @@ var FEATURES = {
 	imagesJp2: "images.jp2",
 	hyperlinks: "hyperlinks",
 	shapes: "shapes",
+	smartArt: "shapes.smartArt",
 	charts: "charts",
 	math: "math",
 	rtl: "rtl",

package/dist/esm/core/ir/flow.d.ts

@@ -1,4 +1,4 @@
-import { BodyElement, Chart, DocumentInfo, Numbering, Section, SectionProperties, StyleSheet } from '../document-model/index.js';
+import { BodyElement, Chart, Comment, DocumentInfo, Numbering, Section, SectionProperties, StyleSheet } from '../document-model/index.js';
 import { FontRegistry } from '../font/index.js';
 import { ResourceStore } from './resources.js';
 export interface FlowDoc {
@@ -14,6 +14,8 @@ export interface FlowDoc {
     /** §17.11 footnotes/endnotes content by id (separator stubs excluded). */
     readonly footnotes?: ReadonlyMap<string, ReadonlyArray<BodyElement>>;
     readonly endnotes?: ReadonlyMap<string, ReadonlyArray<BodyElement>>;
+    /** §17.13.4 review comments by id, anchored from a run's `commentRef`. */
+    readonly comments?: ReadonlyMap<string, Comment>;
     /** Parsed charts keyed by relationship id (ChartBlock.chartRelId). */
     readonly charts?: ReadonlyMap<string, Chart>;
     /** Content-addressed binary resources (images). */

package/dist/esm/core/po-helpers.d.ts

@@ -6,6 +6,8 @@ export declare function poChildren(node: PoNode | undefined): ReadonlyArray<PoNo
 export declare function poChildrenWith(node: PoNode | undefined, tag: string): Array<PoNode>;
 export declare function poFirstChild(node: PoNode | undefined, tag: string): PoNode | undefined;
 export declare function poAttr(node: PoNode | undefined, name: string): string | undefined;
+export declare function poAttrLocal(node: PoNode | undefined, name: string): string | undefined;
+export declare function poIsLocal(node: PoNode | undefined, name: string): boolean;
 export declare function poIntAttr(node: PoNode | undefined, name: string): number | undefined;
 export declare function poVal(node: PoNode | undefined): string | undefined;
 export declare function poToggle(node: PoNode | undefined): boolean | undefined;

package/dist/esm/core/po-helpers.js

@@ -28,6 +28,19 @@ function poAttr(node, name) {
 	const v = a[`@_w:${name}`] ?? a[`@_r:${name}`] ?? a[`@_m:${name}`] ?? a[`@_xml:${name}`] ?? a[`@_${name}`];
 	return typeof v === "string" ? v : void 0;
 }
+function poAttrLocal(node, name) {
+	if (!node || typeof node !== "object") return void 0;
+	const attrs = node[ATTRS_KEY];
+	if (!attrs || typeof attrs !== "object") return void 0;
+	for (const [k, v] of Object.entries(attrs)) {
+		if (!k.startsWith("@_")) continue;
+		if (k.slice(2).split(":").pop() === name && typeof v === "string") return v;
+	}
+}
+function poIsLocal(node, name) {
+	const tag = poTag(node);
+	return tag !== void 0 && (tag === name || tag.split(":").pop() === name);
+}
 function poIntAttr(node, name) {
 	const v = poAttr(node, name);
 	if (v === void 0) return void 0;
@@ -73,4 +86,4 @@ function poFindDescendant(node, tag) {
 	}
 }
 //#endregion
-export { poAttr, poChildren, poChildrenWith, poFindByPath, poFindDescendant, poFirstChild, poIntAttr, poIs, poTag, poText, poToggle, poVal };
+export { poAttr, poAttrLocal, poChildren, poChildrenWith, poFindByPath, poFindDescendant, poFirstChild, poIntAttr, poIs, poIsLocal, poTag, poText, poToggle, poVal };

package/dist/esm/core/spreadsheet-model/index.d.ts

@@ -1 +1 @@
-export type { CellType, WorksheetCell, ColumnWidth, MergedRange, RowHeight, XlsxPageMargins, XlsxPageSetup, XlsxPrintOptions, ParsedWorksheet, XlsxFont, XlsxFill, XlsxBorderStyleName, XlsxBorderEdge, XlsxBorder, XlsxHorizontalAlign, XlsxVerticalAlign, XlsxCellAlignment, XlsxCellXf, XlsxStyles, DefinedName, Dxf, CfOperator, CfRuleCellIs, CfvoType, Cfvo, CfRuleColorScale, CfRuleDataBar, CfRuleIconSet, CfRule, ConditionalFormat, SparklineKind, ParsedSparkline, ExcelTable, SheetPane, } from './types.js';
+export type { CellType, WorksheetCell, ColumnWidth, MergedRange, RowHeight, XlsxPageMargins, XlsxPageSetup, XlsxPrintOptions, ParsedWorksheet, XlsxFont, XlsxFill, XlsxBorderStyleName, XlsxBorderEdge, XlsxBorder, XlsxHorizontalAlign, XlsxVerticalAlign, XlsxCellAlignment, XlsxCellXf, XlsxStyles, DefinedName, Dxf, CfOperator, CfRuleCellIs, CfvoType, Cfvo, CfRuleColorScale, CfRuleDataBar, CfRuleIconSet, CfRule, ConditionalFormat, SparklineKind, ParsedSparkline, ExcelTable, PivotTable, SheetPane, } from './types.js';

package/dist/esm/core/spreadsheet-model/types.d.ts

@@ -61,6 +61,7 @@ export interface ParsedWorksheet {
     readonly sparklines?: ReadonlyArray<ParsedSparkline>;
     readonly tablePartRelIds?: ReadonlyArray<string>;
     readonly tables?: ReadonlyArray<ExcelTable>;
+    readonly pivotTables?: ReadonlyArray<PivotTable>;
     readonly pane?: SheetPane;
 }
 export interface SheetPane {
@@ -81,6 +82,21 @@ export interface ExcelTable {
     readonly bandHex?: string;
     readonly headerTextHex?: string;
 }
+export interface PivotTable {
+    readonly ref: MergedRange;
+    readonly name?: string;
+    readonly styleName?: string;
+    readonly firstHeaderRow: number;
+    readonly firstDataRow: number;
+    readonly firstDataCol: number;
+    readonly showRowStripes: boolean;
+    readonly showColStripes: boolean;
+    readonly rowItemTypes?: ReadonlyArray<string | undefined>;
+    readonly colItemTypes?: ReadonlyArray<string | undefined>;
+    readonly headerHex?: string;
+    readonly bandHex?: string;
+    readonly headerTextHex?: string;
+}
 export type SparklineKind = 'line' | 'column' | 'winLoss';
 export interface ParsedSparkline {
     readonly kind: SparklineKind;

package/dist/esm/excel/pivot-table-parser.d.ts

@@ -0,0 +1,2 @@
+import { PivotTable } from '../core/spreadsheet-model/index.js';
+export declare function parsePivotTablePart(data: Uint8Array): PivotTable | undefined;

package/dist/esm/excel/pivot-table-parser.js

@@ -0,0 +1,68 @@
+import { parseAreaRef } from "./defined-name-ref.js";
+import { XMLParser } from "fast-xml-parser";
+//#region src/excel/pivot-table-parser.ts
+var decoder = new TextDecoder("utf-8");
+var parser = new XMLParser({
+	ignoreAttributes: false,
+	attributeNamePrefix: "@_",
+	parseAttributeValue: false,
+	parseTagValue: false,
+	removeNSPrefix: true
+});
+function parsePivotTablePart(data) {
+	const def = asObj(parser.parse(decoder.decode(data))["pivotTableDefinition"]);
+	if (!def) return void 0;
+	const loc = asObj(def["location"]);
+	const refStr = loc ? strAttr(loc, "ref") : void 0;
+	const ref = refStr ? parseAreaRef(refStr) : void 0;
+	if (!ref) return void 0;
+	const si = asObj(def["pivotTableStyleInfo"]);
+	const name = strAttr(def, "name");
+	const styleName = si ? strAttr(si, "name") : void 0;
+	const rowItemTypes = itemTypes(asObj(def["rowItems"]));
+	const colItemTypes = itemTypes(asObj(def["colItems"]));
+	const hasRowTotals = rowItemTypes?.some((t) => t !== void 0) ?? false;
+	const hasColTotals = colItemTypes?.some((t) => t !== void 0) ?? false;
+	return {
+		ref,
+		...name ? { name } : {},
+		...styleName ? { styleName } : {},
+		firstHeaderRow: (loc ? numAttr(loc, "firstHeaderRow") : void 0) ?? 1,
+		firstDataRow: (loc ? numAttr(loc, "firstDataRow") : void 0) ?? 1,
+		firstDataCol: (loc ? numAttr(loc, "firstDataCol") : void 0) ?? 0,
+		showRowStripes: si ? boolAttr(si, "showRowStripes") : false,
+		showColStripes: si ? boolAttr(si, "showColStripes") : false,
+		...hasRowTotals && rowItemTypes ? { rowItemTypes } : {},
+		...hasColTotals && colItemTypes ? { colItemTypes } : {}
+	};
+}
+function itemTypes(node) {
+	if (!node) return void 0;
+	return toArray(node["i"]).map((i) => {
+		const o = asObj(i);
+		return o ? strAttr(o, "t") : void 0;
+	});
+}
+function toArray(v) {
+	if (v === void 0 || v === null) return [];
+	return Array.isArray(v) ? v : [v];
+}
+function asObj(v) {
+	return v && typeof v === "object" && !Array.isArray(v) ? v : void 0;
+}
+function strAttr(obj, name) {
+	const v = obj[`@_${name}`];
+	return typeof v === "string" ? v : void 0;
+}
+function numAttr(obj, name) {
+	const v = strAttr(obj, name);
+	if (v === void 0) return void 0;
+	const n = Number(v);
+	return Number.isFinite(n) ? n : void 0;
+}
+function boolAttr(obj, name) {
+	const v = strAttr(obj, name);
+	return v === "1" || v === "true";
+}
+//#endregion
+export { parsePivotTablePart };

package/dist/esm/excel/print-model.js

@@ -525,18 +525,23 @@ function collectSeriesValues(cells, area) {
 	for (let r = area.startRow; r <= area.endRow; r++) for (let col = area.startColumn; col <= area.endColumn; col++) out.push(byKey.get(key(r, col)) ?? null);
 	return out;
 }
+function isPivotTotal(t) {
+	return t !== void 0 && t !== "data" && t !== "blank";
+}
 function buildTableFormatLookup(worksheet) {
 	const out = /* @__PURE__ */ new Map();
-	for (const t of worksheet.tables ?? []) {
-		const { ref } = t;
-		const firstDataRow = ref.startRow + t.headerRowCount;
+	const band = (ref, headerRows, style, isTotalRow) => {
+		const firstDataRow = ref.startRow + headerRows;
 		for (let r = ref.startRow; r <= ref.endRow; r++) {
 			let colorHex;
 			let fontColorHex;
 			if (r < firstDataRow) {
-				colorHex = t.headerHex;
-				fontColorHex = t.headerTextHex;
-			} else if (t.showRowStripes && t.bandHex) colorHex = (r - firstDataRow) % 2 === 1 ? t.bandHex : void 0;
+				colorHex = style.headerHex;
+				fontColorHex = style.headerTextHex;
+			} else if (isTotalRow?.(r - firstDataRow)) {
+				colorHex = style.headerHex;
+				fontColorHex = style.headerTextHex;
+			} else if (style.showRowStripes && style.bandHex) colorHex = (r - firstDataRow) % 2 === 1 ? style.bandHex : void 0;
 			if (!colorHex && !fontColorHex) continue;
 			const fmt = {
 				...colorHex ? { shading: { colorHex } } : {},
@@ -544,6 +549,23 @@ function buildTableFormatLookup(worksheet) {
 			};
 			for (let c = ref.startColumn; c <= ref.endColumn; c++) out.set(key(r, c), fmt);
 		}
+	};
+	for (const t of worksheet.tables ?? []) band(t.ref, t.headerRowCount, t);
+	for (const p of worksheet.pivotTables ?? []) band(p.ref, p.firstDataRow, p, (off) => isPivotTotal(p.rowItemTypes?.[off]));
+	for (const p of worksheet.pivotTables ?? []) {
+		if (!p.colItemTypes || p.headerHex === void 0) continue;
+		const firstDataRow = p.ref.startRow + p.firstDataRow;
+		const firstDataCol = p.ref.startColumn + p.firstDataCol;
+		const totalFmt = {
+			shading: { colorHex: p.headerHex },
+			...p.headerTextHex ? { fontColorHex: p.headerTextHex } : {}
+		};
+		for (let i = 0; i < p.colItemTypes.length; i++) {
+			if (!isPivotTotal(p.colItemTypes[i])) continue;
+			const c = firstDataCol + i;
+			if (c > p.ref.endColumn) continue;
+			for (let r = firstDataRow; r <= p.ref.endRow; r++) out.set(key(r, c), totalFmt);
+		}
 	}
 	return out;
 }

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/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;

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';
@@ -28,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;
@@ -53,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;