@stll/folio-core 0.25.3 → 0.25.5

package/dist/docx/compatibility.js

@@ -1,4 +1,4 @@
-import { DOCX_CONFORMANCE_CLASSES } from "@stll/docx-core/model";
+import { DOCX_CONFORMANCE_CLASSES, DRAWING_RAW_XML_MODES } from "@stll/docx-core/model";
 //#region src/docx/compatibility.ts
 const resolveCompatibilityContext = (doc, options) => ({
 	host: options.host ?? "unknown",
@@ -146,7 +146,7 @@ function inspectHyperlink(hyperlink, context) {
 	});
 }
 function inspectRun(run, context) {
-	for (const [contentIndex, content] of run.content.entries()) if (content.type === "drawing" && content.rawXml) context.record({
+	for (const [contentIndex, content] of run.content.entries()) if (content.type === "drawing" && content.rawXml && content.rawXmlMode !== DRAWING_RAW_XML_MODES.PRESERVE_ONLY) context.record({
 		...context.blockId === void 0 ? {} : { blockId: context.blockId },
 		part: context.part,
 		path: `${context.path}.content[${contentIndex}]`

package/dist/docx/runParser.js

@@ -7,7 +7,7 @@ import { requiresXmlSpacePreserve } from "./textWhitespace.js";
 import { resolveThemeFontRef } from "./themeParser.js";
 import { parseVmlImageContent } from "./vmlImageParser.js";
 import { cloneWithXmlnsDeclarations, elementToXml, findAllDeep, findChild, findChildren, getAttribute, getChildElements, getLocalName, getTextContent, mergeXmlnsDeclarations, parseBooleanElement, parseNumericAttribute } from "./xmlParser.js";
-import { normalizeRevisionId } from "@stll/docx-core/model";
+import { DRAWING_RAW_XML_MODES, normalizeRevisionId } from "@stll/docx-core/model";
 //#region src/docx/runParser.ts
 /**
 * Sanity cap on `w:lang` `@w:val`/`@w:eastAsia`/`@w:bidi` tag length. BCP-47
@@ -500,7 +500,8 @@ function parseDrawingContent(element, rels, media) {
 			},
 			wrap: { type: "inline" }
 		},
-		rawXml: elementToXml(element)
+		rawXml: elementToXml(element),
+		rawXmlMode: DRAWING_RAW_XML_MODES.PRESERVE_ONLY
 	};
 	const shape = parseShapeFromDrawing(element);
 	if (shape) return {

package/dist/docx/serializer/runSerializer.js

@@ -448,6 +448,10 @@ function serializeDrawingContent(content) {
 function serializeShapeTextBody(blocks) {
 	return blocks.map((block) => block.type === "paragraph" ? serializeParagraph(block) : serializeTable(block, serializeParagraph)).join("");
 }
+function serializeGeometryAdjustments(shape) {
+	if (!shape.geometryAdjustments || shape.geometryAdjustments.length === 0) return "<a:avLst/>";
+	return `<a:avLst>${shape.geometryAdjustments.map(({ name, formula }) => `<a:gd name="${escapeXml(name)}" fmla="${escapeXml(formula)}"/>`).join("")}</a:avLst>`;
+}
 /**
 * Serialize shape content to full DrawingML XML (wps:wsp inside w:drawing)
 */
@@ -470,7 +474,7 @@ function serializeShapeContent(content) {
 		"<a:off x=\"0\" y=\"0\"/>",
 		`<a:ext cx="${intAttr(cx)}" cy="${intAttr(cy)}"/>`,
 		"</a:xfrm>",
-		`<a:prstGeom prst="${shape.shapeType === "textBox" ? "rect" : shape.shapeType}"><a:avLst/></a:prstGeom>`,
+		`<a:prstGeom prst="${shape.shapeType === "textBox" ? "rect" : shape.shapeType}">${serializeGeometryAdjustments(shape)}</a:prstGeom>`,
 		serializeFill(shape.fill),
 		serializeOutline(shape.outline),
 		"</wps:spPr>"

package/dist/docx/shapeParser.js

@@ -1,6 +1,6 @@
 import { parseAnchorPosition, parseAnchorWrap, parseFill, parseOutline } from "./drawingUtils.js";
 import { ShapeTypeSchema, narrowEnum } from "./parserEnums.js";
-import { findAllDeep, findChildByLocalName, getAttribute, parseNumericAttribute } from "./xmlParser.js";
+import { findAllDeep, findChildByLocalName, findChildren, getAttribute, getChildElements, parseNumericAttribute } from "./xmlParser.js";
 //#region src/docx/shapeParser.ts
 /** Convert OOXML rotation (1/60000ths of a degree) to degrees. */
 function rotToDegrees(rot) {
@@ -56,8 +56,29 @@ function hasUnsupportedGeometry(spPr) {
 	if (!spPr) return false;
 	const prstGeom = findChildByLocalName(spPr, "prstGeom");
 	if (!prstGeom) return findChildByLocalName(spPr, "custGeom") !== null;
-	if (findChildByLocalName(prstGeom, "avLst")?.elements?.some((child) => child.type === "element")) return true;
-	return narrowEnum(getAttribute(prstGeom, null, "prst"), ShapeTypeSchema) === void 0;
+	const avLst = findChildByLocalName(prstGeom, "avLst");
+	const prst = getAttribute(prstGeom, null, "prst");
+	if (narrowEnum(prst, ShapeTypeSchema) === void 0) return true;
+	const adjustmentChildren = avLst ? getChildElements(avLst) : [];
+	if (adjustmentChildren.length === 0) return false;
+	const adjustments = findChildren(avLst, "a", "gd");
+	const adjustmentNames = new Set(adjustments.map((adjustment) => getAttribute(adjustment, null, "name")));
+	return !(prst === "rightBrace" && adjustments.length === 2 && adjustmentChildren.length === adjustments.length && adjustmentNames.size === 2 && adjustmentNames.has("adj1") && adjustmentNames.has("adj2") && adjustments.every((adjustment) => /^val\s+-?\d+$/u.test(getAttribute(adjustment, null, "fmla") ?? "")));
+}
+function parseGeometryAdjustments(spPr) {
+	const prstGeom = spPr ? findChildByLocalName(spPr, "prstGeom") : null;
+	const avLst = prstGeom ? findChildByLocalName(prstGeom, "avLst") : null;
+	if (!avLst) return;
+	const adjustments = [];
+	for (const adjustment of findChildren(avLst, "a", "gd")) {
+		const name = getAttribute(adjustment, null, "name");
+		const formula = getAttribute(adjustment, null, "fmla");
+		if (name !== null && formula !== null) adjustments.push({
+			name,
+			formula
+		});
+	}
+	return adjustments.length === 0 ? void 0 : adjustments;
 }
 function hasUnsupportedRgbColorModifiers(spPr) {
 	for (const color of findAllDeep(spPr, "a", "srgbClr")) if (color.elements?.some((child) => child.type === "element")) return true;
@@ -94,6 +115,8 @@ function parseShape(node) {
 		shapeType,
 		size
 	};
+	const geometryAdjustments = parseGeometryAdjustments(spPr);
+	if (geometryAdjustments !== void 0) shape.geometryAdjustments = geometryAdjustments;
 	if (id !== void 0) shape.id = id;
 	if (name !== void 0) shape.name = name;
 	if (fill !== void 0) shape.fill = fill;

package/dist/layout-bridge/convert/toFlowBlocks.js

@@ -15,6 +15,7 @@ import { resolveColor, resolveHighlightToCss } from "../../utils/colorResolver.j
 import { resolveThemeFont } from "../../utils/fontResolver.js";
 import { resolveShadingFill } from "../../utils/formatToStyle.js";
 import { decodeOoxmlSymbolCharacter } from "../../utils/ooxmlSymbol.js";
+import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
 import { AUTO_PARAGRAPH_SPACING_PX, halfPointsToPixels, halfPointsToPoints, pointsToPixels } from "../../utils/units.js";
 import { getColumns } from "../sectionColumns.js";
 import { groupParagraphFrames } from "./paragraphFrames.js";
@@ -454,12 +455,6 @@ function buildImageRun(attrs, constrained, pmStart, pmEnd, trackedChange) {
 	return run;
 }
 /**
-* Paragraph styleId pattern used by Word for TOC entries (TOC, TOC1, TOC2, …).
-* Hyperlinks inside these paragraphs must render in the paragraph's own colour,
-* not the Hyperlink character style — see {@link stripTocHyperlinkStyle}.
-*/
-const TOC_STYLE_ID = /^TOC\d*$/iu;
-/**
 * In TOC paragraphs, strip the resolved Hyperlink character-style colour and
 * underline so the painter's link fallback doesn't fire. The PM doc keeps the
 * original marks so copy/paste out of a TOC still carries the Hyperlink
@@ -484,7 +479,7 @@ function paragraphToRuns(node, startPos, _options) {
 	const pmAttrs = expectParagraphAttrs(node);
 	const paraDefaults = paragraphRunDefaults(pmAttrs, theme);
 	const paragraphStyleId = pmAttrs.styleId;
-	const inTocParagraph = typeof paragraphStyleId === "string" && TOC_STYLE_ID.test(paragraphStyleId);
+	const inTocParagraph = pmAttrs._tableOfContentsLevel !== void 0 || tableOfContentsStyleLevel({ styleId: paragraphStyleId }) !== void 0;
 	let leadingRenderedPageBreakPending = pmAttrs.renderedPageBreakBefore === true;
 	function pushRunsForChild(child, childPos) {
 		if (child.type.name === "renderedPageBreak") {

package/dist/layout-engine/measure/cache.d.ts

@@ -54,10 +54,7 @@ declare function setFontCacheSize(size: number): void;
  * Get current font metrics cache size
  */
 declare function getFontCacheSize(): number;
-/**
- * Generate a simple hash for a paragraph block
- * Used as cache key to identify identical content
- */
+/** Serialize the complete paragraph measurement contract into a cache key. */
 declare function hashParagraphBlock(block: ParagraphBlock): string;
 /**
  * Get cached paragraph measurement or return undefined

package/dist/layout-engine/measure/cache.js

@@ -1,4 +1,3 @@
-import { lineBreakPolicyCacheParts } from "./effectiveLineBreakPolicy.js";
 import { getLineBreakProviderGeneration } from "./lineBreakProvider.js";
 import { clearFontResolvedCache } from "./measureHelpers.js";
 //#region src/layout-engine/measure/cache.ts
@@ -164,40 +163,38 @@ let paragraphCacheMaxSize = 5e3;
 * Key format: block content hash
 */
 const paragraphMeasureCache = /* @__PURE__ */ new Map();
-/**
-* Generate a simple hash for a paragraph block
-* Used as cache key to identify identical content
-*/
-function hashParagraphBlock(block) {
-	const parts = [`lbp:${getLineBreakProviderGeneration()}`];
-	for (const run of block.runs) if (run.kind === "text") parts.push(`t:${run.text}|${run.fontFamily}|${run.eastAsiaFontFamily}|${run.complexScriptFontFamily}|${run.fontSize}|${run.complexScriptFontSize}|${run.bold}|${run.complexScriptBold}|${run.italic}|${run.complexScriptItalic}|${run.forceComplexScript}|${run.allCaps}|${run.smallCaps}|${run.horizontalScale}|${run.letterSpacing}|${run.language?.val}|${run.language?.eastAsia}|${run.language?.bidi}`);
-	else if (run.kind === "tab") parts.push(`tab:${run.width}`);
-	else if (run.kind === "image") parts.push(`img:${run.width}x${run.height}:${run.exactLineHeight === true ? "exact" : "text"}`);
-	else if (run.kind === "lineBreak") parts.push("br");
-	const attrs = block.attrs;
-	if (attrs) {
-		if (attrs.alignment) parts.push(`align:${attrs.alignment}`);
-		if (attrs.outlineLevel !== void 0) parts.push(`outline:${attrs.outlineLevel}`);
-		if (attrs.indent) parts.push(`indent:${attrs.indent.left}|${attrs.indent.right}|${attrs.indent.firstLine}|${attrs.indent.hanging}`);
-		if (attrs.spacing) parts.push(`spacing:${attrs.spacing.before}|${attrs.spacing.after}|${attrs.spacing.line}|${attrs.spacing.lineRule}`);
-		if (attrs.defaultFontSize != null) parts.push(`dfs:${attrs.defaultFontSize}`);
-		if (attrs.defaultFontFamily != null) parts.push(`dff:${attrs.defaultFontFamily}`);
-		if (attrs.suppressEmptyParagraphHeight) parts.push("sup");
-		if (attrs.reserveEmptyOutlineHeight) parts.push("outline-empty-reserve");
-		if (attrs.documentGridLinePitch !== void 0) parts.push(`documentGrid:${attrs.documentGridLinePitch}|${attrs.snapToGrid !== false}`);
-		if (attrs.justificationCompatibility) parts.push(`justify-compat:${attrs.justificationCompatibility.type}`);
-		if (attrs.listMarker !== void 0) {
-			const marker = attrs.listMarkerFormatting;
-			parts.push(`marker:${attrs.listMarker}|${attrs.listMarkerHidden}|${attrs.listMarkerAlignment}|${attrs.listMarkerSuffix}|${marker?.fontFamily}|${marker?.eastAsiaFontFamily}|${marker?.complexScriptFontFamily}|${marker?.fontSize}|${marker?.complexScriptFontSize}|${marker?.bold}|${marker?.complexScriptBold}|${marker?.italic}|${marker?.complexScriptItalic}|${marker?.rtl}|${marker?.forceComplexScript}`);
-		}
-		parts.push(...lineBreakPolicyCacheParts(attrs));
-		const borders = attrs.borders;
-		if (borders) {
-			const signature = (border) => border ? `${border.width ?? ""},${border.style ?? ""},${border.color ?? ""}` : "";
-			parts.push(`bdr:${signature(borders.top)}|${signature(borders.bottom)}|${signature(borders.left)}|${signature(borders.right)}`);
-		}
+/** Keep image payloads bounded while classifying every field as measured or intentionally ignored. */
+const imageMeasureCacheInput = (run) => ({
+	kind: run.kind,
+	width: run.width,
+	height: run.height,
+	transform: run.transform,
+	wrapType: run.wrapType,
+	displayMode: run.displayMode,
+	distTop: run.distTop,
+	distBottom: run.distBottom,
+	exactLineHeight: run.exactLineHeight,
+	positioned: run.position !== void 0
+});
+const runMeasureCacheInput = (run) => {
+	switch (run.kind) {
+		case "text":
+		case "tab":
+		case "lineBreak":
+		case "renderedPageBreak":
+		case "field":
+		case "math": return run;
+		case "image": return imageMeasureCacheInput(run);
+		default: return run;
 	}
-	return parts.join("||");
+};
+/** Serialize the complete paragraph measurement contract into a cache key. */
+function hashParagraphBlock(block) {
+	return JSON.stringify({
+		lineBreakProviderGeneration: getLineBreakProviderGeneration(),
+		attrs: block.attrs,
+		runs: block.runs.map(runMeasureCacheInput)
+	});
 }
 /**
 * Evict oldest entries if paragraph cache exceeds max size

package/dist/layout-painter/renderParagraph.js

@@ -1454,9 +1454,10 @@ function renderParagraphFragment(fragment, block, measure, context, options = {}
 		});
 		const isFlexLine = lineEl.dataset["flexLine"] === "true";
 		const lineMarginLeft = Math.min(indentLeft, 0) + lineLeftOffset;
+		const lineMarginRight = Math.min(indentRight, 0) + lineRightOffset;
 		if (lineMarginLeft !== 0 || lineRightOffset > 0 || indentLeft < 0 || indentRight < 0) {
 			lineEl.style.marginLeft = `${lineMarginLeft}px`;
-			if (lineRightOffset > 0) lineEl.style.marginRight = `${lineRightOffset}px`;
+			if (lineMarginRight !== 0) lineEl.style.marginRight = `${lineMarginRight}px`;
 			const constrainedWidth = lineAvailableWidth - lineLeftOffset - lineRightOffset;
 			if (constrainedWidth > 0) lineEl.style.width = `${constrainedWidth}px`;
 		}
@@ -1476,27 +1477,33 @@ function renderParagraphFragment(fragment, block, measure, context, options = {}
 		if (isFirstLine && block.attrs?.listMarker && !block.attrs.listMarkerHidden) {
 			const hanging = indent?.hanging ?? 0;
 			const firstLine = indent?.firstLine ?? 0;
-			const markerStart = hanging > 0 ? indentLeft - hanging : indentLeft + firstLine;
-			lineEl.style.paddingLeft = `${Math.max(0, markerStart)}px`;
+			const markerPhysicalStart = isRtl ? "right" : "left";
+			const markerIndent = markerPhysicalStart === "right" ? indentRight : indentLeft;
+			const markerStart = hanging > 0 ? markerIndent - hanging : markerIndent + firstLine;
+			const logicalMarkerVisualOffset = getListMarkerVisualOffset(block);
+			if (markerPhysicalStart === "right") lineEl.style.paddingRight = `${Math.max(0, markerStart)}px`;
+			else lineEl.style.paddingLeft = `${Math.max(0, markerStart)}px`;
 			lineEl.style.textIndent = "0";
-			const marker = renderListMarker(block.attrs.listMarker, getListMarkerInlineWidth(block), getListMarkerVisualOffset(block), doc, resolveListMarkerFont(block), block.attrs.listMarkerRevision, block.attrs.listMarkerSecondSlotOffsetTwips);
-			const markerMarginLeft = markerStart - Math.min(indentLeft, 0);
-			if (markerMarginLeft < 0) marker.style.marginLeft = `${markerMarginLeft}px`;
+			const marker = renderListMarker({
+				marker: block.attrs.listMarker,
+				inlineWidth: getListMarkerInlineWidth(block),
+				visualOffset: markerPhysicalStart === "right" ? -logicalMarkerVisualOffset : logicalMarkerVisualOffset,
+				doc,
+				formatting: resolveListMarkerFont(block),
+				...block.attrs.listMarkerRevision === void 0 ? {} : { revision: block.attrs.listMarkerRevision },
+				...block.attrs.listMarkerSecondSlotOffsetTwips === void 0 ? {} : { secondSlotOffsetTwips: block.attrs.listMarkerSecondSlotOffsetTwips },
+				physicalStart: markerPhysicalStart
+			});
+			const markerMarginLeft = markerStart - (markerPhysicalStart === "right" ? Math.min(indentRight, 0) : Math.min(indentLeft, 0));
+			if (markerMarginLeft < 0) if (markerPhysicalStart === "right") marker.style.marginRight = `${markerMarginLeft}px`;
+			else marker.style.marginLeft = `${markerMarginLeft}px`;
 			lineEl.prepend(marker);
 		}
 		fragmentEl.append(lineEl);
 	}
 	return fragmentEl;
 }
-/**
-* Render a list marker element as an inline-block at the start of the first
-* body line. `inlineWidth` (from `getListMarkerInlineWidth`) sizes the marker
-* so the body text aligns at the next tab stop per ECMA-376 §17.9.25 —
-* this honours `w:suff` (`tab` / `space` / `nothing`) and the document's
-* tab grid. Long markers like "1.1.1." therefore grow to the next stop
-* instead of butting against the body text.
-*/
-function renderListMarker(marker, inlineWidth, visualOffset, doc, formatting, revision, secondSlotOffsetTwips) {
+function renderListMarker({ marker, inlineWidth, visualOffset, doc, formatting, revision, secondSlotOffsetTwips, physicalStart }) {
 	const span = doc.createElement("span");
 	span.className = "layout-list-marker";
 	span.style.display = "inline-block";
@@ -1505,8 +1512,8 @@ function renderListMarker(marker, inlineWidth, visualOffset, doc, formatting, re
 	if (formatting.bold !== void 0) span.style.fontWeight = formatting.bold ? "700" : "normal";
 	if (formatting.italic !== void 0) span.style.fontStyle = formatting.italic ? "italic" : "normal";
 	if (formatting.rtl !== void 0) span.dir = formatting.rtl ? "rtl" : "ltr";
-	span.style.textAlign = "left";
-	span.style.textAlignLast = "left";
+	span.style.textAlign = physicalStart;
+	span.style.textAlignLast = physicalStart;
 	span.style.boxSizing = "border-box";
 	span.style.width = `${inlineWidth}px`;
 	if (visualOffset !== 0) span.style.transform = `translateX(${visualOffset}px)`;
@@ -1540,7 +1547,8 @@ function renderListMarker(marker, inlineWidth, visualOffset, doc, formatting, re
 		secondSlot.style.display = "inline-block";
 		span.style.position = "relative";
 		secondSlot.style.position = "absolute";
-		secondSlot.style.left = `${secondSlotOffsetTwips / 15}px`;
+		if (physicalStart === "right") secondSlot.style.right = `${secondSlotOffsetTwips / 15}px`;
+		else secondSlot.style.left = `${secondSlotOffsetTwips / 15}px`;
 		secondSlot.style.top = "0";
 		span.append(firstSlot, secondSlot);
 		return span;

package/dist/prosemirror/attrs/index.js

@@ -2,7 +2,7 @@ import { EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FONT_HINT_VALUES, FONT_THEME_V
 import { isParagraphDirection } from "../paragraphDirection.js";
 import { TRACKED_CHANGE_PROVENANCE_VALUES } from "../schema/marks.js";
 import { panic } from "better-result";
-import { isOoxmlSymbolCharacter } from "@stll/docx-core/model";
+import { DRAWING_RAW_XML_MODES, isOoxmlSymbolCharacter } from "@stll/docx-core/model";
 //#region src/prosemirror/attrs/index.ts
 const SECTION_BREAK_TYPES = [
 	"nextPage",
@@ -143,6 +143,7 @@ const readParagraphAttrs = (node) => {
 	optionalString(attrs, "textId", "paragraph.attrs.textId", issues);
 	optionalOneOf(attrs, "alignment", "paragraph.attrs.alignment", issues, PARAGRAPH_ALIGNMENT_VALUES);
 	optionalString(attrs, "styleId", "paragraph.attrs.styleId", issues);
+	optionalNumber(attrs, "_tableOfContentsLevel", "paragraph.attrs._tableOfContentsLevel", issues);
 	optionalBoolean(attrs, "kinsoku", "paragraph.attrs.kinsoku", issues);
 	optionalBoolean(attrs, "overflowPunctuation", "paragraph.attrs.overflowPunctuation", issues);
 	optionalBoolean(attrs, "suppressAutoHyphens", "paragraph.attrs.suppressAutoHyphens", issues);
@@ -357,6 +358,12 @@ const readImageAttrs = (node) => {
 	optionalString(attrs, "hlinkHref", "image.attrs.hlinkHref", issues);
 	optionalString(attrs, "hlinkRId", "image.attrs.hlinkRId", issues);
 	optionalString(attrs, "_docxRawXml", "image.attrs._docxRawXml", issues);
+	optionalOneOf(attrs, "_docxRawXmlMode", "image.attrs._docxRawXmlMode", issues, Object.values(DRAWING_RAW_XML_MODES));
+	const rawXml = attrs["_docxRawXml"];
+	if (attrs["_docxRawXmlMode"] === DRAWING_RAW_XML_MODES.PRESERVE_ONLY && (typeof rawXml !== "string" || rawXml.trim().length === 0)) issues.push({
+		path: "image.attrs._docxRawXml",
+		message: "Preservation-only drawings require raw XML."
+	});
 	optionalBoolean(attrs, "_docxObjectPreview", "image.attrs._docxObjectPreview", issues);
 	return attrsResult(attrs, issues);
 };
@@ -422,6 +429,7 @@ const readShapeAttrs = (node) => {
 	const issues = [];
 	expectNodeType(node, "shape", issues);
 	optionalString(attrs, "shapeType", "shape.attrs.shapeType", issues);
+	optionalString(attrs, "geometryAdjustments", "shape.attrs.geometryAdjustments", issues);
 	optionalString(attrs, "shapeId", "shape.attrs.shapeId", issues);
 	optionalNumber(attrs, "width", "shape.attrs.width", issues);
 	optionalNumber(attrs, "height", "shape.attrs.height", issues);

package/dist/prosemirror/commands/image.js

@@ -105,7 +105,8 @@ const constrainImageSize = (width, height) => {
 };
 const imageNodeAt = (view, pos) => {
 	const node = view.state.doc.nodeAt(pos);
-	return node && node.type.name === "image" ? node : null;
+	if (!node || node.type.name !== "image") return null;
+	return expectImageAttrs(node)._docxRawXmlMode ? null : node;
 };
 /** Change the wrap mode of the image at `pos`. Returns whether it applied. */
 const applyImageWrapType = (view, pos, wrapType) => {

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -7,13 +7,27 @@ import { autospacingMatchesBase, hasAutospacingBaseSide } from "../autospacingBa
 import { applyRunFormattingOverrideAttrs } from "../extensions/marks/RunFormattingOverrideExtension.js";
 import { directionToBidi } from "../paragraphDirection.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../runFormattingMarkNames.js";
+import { parseShapeGeometryAdjustments } from "../shapeGeometryAdjustments.js";
 import { expectTextBoxAnchorAttrs } from "../textBoxAnchorAttrs.js";
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { runShadingAttrsToShading } from "./runShadingMark.js";
 import { decodeSdtListItems, sdtPropertiesFromAttrs, sdtPropertiesMatchAttrs } from "./sdtAttrs.js";
 import { textFormattingToMarks } from "./toProseDoc.js";
+import { panic } from "better-result";
+import { DRAWING_RAW_XML_MODES } from "@stll/docx-core/model";
 import { Fragment } from "prosemirror-model";
 //#region src/prosemirror/conversion/fromProseDoc.ts
+/**
+* ProseMirror to Document Conversion
+*
+* Converts a ProseMirror document back to our Document type.
+* This enables round-trip editing: DOCX -> Document -> PM -> Document -> DOCX
+*
+* Key responsibilities:
+* - Coalesce consecutive text with same marks into single Runs
+* - Preserve paragraph attributes (paraId, textId, formatting)
+* - Handle marks -> TextFormatting conversion
+*/
 function normalizeShapeOutlineStyle(style) {
 	if (!style) return;
 	if (style in OUTLINE_STYLE_CSS_ALIASES) return OUTLINE_STYLE_CSS_ALIASES[style];
@@ -1256,14 +1270,18 @@ function createImageRun(node) {
 		if (cropLeft !== void 0) crop.left = cropLeft;
 		image.crop = crop;
 	}
-	const drawingContent = {
-		type: "drawing",
-		image
-	};
-	if (attrs._docxRawXml) drawingContent.rawXml = attrs._docxRawXml;
 	return {
 		type: "run",
-		content: [drawingContent]
+		content: [attrs._docxRawXmlMode === DRAWING_RAW_XML_MODES.PRESERVE_ONLY ? {
+			type: "drawing",
+			image,
+			rawXml: attrs._docxRawXml ?? panic("Preservation-only ProseMirror image attrs must include raw XML."),
+			rawXmlMode: DRAWING_RAW_XML_MODES.PRESERVE_ONLY
+		} : {
+			type: "drawing",
+			image,
+			...attrs._docxRawXml ? { rawXml: attrs._docxRawXml } : {}
+		}]
 	};
 }
 /**
@@ -1280,6 +1298,8 @@ function createShapeRun(node) {
 		}
 	};
 	if (attrs.shapeId) shape.id = attrs.shapeId;
+	const geometryAdjustments = parseShapeGeometryAdjustments(attrs.geometryAdjustments);
+	if (geometryAdjustments !== void 0) shape.geometryAdjustments = geometryAdjustments;
 	const shapeTransform = parseTransformAttr(attrs.transform);
 	if (shapeTransform) shape.transform = shapeTransform;
 	const wrap = { type: attrs.wrapType || "inline" };

package/dist/prosemirror/conversion/toProseDoc.js

@@ -1,6 +1,7 @@
 import { resolveColorValueToHex } from "../../docx/drawingUtils.js";
 import { createStyleEngine } from "../../style-engine/styleEngine.js";
 import { mergeParagraphFormatting, mergeParagraphTabStops } from "../../utils/paragraphFormattingMerge.js";
+import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
 import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
 import { emuToPixels } from "../../utils/units.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
@@ -13,8 +14,6 @@ import { marksToTextFormatting } from "./fromProseDoc.js";
 import { shadingToRunShadingAttrs } from "./runShadingMark.js";
 import { sdtAttrsFromProperties } from "./sdtAttrs.js";
 //#region src/prosemirror/conversion/toProseDoc.ts
-const TOC_STYLE_ID = /^TOC\d*$/iu;
-const isTocStyleId = (styleId) => styleId !== void 0 && TOC_STYLE_ID.test(styleId);
 /**
 * Build a `nextTextBoxGroupId()` generator salted with a random per-load
 * nonce, so minted text-box anchor ids (`<salt>:<group>:<index>`) are unique
@@ -128,7 +127,7 @@ function convertBlockSdt(blockSdt, convertBlocks) {
 */
 function convertParagraph(paragraph, styleResolver, nextHyperlinkInstanceIndex, activeCommentIds, extraRunFormatting, tableParagraphOverlay, textBoxAnchors) {
 	const attrs = paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOverlay);
-	const isTocParagraph = isTocStyleId(paragraph.formatting?.styleId);
+	const isTocParagraph = attrs._tableOfContentsLevel !== void 0;
 	const inlineNodes = [];
 	let inlineOffset = 0;
 	let bookmarksArr;
@@ -280,10 +279,16 @@ function canCarryTrackedRunMark(node, markType) {
 function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOverlay) {
 	const formatting = paragraph.formatting;
 	const styleId = formatting?.styleId;
+	const styleName = styleId ? styleResolver?.getStyle(styleId)?.name : void 0;
+	const tableOfContentsLevel = tableOfContentsStyleLevel({
+		styleId,
+		...styleName ? { styleName } : {}
+	});
 	const attrs = {};
 	if (paragraph.paraId) attrs.paraId = paragraph.paraId;
 	if (paragraph.textId) attrs.textId = paragraph.textId;
 	if (styleId) attrs.styleId = styleId;
+	if (tableOfContentsLevel !== void 0) attrs._tableOfContentsLevel = tableOfContentsLevel;
 	if (formatting?.numPr) attrs.numPr = formatting.numPr;
 	if (formatting?.numPrFromStyle) attrs.numPrFromStyle = formatting.numPrFromStyle;
 	if (paragraph.listRendering?.numFmt) attrs.listNumFmt = paragraph.listRendering.numFmt;
@@ -350,7 +355,7 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 		set("runInWithNext", formatting?.runInWithNext ?? stylePpr?.runInWithNext);
 		set("outlineLevel", formatting?.outlineLevel ?? stylePpr?.outlineLevel);
 		set("direction", directionFromBidi(formatting?.bidi ?? stylePpr?.bidi));
-		set("defaultTextFormatting", resolveParagraphDefaultTextFormatting(styleId, formatting, styleResolver, { includeParagraphMarkRunProperties: !isTocStyleId(styleId) }));
+		set("defaultTextFormatting", resolveParagraphDefaultTextFormatting(styleId, formatting, styleResolver, { includeParagraphMarkRunProperties: tableOfContentsLevel === void 0 }));
 		if (!formatting?.numPr && stylePpr?.numPr && stylePpr.numPr.numId !== 0) {
 			attrs.numPr = stylePpr.numPr;
 			attrs.numPrFromStyle = stylePpr.numPr;
@@ -1050,7 +1055,11 @@ function convertRunContent(content, marks, formatting, textBoxAnchors) {
 			return [];
 		case "renderedPageBreak": return [schema.node("renderedPageBreak").mark(marks)];
 		case "tab": return [schema.node("tab", content.positional ? { positional: content.positional } : void 0).mark(marks)];
-		case "drawing": return [withHyperlinkBoundaryMarks(convertImage(content.image, content.rawXml), marks)];
+		case "drawing": return [withHyperlinkBoundaryMarks(convertImage({
+			image: content.image,
+			rawXml: content.rawXml,
+			rawXmlMode: content.rawXmlMode
+		}), marks)];
 		case "shape": {
 			const shp = content.shape;
 			if (shp.textBody) {
@@ -1089,7 +1098,7 @@ function withHyperlinkBoundaryMarks(node, marks) {
 	if (!marks.some((mark) => mark.type.name === "hyperlink")) return node;
 	return node.mark(marks);
 }
-function convertImage(image, rawXml) {
+function convertImage({ image, rawXml, rawXmlMode }) {
 	const imageSize = image.size;
 	const widthPx = imageSize?.width ? emuToPixels(imageSize.width) : void 0;
 	const heightPx = imageSize?.height ? emuToPixels(imageSize.height) : void 0;
@@ -1190,6 +1199,7 @@ function convertImage(image, rawXml) {
 		hlinkHref: image.hlinkHref,
 		hlinkRId: image.hlinkRId,
 		_docxRawXml: rawXml,
+		_docxRawXmlMode: rawXmlMode,
 		_docxObjectPreview: rawXml !== void 0 && /<(?:[A-Za-z_][\w.-]*:)?object(?:\s|>)/u.test(rawXml)
 	});
 }
@@ -1347,6 +1357,7 @@ function convertShape(shape) {
 	};
 	return schema.node("shape", {
 		shapeType: shapeAttrs.shapeType ?? "rect",
+		geometryAdjustments: shape.geometryAdjustments === void 0 ? void 0 : JSON.stringify(shape.geometryAdjustments),
 		shapeId: shape.id,
 		width: widthPx,
 		height: heightPx,

package/dist/prosemirror/extensions/core/ParagraphExtension.d.ts

@@ -6,6 +6,8 @@ import { EditorState } from "prosemirror-state";
 type ResolvedStyleAttrs = {
   paragraphFormatting?: document_d_exports.ParagraphFormatting;
   runFormatting?: document_d_exports.TextFormatting;
+  /** Canonical OOXML style name, used when the document-local style id is localized. */
+  styleName?: string;
   /**
    * Numbering definitions from the document package. When the applied style
    * carries a `w:numPr`, these resolve the numbering level into the list

package/dist/prosemirror/extensions/core/ParagraphExtension.js

@@ -1,5 +1,6 @@
 import { paragraphToStyle } from "../../../utils/formatToStyle.js";
 import { collectHeadings } from "../../../utils/headingCollector.js";
+import { tableOfContentsStyleLevel } from "../../../utils/tableOfContentsStyle.js";
 import { expectParagraphAttrs } from "../../attrs/index.js";
 import { autospacingMatchesBase } from "../../autospacingBase.js";
 import { directionIsRtl } from "../../paragraphDirection.js";
@@ -215,6 +216,7 @@ const paragraphNodeSpec = {
 		listAbstractNumId: { default: null },
 		listStartOverride: { default: null },
 		styleId: { default: null },
+		_tableOfContentsLevel: { default: null },
 		borders: { default: null },
 		shading: { default: null },
 		tabs: { default: null },
@@ -248,11 +250,13 @@ const paragraphNodeSpec = {
 			const paraId = element.dataset["paraId"];
 			const alignment = element.dataset["alignment"];
 			const styleId = element.dataset["styleId"];
+			const tableOfContentsLevel = Number(element.dataset["tableOfContentsLevel"]);
 			const sectionBreakType = element.dataset["sectionBreak"];
 			const attrs = {
 				...paraId ? { paraId } : {},
 				...alignment ? { alignment } : {},
 				...styleId ? { styleId } : {},
+				...Number.isSafeInteger(tableOfContentsLevel) && tableOfContentsLevel > 0 ? { _tableOfContentsLevel: tableOfContentsLevel } : {},
 				...sectionBreakType ? { sectionBreakType } : {}
 			};
 			const styleAttrs = extractParagraphAttrsFromStyle(element);
@@ -291,6 +295,7 @@ const paragraphNodeSpec = {
 		if (attrs.paraId) domAttrs["data-para-id"] = attrs.paraId;
 		if (attrs.alignment) domAttrs["data-alignment"] = attrs.alignment;
 		if (attrs.styleId) domAttrs["data-style-id"] = attrs.styleId;
+		if (typeof attrs._tableOfContentsLevel === "number") domAttrs["data-table-of-contents-level"] = String(attrs._tableOfContentsLevel);
 		if (attrs.listMarker) domAttrs["data-list-marker"] = attrs.listMarker;
 		if (directionIsRtl(attrs.direction)) domAttrs["dir"] = "rtl";
 		if (attrs.sectionBreakType) {
@@ -460,10 +465,14 @@ function makeApplyStyle(schema) {
 				seen.add(pos);
 				const newAttrs = {
 					...node.attrs,
-					styleId
+					styleId,
+					_tableOfContentsLevel: tableOfContentsStyleLevel({ styleId }) ?? null
 				};
 				if (resolvedAttrs) {
-					Object.assign(newAttrs, paragraphAttrsFromResolvedStyle(resolvedAttrs));
+					Object.assign(newAttrs, paragraphAttrsFromResolvedStyle(resolvedAttrs, {
+						styleId,
+						...resolvedAttrs.styleName ? { styleName: resolvedAttrs.styleName } : {}
+					}));
 					const listAttrs = listAttrsFromResolvedStyle(resolvedAttrs, resolvedAttrs.numbering);
 					if (listAttrs) Object.assign(newAttrs, listAttrs);
 				}
@@ -534,7 +543,10 @@ const ParagraphExtension = createNodeExtension({
 				hangingIndent: hanging ?? false
 			}),
 			applyStyle: (styleId, resolvedAttrs) => applyStyleFn(styleId, resolvedAttrs),
-			clearStyle: () => setParagraphAttr("styleId", null),
+			clearStyle: () => setParagraphAttrsCmd({
+				styleId: null,
+				_tableOfContentsLevel: null
+			}),
 			insertSectionBreak: (breakType) => setParagraphAttr("sectionBreakType", breakType),
 			removeSectionBreak: () => setParagraphAttr("sectionBreakType", null),
 			generateTOC: () => (state, dispatch) => {

package/dist/prosemirror/extensions/features/BaseKeymapExtension.js

@@ -53,6 +53,7 @@ const clearIndentOnBackspace = (state, dispatch) => {
 const INHERITED_PARA_ATTRS = [
 	"defaultTextFormatting",
 	"styleId",
+	"_tableOfContentsLevel",
 	"lineSpacing",
 	"lineSpacingRule",
 	"snapToGrid",
@@ -77,11 +78,15 @@ function applyNextParagraphStyle(tr, sourcePara, newPara, resolver) {
 	const nextStyleId = resolver.getNextStyleId(sourcePara.attrs["styleId"]);
 	if (!nextStyleId) return false;
 	const resolved = resolver.resolveParagraphStyle(nextStyleId);
+	const styleName = resolver.getStyle(nextStyleId)?.name;
 	const { $from } = tr.selection;
 	tr.setNodeMarkup($from.before(), void 0, {
 		...newPara.attrs,
 		styleId: nextStyleId,
-		...paragraphAttrsFromResolvedStyle(resolved)
+		...paragraphAttrsFromResolvedStyle(resolved, {
+			styleId: nextStyleId,
+			...styleName ? { styleName } : {}
+		})
 	});
 	tr.setStoredMarks(resolved.runFormatting ? textFormattingToMarks(resolved.runFormatting, tr.doc.type.schema) : []);
 	return true;

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

@@ -42,6 +42,7 @@ const ImageExtension = createNodeExtension({
 			hlinkHref: { default: null },
 			hlinkRId: { default: null },
 			_docxRawXml: { default: null },
+			_docxRawXmlMode: { default: null },
 			_docxObjectPreview: { default: null }
 		},
 		parseDOM: [{

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

@@ -1,3 +1,4 @@
+import { document_d_exports } from "../../../types/document.js";
 import { ShapeAttrs as ShapeAttrs$1 } from "../../schema/nodes.js";
 import { NodeExtension } from "../types.js";
 //#region src/prosemirror/extensions/nodes/ShapeExtension.d.ts
@@ -7,6 +8,11 @@ declare function sanitizeTransform(value: string | null | undefined): string | n
 declare function sanitizeSvgId(value: string | null | undefined): string | null;
 declare function sanitizeShapeDimension(value: number | null | undefined, fallback: number): number;
 declare function strokeDashArrayForOutlineStyle(outlineStyle: string | undefined): string | undefined;
+type RightBracePaths = {
+  fill: string;
+  outline: string;
+};
+declare function buildRightBracePaths(w: number, h: number, adjustments: readonly document_d_exports.ShapeGeometryAdjustment[]): RightBracePaths;
 /**
  * Build the `points` string for a polygon-based shape preset.
  *
@@ -26,4 +32,4 @@ type GradientStop = {
 declare function parseGradientStops(raw: string | undefined): GradientStop[];
 declare const ShapeExtension: (options?: Partial<Record<string, unknown>> | undefined) => NodeExtension;
 //#endregion
-export { ShapeAttrs, ShapeExtension, buildShapePolygonPoints, parseGradientStops, sanitizeColor, sanitizeShapeDimension, sanitizeSvgId, sanitizeTransform, strokeDashArrayForOutlineStyle };
+export { ShapeAttrs, ShapeExtension, buildRightBracePaths, buildShapePolygonPoints, parseGradientStops, sanitizeColor, sanitizeShapeDimension, sanitizeSvgId, sanitizeTransform, strokeDashArrayForOutlineStyle };

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

@@ -1,4 +1,5 @@
 import { expectShapeAttrs } from "../../attrs/index.js";
+import { parseShapeGeometryAdjustments } from "../../shapeGeometryAdjustments.js";
 import { createNodeExtension } from "../create.js";
 //#region src/prosemirror/extensions/nodes/ShapeExtension.ts
 /**
@@ -123,6 +124,40 @@ function setNum(el, name, value) {
 function fmt(n) {
 	return Number.isInteger(n) ? String(n) : Number(n.toFixed(3)).toString();
 }
+const RIGHT_BRACE_DEFAULT_THICKNESS = 8333;
+const RIGHT_BRACE_DEFAULT_CUSP = 5e4;
+const GEOMETRY_PERCENT_SCALE = 1e5;
+const geometryAdjustment = (adjustments, name, fallback) => {
+	const authored = adjustments.find((adjustment) => adjustment.name === name);
+	if (!authored) return fallback;
+	const match = /^val\s+(-?\d+)$/u.exec(authored.formula);
+	if (!match) return fallback;
+	return Number(match.at(1));
+};
+function buildRightBracePaths(w, h, adjustments) {
+	const shortSide = Math.min(w, h);
+	const cuspAdjustment = Math.min(GEOMETRY_PERCENT_SCALE, Math.max(0, geometryAdjustment(adjustments, "adj2", RIGHT_BRACE_DEFAULT_CUSP)));
+	const maxThickness = Math.min(cuspAdjustment, GEOMETRY_PERCENT_SCALE - cuspAdjustment) / 2 * h / shortSide;
+	const radius = shortSide * Math.min(maxThickness, Math.max(0, geometryAdjustment(adjustments, "adj1", RIGHT_BRACE_DEFAULT_THICKNESS))) / GEOMETRY_PERCENT_SCALE;
+	const halfWidth = w / 2;
+	const cusp = h * cuspAdjustment / GEOMETRY_PERCENT_SCALE;
+	const upperStemEnd = cusp - radius;
+	const lowerStemStart = cusp + radius;
+	const bottomCurveStart = h - radius;
+	const commands = [
+		"M 0 0",
+		`A ${fmt(halfWidth)} ${fmt(radius)} 0 0 1 ${fmt(halfWidth)} ${fmt(radius)}`,
+		`L ${fmt(halfWidth)} ${fmt(upperStemEnd)}`,
+		`A ${fmt(halfWidth)} ${fmt(radius)} 0 0 0 ${fmt(w)} ${fmt(cusp)}`,
+		`A ${fmt(halfWidth)} ${fmt(radius)} 0 0 0 ${fmt(halfWidth)} ${fmt(lowerStemStart)}`,
+		`L ${fmt(halfWidth)} ${fmt(bottomCurveStart)}`,
+		`A ${fmt(halfWidth)} ${fmt(radius)} 0 0 1 0 ${fmt(h)}`
+	].join(" ");
+	return {
+		fill: `${commands} Z`,
+		outline: commands
+	};
+}
 /**
 * Build the `points` string for a polygon-based shape preset.
 *
@@ -209,7 +244,7 @@ function buildShapePolygonPoints(type, w, h) {
 * displays. The original `<a:prstGeom prst>` value round-trips through the
 * model regardless of what the renderer chooses to draw.
 */
-function createShapeElement(type, w, h) {
+function createShapeElement(type, w, h, adjustments) {
 	switch (type) {
 		case "ellipse":
 		case "oval": {
@@ -238,6 +273,19 @@ function createShapeElement(type, w, h) {
 			setNum(el, "y2", h / 2);
 			return el;
 		}
+		case "rightBrace": {
+			const paths = buildRightBracePaths(w, h, adjustments);
+			const group = document.createElementNS(SVG_NS, "g");
+			const fill = document.createElementNS(SVG_NS, "path");
+			fill.setAttribute("d", paths.fill);
+			fill.setAttribute("stroke", "none");
+			group.append(fill);
+			const outline = document.createElementNS(SVG_NS, "path");
+			outline.setAttribute("d", paths.outline);
+			outline.setAttribute("fill", "none");
+			group.append(outline);
+			return group;
+		}
 		default: {
 			const points = buildShapePolygonPoints(type, w, h);
 			if (points !== null) {
@@ -320,6 +368,7 @@ const ShapeExtension = createNodeExtension({
 		atom: true,
 		attrs: {
 			shapeType: { default: "rect" },
+			geometryAdjustments: { default: null },
 			shapeId: { default: null },
 			width: { default: 100 },
 			height: { default: 80 },
@@ -362,6 +411,7 @@ const ShapeExtension = createNodeExtension({
 				const outlineTailEnd = parseShapeLineEnd(d["outlineTailEnd"]);
 				return {
 					shapeType: d["shapeType"] || "rect",
+					...d["geometryAdjustments"] ? { geometryAdjustments: d["geometryAdjustments"] } : {},
 					...d["shapeId"] ? { shapeId: d["shapeId"] } : {},
 					...d["width"] ? { width: Number(d["width"]) } : {},
 					...d["height"] ? { height: Number(d["height"]) } : {},
@@ -403,6 +453,7 @@ const ShapeExtension = createNodeExtension({
 				class: "docx-shape",
 				"data-shape-type": attrs.shapeType || "rect"
 			};
+			if (attrs.geometryAdjustments) domAttrs["data-geometry-adjustments"] = attrs.geometryAdjustments;
 			if (attrs.shapeId) domAttrs["data-shape-id"] = attrs.shapeId;
 			domAttrs["data-width"] = String(w);
 			domAttrs["data-height"] = String(h);
@@ -489,7 +540,8 @@ const ShapeExtension = createNodeExtension({
 				defs.append(gradient);
 				svg.append(defs);
 			}
-			const shapeEl = createShapeElement(attrs.shapeType || "rect", w, h);
+			const geometryAdjustments = parseShapeGeometryAdjustments(attrs.geometryAdjustments) ?? [];
+			const shapeEl = createShapeElement(attrs.shapeType || "rect", w, h, geometryAdjustments);
 			const strokeDasharray = strokeDashArrayForOutlineStyle(attrs.outlineStyle);
 			if (strokeDasharray) shapeEl.setAttribute("stroke-dasharray", strokeDasharray);
 			svg.append(shapeEl);
@@ -501,4 +553,4 @@ const ShapeExtension = createNodeExtension({
 	}
 });
 //#endregion
-export { ShapeExtension, buildShapePolygonPoints, parseGradientStops, sanitizeColor, sanitizeShapeDimension, sanitizeSvgId, sanitizeTransform, strokeDashArrayForOutlineStyle };
+export { ShapeExtension, buildRightBracePaths, buildShapePolygonPoints, parseGradientStops, sanitizeColor, sanitizeShapeDimension, sanitizeSvgId, sanitizeTransform, strokeDashArrayForOutlineStyle };

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

@@ -102,6 +102,8 @@ type ParagraphAttrs = {
   /** Numbering start override for this numId/level. */
   listStartOverride?: number;
   styleId?: string;
+  /** Imported built-in TOC entry level, resolved from the canonical style name. */
+  _tableOfContentsLevel?: number;
   borders?: {
     top?: document_d_exports.BorderSpec;
     bottom?: document_d_exports.BorderSpec;
@@ -275,6 +277,8 @@ type ImageAttrs = {
   hlinkRId?: string;
   /** Original OOXML for opaque/unsupported DOCX drawings. */
   _docxRawXml?: string;
+  /** Raw XML preserved without an editable image projection. */
+  _docxRawXmlMode?: document_d_exports.DrawingRawXmlMode;
   /** Embedded-object previews use their authored box as the exact line height. */
   _docxObjectPreview?: boolean;
 };
@@ -382,6 +386,8 @@ type BlockSdtAttrs = {
 type ShapeAttrs = {
   /** Shape type preset */
   shapeType?: string;
+  /** Preset geometry adjustments serialized as JSON. */
+  geometryAdjustments?: string;
   /** Unique identifier */
   shapeId?: string;
   /** Width in pixels */

package/dist/prosemirror/shapeGeometryAdjustments.d.ts

@@ -0,0 +1,5 @@
+import { document_d_exports } from "../types/document.js";
+//#region src/prosemirror/shapeGeometryAdjustments.d.ts
+declare const parseShapeGeometryAdjustments: (raw: string | undefined) => document_d_exports.ShapeGeometryAdjustment[] | undefined;
+//#endregion
+export { parseShapeGeometryAdjustments };

package/dist/prosemirror/shapeGeometryAdjustments.js

@@ -0,0 +1,24 @@
+//#region src/prosemirror/shapeGeometryAdjustments.ts
+const MAX_ADJUSTMENT_COUNT = 32;
+const MAX_ADJUSTMENT_NAME_LENGTH = 64;
+const MAX_ADJUSTMENT_FORMULA_LENGTH = 128;
+const parseShapeGeometryAdjustments = (raw) => {
+	if (!raw) return;
+	try {
+		const parsed = JSON.parse(raw);
+		if (!Array.isArray(parsed) || parsed.length > MAX_ADJUSTMENT_COUNT) return;
+		const adjustments = [];
+		for (const item of parsed) {
+			if (typeof item !== "object" || item === null || !("name" in item) || typeof item.name !== "string" || item.name.length === 0 || item.name.length > MAX_ADJUSTMENT_NAME_LENGTH || !("formula" in item) || typeof item.formula !== "string" || item.formula.length === 0 || item.formula.length > MAX_ADJUSTMENT_FORMULA_LENGTH) return;
+			adjustments.push({
+				name: item.name,
+				formula: item.formula
+			});
+		}
+		return adjustments.length === 0 ? void 0 : adjustments;
+	} catch {
+		return;
+	}
+};
+//#endregion
+export { parseShapeGeometryAdjustments };

package/dist/prosemirror/styles/resolvedStyleAttrs.d.ts

@@ -1,13 +1,17 @@
 import { NumberingMap } from "../../docx/numberingParser.js";
 import { ResolvedParagraphStyle } from "./styleResolver.js";
 //#region src/prosemirror/styles/resolvedStyleAttrs.d.ts
+type ResolvedStyleIdentity = {
+  styleId: string;
+  styleName?: string;
+};
 /**
  * The paragraph attrs a style definition controls. Applying a style resets
  * every one of these to the style's value (or `null` to clear), so a prior
  * style's properties (e.g. a heading's spacing) never leak through. Returns
  * a partial attrs object to merge over the paragraph's existing attrs.
  */
-declare function paragraphAttrsFromResolvedStyle(resolved: ResolvedParagraphStyle): Record<string, unknown>;
+declare function paragraphAttrsFromResolvedStyle(resolved: ResolvedParagraphStyle, identity: ResolvedStyleIdentity): Record<string, unknown>;
 /**
  * The list attrs a style's `w:pPr/w:numPr` controls (numbering reference plus
  * the baked marker-rendering attrs that `toProseDoc` normally derives from

package/dist/prosemirror/styles/resolvedStyleAttrs.js

@@ -1,4 +1,5 @@
 import { computeListRendering } from "../../docx/numberingParser.js";
+import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
 //#region src/prosemirror/styles/resolvedStyleAttrs.ts
 /**
@@ -17,7 +18,7 @@ import { setAutospacingBaseValue } from "../autospacingBase.js";
 * style's properties (e.g. a heading's spacing) never leak through. Returns
 * a partial attrs object to merge over the paragraph's existing attrs.
 */
-function paragraphAttrsFromResolvedStyle(resolved) {
+function paragraphAttrsFromResolvedStyle(resolved, identity) {
 	const ppr = resolved.paragraphFormatting;
 	const runFormatting = resolved.runFormatting;
 	const hasRunFormatting = !!runFormatting && Object.keys(runFormatting).length > 0;
@@ -40,7 +41,8 @@ function paragraphAttrsFromResolvedStyle(resolved) {
 		outlineLevel: ppr?.outlineLevel ?? null,
 		borders: ppr?.borders ?? null,
 		defaultTextFormatting: hasRunFormatting ? runFormatting : null,
-		_autospacingBase: autospacingBaseFromResolvedParagraphFormatting(ppr)
+		_autospacingBase: autospacingBaseFromResolvedParagraphFormatting(ppr),
+		_tableOfContentsLevel: tableOfContentsStyleLevel(identity) ?? null
 	};
 }
 function autospacingBaseFromResolvedParagraphFormatting(ppr) {

package/dist/types/content.d.ts

@@ -1,2 +1,2 @@
-import { BlockContent, BlockSdt, BookmarkEnd, BookmarkStart, BreakContent, Column, Comment, CommentRangeEnd, CommentRangeStart, CommentReference, ComplexField, Deletion, DocumentBody, DrawingContent, Endnote, EndnotePosition, EndnoteProperties, Field, FieldCharContent, FieldType, FooterReference, Footnote, FootnotePosition, FootnoteProperties, HeaderFooter, HeaderFooterType, HeaderReference, Hyperlink, Image, ImageCrop, ImagePadding, ImagePosition, ImageSize, ImageTransform, ImageWrap, InlineSdt, Insertion, InstrTextContent, LineNumberRestart, MathEquation, MoveFrom, MoveFromRangeEnd, MoveFromRangeStart, MoveTo, MoveToRangeEnd, MoveToRangeStart, NoBreakHyphenContent, NoteNumberRestart, NoteReferenceContent, PageOrientation, Paragraph, ParagraphContent, ParagraphPropertyChange, PositionalTab, PropertyChangeInfo, Run, RunContent, RunPropertyChange, SdtProperties, SdtType, Section, SectionProperties, SectionStart, Shape, ShapeContent, ShapeFill, ShapeOutline, ShapeTextBody, ShapeType, SimpleField, SoftHyphenContent, SymbolContent, TabContent, Table, TableCell, TableCellPropertyChange, TableRow, TableRowPropertyChange, TableStructuralChangeInfo, TextBox, TextContent, TrackedChangeInfo, TrackedRunChange, VerticalAlign } from "@stll/docx-core/model";
-export type { BlockContent, BlockSdt, BookmarkEnd, BookmarkStart, BreakContent, Column, Comment, CommentRangeEnd, CommentRangeStart, CommentReference, ComplexField, Deletion, DocumentBody, DrawingContent, Endnote, EndnotePosition, EndnoteProperties, Field, FieldCharContent, FieldType, FooterReference, Footnote, FootnotePosition, FootnoteProperties, HeaderFooter, HeaderFooterType, HeaderReference, Hyperlink, Image, ImageCrop, ImagePadding, ImagePosition, ImageSize, ImageTransform, ImageWrap, InlineSdt, Insertion, InstrTextContent, LineNumberRestart, MathEquation, MoveFrom, MoveFromRangeEnd, MoveFromRangeStart, MoveTo, MoveToRangeEnd, MoveToRangeStart, NoBreakHyphenContent, NoteNumberRestart, NoteReferenceContent, PageOrientation, Paragraph, ParagraphContent, ParagraphPropertyChange, PositionalTab, PropertyChangeInfo, Run, RunContent, RunPropertyChange, SdtProperties, SdtType, Section, SectionProperties, SectionStart, Shape, ShapeContent, ShapeFill, ShapeOutline, ShapeTextBody, ShapeType, SimpleField, SoftHyphenContent, SymbolContent, TabContent, Table, TableCell, TableCellPropertyChange, TableRow, TableRowPropertyChange, TableStructuralChangeInfo, TextBox, TextContent, TrackedChangeInfo, TrackedRunChange, VerticalAlign };
+import { BlockContent, BlockSdt, BookmarkEnd, BookmarkStart, BreakContent, Column, Comment, CommentRangeEnd, CommentRangeStart, CommentReference, ComplexField, Deletion, DocumentBody, DrawingContent, DrawingRawXmlMode, Endnote, EndnotePosition, EndnoteProperties, Field, FieldCharContent, FieldType, FooterReference, Footnote, FootnotePosition, FootnoteProperties, HeaderFooter, HeaderFooterType, HeaderReference, Hyperlink, Image, ImageCrop, ImagePadding, ImagePosition, ImageSize, ImageTransform, ImageWrap, InlineSdt, Insertion, InstrTextContent, LineNumberRestart, MathEquation, MoveFrom, MoveFromRangeEnd, MoveFromRangeStart, MoveTo, MoveToRangeEnd, MoveToRangeStart, NoBreakHyphenContent, NoteNumberRestart, NoteReferenceContent, PageOrientation, Paragraph, ParagraphContent, ParagraphPropertyChange, PositionalTab, PropertyChangeInfo, Run, RunContent, RunPropertyChange, SdtProperties, SdtType, Section, SectionProperties, SectionStart, Shape, ShapeContent, ShapeFill, ShapeGeometryAdjustment, ShapeOutline, ShapeTextBody, ShapeType, SimpleField, SoftHyphenContent, SymbolContent, TabContent, Table, TableCell, TableCellPropertyChange, TableRow, TableRowPropertyChange, TableStructuralChangeInfo, TextBox, TextContent, TrackedChangeInfo, TrackedRunChange, VerticalAlign } from "@stll/docx-core/model";
+export type { BlockContent, BlockSdt, BookmarkEnd, BookmarkStart, BreakContent, Column, Comment, CommentRangeEnd, CommentRangeStart, CommentReference, ComplexField, Deletion, DocumentBody, DrawingContent, DrawingRawXmlMode, Endnote, EndnotePosition, EndnoteProperties, Field, FieldCharContent, FieldType, FooterReference, Footnote, FootnotePosition, FootnoteProperties, HeaderFooter, HeaderFooterType, HeaderReference, Hyperlink, Image, ImageCrop, ImagePadding, ImagePosition, ImageSize, ImageTransform, ImageWrap, InlineSdt, Insertion, InstrTextContent, LineNumberRestart, MathEquation, MoveFrom, MoveFromRangeEnd, MoveFromRangeStart, MoveTo, MoveToRangeEnd, MoveToRangeStart, NoBreakHyphenContent, NoteNumberRestart, NoteReferenceContent, PageOrientation, Paragraph, ParagraphContent, ParagraphPropertyChange, PositionalTab, PropertyChangeInfo, Run, RunContent, RunPropertyChange, SdtProperties, SdtType, Section, SectionProperties, SectionStart, Shape, ShapeContent, ShapeFill, ShapeGeometryAdjustment, ShapeOutline, ShapeTextBody, ShapeType, SimpleField, SoftHyphenContent, SymbolContent, TabContent, Table, TableCell, TableCellPropertyChange, TableRow, TableRowPropertyChange, TableStructuralChangeInfo, TextBox, TextContent, TrackedChangeInfo, TrackedRunChange, VerticalAlign };

package/dist/types/index.d.ts

@@ -16,6 +16,7 @@ type DocumentBody = document_d_exports.DocumentBody;
 type DocxConformanceClass = document_d_exports.DocxConformanceClass;
 type DocxPackage = document_d_exports.DocxPackage;
 type DrawingContent = document_d_exports.DrawingContent;
+type DrawingRawXmlMode = document_d_exports.DrawingRawXmlMode;
 type EmphasisMark = document_d_exports.EmphasisMark;
 type Endnote = document_d_exports.Endnote;
 type EndnotePosition = document_d_exports.EndnotePosition;
@@ -72,6 +73,7 @@ type ShadingProperties = document_d_exports.ShadingProperties;
 type Shape = document_d_exports.Shape;
 type ShapeContent = document_d_exports.ShapeContent;
 type ShapeFill = document_d_exports.ShapeFill;
+type ShapeGeometryAdjustment = document_d_exports.ShapeGeometryAdjustment;
 type ShapeOutline = document_d_exports.ShapeOutline;
 type ShapeTextBody = document_d_exports.ShapeTextBody;
 type ShapeType = document_d_exports.ShapeType;
@@ -106,4 +108,4 @@ type ThemeFont = document_d_exports.ThemeFont;
 type ThemeFontScheme = document_d_exports.ThemeFontScheme;
 type UnderlineStyle = document_d_exports.UnderlineStyle;
 type VerticalAlign = document_d_exports.VerticalAlign;
-export type { AbstractNumbering, BlockContent, BookmarkEnd, BookmarkStart, BorderSpec, BreakContent, CellMargins, ColorValue, Column, ComplexField, ConditionalFormatStyle, DocDefaults, Document, DocumentBody, DocxConformanceClass, DocxPackage, DrawingContent, EmphasisMark, Endnote, EndnotePosition, EndnoteProperties, Field, FieldCharContent, FieldType, FloatingTableProperties, FontInfo, FontTable, FooterReference, Footnote, FootnotePosition, FootnoteProperties, HeaderFooter, HeaderFooterType, HeaderReference, Hyperlink, Image, ImageCrop, ImagePadding, ImagePosition, ImageSize, ImageTransform, ImageWrap, InstrTextContent, LevelSuffix, LineNumberRestart, LineSpacingRule, ListLevel, ListRendering, MediaFile, NoBreakHyphenContent, NoteNumberRestart, NoteReferenceContent, NumberFormat, NumberingDefinitions, NumberingInstance, PageOrientation, Paragraph, ParagraphAlignment, ParagraphContent, ParagraphFormatting, PositionalTab, Relationship, RelationshipMap, RelationshipType, Run, RunContent, Section, SectionProperties, SectionStart, ShadingProperties, Shape, ShapeContent, ShapeFill, ShapeOutline, ShapeTextBody, ShapeType, SimpleField, SoftHyphenContent, Style, StyleDefinitions, StyleType, SymbolContent, TabContent, TabLeader, TabStop, TabStopAlignment, Table, TableBorders, TableCell, TableCellFormatting, TableFormatting, TableLook, TableMeasurement, TableRow, TableRowFormatting, TableWidthType, TextBox, TextContent, TextEffect, TextFormatting, Theme, ThemeColorScheme, ThemeColorSlot, ThemeFont, ThemeFontScheme, UnderlineStyle, VerticalAlign };
+export type { AbstractNumbering, BlockContent, BookmarkEnd, BookmarkStart, BorderSpec, BreakContent, CellMargins, ColorValue, Column, ComplexField, ConditionalFormatStyle, DocDefaults, Document, DocumentBody, DocxConformanceClass, DocxPackage, DrawingContent, DrawingRawXmlMode, EmphasisMark, Endnote, EndnotePosition, EndnoteProperties, Field, FieldCharContent, FieldType, FloatingTableProperties, FontInfo, FontTable, FooterReference, Footnote, FootnotePosition, FootnoteProperties, HeaderFooter, HeaderFooterType, HeaderReference, Hyperlink, Image, ImageCrop, ImagePadding, ImagePosition, ImageSize, ImageTransform, ImageWrap, InstrTextContent, LevelSuffix, LineNumberRestart, LineSpacingRule, ListLevel, ListRendering, MediaFile, NoBreakHyphenContent, NoteNumberRestart, NoteReferenceContent, NumberFormat, NumberingDefinitions, NumberingInstance, PageOrientation, Paragraph, ParagraphAlignment, ParagraphContent, ParagraphFormatting, PositionalTab, Relationship, RelationshipMap, RelationshipType, Run, RunContent, Section, SectionProperties, SectionStart, ShadingProperties, Shape, ShapeContent, ShapeFill, ShapeGeometryAdjustment, ShapeOutline, ShapeTextBody, ShapeType, SimpleField, SoftHyphenContent, Style, StyleDefinitions, StyleType, SymbolContent, TabContent, TabLeader, TabStop, TabStopAlignment, Table, TableBorders, TableCell, TableCellFormatting, TableFormatting, TableLook, TableMeasurement, TableRow, TableRowFormatting, TableWidthType, TextBox, TextContent, TextEffect, TextFormatting, Theme, ThemeColorScheme, ThemeColorSlot, ThemeFont, ThemeFontScheme, UnderlineStyle, VerticalAlign };

package/dist/utils/tableOfContentsStyle.d.ts

@@ -0,0 +1,9 @@
+//#region src/utils/tableOfContentsStyle.d.ts
+type TableOfContentsStyleIdentity = {
+  styleId: string | undefined;
+  styleName?: string;
+};
+/** Resolve a built-in TOC entry style without relying on its localized style id. */
+declare const tableOfContentsStyleLevel: ({ styleId, styleName }: TableOfContentsStyleIdentity) => number | undefined;
+//#endregion
+export { tableOfContentsStyleLevel };

package/dist/utils/tableOfContentsStyle.js

@@ -0,0 +1,14 @@
+//#region src/utils/tableOfContentsStyle.ts
+const TABLE_OF_CONTENTS_STYLE_ID = /^TOC(?<level>\d*)$/iu;
+const TABLE_OF_CONTENTS_STYLE_NAME = /^toc\s+(?<level>\d+)$/iu;
+const parsedLevel = (match) => {
+	if (!match) return;
+	const rawLevel = match.groups?.["level"];
+	if (rawLevel === "") return 1;
+	const level = Number(rawLevel);
+	return Number.isSafeInteger(level) && level > 0 ? level : void 0;
+};
+/** Resolve a built-in TOC entry style without relying on its localized style id. */
+const tableOfContentsStyleLevel = ({ styleId, styleName }) => parsedLevel(TABLE_OF_CONTENTS_STYLE_ID.exec(styleId ?? "")) ?? parsedLevel(TABLE_OF_CONTENTS_STYLE_NAME.exec(styleName ?? ""));
+//#endregion
+export { tableOfContentsStyleLevel };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.25.3",
+  "version": "0.25.5",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",
@@ -113,7 +113,7 @@
     "perf": "bun scripts/profile-editor.ts"
   },
   "dependencies": {
-    "@stll/docx-core": "^0.17.0",
+    "@stll/docx-core": "^0.17.1",
     "@stll/docx-utils": "^0.1.0",
     "@stll/template-conditions": "^0.1.0",
     "better-result": "3.0.1",