reamkit 1.11.0 → 1.13.0

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

@@ -9,7 +9,7 @@ var parser = new XMLParser({
 	parseTagValue: false,
 	removeNSPrefix: true
 });
-function parseTablePart(data) {
+function parseTablePartFull(data) {
 	const t = asObj(parser.parse(decoder.decode(data))["table"]);
 	if (!t) return void 0;
 	const refStr = strAttr(t, "ref");
@@ -18,7 +18,8 @@ function parseTablePart(data) {
 	const si = asObj(t["tableStyleInfo"]);
 	const name = strAttr(t, "name");
 	const styleName = si ? strAttr(si, "name") : void 0;
-	return {
+	const af = asObj(t["autoFilter"]);
+	const table = {
 		ref,
 		...name ? { name } : {},
 		...styleName ? { styleName } : {},
@@ -27,9 +28,40 @@ function parseTablePart(data) {
 		showColumnStripes: si ? boolAttr(si, "showColumnStripes") : false,
 		showFirstColumn: si ? boolAttr(si, "showFirstColumn") : false,
 		showLastColumn: si ? boolAttr(si, "showLastColumn") : false,
-		autoFilter: asObj(t["autoFilter"]) !== void 0
+		autoFilter: af !== void 0
+	};
+	const id = numAttr(t, "id");
+	return {
+		table,
+		...id !== void 0 ? { id } : {},
+		filters: parseFilterColumns(af)
 	};
 }
+function parseFilterColumns(af) {
+	if (!af) return [];
+	const out = [];
+	for (const fc of asArray(af["filterColumn"])) {
+		const col = asObj(fc);
+		if (!col) continue;
+		const colId = numAttr(col, "colId");
+		if (colId === void 0) continue;
+		const filters = asObj(col["filters"]);
+		if (!filters) continue;
+		const values = [];
+		for (const f of asArray(filters["filter"])) {
+			const v = asObj(f) ? strAttr(asObj(f), "val") : void 0;
+			if (v !== void 0) values.push(v);
+		}
+		out.push({
+			colId,
+			values
+		});
+	}
+	return out;
+}
+function asArray(v) {
+	return Array.isArray(v) ? v : v === void 0 || v === null ? [] : [v];
+}
 function asObj(v) {
 	return v && typeof v === "object" && !Array.isArray(v) ? v : void 0;
 }
@@ -48,4 +80,4 @@ function boolAttr(obj, name) {
 	return v === "1" || v === "true";
 }
 //#endregion
-export { parseTablePart };
+export { parseTablePartFull };

package/dist/esm/excel/worksheet-parser.js

@@ -37,6 +37,7 @@ function parseWorksheet(data) {
 	const drawingNode = wsObj["drawing"];
 	const drawingRelId = drawingNode && typeof drawingNode === "object" ? strAttr(drawingNode, "id") : void 0;
 	const conditionalFormats = parseConditionalFormatting(wsObj);
+	const dataValidations = parseDataValidations(wsObj);
 	const sparklines = parseSparklines(wsObj);
 	const tablePartRelIds = parseTableParts(wsObj);
 	const printModel = {
@@ -49,6 +50,7 @@ function parseWorksheet(data) {
 		...pane ? { pane } : {},
 		...drawingRelId !== void 0 ? { drawingRelId } : {},
 		...conditionalFormats.length > 0 ? { conditionalFormats } : {},
+		...dataValidations.length > 0 ? { dataValidations } : {},
 		...sparklines.length > 0 ? { sparklines } : {},
 		...tablePartRelIds.length > 0 ? { tablePartRelIds } : {}
 	};
@@ -298,6 +300,60 @@ function parseConditionalFormatting(ws) {
 	}
 	return out;
 }
+var DV_TYPES = new Set([
+	"none",
+	"whole",
+	"decimal",
+	"list",
+	"date",
+	"time",
+	"textLength",
+	"custom"
+]);
+function parseDataValidations(ws) {
+	const node = asObjectNode(ws["dataValidations"]);
+	if (!node) return [];
+	const out = [];
+	for (const dv of toArray(node["dataValidation"])) {
+		const obj = asObjectNode(dv);
+		if (!obj) continue;
+		const sqref = strAttr(obj, "sqref");
+		if (!sqref) continue;
+		const ranges = parseSqref(sqref);
+		if (ranges.length === 0) continue;
+		const typeRaw = strAttr(obj, "type");
+		const type = typeRaw && DV_TYPES.has(typeRaw) ? typeRaw : "none";
+		const operator = strAttr(obj, "operator");
+		const errorStyle = strAttr(obj, "errorStyle");
+		const formula1 = formulaText(obj["formula1"]);
+		const formula2 = formulaText(obj["formula2"]);
+		const promptTitle = strAttr(obj, "promptTitle");
+		const prompt = strAttr(obj, "prompt");
+		const errorTitle = strAttr(obj, "errorTitle");
+		const error = strAttr(obj, "error");
+		out.push({
+			type,
+			ranges,
+			...operator !== void 0 ? { operator } : {},
+			...boolAttr(obj, "allowBlank") ? { allowBlank: true } : {},
+			...boolAttr(obj, "showDropDown") ? { showDropDown: true } : {},
+			...boolAttr(obj, "showInputMessage") ? { showInputMessage: true } : {},
+			...boolAttr(obj, "showErrorMessage") ? { showErrorMessage: true } : {},
+			...errorStyle !== void 0 ? { errorStyle } : {},
+			...formula1 !== void 0 ? { formula1 } : {},
+			...formula2 !== void 0 ? { formula2 } : {},
+			...promptTitle !== void 0 ? { promptTitle } : {},
+			...prompt !== void 0 ? { prompt } : {},
+			...errorTitle !== void 0 ? { errorTitle } : {},
+			...error !== void 0 ? { error } : {}
+		});
+	}
+	return out;
+}
+function boolAttr(obj, key) {
+	const raw = strAttr(obj, key);
+	return raw === "1" || raw === "true";
+}
 function parseSqref(sqref) {
 	const out = [];
 	for (const token of sqref.split(/\s+/)) {

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

@@ -13,14 +13,20 @@ import { parseWorkbook } from "./workbook-parser.js";
 import { parseWorksheet } from "./worksheet-parser.js";
 import { EMPTY_XLSX_STYLES, parseXlsxStyles } from "./styles-parser.js";
 import "./index.js";
+import { resolveCellText } from "./print-model.js";
 import { parseSheetDrawing } from "./sheet-drawing.js";
-import { parseTablePart } from "./table-parser.js";
+import { parseTablePartFull } from "./table-parser.js";
+import { parsePivotTablePart } from "./pivot-table-parser.js";
+import { parseSlicerCachePart, parseSlicerPart } from "./slicer-parser.js";
 import { projectSheetDoc } from "./sheet-to-flow.js";
 //#region src/excel/xlsx-reader.ts
 var WORKBOOK_PART = "xl/workbook.xml";
 var SHARED_STRINGS_PART = "xl/sharedStrings.xml";
 var STYLES_PART = "xl/styles.xml";
 var CORE_PROPS_PART = "docProps/core.xml";
+var SLICER_REL_TAIL = "/slicer";
+var SLICER_CACHE_REL_TAIL = "/slicerCache";
+var MAX_SLICER_ITEMS = 256;
 function readXlsx(xlsx) {
 	return {
 		doc: projectSheetDoc(readXlsxToSheetDoc(xlsx)),
@@ -42,6 +48,8 @@ function readXlsxToSheetDoc(xlsx) {
 	const palette = buildThemePalette(pkg, workbookRels);
 	const resolveColor = makeColorResolver(palette);
 	const sheetsOut = [];
+	const tableIndex = /* @__PURE__ */ new Map();
+	const pendingSlicers = [];
 	for (let sheetIdx = 0; sheetIdx < sheets.length; sheetIdx++) {
 		const sheet = sheets[sheetIdx];
 		const sheetRel = workbookRels.find((r) => r.id === sheet.relationshipId);
@@ -74,14 +82,46 @@ function readXlsxToSheetDoc(xlsx) {
 			for (const rid of worksheet.tablePartRelIds) {
 				const rel = wsRels.find((r) => r.id === rid);
 				const part = rel ? pkg.resolveRelatedPart(resolved.path, rel) : void 0;
-				const parsed = part ? parseTablePart(part.data) : void 0;
-				if (parsed) resolvedTables.push(resolveTableStyle(parsed, palette));
+				const full = part ? parseTablePartFull(part.data) : void 0;
+				if (!full) continue;
+				resolvedTables.push(resolveTableStyle(full.table, palette));
+				if (full.id !== void 0) tableIndex.set(full.id, {
+					cells: worksheet.cells,
+					ref: full.table.ref,
+					headerRows: full.table.headerRowCount,
+					filters: full.filters
+				});
 			}
 			if (resolvedTables.length > 0) tables = resolvedTables;
 		}
-		const grid = tables ? {
+		{
+			const wsRels = pkg.getPartRelationships(resolved.path);
+			const defs = [];
+			for (const rel of wsRels) {
+				if (!rel.type.endsWith(SLICER_REL_TAIL)) continue;
+				const part = pkg.resolveRelatedPart(resolved.path, rel);
+				if (part) defs.push(...parseSlicerPart(part.data));
+			}
+			if (defs.length > 0) pendingSlicers.push({
+				outIdx: sheetsOut.length,
+				defs
+			});
+		}
+		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,
@@ -89,6 +129,24 @@ function readXlsxToSheetDoc(xlsx) {
 			...charts.length > 0 ? { charts } : {}
 		});
 	}
+	if (pendingSlicers.length > 0) {
+		const cacheByName = /* @__PURE__ */ new Map();
+		for (const rel of workbookRels) {
+			if (!rel.type.endsWith(SLICER_CACHE_REL_TAIL)) continue;
+			const part = pkg.resolveRelatedPart(WORKBOOK_PART, rel);
+			const cache = part ? parseSlicerCachePart(part.data) : void 0;
+			if (cache) cacheByName.set(cache.name, cache);
+		}
+		for (const { outIdx, defs } of pendingSlicers) {
+			const sheet = sheetsOut[outIdx];
+			if (!sheet) continue;
+			const slicers = defs.map((def) => resolveSlicer(def, cacheByName.get(def.cacheName), tableIndex, styles, sharedStrings, date1904, palette));
+			sheetsOut[outIdx] = {
+				...sheet,
+				slicers
+			};
+		}
+	}
 	const coreData = pkg.getPart(CORE_PROPS_PART);
 	const info = infoFromCore(coreData ? parseCoreProperties(coreData) : void 0);
 	return {
@@ -132,6 +190,72 @@ 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 resolveSlicer(def, cache, tableIndex, styles, sharedStrings, date1904, palette) {
+	const items = cache ? resolveTableSlicerItems(cache, tableIndex, styles, sharedStrings, date1904) : [];
+	return {
+		caption: def.caption,
+		columnCount: def.columnCount,
+		items,
+		...resolveSlicerStyle(def.styleName, palette)
+	};
+}
+function resolveTableSlicerItems(cache, tableIndex, styles, sharedStrings, date1904) {
+	const loc = cache.tableId !== void 0 ? tableIndex.get(cache.tableId) : void 0;
+	if (!loc || cache.columnId === void 0) return [];
+	const colOffset = cache.columnId - 1;
+	const absCol = loc.ref.startColumn + colOffset;
+	if (absCol < loc.ref.startColumn || absCol > loc.ref.endColumn) return [];
+	const firstDataRow = loc.ref.startRow + Math.max(1, loc.headerRows);
+	const filter = loc.filters.find((f) => f.colId === colOffset);
+	const kept = filter ? new Set(filter.values) : void 0;
+	const byRow = /* @__PURE__ */ new Map();
+	for (const c of loc.cells) {
+		if (c.column !== absCol || c.row < firstDataRow || c.row > loc.ref.endRow) continue;
+		byRow.set(c.row, resolveCellText(c, sharedStrings, styles, date1904));
+	}
+	const seen = /* @__PURE__ */ new Set();
+	const out = [];
+	for (const row of [...byRow.keys()].sort((a, b) => a - b)) {
+		const label = byRow.get(row);
+		if (label === "" || seen.has(label)) continue;
+		seen.add(label);
+		out.push({
+			label,
+			selected: kept ? kept.has(label) : true
+		});
+		if (out.length >= MAX_SLICER_ITEMS) break;
+	}
+	return out;
+}
+function resolveSlicerStyle(styleName, palette) {
+	const m = styleName ? /SlicerStyle[A-Za-z]*?(\d+)/i.exec(styleName) : null;
+	const column = m ? (Number(m[1]) - 1) % 7 : 1;
+	const base = column === 0 ? "7F7F7F" : palette.get(`accent${column}`) ?? "4472C4";
+	return {
+		headerHex: base,
+		headerTextHex: "FFFFFF",
+		selectedHex: base,
+		selectedTextHex: "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-writer.js

@@ -200,7 +200,7 @@ function worksheetXml(grid, tableRelIds = [], drawingRelId) {
 		return `<row r="${r + 1}"${heightAttrs}>${cells.map(cellXml).join("")}</row>`;
 	}).join("");
 	const mergesXml = grid.merges.length > 0 ? `<mergeCells count="${grid.merges.length}">${grid.merges.map((m) => `<mergeCell ref="${cellRef(m.startRow, m.startColumn)}:${cellRef(m.endRow, m.endColumn)}"/>`).join("")}</mergeCells>` : "";
-	return XML_DECL + `<worksheet xmlns="${MAIN_NS}" xmlns:r="${R_NS}">` + (grid.fitToPage ? "<sheetPr><pageSetUpPr fitToPage=\"1\"/></sheetPr>" : "") + dimension + sheetViewsXml(grid.pane) + colsXml + `<sheetData>${rowsXml}</sheetData>` + mergesXml + conditionalFormattingXml(grid.conditionalFormats) + printOptionsXml(grid.printOptions) + pageMarginsXml(grid.pageMargins) + pageSetupXml(grid.pageSetup) + breaksXml("rowBreaks", grid.rowBreaks) + breaksXml("colBreaks", grid.colBreaks) + (drawingRelId ? `<drawing r:id="${drawingRelId}"/>` : "") + (tableRelIds.length > 0 ? `<tableParts count="${tableRelIds.length}">${tableRelIds.map((id) => `<tablePart r:id="${id}"/>`).join("")}</tableParts>` : "") + sparklineExtXml(grid.sparklines) + "</worksheet>";
+	return XML_DECL + `<worksheet xmlns="${MAIN_NS}" xmlns:r="${R_NS}">` + (grid.fitToPage ? "<sheetPr><pageSetUpPr fitToPage=\"1\"/></sheetPr>" : "") + dimension + sheetViewsXml(grid.pane) + colsXml + `<sheetData>${rowsXml}</sheetData>` + mergesXml + conditionalFormattingXml(grid.conditionalFormats) + dataValidationsXml(grid.dataValidations) + printOptionsXml(grid.printOptions) + pageMarginsXml(grid.pageMargins) + pageSetupXml(grid.pageSetup) + breaksXml("rowBreaks", grid.rowBreaks) + breaksXml("colBreaks", grid.colBreaks) + (drawingRelId ? `<drawing r:id="${drawingRelId}"/>` : "") + (tableRelIds.length > 0 ? `<tableParts count="${tableRelIds.length}">${tableRelIds.map((id) => `<tablePart r:id="${id}"/>`).join("")}</tableParts>` : "") + sparklineExtXml(grid.sparklines) + "</worksheet>";
 }
 function sheetViewsXml(pane) {
 	if (!pane || pane.frozenRows <= 0 && pane.frozenCols <= 0) return "";
@@ -235,6 +235,14 @@ function cfRuleXml(rule) {
 function cfvoXml(cfvo) {
 	return `<cfvo type="${cfvo.type}"${cfvo.val !== void 0 ? ` val="${escapeAttr(cfvo.val)}"` : ""}/>`;
 }
+function dataValidationsXml(dvs) {
+	if (!dvs || dvs.length === 0) return "";
+	return `<dataValidations count="${dvs.length}">${dvs.map(dataValidationXml).join("")}</dataValidations>`;
+}
+function dataValidationXml(dv) {
+	const sqref = dv.ranges.map(rangeRef).join(" ");
+	return `<dataValidation${(dv.type !== "none" ? ` type="${dv.type}"` : "") + (dv.operator !== void 0 ? ` operator="${escapeAttr(dv.operator)}"` : "") + (dv.allowBlank ? " allowBlank=\"1\"" : "") + (dv.showDropDown ? " showDropDown=\"1\"" : "") + (dv.showInputMessage ? " showInputMessage=\"1\"" : "") + (dv.showErrorMessage ? " showErrorMessage=\"1\"" : "") + (dv.errorStyle !== void 0 ? ` errorStyle="${escapeAttr(dv.errorStyle)}"` : "") + (dv.promptTitle !== void 0 ? ` promptTitle="${escapeAttr(dv.promptTitle)}"` : "") + (dv.prompt !== void 0 ? ` prompt="${escapeAttr(dv.prompt)}"` : "") + (dv.errorTitle !== void 0 ? ` errorTitle="${escapeAttr(dv.errorTitle)}"` : "") + (dv.error !== void 0 ? ` error="${escapeAttr(dv.error)}"` : "") + ` sqref="${sqref}"`}>${(dv.formula1 !== void 0 ? `<formula1>${escapeText(dv.formula1)}</formula1>` : "") + (dv.formula2 !== void 0 ? `<formula2>${escapeText(dv.formula2)}</formula2>` : "")}</dataValidation>`;
+}
 var X14_NS = "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main";
 var XM_NS = "http://schemas.microsoft.com/office/excel/2006/main";
 function sparklineExtXml(sparklines) {

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);
@@ -446,6 +496,7 @@ function emitCell(out, cell, table, ctx, pos) {
 		if (!cell.properties.shading) css.push("background-color:#fff");
 	}
 	out.push(`<${tag}${attrs.length > 0 ? ` ${attrs.join(" ")}` : ""} style="${css.join(";")}">`);
+	if (cell.properties.dropdown) out.push(cellDropdownSvg());
 	if (cell.properties.icon) out.push(cellIconSvg(cell.properties.icon));
 	if (cell.properties.sparkline) out.push(cellSparklineSvg(cell.properties.sparkline));
 	for (const child of cell.content) emitBlock(out, child, ctx);
@@ -464,6 +515,9 @@ function cellSparklineSvg(sp) {
 	}
 	return `<svg width="${W}" height="${H}" viewBox="0 0 ${W} ${H}" style="vertical-align:middle"><g transform="translate(0,${H}) scale(1,-1)">${parts.join("")}</g></svg>`;
 }
+function cellDropdownSvg() {
+	return "<svg width=\"13\" height=\"13\" viewBox=\"0 0 13 13\" style=\"float:right;margin-left:3px\"><rect x=\"0.5\" y=\"0.5\" width=\"12\" height=\"12\" fill=\"#F0F0F0\" stroke=\"#B0B0B0\"/><polygon points=\"3.4,5 9.6,5 6.5,8.6\" fill=\"#595959\"/></svg>";
+}
 var ICON_EMPTY_HEX = "BFBFBF";
 function cellIconSvg(icon) {
 	const fill = `#${icon.colorHex}`;

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;