@stll/folio-core 0.38.0 → 0.39.0

package/dist/controller/layoutPipeline.js

@@ -1,3 +1,4 @@
+import { displayCommentsFrom } from "../display-list/build/commentAnnotations.js";
 import { createDisplayListPagePainter } from "../display-list/editor/displayListPagePainter.js";
 import { PAGE_RENDERER, displayListFurnitureFrom } from "../display-list/editor/pageRenderer.js";
 import { resolveDocumentGridLinePitch } from "../docx/documentGrid.js";
@@ -307,6 +308,8 @@ function runLayoutPipeline(deps, state, options = {}) {
 				pageGap,
 				mirrorMargins
 			};
+			if (document?.package.document.sections !== void 0) nextLayoutOpts.sectionVerticalAlignments = document.package.document.sections.map(({ properties }) => properties.verticalAlign);
+			else if (sectionProperties !== null && sectionProperties !== void 0) nextLayoutOpts.sectionVerticalAlignments = [sectionProperties.verticalAlign];
 			if (hasTitlePg) nextLayoutOpts.firstPageMargins = bodyMarginsClearHeaderFooter({
 				authoredMargins: margins,
 				preparedHeader: firstPageHeaderForRender,
@@ -513,6 +516,7 @@ function runLayoutPipeline(deps, state, options = {}) {
 				layout: newLayout,
 				blockLookup,
 				doc: pagesContainer.ownerDocument,
+				...document?.package.document.comments === void 0 ? {} : { comments: displayCommentsFrom(document.package.document.comments) },
 				...displayListFurnitureFrom(renderOpts),
 				...footnoteContentMap.size === 0 ? {} : { footnoteContentById: footnoteContentMap }
 			}).paintPage;

package/dist/display-list/build/buildContext.d.ts

@@ -1,4 +1,4 @@
-import { DisplayColor, DisplayLink, DisplayLinkTarget, DisplayStoryRef } from "../types.js";
+import { DisplayColor, DisplayLink, DisplayLinkTarget, DisplayRect, DisplayStoryRef } from "../types.js";
 import { FontTable } from "./fontTable.js";
 import { ImageTable } from "./imagePrimitives.js";
 import { UnsupportedCollector } from "./unsupported.js";
@@ -23,6 +23,8 @@ type BuildContext = {
   readonly authorColors: AuthorColorTable;
   /** Link sink for the page being built. */
   readonly links: DisplayLink[];
+  /** Exact painted rectangles for each comment range on this page. */
+  readonly commentRects: Map<number, DisplayRect[]>;
   /**
    * Bookmark name → where it lands, collected in a first pass over the layout.
    * A `#name` hyperlink can only become a `page` target once every page is

package/dist/display-list/build/buildDisplayList.d.ts

@@ -3,6 +3,7 @@ import { Layout } from "../../layout-engine/types.js";
 import { BlockLookup } from "../../layout-painter/index.js";
 import { DisplayColor, DisplayList, DisplayMetadata, DisplayPage } from "../types.js";
 import { PageFurnitureInputs } from "./furniture.js";
+import { DisplayCommentInput } from "./commentAnnotations.js";
 //#region src/display-list/build/buildDisplayList.d.ts
 /**
  * Every feature a source document can have that a `Layout` does not record and
@@ -42,6 +43,8 @@ type BuildDisplayListOptions = PageFurnitureInputs & {
    * that cannot find that name on the host paints the document in a substitute.
    */
   readonly embeddedFonts?: readonly EmbeddedFont[];
+  /** Comment bodies keyed by the `commentIds` already carried on layout runs. */
+  readonly comments?: readonly DisplayCommentInput[];
 };
 /**
  * A document's display list, one page at a time.
@@ -68,7 +71,7 @@ type DisplayListBuilder = {
    */
   readonly snapshot: () => DisplayList;
 };
-declare const createDisplayListBuilder: ({ layout, blockLookup, metadata, pageBackground, documentFeatures, embeddedFonts, ...furniture }: BuildDisplayListOptions) => DisplayListBuilder;
+declare const createDisplayListBuilder: ({ layout, blockLookup, metadata, pageBackground, documentFeatures, embeddedFonts, comments, ...furniture }: BuildDisplayListOptions) => DisplayListBuilder;
 /**
  * The whole document's display list. Every page is built, so the tables, the
  * outline and the gap report are complete; an editor that paints a window of

package/dist/display-list/build/buildDisplayList.js

@@ -27,6 +27,34 @@ const FIRST_PAGE_INDEX = 0;
 * document-wide flag the caller would have to remember to set.
 */
 const DOCUMENT_FEATURE_GAPS = [["pageBorders", "w:pgBorders reach the painter through render options, not through Layout, and none were supplied to the builder"], ["watermark", "watermarks reach the painter through render options, not through Layout, and none was supplied to the builder"]];
+const rectKey = ({ xPx, yPx, widthPx, heightPx }) => `${String(xPx)}:${String(yPx)}:${String(widthPx)}:${String(heightPx)}`;
+const dedupeRects = (rects) => {
+	const seen = /* @__PURE__ */ new Set();
+	const unique = [];
+	for (const rect of rects) {
+		const key = rectKey(rect);
+		if (seen.has(key)) continue;
+		seen.add(key);
+		unique.push(rect);
+	}
+	return unique;
+};
+const buildCommentAnnotations = (commentsById, commentRects) => {
+	const annotations = [];
+	for (const [commentId, rects] of commentRects) {
+		const comment = commentsById.get(commentId);
+		if (comment === void 0) continue;
+		const uniqueRects = dedupeRects(rects);
+		if (uniqueRects.length === 0) continue;
+		annotations.push({
+			commentId,
+			rects: uniqueRects,
+			contents: comment.contents,
+			author: comment.author
+		});
+	}
+	return annotations;
+};
 const paragraphTextOf = (block) => block.runs.map((run) => run.kind === "text" ? run.text : "").join("").trim();
 /**
 * Resolve everything that needs the whole document before any page is painted:
@@ -126,14 +154,16 @@ const paintFragment = ({ fragment, entry, context, composer, prevEntry, nextEntr
 		}
 	}
 };
-const buildPage = ({ page, pageIndex, totalPages, blockLookup, pageBackground, bookmarkTargets, fonts, images, unsupported, authorColors, furniture }) => {
+const buildPage = ({ page, pageIndex, totalPages, blockLookup, pageBackground, bookmarkTargets, fonts, images, unsupported, authorColors, furniture, commentsById }) => {
 	const links = [];
+	const commentRects = /* @__PURE__ */ new Map();
 	const context = {
 		fonts,
 		images,
 		unsupported,
 		authorColors,
 		links,
+		commentRects,
 		bookmarkTargets,
 		story: { kind: "body" },
 		pageIndex,
@@ -208,7 +238,8 @@ const buildPage = ({ page, pageIndex, totalPages, blockLookup, pageBackground, b
 		orientation: page.orientation ?? (page.size.w > page.size.h ? "landscape" : "portrait"),
 		primitives: composer.primitives(),
 		regions: composer.regions(),
-		links
+		links,
+		comments: buildCommentAnnotations(commentsById, commentRects)
 	};
 };
 /** Which kind of region a fragment paints into. */
@@ -223,12 +254,14 @@ const SUPPLIED_BY = {
 	pageBorders: (furniture) => furniture.pageBorders !== void 0,
 	watermark: (furniture) => furniture.watermark !== void 0 || furniture.watermarkByHeaderRId !== void 0
 };
-const createDisplayListBuilder = ({ layout, blockLookup, metadata, pageBackground, documentFeatures, embeddedFonts, ...furniture }) => {
+const createDisplayListBuilder = ({ layout, blockLookup, metadata, pageBackground, documentFeatures, embeddedFonts, comments, ...furniture }) => {
 	const fonts = new FontTable(embeddedFonts ?? []);
 	const images = new ImageTable();
 	const unsupported = new UnsupportedCollector();
 	const authorColors = new AuthorColorTable();
 	const { bookmarkTargets, outline } = collectDocumentTargets(layout, blockLookup);
+	const commentsById = /* @__PURE__ */ new Map();
+	for (const comment of comments ?? []) commentsById.set(comment.id, comment);
 	if (layout.pages.length > 0) for (const [feature, detail] of DOCUMENT_FEATURE_GAPS) {
 		if (SUPPLIED_BY[feature](furniture)) continue;
 		if (documentFeatures !== void 0 && !documentFeatures[feature]) continue;
@@ -251,7 +284,8 @@ const createDisplayListBuilder = ({ layout, blockLookup, metadata, pageBackgroun
 			images,
 			unsupported,
 			authorColors,
-			furniture
+			furniture,
+			commentsById
 		});
 		built.set(pageIndex, display);
 		return display;

package/dist/display-list/build/commentAnnotations.d.ts

@@ -0,0 +1,10 @@
+import { document_d_exports } from "../../types/document.js";
+//#region src/display-list/build/commentAnnotations.d.ts
+type DisplayCommentInput = {
+  readonly id: number;
+  readonly author: string;
+  readonly contents: string;
+};
+declare const displayCommentsFrom: (comments: readonly document_d_exports.Comment[]) => readonly DisplayCommentInput[];
+//#endregion
+export { DisplayCommentInput, displayCommentsFrom };

package/dist/display-list/build/commentAnnotations.js

@@ -0,0 +1,17 @@
+import { getParagraphText } from "../../docx/paragraphParser.js";
+//#region src/display-list/build/commentAnnotations.ts
+const displayCommentsFrom = (comments) => {
+	const inputs = [];
+	for (const { id, author, content } of comments) {
+		const paragraphs = [];
+		for (const paragraph of content) paragraphs.push(getParagraphText(paragraph));
+		inputs.push({
+			id,
+			author,
+			contents: paragraphs.join("\n")
+		});
+	}
+	return inputs;
+};
+//#endregion
+export { displayCommentsFrom };

package/dist/display-list/build/paragraphPrimitives.js

@@ -45,6 +45,20 @@ const HYPERLINK_COLOR = {
 	b: 193,
 	a: 1
 };
+/** Matches the editable DOM painter's review-range treatment. */
+const COMMENT_BACKGROUND = {
+	r: 255,
+	g: 212,
+	b: 0,
+	a: .08
+};
+const COMMENT_BORDER = {
+	r: 180,
+	g: 130,
+	b: 0,
+	a: .24
+};
+const COMMENT_BORDER_WIDTH_PX = 1;
 /** `renderParagraph.ts:603-616`: a raised run paints 0.4em up, a lowered one 0.2em down. */
 const SUPERSCRIPT_RISE_RATIO = .4;
 const SUBSCRIPT_DROP_RATIO = .2;
@@ -275,8 +289,32 @@ const emitGlyphRun = ({ sink, context, run, glyphs, style, paintXPx, baselineYPx
 	let runBaselineYPx = baselineYPx - (run.positionPx ?? 0);
 	if (run.superscript) runBaselineYPx -= fontSizePx * SUPERSCRIPT_RISE_RATIO;
 	else if (run.subscript) runBaselineYPx += fontSizePx * SUBSCRIPT_DROP_RATIO;
+	const commentIds = run.commentIds ?? [];
 	const background = run.highlight ?? run.shading;
-	if (background && glyphs.widthPx > 0) {
+	if (commentIds.length > 0 && glyphs.widthPx > 0) {
+		const metrics = getFontMetrics(style);
+		const rect = {
+			xPx: paintXPx,
+			yPx: runBaselineYPx - metrics.fontBoxAscent,
+			widthPx: glyphs.widthPx,
+			heightPx: metrics.fontBoxAscent + metrics.fontBoxDescent
+		};
+		sink.backgrounds.push({
+			kind: "rect",
+			rect,
+			fill: COMMENT_BACKGROUND
+		});
+		sink.decorations.push(horizontalLine(paintXPx, glyphs.widthPx, rect.yPx + rect.heightPx - .5, {
+			color: COMMENT_BORDER,
+			thicknessPx: COMMENT_BORDER_WIDTH_PX,
+			pattern: "solid"
+		}));
+		for (const commentId of commentIds) {
+			const rects = context.commentRects.get(commentId);
+			if (rects === void 0) context.commentRects.set(commentId, [rect]);
+			else rects.push(rect);
+		}
+	} else if (background && glyphs.widthPx > 0) {
 		const fill = parseDisplayColor(background);
 		if (fill) {
 			const metrics = getFontMetrics(style);

package/dist/display-list/primitives.d.ts

@@ -15,7 +15,7 @@ import { hasComplexScript, isComplexScriptCodePoint } from "../utils/scriptSegme
  * advances rightward from its origin whatever the paragraph does.
  */
 declare const glyphCellOffsetsPx: (run: DisplayGlyphRun) => readonly number[];
-declare const DISPLAY_PRIMITIVE_KINDS: ("glyphRun" | "rect" | "line" | "image" | "clipGroup" | "rotateGroup" | "opacityGroup")[];
+declare const DISPLAY_PRIMITIVE_KINDS: ("line" | "rect" | "image" | "glyphRun" | "clipGroup" | "rotateGroup" | "opacityGroup")[];
 /**
  * Dash geometry of each stroke pattern, as multiples of the stroke thickness.
  *

package/dist/display-list/types.d.ts

@@ -357,6 +357,19 @@ type DisplayLinkTarget = {
   readonly pageIndex: number;
   readonly yPx: number;
 };
+/**
+ * One DOCX comment whose anchor reaches this page.
+ *
+ * A range may cross run and line boundaries, so every painted rectangle is
+ * retained. Raster backends use those rectangles for the highlight; PDF uses
+ * the final one as the location of its single text annotation.
+ */
+type DisplayCommentAnnotation = {
+  readonly commentId: number;
+  readonly rects: readonly DisplayRect[];
+  readonly contents: string;
+  readonly author: string;
+};
 /**
  * What kind of thing a click landed in.
  *
@@ -437,6 +450,8 @@ type DisplayPage = {
    */
   readonly regions: readonly DisplayHitRegion[];
   readonly links: readonly DisplayLink[];
+  /** Native review comments anchored on this page. */
+  readonly comments: readonly DisplayCommentAnnotation[];
 };
 /** One heading, for a document outline. `pageIndex` is 0-based. */
 type DisplayOutlineEntry = {
@@ -473,4 +488,4 @@ type DisplayList = {
   readonly unsupported: readonly DisplayUnsupported[];
 };
 //#endregion
-export { DisplayClipGroup, DisplayColor, DisplayEmbeddedFont, DisplayFontFace, DisplayFontRef, DisplayGlyphRun, DisplayHitRegion, DisplayHitRegionKind, DisplayHitRegionModel, DisplayImagePrimitive, DisplayImageRef, DisplayImageSource, DisplayLine, DisplayLink, DisplayLinkTarget, DisplayList, DisplayMetadata, DisplayModelRange, DisplayOpacityGroup, DisplayOutlineEntry, DisplayPage, DisplayPrimitive, DisplayRect, DisplayRectPrimitive, DisplayRotateGroup, DisplayRunAdjustments, DisplayStoryRef, DisplayStroke, DisplayStrokePattern, DisplayUnsupported };
+export { DisplayClipGroup, DisplayColor, DisplayCommentAnnotation, DisplayEmbeddedFont, DisplayFontFace, DisplayFontRef, DisplayGlyphRun, DisplayHitRegion, DisplayHitRegionKind, DisplayHitRegionModel, DisplayImagePrimitive, DisplayImageRef, DisplayImageSource, DisplayLine, DisplayLink, DisplayLinkTarget, DisplayList, DisplayMetadata, DisplayModelRange, DisplayOpacityGroup, DisplayOutlineEntry, DisplayPage, DisplayPrimitive, DisplayRect, DisplayRectPrimitive, DisplayRotateGroup, DisplayRunAdjustments, DisplayStoryRef, DisplayStroke, DisplayStrokePattern, DisplayUnsupported };

package/dist/docx/diagramPreview.d.ts

@@ -0,0 +1,7 @@
+import { document_d_exports } from "../types/document.js";
+import { XmlElement } from "./xmlParser.js";
+//#region src/docx/diagramPreview.d.ts
+/** Create a deliberately simple, bounded preview; it is never an editable diagram projection. */
+declare const parseDiagramPreview: (drawing: XmlElement, rels: document_d_exports.RelationshipMap | undefined, media: Map<string, document_d_exports.MediaFile> | undefined) => document_d_exports.Image | null;
+//#endregion
+export { parseDiagramPreview };

package/dist/docx/diagramPreview.js

@@ -0,0 +1,191 @@
+import { resolveRelativePath } from "./relsParser.js";
+import { findChildByNamespaceUri, getAttribute, getLocalName, parseNumericAttribute, parseXmlDocument } from "./xmlParser.js";
+//#region src/docx/diagramPreview.ts
+const MAX_PREVIEW_SHAPES = 128;
+const MAX_PREVIEW_PIXELS = 144e4;
+const MAX_PREVIEW_PAINT_PIXELS = MAX_PREVIEW_PIXELS * 4;
+const DRAWINGML_NAMESPACE_URIS = /* @__PURE__ */ new Set(["http://schemas.openxmlformats.org/drawingml/2006/main", "http://purl.oclc.org/ooxml/drawingml/main"]);
+const DIAGRAM_NAMESPACE_URIS = /* @__PURE__ */ new Set(["http://schemas.openxmlformats.org/drawingml/2006/diagram", "http://purl.oclc.org/ooxml/drawingml/diagram"]);
+const DIAGRAM_DRAWING_NAMESPACE_URIS = /* @__PURE__ */ new Set(["http://schemas.microsoft.com/office/drawing/2008/diagram"]);
+const WORD_DRAWING_NAMESPACE_URIS = /* @__PURE__ */ new Set(["http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing", "http://purl.oclc.org/ooxml/drawingml/wordprocessingDrawing"]);
+const crc32 = (bytes) => {
+	let crc = 4294967295;
+	for (const byte of bytes) {
+		crc ^= byte;
+		for (let bit = 0; bit < 8; bit += 1) crc = crc >>> 1 ^ (crc & 1 ? 3988292384 : 0);
+	}
+	return (crc ^ 4294967295) >>> 0;
+};
+const adler32 = (bytes) => {
+	let a = 1;
+	let b = 0;
+	for (const byte of bytes) {
+		a = (a + byte) % 65521;
+		b = (b + a) % 65521;
+	}
+	return b << 16 | a;
+};
+const pngChunk = (type, data) => {
+	const name = new TextEncoder().encode(type);
+	const output = new Uint8Array(12 + data.length);
+	const view = new DataView(output.buffer);
+	view.setUint32(0, data.length);
+	output.set(name, 4);
+	output.set(data, 8);
+	view.setUint32(8 + data.length, crc32(output.subarray(4, 8 + data.length)));
+	return output;
+};
+const previewPng = (width, height, shapes) => {
+	const scale = Math.min(1, Math.sqrt(MAX_PREVIEW_PIXELS / (width * height)));
+	const w = Math.max(1, Math.round(width * scale));
+	const h = Math.max(1, Math.round(height * scale));
+	const pixels = new Uint8Array((w * 4 + 1) * h);
+	for (let y = 0; y < h; y += 1) {
+		const row = y * (w * 4 + 1);
+		pixels[row] = 0;
+		for (let x = 0; x < w; x += 1) {
+			const index = row + 1 + x * 4;
+			pixels[index] = 238;
+			pixels[index + 1] = 242;
+			pixels[index + 2] = 247;
+			pixels[index + 3] = 255;
+		}
+	}
+	let paintedPixels = 0;
+	for (const shape of shapes) {
+		const sx = Math.max(0, Math.round(shape.x / width * w));
+		const sy = Math.max(0, Math.round(shape.y / height * h));
+		const ex = Math.min(w, Math.round((shape.x + shape.width) / width * w));
+		const ey = Math.min(h, Math.round((shape.y + shape.height) / height * h));
+		const red = Number.parseInt(shape.color.slice(0, 2), 16) || 232;
+		const green = Number.parseInt(shape.color.slice(2, 4), 16) || 238;
+		const blue = Number.parseInt(shape.color.slice(4, 6), 16) || 247;
+		const shapePixels = Math.max(0, ex - sx) * Math.max(0, ey - sy);
+		if (paintedPixels + shapePixels > MAX_PREVIEW_PAINT_PIXELS) break;
+		paintedPixels += shapePixels;
+		for (let y = sy; y < ey; y += 1) {
+			const row = y * (w * 4 + 1);
+			for (let x = sx; x < ex; x += 1) {
+				const index = row + 1 + x * 4;
+				pixels[index] = red;
+				pixels[index + 1] = green;
+				pixels[index + 2] = blue;
+			}
+		}
+	}
+	const compressed = new Uint8Array(2 + pixels.length + Math.ceil(pixels.length / 65535) * 5 + 4);
+	compressed[0] = 120;
+	compressed[1] = 1;
+	let cursor = 2;
+	for (let offset = 0; offset < pixels.length;) {
+		const length = Math.min(65535, pixels.length - offset);
+		compressed[cursor++] = offset + length === pixels.length ? 1 : 0;
+		compressed[cursor++] = length & 255;
+		compressed[cursor++] = length >>> 8;
+		compressed[cursor++] = ~length & 255;
+		compressed[cursor++] = ~length >>> 8 & 255;
+		compressed.set(pixels.subarray(offset, offset + length), cursor);
+		cursor += length;
+		offset += length;
+	}
+	const output = new Uint8Array(cursor + 4);
+	output.set(compressed.subarray(0, cursor));
+	new DataView(output.buffer).setUint32(cursor, adler32(pixels));
+	const signature = new Uint8Array([
+		137,
+		80,
+		78,
+		71,
+		13,
+		10,
+		26,
+		10
+	]);
+	const header = /* @__PURE__ */ new Uint8Array(13);
+	new DataView(header.buffer).setUint32(0, w);
+	new DataView(header.buffer).setUint32(4, h);
+	header[8] = 8;
+	header[9] = 6;
+	const chunks = [
+		signature,
+		pngChunk("IHDR", header),
+		pngChunk("IDAT", output),
+		pngChunk("IEND", /* @__PURE__ */ new Uint8Array())
+	];
+	const png = new Uint8Array(chunks.reduce((total, chunk) => total + chunk.length, 0));
+	let position = 0;
+	for (const chunk of chunks) {
+		png.set(chunk, position);
+		position += chunk.length;
+	}
+	return png;
+};
+const extent = (drawing) => {
+	const value = findChildByNamespaceUri(findChildByNamespaceUri(drawing, WORD_DRAWING_NAMESPACE_URIS, "inline") ?? findChildByNamespaceUri(drawing, WORD_DRAWING_NAMESPACE_URIS, "anchor"), WORD_DRAWING_NAMESPACE_URIS, "extent");
+	return {
+		width: parseNumericAttribute(value, null, "cx") ?? 0,
+		height: parseNumericAttribute(value, null, "cy") ?? 0
+	};
+};
+const cachedDiagramShapes = (rels, media) => {
+	const matches = [...rels.values()].filter((relationship) => relationship.type === "http://schemas.microsoft.com/office/2007/relationships/diagramDrawing");
+	if (matches.length !== 1 || !matches[0]?.target) return [];
+	const path = resolveRelativePath("word/document.xml", matches[0].target);
+	const file = media.get(path);
+	if (!file?.data) return [];
+	const root = parseXmlDocument(new TextDecoder().decode(file.data));
+	if (!root) return [];
+	const shapes = [];
+	for (const shape of descendantsByNamespace(root, DIAGRAM_DRAWING_NAMESPACE_URIS, "sp").slice(0, MAX_PREVIEW_SHAPES)) {
+		const properties = findChildByNamespaceUri(shape, DIAGRAM_DRAWING_NAMESPACE_URIS, "spPr");
+		const transform = findChildByNamespaceUri(properties, DRAWINGML_NAMESPACE_URIS, "xfrm");
+		const offset = findChildByNamespaceUri(transform, DRAWINGML_NAMESPACE_URIS, "off");
+		const size = findChildByNamespaceUri(transform, DRAWINGML_NAMESPACE_URIS, "ext");
+		const width = parseNumericAttribute(size, null, "cx") ?? 0;
+		const height = parseNumericAttribute(size, null, "cy") ?? 0;
+		if (width <= 0 || height <= 0) continue;
+		const color = findChildByNamespaceUri(findChildByNamespaceUri(properties, DRAWINGML_NAMESPACE_URIS, "solidFill"), DRAWINGML_NAMESPACE_URIS, "srgbClr");
+		shapes.push({
+			x: parseNumericAttribute(offset, null, "x") ?? 0,
+			y: parseNumericAttribute(offset, null, "y") ?? 0,
+			width,
+			height,
+			color: getAttribute(color, null, "val") ?? "E8EEF7"
+		});
+	}
+	return shapes;
+};
+const descendantsByNamespace = (root, namespaceUris, localName) => {
+	const result = [];
+	const visit = (element) => {
+		if (element.namespaceUri && namespaceUris.has(element.namespaceUri) && getLocalName(element.name ?? "") === localName) result.push(element);
+		for (const child of element.elements ?? []) if (child.type === "element") visit(child);
+	};
+	visit(root);
+	return result;
+};
+/** Create a deliberately simple, bounded preview; it is never an editable diagram projection. */
+const parseDiagramPreview = (drawing, rels, media) => {
+	if (!rels || !media) return null;
+	const graphicData = descendantsByNamespace(drawing, DRAWINGML_NAMESPACE_URIS, "graphicData").at(0);
+	if (!graphicData || !DIAGRAM_NAMESPACE_URIS.has(getAttribute(graphicData, null, "uri") ?? "")) return null;
+	const { width, height } = extent(drawing);
+	if (width <= 0 || height <= 0) return null;
+	const png = previewPng(width, height, cachedDiagramShapes(rels, media));
+	let binary = "";
+	for (let offset = 0; offset < png.length; offset += 32768) binary += String.fromCodePoint(...png.subarray(offset, offset + 32768));
+	return {
+		type: "image",
+		rId: "",
+		src: `data:image/png;base64,${btoa(binary)}`,
+		mimeType: "image/png",
+		filename: "smartart-preview.png",
+		size: {
+			width,
+			height
+		},
+		wrap: { type: "inline" }
+	};
+};
+//#endregion
+export { parseDiagramPreview };

package/dist/docx/paragraphTextBoxEnrichment.js

@@ -207,7 +207,8 @@ const enrichTextBoxRuns = ({ content, xmlChildren, styles, theme, numbering, rel
 					...textBox.autoFit !== void 0 ? { autoFit: textBox.autoFit } : {},
 					...textBox.textWrap !== void 0 ? { textWrap: textBox.textWrap } : {},
 					...textBox.verticalAlign !== void 0 ? { anchor: textBox.verticalAlign } : {},
-					...textBox.margins !== void 0 ? { margins: textBox.margins } : {}
+					...textBox.margins !== void 0 ? { margins: textBox.margins } : {},
+					...textBox.wordArt !== void 0 ? { wordArt: textBox.wordArt } : {}
 				}
 			};
 			if (textBox.id) shape.id = textBox.id;

package/dist/docx/parser.js

@@ -27,6 +27,7 @@ import { applyThemeFontLang, parseTheme } from "./themeParser.js";
 import { normalizeTrackedMoveRanges } from "./trackedMoveRangeNormalization.js";
 import { getMediaMimeType, mediaToDataUrl, unzipDocx } from "./unzip.js";
 import { enforcePackageVmlPreviewBudget } from "./vmlPreview.js";
+import { FOLIO_XML_RESOURCE_LIMITS } from "./xmlResourceLimits.js";
 import { TaggedError } from "better-result";
 //#region src/docx/parser.ts
 /**
@@ -341,6 +342,18 @@ async function buildMediaMap(raw, rels) {
 		const normalizedPath = path.replace(/^word\//u, "");
 		if (normalizedPath !== path) media.set(normalizedPath, mediaFile);
 	}
+	for (const [path, xml] of raw.allXml.entries()) {
+		if (!/^word\/diagrams\/[^/]+\.xml$/iu.test(path) || new TextEncoder().encode(xml).byteLength > FOLIO_XML_RESOURCE_LIMITS.maxBytes) continue;
+		const data = new TextEncoder().encode(xml).buffer;
+		const file = {
+			path,
+			filename: path.split("/").pop() ?? path,
+			mimeType: "application/xml",
+			data
+		};
+		media.set(path, file);
+		media.set(path.replace(/^word\//u, ""), file);
+	}
 	return media;
 }
 async function applyMediaResolver(media, resolver) {

package/dist/docx/runParser.js

@@ -1,5 +1,6 @@
 import { isValidHexColor } from "../utils/colorResolver.js";
 import { parseHorizontalScalePercent } from "../utils/horizontalScale.js";
+import { parseDiagramPreview } from "./diagramPreview.js";
 import { parseGroupDrawing } from "./groupDrawingParser.js";
 import { parseImage } from "./imageParser.js";
 import { imageRawXmlFingerprint } from "./imageRawXml.js";
@@ -488,6 +489,13 @@ function parseDrawingContent(element, rels, media) {
 		rawXml: captureVerbatimXml(element),
 		rawImageFingerprint: imageRawXmlFingerprint(groupImage)
 	};
+	const diagramImage = parseDiagramPreview(element, rels ?? void 0, media ?? void 0);
+	if (diagramImage) return {
+		type: "drawing",
+		image: diagramImage,
+		rawXml: captureVerbatimXml(element),
+		rawXmlMode: DRAWING_RAW_XML_MODES.PRESERVE_ONLY
+	};
 	if (shouldPreserveRawShapeDrawing(element)) return {
 		type: "drawing",
 		image: {

package/dist/docx/serializer/runSerializer.js

@@ -364,6 +364,7 @@ function serializeShapeContent(content) {
 	if (shape.textBody) {
 		const tb = shape.textBody;
 		const bpAttrs = ["rot=\"0\"", "vert=\"horz\""];
+		if (tb.wordArt?.fromWordArt !== void 0) bpAttrs.push(`fromWordArt="${tb.wordArt.fromWordArt ? "1" : "0"}"`);
 		if (tb.textWrap) bpAttrs.push(`wrap="${tb.textWrap}"`);
 		if (tb.anchor) bpAttrs.push(`anchor="${serializeTextBodyAnchor(tb.anchor)}"`);
 		if (tb.anchorCenter) bpAttrs.push("anchorCtr=\"1\"");
@@ -377,7 +378,8 @@ function serializeShapeContent(content) {
 		if (tb.autoFit === "shape") autoFitXml = "<a:spAutoFit/>";
 		else if (tb.autoFit === "normal") autoFitXml = "<a:normAutofit/>";
 		else if (tb.autoFit === "none") autoFitXml = "<a:noAutofit/>";
-		const bodyPrXml = autoFitXml ? `<wps:bodyPr ${bpAttrs.join(" ")}>${autoFitXml}</wps:bodyPr>` : `<wps:bodyPr ${bpAttrs.join(" ")}/>`;
+		const bodyPrChildren = `${tb.wordArt?.preset ? `<a:prstTxWarp prst="${escapeXml(tb.wordArt.preset)}">${tb.wordArt.adjustments && tb.wordArt.adjustments.length > 0 ? `<a:avLst>${tb.wordArt.adjustments.map(({ name, formula }) => `<a:gd name="${escapeXml(name)}" fmla="${escapeXml(formula)}"/>`).join("")}</a:avLst>` : "<a:avLst/>"}</a:prstTxWarp>` : ""}${autoFitXml}`;
+		const bodyPrXml = bodyPrChildren ? `<wps:bodyPr ${bpAttrs.join(" ")}>${bodyPrChildren}</wps:bodyPr>` : `<wps:bodyPr ${bpAttrs.join(" ")}/>`;
 		if (isTextBox) textBody = [
 			"<wps:txbx><w:txbxContent>",
 			serializeShapeTextBody(tb.content),

package/dist/docx/textBoxParser.js

@@ -1,7 +1,9 @@
 import { emuToPixels } from "../utils/units.js";
 import { parseAnchorPosition, parseAnchorWrap, parseFill, parseOutline, resolveColorValueToHex } from "./drawingUtils.js";
-import { findByFullName, findChildByLocalName, findChildrenByLocalName, getAttribute, getChildElements, parseNumericAttribute } from "./xmlParser.js";
+import { findByFullName, findChildByLocalName, findChildByNamespaceUri, findChildrenByLocalName, findChildrenByNamespaceUri, getAttribute, getChildElements, parseNumericAttribute } from "./xmlParser.js";
 //#region src/docx/textBoxParser.ts
+const DRAWINGML_MAIN_NAMESPACE_URIS = /* @__PURE__ */ new Set(["http://schemas.openxmlformats.org/drawingml/2006/main", "http://purl.oclc.org/ooxml/drawingml/main"]);
+const WORDPROCESSING_SHAPE_NAMESPACE_URIS = /* @__PURE__ */ new Set(["http://schemas.microsoft.com/office/word/2010/wordprocessingShape"]);
 /** Default text box margins in EMUs (0.1 inch) */
 const DEFAULT_MARGIN_EMU = 91440;
 const parseTextBoxVerticalAlign = (value) => {
@@ -28,6 +30,24 @@ function parseBodyProperties(bodyPr) {
 	else if (findChildByLocalName(bodyPr, "noAutofit")) result.autoFit = "none";
 	const verticalAlign = parseTextBoxVerticalAlign(getAttribute(bodyPr, null, "anchor"));
 	if (verticalAlign) result.verticalAlign = verticalAlign;
+	const fromWordArt = getAttribute(bodyPr, null, "fromWordArt");
+	const warp = findChildByNamespaceUri(bodyPr, DRAWINGML_MAIN_NAMESPACE_URIS, "prstTxWarp");
+	if (fromWordArt !== null || warp) {
+		const adjustments = warp ? findChildrenByNamespaceUri(findChildByNamespaceUri(warp, DRAWINGML_MAIN_NAMESPACE_URIS, "avLst"), DRAWINGML_MAIN_NAMESPACE_URIS, "gd").map((adjustment) => {
+			const name = getAttribute(adjustment, null, "name");
+			const formula = getAttribute(adjustment, null, "fmla");
+			return name !== null && formula !== null ? {
+				name,
+				formula
+			} : void 0;
+		}).filter((adjustment) => adjustment !== void 0) : [];
+		const preset = warp ? getAttribute(warp, null, "prst") : null;
+		result.wordArt = {
+			...fromWordArt !== null ? { fromWordArt: fromWordArt === "1" || fromWordArt === "true" || fromWordArt === "on" } : {},
+			...preset !== null ? { preset } : {},
+			...adjustments.length > 0 ? { adjustments } : {}
+		};
+	}
 	const lIns = parseNumericAttribute(bodyPr, null, "lIns");
 	const rIns = parseNumericAttribute(bodyPr, null, "rIns");
 	const tIns = parseNumericAttribute(bodyPr, null, "tIns");
@@ -119,9 +139,8 @@ function parseTextBox(drawingEl) {
 	const wsp = findByFullName(graphicData, "wps:wsp");
 	if (!wsp) return null;
 	if (!findByFullName(wsp, "wps:txbx")) return null;
-	const wspChildren = getChildElements(wsp);
-	const spPr = wspChildren.find((el) => el.name === "wps:spPr");
-	const bodyPr = wspChildren.find((el) => el.name === "wps:bodyPr");
+	const spPr = getChildElements(wsp).find((el) => el.name === "wps:spPr");
+	const bodyPr = findChildByNamespaceUri(wsp, WORDPROCESSING_SHAPE_NAMESPACE_URIS, "bodyPr");
 	const extent = findByFullName(container, "wp:extent");
 	const size = {
 		width: parseNumericAttribute(extent, null, "cx") ?? 0,
@@ -144,6 +163,7 @@ function parseTextBox(drawingEl) {
 	if (bodyProps.autoFit) textBox.autoFit = bodyProps.autoFit;
 	if (bodyProps.textWrap) textBox.textWrap = bodyProps.textWrap;
 	if (bodyProps.verticalAlign) textBox.verticalAlign = bodyProps.verticalAlign;
+	if (bodyProps.wordArt) textBox.wordArt = bodyProps.wordArt;
 	if (isAnchor) {
 		const position = parseAnchorPosition(container);
 		if (position) textBox.position = position;
@@ -170,7 +190,7 @@ function parseTextBoxFromShape(wsp, size, position, wrap) {
 	if (!findByFullName(wsp, "wps:txbx")) return null;
 	const wspChildren = getChildElements(wsp);
 	const spPr = wspChildren.find((el) => el.name === "wps:spPr");
-	const bodyPr = wspChildren.find((el) => el.name === "wps:bodyPr");
+	const bodyPr = findChildByNamespaceUri(wsp, WORDPROCESSING_SHAPE_NAMESPACE_URIS, "bodyPr");
 	const cNvPr = wspChildren.find((el) => el.name === "wps:cNvPr");
 	const id = cNvPr ? getAttribute(cNvPr, null, "id") ?? void 0 : void 0;
 	const fill = parseFill(spPr ?? null);

package/dist/export-pdf.js

@@ -1,4 +1,5 @@
 import { buildDisplayList } from "./display-list/build/buildDisplayList.js";
+import { displayCommentsFrom } from "./display-list/build/commentAnnotations.js";
 import { installHeadlessMeasureProvider } from "./fonts/headlessMeasure.js";
 import { layoutDocxHeadless } from "./headless-layout.js";
 import { getMeasureProvider, setMeasureProvider } from "./layout-engine/measure/measureProvider.js";
@@ -73,6 +74,7 @@ const exportWithHeadlessProvider = async (input, options) => {
 		documentFeatures: laidOut.value.documentFeatures,
 		...laidOut.value.furniture,
 		embeddedFonts: laidOut.value.embeddedFonts,
+		...laidOut.value.document.package.document.comments === void 0 ? {} : { comments: displayCommentsFrom(laidOut.value.document.package.document.comments) },
 		...options.metadata === void 0 ? {} : { metadata: options.metadata }
 	});
 	const written = await writePdf(list, {

package/dist/headless-layout.js

@@ -272,6 +272,7 @@ const layoutDocxHeadless = async (input, options = {}) => {
 				finalPageSize,
 				finalMargins,
 				finalPageNumbering: getPageNumbering(finalSection),
+				sectionVerticalAlignments: sections.map(({ properties }) => properties.verticalAlign),
 				pageGap: options.pageGap ?? 0,
 				titlePage: firstSection?.titlePg === true,
 				evenAndOddHeaders: document.package.settings?.evenAndOddHeaders === true,

package/dist/layout-engine/index.js

@@ -11,6 +11,7 @@ import { collapseParagraphSpacing, getParagraphSpacingAfter, getParagraphSpacing
 import { assertExhaustiveFlowBlock, findPageIndexContainingPmPos } from "./pmPageIndex.js";
 import { INITIAL_RENDERED_BREAK_STATE, PAGE_ADVANCE, reconcileAfterBlock, reconcileBreakBeforeBlock, recordReflowBoundary } from "./renderedBreakReconciliation.js";
 import { applyPendingToActive, createInitialSectionState, getEffectiveColumns, getEffectiveMargins, getEffectivePageSize, normalizeSectionBreakType, scheduleSectionBreak } from "./section-breaks.js";
+import { applySectionVerticalAlignment } from "./sectionVerticalAlignment.js";
 import { buildTableRowBreakInfo, getRowContinuationSkip, snapRowBreak } from "./tableRowBreak.js";
 import { bandFragmentX, bandTopContentY, isPageFrameRelativeAnchor } from "./textBoxFlow.js";
 import { DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getTableRowLeadingWidth, isFloatingImageRun, isFloatingTextBoxBlock, isTextWrappingFloatingImageRun, resolveTableCellPadding, tableColumnsArePinned } from "./types.js";
@@ -145,16 +146,15 @@ function applyContextualSpacing(blocks) {
 * reservations as page floors so every column participates in the same footnote geometry.
 */
 function layoutDocument(blocks, measures, options) {
-	const layout = layoutDocumentPass(blocks, measures, options);
-	if (!options.footnoteHeightById) return layout;
-	return reflowFootnoteColumns({
-		initialLayout: layout,
+	const initialLayout = layoutDocumentPass(blocks, measures, options);
+	return applySectionVerticalAlignment(options.footnoteHeightById ? reflowFootnoteColumns({
+		initialLayout,
 		...options.footnoteReservedHeights ? { initialReserveFloors: options.footnoteReservedHeights } : {},
 		runLayout: (reserveFloors) => layoutDocumentPass(blocks, measures, {
 			...options,
 			footnoteReservedHeights: reserveFloors
 		})
-	});
+	}) : initialLayout, options.sectionVerticalAlignments);
 }
 function layoutDocumentPass(blocks, measures, options) {
 	if (blocks.length !== measures.length) panic(`layoutDocument: expected one measure per block (blocks=${blocks.length}, measures=${measures.length})`);

package/dist/layout-engine/sectionVerticalAlignment.d.ts

@@ -0,0 +1,7 @@
+import { Layout } from "./types.js";
+import { VerticalAlign } from "@stll/docx-core/model";
+//#region src/layout-engine/sectionVerticalAlignment.d.ts
+/** Align each page's body inside the authored section content frame. */
+declare const applySectionVerticalAlignment: (layout: Layout, alignments: readonly (VerticalAlign | undefined)[] | undefined) => Layout;
+//#endregion
+export { applySectionVerticalAlignment };

package/dist/layout-engine/sectionVerticalAlignment.js

@@ -0,0 +1,52 @@
+//#region src/layout-engine/sectionVerticalAlignment.ts
+const isFlowFragment = (fragment) => {
+	switch (fragment.kind) {
+		case "paragraph": return true;
+		case "table": return !fragment.isFloating;
+		case "image": return !fragment.isAnchored;
+		case "textBox": return !fragment.isPositioned;
+		default: return false;
+	}
+};
+const alignedOffset = (alignment, availableHeight) => {
+	switch (alignment) {
+		case "center": return availableHeight / 2;
+		case "bottom": return availableHeight;
+		case "top":
+		case "both": return 0;
+		default: return 0;
+	}
+};
+const alignPage = (page, alignment) => {
+	if (alignment !== "center" && alignment !== "bottom") return page;
+	const flow = page.fragments.filter(isFlowFragment);
+	if (flow.length === 0) return page;
+	const contentBottom = page.size.h - page.margins.bottom - (page.footnoteReservedHeight ?? 0);
+	const occupiedBottom = Math.max(...flow.map((fragment) => fragment.y + fragment.height));
+	const offset = alignedOffset(alignment, Math.max(0, contentBottom - occupiedBottom));
+	if (offset === 0) return page;
+	const flowSet = new Set(flow);
+	return {
+		...page,
+		fragments: page.fragments.map((fragment) => flowSet.has(fragment) ? {
+			...fragment,
+			y: fragment.y + offset
+		} : fragment)
+	};
+};
+/** Align each page's body inside the authored section content frame. */
+const applySectionVerticalAlignment = (layout, alignments) => {
+	if (alignments === void 0) return layout;
+	let changed = false;
+	const pages = layout.pages.map((page) => {
+		const aligned = alignPage(page, alignments[page.sectionIndex ?? 0]);
+		changed ||= aligned !== page;
+		return aligned;
+	});
+	return changed ? {
+		...layout,
+		pages
+	} : layout;
+};
+//#endregion
+export { applySectionVerticalAlignment };

package/dist/layout-engine/types.d.ts

@@ -1,5 +1,5 @@
 import { OutlineStyleAttr } from "../types/documentEnumValues.js";
-import { ImagePosition, ImageWrap, NumberFormat, SdtProperties, SdtType, ShapeTextBody, TableCellFormatting, TableWidthType } from "@stll/docx-core/model";
+import { ImagePosition, ImageWrap, NumberFormat, SdtProperties, SdtType, ShapeTextBody, TableCellFormatting, TableWidthType, VerticalAlign } from "@stll/docx-core/model";
 declare namespace types_d_exports {
   export { BlockId, BorderStyle, CellBorderSpec, CellBorders, ColumnBreakBlock, ColumnBreakMeasure, ColumnLayout, DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, DocumentPosition, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, FieldRun, FloatingTablePosition, FlowBlock, FootnoteContent, Fragment, FragmentBase, HeaderFooterContent, HeaderFooterContentHeights, HeaderFooterLayout, HitTestResult, HyperlinkInfo, ImageBlock, ImageFragment, ImageMeasure, ImageRun, ImageRunPosition, Layout, LayoutOptions, LineBreakRun, ListMarkerFormatting, ListNumPr, MathRun, Measure, MeasuredLine, Page, PageBreakBlock, PageBreakMeasure, PageHeaderFooterRefs, PageMargins, ParagraphAttrs, ParagraphBlock, ParagraphBorders, ParagraphFragment, ParagraphIndent, ParagraphMeasure, ParagraphSpacing, RenderedPageBreakRun, Run, RunFormatting, SdtGroup, SectionBreakBlock, SectionBreakMeasure, SectionPageNumbering, TabAlignment, TabRun, TabStop, TableBlock, TableCell, TableCellMeasure, TableFragment, TableMeasure, TableRow, TableRowMeasure, TextBoxBlock, TextBoxFlowAttrs, TextBoxFragment, TextBoxMeasure, TextRun, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getTableRowLeadingWidth, isFloatingImageRun, isFloatingTextBoxBlock, isTextWrappingFloatingImageRun, resolveTableCellPadding, tableColumnsArePinned };
 }
@@ -1252,6 +1252,8 @@ type LayoutOptions = {
   finalColumns?: ColumnLayout;
   /** Body-level final section page-number policy. */
   finalPageNumbering?: SectionPageNumbering;
+  /** Vertical body alignment for each section, indexed by section ordinal. */
+  sectionVerticalAlignments?: readonly (VerticalAlign | undefined)[];
   /** Column configuration. */
   columns?: ColumnLayout;
   /** Gap between rendered pages (for UI). */

package/dist/pdf/writePdf.js

@@ -116,7 +116,7 @@ const buildDestination = ({ pageRefs, pages, pageIndex, yPx }) => {
 		pdfNull
 	]));
 };
-const buildAnnotation = ({ document, link, page, pages, pageRefs }) => {
+const buildLinkAnnotation = ({ document, link, page, pages, pageRefs }) => {
 	const topLeft = displayPointToPdf(page.heightPx, link.rect.xPx, link.rect.yPx);
 	const bottomRight = displayPointToPdf(page.heightPx, link.rect.xPx + link.rect.widthPx, link.rect.yPx + link.rect.heightPx);
 	let action;
@@ -160,6 +160,26 @@ const buildAnnotation = ({ document, link, page, pages, pageRefs }) => {
 		["Dest", destination]
 	])));
 };
+const buildCommentAnnotation = ({ document, comment, page }) => {
+	const rect = comment.rects.at(-1);
+	if (rect === void 0) return Result.err(new WritePdfError({ message: `comment ${String(comment.commentId)} has no anchor rectangle` }));
+	const topLeft = displayPointToPdf(page.heightPx, rect.xPx, rect.yPx);
+	const bottomRight = displayPointToPdf(page.heightPx, rect.xPx + rect.widthPx, rect.yPx + rect.heightPx);
+	return Result.ok(document.add(pdfDict([
+		["Type", pdfName("Annot")],
+		["Subtype", pdfName("Text")],
+		["Rect", pdfNumberArray([
+			Math.min(topLeft.x, bottomRight.x),
+			Math.min(topLeft.y, bottomRight.y),
+			Math.max(topLeft.x, bottomRight.x),
+			Math.max(topLeft.y, bottomRight.y)
+		])],
+		["Contents", pdfTextString(comment.contents)],
+		["T", pdfTextString(comment.author)],
+		["Name", pdfName("Comment")],
+		["NM", pdfAsciiString(`folio-comment-${String(comment.commentId)}`)]
+	])));
+};
 const buildOutlineTree = (entries, document) => {
 	const roots = [];
 	const ancestors = [];
@@ -255,6 +275,11 @@ const writePdf = async (list, options) => {
 	}
 	const outlineRoots = buildOutlineTree(list.outline, document);
 	const outlineRef = outlineRoots.length === 0 ? void 0 : document.allocate();
+	const commentLocations = /* @__PURE__ */ new Map();
+	for (const [pageIndex, page] of list.pages.entries()) for (const comment of page.comments) commentLocations.set(comment.commentId, {
+		pageIndex,
+		comment
+	});
 	for (const [pageIndex, page] of list.pages.entries()) {
 		const pageRef = pageRefs[pageIndex];
 		if (pageRef === void 0) return Result.err(new WritePdfError({ message: `page ${String(pageIndex)} lost its object` }));
@@ -266,7 +291,7 @@ const writePdf = async (list, options) => {
 		const contentRef = document.add(pdfFlateStream([], new TextEncoder().encode(renderContentStream(parts, resources))));
 		const annotationRefs = [];
 		for (const link of page.links) {
-			const annotation = buildAnnotation({
+			const annotation = buildLinkAnnotation({
 				document,
 				link,
 				page,
@@ -276,6 +301,16 @@ const writePdf = async (list, options) => {
 			if (annotation.isErr()) return Result.err(annotation.error);
 			annotationRefs.push(annotation.value);
 		}
+		for (const { pageIndex: commentPageIndex, comment } of commentLocations.values()) {
+			if (commentPageIndex !== pageIndex) continue;
+			const annotation = buildCommentAnnotation({
+				document,
+				comment,
+				page
+			});
+			if (annotation.isErr()) return Result.err(annotation.error);
+			annotationRefs.push(annotation.value);
+		}
 		document.define(pageRef, pdfDict([
 			["Type", pdfName("Page")],
 			["Parent", pagesRef],

package/dist/prosemirror/attrs/index.js

@@ -519,6 +519,7 @@ const readTextBoxAttrs = (node) => {
 	optionalNumber(attrs, "width", "textBox.attrs.width", issues);
 	optionalNumber(attrs, "height", "textBox.attrs.height", issues);
 	optionalOneOf(attrs, "autoFit", "textBox.attrs.autoFit", issues, TEXT_BOX_AUTO_FIT_VALUES);
+	optionalWordArt(attrs, "wordArt", "textBox.attrs.wordArt", issues);
 	optionalOneOf(attrs, "textWrap", "textBox.attrs.textWrap", issues, TEXT_BOX_TEXT_WRAP_VALUES);
 	optionalString(attrs, "textBoxId", "textBox.attrs.textBoxId", issues);
 	optionalString(attrs, "fillColor", "textBox.attrs.fillColor", issues);
@@ -1547,6 +1548,40 @@ const optionalNestedRecord = (attrs, key, path, issues, validate) => {
 	}
 	validate(value, path, issues);
 };
+const optionalWordArt = (attrs, key, path, issues) => {
+	const value = attrs[key];
+	if (value === void 0 || value === null) return;
+	if (!isRecord(value)) {
+		issues.push({
+			path,
+			message: "Expected an object."
+		});
+		return;
+	}
+	optionalString(value, "preset", `${path}.preset`, issues);
+	optionalBoolean(value, "fromWordArt", `${path}.fromWordArt`, issues);
+	const adjustments = value["adjustments"];
+	if (adjustments === void 0 || adjustments === null) return;
+	if (!Array.isArray(adjustments)) {
+		issues.push({
+			path: `${path}.adjustments`,
+			message: "Expected an array."
+		});
+		return;
+	}
+	for (const [index, adjustment] of adjustments.entries()) {
+		const adjustmentPath = `${path}.adjustments[${index}]`;
+		if (!isRecord(adjustment)) {
+			issues.push({
+				path: adjustmentPath,
+				message: "Expected an object."
+			});
+			continue;
+		}
+		optionalString(adjustment, "name", `${adjustmentPath}.name`, issues);
+		optionalString(adjustment, "formula", `${adjustmentPath}.formula`, issues);
+	}
+};
 const PARAGRAPH_FORMATTING_BOOLEAN_KEYS = [
 	"bidi",
 	"kinsoku",

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -2902,6 +2902,7 @@ function convertPMTextBox(node, styleResolver = null) {
 		},
 		textBody: {
 			content: textBodyContent.type === "source-empty" ? [] : textBodyContent.content,
+			...attrs.wordArt !== void 0 ? { wordArt: attrs.wordArt } : {},
 			...attrs.autoFit !== void 0 ? { autoFit: attrs.autoFit } : {},
 			...attrs.textWrap !== void 0 ? { textWrap: attrs.textWrap } : {},
 			...verticalAlign !== void 0 ? { anchor: verticalAlign } : {},

package/dist/prosemirror/conversion/toProseDoc.js

@@ -2111,6 +2111,7 @@ function textBoxFromShape(shape, textBody) {
 	if (textBody.autoFit) textBox.autoFit = textBody.autoFit;
 	if (textBody.textWrap) textBox.textWrap = textBody.textWrap;
 	if (textBody.anchor) textBox.verticalAlign = textBody.anchor;
+	if (textBody.wordArt) textBox.wordArt = textBody.wordArt;
 	return textBox;
 }
 /**
@@ -2194,6 +2195,7 @@ function convertTextBox(textBox, styleResolver, options) {
 		width: widthPx,
 		height: heightPx,
 		autoFit: textBox.autoFit,
+		wordArt: textBox.wordArt,
 		textWrap: textBox.textWrap,
 		verticalAlign: textBox.verticalAlign,
 		textBoxId: textBox.id,

package/dist/prosemirror/extensions/nodes/TextBoxExtension.d.ts

@@ -2,6 +2,7 @@ import { TextBoxAttrs as TextBoxAttrs$1 } from "../../schema/nodes.js";
 import { NodeExtension } from "../types.js";
 //#region src/prosemirror/extensions/nodes/TextBoxExtension.d.ts
 type TextBoxAttrs = TextBoxAttrs$1;
+declare function parseTextBoxWordArt(raw: string): TextBoxAttrs["wordArt"];
 declare const TextBoxExtension: (options?: Partial<Record<string, unknown>> | undefined) => NodeExtension;
 //#endregion
-export { TextBoxAttrs, TextBoxExtension };
+export { TextBoxAttrs, TextBoxExtension, parseTextBoxWordArt };

package/dist/prosemirror/extensions/nodes/TextBoxExtension.js

@@ -31,6 +31,41 @@ function parseTextBoxTextWrap(raw) {
 function parseTextBoxVerticalAlign(raw) {
 	return normalizeShapeTextAnchor(raw);
 }
+function parseTextBoxWordArt(raw) {
+	try {
+		const parsed = JSON.parse(raw);
+		if (typeof parsed !== "object" || parsed === null) return;
+		const wordArt = {};
+		const fromWordArt = Reflect.get(parsed, "fromWordArt");
+		if (fromWordArt !== void 0) {
+			if (typeof fromWordArt !== "boolean") return void 0;
+			wordArt.fromWordArt = fromWordArt;
+		}
+		const preset = Reflect.get(parsed, "preset");
+		if (preset !== void 0) {
+			if (typeof preset !== "string") return void 0;
+			wordArt.preset = preset;
+		}
+		const adjustments = Reflect.get(parsed, "adjustments");
+		if (adjustments !== void 0) {
+			if (!Array.isArray(adjustments)) return void 0;
+			const validAdjustments = [];
+			for (const adjustment of adjustments) {
+				if (typeof adjustment !== "object" || adjustment === null) continue;
+				const name = Reflect.get(adjustment, "name");
+				const formula = Reflect.get(adjustment, "formula");
+				if (typeof name === "string" && typeof formula === "string") validAdjustments.push({
+					name,
+					formula
+				});
+			}
+			if (validAdjustments.length > 0) wordArt.adjustments = validAdjustments;
+		}
+		return wordArt.fromWordArt !== void 0 || wordArt.preset !== void 0 || wordArt.adjustments !== void 0 ? wordArt : void 0;
+	} catch {
+		return;
+	}
+}
 const TextBoxExtension = createNodeExtension({
 	name: "textBox",
 	schemaNodeName: "textBox",
@@ -43,6 +78,7 @@ const TextBoxExtension = createNodeExtension({
 			width: { default: 200 },
 			height: { default: null },
 			autoFit: { default: null },
+			wordArt: { default: null },
 			textWrap: { default: null },
 			textBoxId: { default: null },
 			fillColor: { default: null },
@@ -86,6 +122,7 @@ const TextBoxExtension = createNodeExtension({
 					...d["width"] ? { width: Number(d["width"]) } : {},
 					...d["height"] ? { height: Number(d["height"]) } : {},
 					...autoFit ? { autoFit } : {},
+					...d["wordArt"] ? { wordArt: parseTextBoxWordArt(d["wordArt"]) } : {},
 					...textWrap ? { textWrap } : {},
 					...d["textboxId"] ? { textBoxId: d["textboxId"] } : {},
 					...d["fillColor"] ? { fillColor: d["fillColor"] } : {},
@@ -113,6 +150,7 @@ const TextBoxExtension = createNodeExtension({
 		toDOM(node) {
 			const attrs = expectTextBoxAttrs(node);
 			const domAttrs = { class: "docx-textbox" };
+			if (attrs.wordArt) domAttrs["data-word-art"] = JSON.stringify(attrs.wordArt);
 			if (attrs.width) domAttrs["data-width"] = String(attrs.width);
 			if (attrs.height) domAttrs["data-height"] = String(attrs.height);
 			if (attrs.autoFit) domAttrs["data-auto-fit"] = attrs.autoFit;
@@ -184,4 +222,4 @@ const TextBoxExtension = createNodeExtension({
 	}
 });
 //#endregion
-export { TextBoxExtension };
+export { TextBoxExtension, parseTextBoxWordArt };

package/dist/prosemirror/schema/nodes.d.ts

@@ -502,6 +502,8 @@ type TextBoxAttrs = {
   height?: number;
   /** Text fitting behavior */
   autoFit?: document_d_exports.ShapeTextBody["autoFit"];
+  /** Authored DrawingML WordArt metadata. */
+  wordArt?: document_d_exports.ShapeTextBody["wordArt"];
   /** Horizontal text wrapping inside the box */
   textWrap?: document_d_exports.ShapeTextBody["textWrap"];
   /** Unique identifier */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.38.0",
+  "version": "0.39.0",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",
@@ -121,7 +121,7 @@
     "perf": "bun scripts/profile-editor.ts"
   },
   "dependencies": {
-    "@stll/docx-core": "^0.20.0",
+    "@stll/docx-core": "^0.20.1",
     "@stll/docx-utils": "^0.1.0",
     "@stll/template-conditions": ">=0.4.0 <1.0.0",
     "better-result": "3.0.1",