@stll/folio-core 0.52.0 → 0.53.0

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

@@ -192,13 +192,22 @@ function toFlowBlocks(doc, options = {}) {
 				trailingPageBreakSectionPositions.add(childStart);
 				consumedPageBreakPositions.add(childStart + child.nodeSize);
 			}
-			if (child.type.name === "blockSdt") collectTrailingPageBreakSections(child, childStart + 1);
+			if (child.type.name === "blockSdt" || child.type.name === "blockCustomXml") collectTrailingPageBreakSections(child, childStart + 1);
 			childStart += child.nodeSize;
 		}
 	};
 	collectTrailingPageBreakSections(doc, offset);
 	const visit = (node, pos) => {
 		switch (node.type.name) {
+			case "blockCustomXml": {
+				let childOffset = pos + 1;
+				for (let i = 0; i < node.childCount; i += 1) {
+					const child = node.child(i);
+					visit(child, childOffset);
+					childOffset += child.nodeSize;
+				}
+				return;
+			}
 			case "blockSdt": {
 				const attrs = expectBlockSdtAttrs(node);
 				sdtSeq += 1;

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

@@ -32,6 +32,13 @@ type LayoutInstrumentation = {
   onLayoutStart?: (event: {
     reason: LayoutRunReason;
   }) => void;
+  /**
+   * A review view (the editor's `DisplayMode`) laid out part of the story as
+   * authored: a revision there has no resolution.
+   */
+  onMarkupViewIncomplete?: (event: {
+    view: string;
+  }) => void;
   onLayoutPhase?: (event: {
     durationMs: number;
     phase: LayoutPhase;
@@ -55,6 +62,7 @@ declare function recordMeasureBlockError(blockIndex: number, block: FlowBlock, e
 declare function recordLayoutComplete(reason?: LayoutRunReason): void;
 declare function recordLayoutStart(reason: LayoutRunReason): void;
 declare function recordLayoutError(reason: LayoutRunReason, error: unknown): void;
+declare function recordMarkupViewIncomplete(view: string): void;
 /** A dictionary failed to load; layout continues without hyphenating that language. */
 declare function recordHyphenationDictionaryError(dictionary: string, error: Error): void;
 declare function recordLayoutPhase(reason: LayoutRunReason, phase: LayoutPhase, durationMs: number): void;
@@ -62,4 +70,4 @@ declare function recordHiddenEditorStateCreate(reason: HiddenEditorStateReason):
 declare function recordHiddenEditorPhase(reason: HiddenEditorStateReason, phase: HiddenEditorPhase, durationMs: number): void;
 declare function recordDocumentLoadPhase(phase: DocumentLoadPhase, durationMs: number): void;
 //#endregion
-export { DocumentLoadPhase, HiddenEditorPhase, HiddenEditorStateReason, LayoutInstrumentation, LayoutPhase, LayoutRunReason, recordDocumentLoadPhase, recordHiddenEditorPhase, recordHiddenEditorStateCreate, recordHyphenationDictionaryError, recordLayoutComplete, recordLayoutError, recordLayoutPhase, recordLayoutStart, recordMeasureBlock, recordMeasureBlockError };
+export { DocumentLoadPhase, HiddenEditorPhase, HiddenEditorStateReason, LayoutInstrumentation, LayoutPhase, LayoutRunReason, recordDocumentLoadPhase, recordHiddenEditorPhase, recordHiddenEditorStateCreate, recordHyphenationDictionaryError, recordLayoutComplete, recordLayoutError, recordLayoutPhase, recordLayoutStart, recordMarkupViewIncomplete, recordMeasureBlock, recordMeasureBlockError };

package/dist/layout-engine/layoutInstrumentation.js

@@ -25,6 +25,9 @@ function recordLayoutError(reason, error) {
 		reason
 	});
 }
+function recordMarkupViewIncomplete(view) {
+	globalThis.__folioLayoutInstrumentation?.onMarkupViewIncomplete?.({ view });
+}
 /** A dictionary failed to load; layout continues without hyphenating that language. */
 function recordHyphenationDictionaryError(dictionary, error) {
 	globalThis.__folioLayoutInstrumentation?.onHyphenationDictionaryError?.({
@@ -56,4 +59,4 @@ function recordDocumentLoadPhase(phase, durationMs) {
 	});
 }
 //#endregion
-export { recordDocumentLoadPhase, recordHiddenEditorPhase, recordHiddenEditorStateCreate, recordHyphenationDictionaryError, recordLayoutComplete, recordLayoutError, recordLayoutPhase, recordLayoutStart, recordMeasureBlock, recordMeasureBlockError };
+export { recordDocumentLoadPhase, recordHiddenEditorPhase, recordHiddenEditorStateCreate, recordHyphenationDictionaryError, recordLayoutComplete, recordLayoutError, recordLayoutPhase, recordLayoutStart, recordMarkupViewIncomplete, recordMeasureBlock, recordMeasureBlockError };

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

@@ -83,9 +83,26 @@ declare function getParagraphCacheSize(): number;
  * Call when fonts change, page width changes, or for testing
  */
 declare function clearAllCaches(): void;
+/**
+ * Bind the caches to the font set the next measurements are taken in. When a
+ * face has loaded (or been added or removed) since the cached entries were
+ * measured, they are dropped: a width measured in a fallback cannot be served
+ * once the face it stood in for is available. Entries measured before the
+ * caches were first bound are dropped too: nothing records their font set.
+ * Returns whether it cleared.
+ */
+declare function syncMeasureCachesToFontSet(fontSet: string): boolean;
+/**
+ * Rename the font set the cached entries were measured in, without dropping
+ * them: for a layout run that has just measured, whose signature now also
+ * names the families it measured first. Only valid within the run that bound
+ * the caches with {@link syncMeasureCachesToFontSet}, since no face can load
+ * during a synchronous run.
+ */
+declare function labelMeasureCachesFontSet(fontSet: string): void;
 /**
  * Get total size of all caches
  */
 declare function getTotalCacheSize(): number;
 //#endregion
-export { clearAllCaches, clearFontMetricsCache, clearParagraphMeasureCache, clearTextWidthCache, getCachedFontMetrics, getCachedParagraphMeasure, getCachedTextWidth, getFontCacheSize, getParagraphCacheSize, getTextCacheSize, getTextWidthCacheGeneration, getTotalCacheSize, hashParagraphBlock, setCachedFontMetrics, setCachedParagraphMeasure, setCachedTextWidth, setFontCacheSize, setParagraphCacheSize, setTextCacheSize };
+export { clearAllCaches, clearFontMetricsCache, clearParagraphMeasureCache, clearTextWidthCache, getCachedFontMetrics, getCachedParagraphMeasure, getCachedTextWidth, getFontCacheSize, getParagraphCacheSize, getTextCacheSize, getTextWidthCacheGeneration, getTotalCacheSize, hashParagraphBlock, labelMeasureCachesFontSet, setCachedFontMetrics, setCachedParagraphMeasure, setCachedTextWidth, setFontCacheSize, setParagraphCacheSize, setTextCacheSize, syncMeasureCachesToFontSet };

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

@@ -259,6 +259,11 @@ function getParagraphCacheSize() {
 	return paragraphMeasureCache.size;
 }
 /**
+* The font set (a `readFontSetSignature` value) every cached measurement was
+* taken in; `null` once the caches are cleared and before anything measures.
+*/
+let cachedFontSet = null;
+/**
 * Clear all measurement caches
 * Call when fonts change, page width changes, or for testing
 */
@@ -267,6 +272,31 @@ function clearAllCaches() {
 	clearFontMetricsCache();
 	clearParagraphMeasureCache();
 	clearFontResolvedCache();
+	cachedFontSet = null;
+}
+/**
+* Bind the caches to the font set the next measurements are taken in. When a
+* face has loaded (or been added or removed) since the cached entries were
+* measured, they are dropped: a width measured in a fallback cannot be served
+* once the face it stood in for is available. Entries measured before the
+* caches were first bound are dropped too: nothing records their font set.
+* Returns whether it cleared.
+*/
+function syncMeasureCachesToFontSet(fontSet) {
+	if (cachedFontSet === fontSet) return false;
+	clearAllCaches();
+	cachedFontSet = fontSet;
+	return true;
+}
+/**
+* Rename the font set the cached entries were measured in, without dropping
+* them: for a layout run that has just measured, whose signature now also
+* names the families it measured first. Only valid within the run that bound
+* the caches with {@link syncMeasureCachesToFontSet}, since no face can load
+* during a synchronous run.
+*/
+function labelMeasureCachesFontSet(fontSet) {
+	cachedFontSet = fontSet;
 }
 /**
 * Get total size of all caches
@@ -275,4 +305,4 @@ function getTotalCacheSize() {
 	return getTextCacheSize() + getFontCacheSize() + getParagraphCacheSize();
 }
 //#endregion
-export { clearAllCaches, clearFontMetricsCache, clearParagraphMeasureCache, clearTextWidthCache, getCachedFontMetrics, getCachedParagraphMeasure, getCachedTextWidth, getFontCacheSize, getParagraphCacheSize, getTextCacheSize, getTextWidthCacheGeneration, getTotalCacheSize, hashParagraphBlock, setCachedFontMetrics, setCachedParagraphMeasure, setCachedTextWidth, setFontCacheSize, setParagraphCacheSize, setTextCacheSize };
+export { clearAllCaches, clearFontMetricsCache, clearParagraphMeasureCache, clearTextWidthCache, getCachedFontMetrics, getCachedParagraphMeasure, getCachedTextWidth, getFontCacheSize, getParagraphCacheSize, getTextCacheSize, getTextWidthCacheGeneration, getTotalCacheSize, hashParagraphBlock, labelMeasureCachesFontSet, setCachedFontMetrics, setCachedParagraphMeasure, setCachedTextWidth, setFontCacheSize, setParagraphCacheSize, setTextCacheSize, syncMeasureCachesToFontSet };

package/dist/layout-engine/measure/font-metrics.worker.js

@@ -1,4 +1,4 @@
-import { WORKER_FONT_FINGERPRINT_TEXT, countCodePoints } from "./measureWorkerProtocol.js";
+import { countCodePoints } from "./measureWorkerProtocol.js";
 import { TaggedError } from "better-result";
 //#region src/layout-engine/measure/font-metrics.worker.ts
 /**
@@ -36,16 +36,12 @@ function getCtx() {
 	ctx = next;
 	return ctx;
 }
-function isFontFingerprintMatch(context, expectedWidth) {
-	const actualWidth = context.measureText(WORKER_FONT_FINGERPRINT_TEXT).width;
-	const tolerance = Math.max(FONT_FINGERPRINT_EPSILON, expectedWidth * 1e-4);
-	return Math.abs(actualWidth - expectedWidth) <= tolerance;
-}
 function measureEntry(entry) {
 	const context = getCtx();
 	context.font = entry.font;
 	context.fontKerning = entry.fontKerning;
-	if (!isFontFingerprintMatch(context, entry.fontFingerprintWidth)) return null;
+	const actualFingerprintWidth = context.measureText(entry.fontFingerprintText).width;
+	if (Math.abs(actualFingerprintWidth - entry.fontFingerprintWidth) > FONT_FINGERPRINT_EPSILON) return null;
 	let width = context.measureText(entry.text).width;
 	const codePoints = countCodePoints(entry.text);
 	if (entry.letterSpacing !== 0 && codePoints > 1) width += entry.letterSpacing * (codePoints - 1);

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

@@ -1,11 +1,11 @@
 import { getHorizontalScaleFactor } from "../../utils/horizontalScale.js";
 import { SCRIPT_CLASS, hasComplexScript, hasEastAsiaSlotText, scriptClassOf, segmentByScript } from "../../utils/scriptSegments.js";
-import { getCachedFontMetrics, getCachedTextWidth, getTextWidthCacheGeneration, setCachedFontMetrics, setCachedTextWidth } from "./cache.js";
+import { getCachedFontMetrics, getCachedTextWidth, setCachedFontMetrics, setCachedTextWidth } from "./cache.js";
 import { applyComplexScriptFormatting, hasComplexScriptFormatting } from "./complexScriptFormatting.js";
 import { buildFontString, getResolvedData, ptToPx } from "./measureHelpers.js";
 import { setMeasureProvider } from "./measureProvider.js";
 import { canPrefetchMeasurement, prefetchMeasurement } from "./measureWorker.js";
-import { WORKER_FONT_FINGERPRINT_TEXT, countCodePoints } from "./measureWorkerProtocol.js";
+import { countCodePoints } from "./measureWorkerProtocol.js";
 import { SMALL_CAPS_SCALE, smallCapsMask, smallCapsSegments } from "./smallCapsCasing.js";
 import { getFontKerningMode } from "./textMeasurementPolicy.js";
 import { panic } from "better-result";
@@ -31,7 +31,6 @@ const DEFAULT_LINE_HEIGHT_MULTIPLIER = 1;
 const DEFAULT_ASCENT_RATIO = .8;
 const DEFAULT_DESCENT_RATIO = .2;
 let canvasContext = null;
-const workerFontFingerprintCache = /* @__PURE__ */ new Map();
 /**
 * Get or create a canvas 2D context for text measurement
 */
@@ -50,19 +49,6 @@ function getCanvasContext() {
 function resetCanvasContext() {
 	canvasContext = null;
 }
-function getWorkerFontFingerprintWidth(ctx, font, fontCacheKey, fontKerning) {
-	const generation = getTextWidthCacheGeneration();
-	const cached = workerFontFingerprintCache.get(fontCacheKey);
-	if (cached?.generation === generation) return cached.width;
-	ctx.font = font;
-	ctx.fontKerning = fontKerning;
-	const width = ctx.measureText(WORKER_FONT_FINGERPRINT_TEXT).width;
-	workerFontFingerprintCache.set(fontCacheKey, {
-		generation,
-		width
-	});
-	return width;
-}
 /**
 * Get typography metrics for a given font size and family
 *
@@ -149,7 +135,8 @@ function canvasMeasureTextWidth(text, sourceStyle) {
 	if (cached !== void 0) return cached;
 	ctx.font = font;
 	ctx.fontKerning = fontKerning;
-	let width = ctx.measureText(measuredText).width;
+	const metrics = ctx.measureText(measuredText);
+	let width = metrics.width;
 	if (letterSpacing) {
 		const codePoints = countCodePoints(measuredText);
 		if (codePoints > 1) width += letterSpacing * (codePoints - 1);
@@ -157,17 +144,18 @@ function canvasMeasureTextWidth(text, sourceStyle) {
 	const scaledWidth = width * horizontalScale;
 	setCachedTextWidth(measuredText, fontCacheKey, letterSpacing, scaledWidth);
 	if (!canPrefetchMeasurement()) return scaledWidth;
-	const fontFingerprintWidth = getWorkerFontFingerprintWidth(ctx, font, fontCacheKey, fontKerning);
+	const fontFingerprintText = measuredText;
+	const fontFingerprintWidth = metrics.width;
 	prefetchMeasurement({
 		text: measuredText,
 		font,
 		letterSpacing,
 		horizontalScale,
 		fontCacheKey,
+		fontFingerprintText,
 		fontFingerprintWidth,
 		fontKerning
 	});
-	prefetchBinarySearchProbes(measuredText, font, fontCacheKey, fontFingerprintWidth, letterSpacing, horizontalScale, fontKerning);
 	return scaledWidth;
 }
 /**
@@ -262,34 +250,6 @@ function measureSmallCapsWidth(measuredText, style) {
 	return width * horizontalScale;
 }
 /**
-* Speculatively enqueue the slice lengths that a subsequent
-* `findMaxFittingLength` binary search is likely to probe. We pick the
-* geometric series (full, half, quarter, eighth) which covers the
-* majority of probe points the binary search uses, without flooding
-* the worker for runs that will never trigger a line break.
-*
-* The worker is racing the main thread here: if the main thread asks
-* for slice(0, n/2) before the worker has answered, the cache miss
-* pays the main-thread cost as usual. When the worker wins, that probe
-* lands on a hit.
-*/
-function prefetchBinarySearchProbes(text, font, fontCacheKey, fontFingerprintWidth, letterSpacing, horizontalScale, fontKerning) {
-	if (text.length < 4) return;
-	for (let denom = 2; denom <= 8; denom *= 2) {
-		const len = Math.floor(text.length / denom);
-		if (len < 2) break;
-		prefetchMeasurement({
-			text: text.slice(0, len),
-			font,
-			letterSpacing,
-			horizontalScale,
-			fontCacheKey,
-			fontFingerprintWidth,
-			fontKerning
-		});
-	}
-}
-/**
 * Measure text and return full metrics
 */
 function canvasMeasureText(text, style) {

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

@@ -34,6 +34,11 @@ type ResolvedFontCache = {
  * Get the resolved font data for a font family, with caching.
  */
 declare function getResolvedData(fontFamily: string, alternateFontFamily?: string): ResolvedFontCache;
+/**
+ * Whether a face of `family` (a `FontFace.family`, possibly quoted) can change
+ * a width this page has measured.
+ */
+declare function isLayoutFontFamily(family: string): boolean;
 /**
  * Clear the resolved-font-family cache. `resolveFontFamily`'s output for a
  * given key can change even when the raw font names don't — e.g. when the
@@ -100,4 +105,4 @@ declare function halfPtToPx(halfPt: number): number;
  */
 declare function pxToHalfPt(px: number): number;
 //#endregion
-export { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, buildFontString, buildRunFontStyle, clearFontResolvedCache, docxScriptFontSize, findCharacterAtX, getResolvedData, getXForCharacter, halfPtToPx, ptToPx, pxToHalfPt, pxToPt, pxToTwips, twipsToPx };
+export { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, buildFontString, buildRunFontStyle, clearFontResolvedCache, docxScriptFontSize, findCharacterAtX, getResolvedData, getXForCharacter, halfPtToPx, isLayoutFontFamily, ptToPx, pxToHalfPt, pxToPt, pxToTwips, twipsToPx };

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

@@ -1,4 +1,4 @@
-import { resolveFontFamily } from "../../utils/fontResolver.js";
+import { parseFontFamilyList, resolveFontFamily } from "../../utils/fontResolver.js";
 import "../../utils/fontWeights.js";
 import { normalizeHorizontalScalePercent } from "../../utils/horizontalScale.js";
 import { eastAsiaHintApplies } from "../../utils/scriptSegments.js";
@@ -93,10 +93,30 @@ function getResolvedData(fontFamily, alternateFontFamily) {
 			singleLineRatio: resolved.singleLineRatio
 		};
 		fontResolvedCache.set(cacheKey, cached);
+		for (const family of parseFontFamilyList(resolved.cssFallback)) layoutFontFamilies.add(normalizeFontFamilyName(family));
 	}
 	return cached;
 }
 /**
+* Every family a measured font stack has named on this page, normalized.
+*
+* Recorded where measurement resolves its stacks, so it is exactly the set of
+* families whose faces can change a measured width: a face of any other family
+* loading (the host's UI font, say) cannot. Never cleared, because a family
+* stays relevant for as long as a cached or committed measurement may hold it,
+* and the set is bounded by the families the page's documents name.
+*/
+const layoutFontFamilies = /* @__PURE__ */ new Set();
+/** CSS family names match ASCII case-insensitively, quotes aside. */
+const normalizeFontFamilyName = (family) => family.trim().replace(/^(["'])(.*)\1$/u, "$2").toLowerCase();
+/**
+* Whether a face of `family` (a `FontFace.family`, possibly quoted) can change
+* a width this page has measured.
+*/
+function isLayoutFontFamily(family) {
+	return layoutFontFamilies.has(normalizeFontFamilyName(family));
+}
+/**
 * Get the CSS fallback string for a font family, with caching.
 */
 function getResolvedFallback(fontFamily, alternateFontFamily) {
@@ -207,4 +227,4 @@ function pxToHalfPt(px) {
 	return pxToPt(px) * 2;
 }
 //#endregion
-export { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, buildFontString, buildRunFontStyle, clearFontResolvedCache, docxScriptFontSize, findCharacterAtX, getResolvedData, getXForCharacter, halfPtToPx, ptToPx, pxToHalfPt, pxToPt, pxToTwips, twipsToPx };
+export { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, buildFontString, buildRunFontStyle, clearFontResolvedCache, docxScriptFontSize, findCharacterAtX, getResolvedData, getXForCharacter, halfPtToPx, isLayoutFontFamily, ptToPx, pxToHalfPt, pxToPt, pxToTwips, twipsToPx };

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

@@ -118,9 +118,8 @@ function ensureProxy() {
 }
 /**
 * How long to wait before flushing the queue, in milliseconds. Short
-* enough to keep the worker warm and ahead of the binary-search probes,
-* long enough to amortise `postMessage` overhead across a typical
-* paragraph's worth of probes.
+* enough to process measured entries promptly, long enough to amortise
+* `postMessage` overhead across a typical paragraph's runs.
 */
 const FLUSH_INTERVAL_MS = 10;
 /**

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

@@ -14,22 +14,21 @@ import { FontKerningMode } from "./textMeasurementPolicy.js";
  * `fontCacheKey` is the main-thread cache identity. It intentionally
  * differs from `font` when scale metadata is appended.
  *
- * `fontFingerprintWidth` is the main-thread width for
- * `WORKER_FONT_FINGERPRINT_TEXT` in the same `font`. The worker checks
- * the same sentinel before measuring and skips entries whose font
- * metrics do not match, which prevents worker fallback fonts from
- * poisoning the main-thread cache.
+ * `fontFingerprintText` is text already measured on the main thread in
+ * this font. The worker checks its unscaled width against
+ * `fontFingerprintWidth` before caching a result. This covers the actual
+ * glyphs and font subsets used by the request, including non-Latin text.
  */
 type MeasureRequestEntry = {
   text: string;
   font: string;
   fontCacheKey: string;
+  fontFingerprintText: string;
   fontFingerprintWidth: number;
   letterSpacing: number;
   horizontalScale: number;
   fontKerning: FontKerningMode;
 };
-declare const WORKER_FONT_FINGERPRINT_TEXT = "HAMBURGEFONTS ivwqy 0123456789";
 /**
  * Count whole code points (not UTF-16 units) so letter spacing is applied once
  * per rendered glyph — an astral character is one glyph spanning two units.
@@ -73,4 +72,4 @@ type MeasureWorkerResponse = {
   error: string;
 };
 //#endregion
-export { MeasureRequestEntry, MeasureResponseEntry, MeasureWorkerRequest, MeasureWorkerResponse, WORKER_FONT_FINGERPRINT_TEXT, countCodePoints };
+export { MeasureRequestEntry, MeasureResponseEntry, MeasureWorkerRequest, MeasureWorkerResponse, countCodePoints };

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

@@ -1,5 +1,4 @@
 //#region src/layout-engine/measure/measureWorkerProtocol.ts
-const WORKER_FONT_FINGERPRINT_TEXT = "HAMBURGEFONTS ivwqy 0123456789";
 /**
 * Count whole code points (not UTF-16 units) so letter spacing is applied once
 * per rendered glyph — an astral character is one glyph spanning two units.
@@ -17,4 +16,4 @@ function countCodePoints(text) {
 	return count;
 }
 //#endregion
-export { WORKER_FONT_FINGERPRINT_TEXT, countCodePoints };
+export { countCodePoints };

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

@@ -585,6 +585,12 @@ type ParagraphBlock = {
    * the innermost group and draws boundary chrome per outer→inner level.
    */
   sdtGroups?: SdtGroup[];
+  /**
+   * Set by a review view that lays out resolved text (Simple Markup) on a
+   * paragraph whose authored text carries a revision the view resolved: the
+   * painter marks it with the change bar its runs no longer show.
+   */
+  reviewIndicator?: "change-bar";
 };
 /**
  * Cell border specification for rendering.

package/dist/layout-painter/renderPage.js

@@ -1326,6 +1326,7 @@ function collectContentFingerprint(block, parts) {
 	if (block.kind === "paragraph") {
 		if (block.attrs?.styleId) parts.push(`p:st:${block.attrs.styleId}`);
 		if (block.attrs?.alignment) parts.push(`p:al:${block.attrs.alignment}`);
+		if (block.reviewIndicator) parts.push(`p:ri:${block.reviewIndicator}`);
 		for (let index = 0; index < block.runs.length; index++) {
 			const run = block.runs[index];
 			if (!run) continue;

package/dist/layout-painter/renderParagraph.js

@@ -1500,7 +1500,7 @@ function bordersFormGroup(a, b) {
 	if (!a || !b) return false;
 	return bordersEqual(a.top, b.top) && bordersEqual(a.bottom, b.bottom) && bordersEqual(a.left, b.left) && bordersEqual(a.right, b.right) && bordersEqual(a.between, b.between);
 }
-const paragraphHasTrackedChanges = (block) => block.attrs?.listMarkerRevision !== void 0 || block.runs.some((run) => run.kind !== "lineBreak" && (run.isInsertion === true || run.isDeletion === true));
+const paragraphHasTrackedChanges = (block) => block.reviewIndicator === "change-bar" || block.attrs?.listMarkerRevision !== void 0 || block.runs.some((run) => run.kind !== "lineBreak" && (run.isInsertion === true || run.isDeletion === true));
 /**
 * Render a paragraph fragment
 *

package/dist/managers/ContextMenuManager.js

@@ -1,4 +1,5 @@
 import { isInTable as isInTableCell } from "../prosemirror/extensions/nodes/TableExtension.js";
+import { NO_LIST_NUMBERING_MENU, listNumberingMenuState } from "../prosemirror/listNumbering.js";
 import { Subscribable } from "./Subscribable.js";
 //#region src/managers/ContextMenuManager.ts
 const CLOSED_STATE = {
@@ -13,7 +14,8 @@ const CLOSED_STATE = {
 		to: 0
 	},
 	cursorInTable: false,
-	cursorInTrackedChange: false
+	cursorInTrackedChange: false,
+	listNumbering: NO_LIST_NUMBERING_MENU
 };
 var ContextMenuManager = class extends Subscribable {
 	constructor() {
@@ -36,7 +38,8 @@ var ContextMenuManager = class extends Subscribable {
 				to: selection.to
 			},
 			cursorInTable,
-			cursorInTrackedChange
+			cursorInTrackedChange,
+			listNumbering: state ? listNumberingMenuState(state) : NO_LIST_NUMBERING_MENU
 		});
 	}
 	/** Close the menu. */

package/dist/managers/types.d.ts

@@ -1,3 +1,4 @@
+import { ListNumberingMenuState } from "../prosemirror/listNumbering.js";
 //#region src/managers/types.d.ts
 /** Cell coordinates in a table */
 type CellCoordinates = {
@@ -21,6 +22,8 @@ type ContextMenuSnapshot = {
   };
   cursorInTable: boolean;
   cursorInTrackedChange: boolean;
+  /** Restart / continue / set-value entries for the list item under the caret. */
+  listNumbering: ListNumberingMenuState;
 };
 /** Error severity levels */
 type ErrorSeverity = "error" | "warning" | "info";

package/dist/markdown/fromMarkdown.js

@@ -36,9 +36,10 @@ const applyMarkdownPageGeometry = (document) => {
 */
 function fromMarkdown(markdown) {
 	const document = createEmptyDocument();
-	const { content, numbering } = compileMarkdownToContent(markdown);
+	const { content, numbering, warnings } = compileMarkdownToContent(markdown);
 	if (content.length > 0) document.package.document.content = content;
 	if (numbering) document.package.numbering = numbering;
+	if (warnings && warnings.length > 0) document.warnings = [...document.warnings ?? [], ...warnings];
 	applyMarkdownPageGeometry(document);
 	return document;
 }

package/dist/markdown/internals.d.ts

@@ -1,4 +1,5 @@
 import { document_d_exports } from "../types/document.js";
+import { NoteReferenceKind } from "../utils/noteReferenceLabels.js";
 import { MarkdownOptions, RenderContext } from "./types.js";
 //#region src/markdown/internals.d.ts
 /**
@@ -15,5 +16,14 @@ declare function newContext(opts?: MarkdownOptions, styles?: document_d_exports.
  * recurring messages appear at most once.
  */
 declare function pushWarning(ctx: RenderContext, message: string): void;
+/**
+ * Number a footnote or endnote reference in reading order and record its
+ * note for the definitions trailer on the note's first reference. Returns the
+ * bare token (`1`, `e1`) and the inline marker (`[^1]`, `[^e1]`).
+ */
+declare function numberNoteReference(ctx: RenderContext, kind: NoteReferenceKind, refId: number): {
+  token: string;
+  marker: string;
+};
 //#endregion
-export { newContext, pushWarning };
+export { newContext, numberNoteReference, pushWarning };

package/dist/markdown/internals.js

@@ -1,4 +1,6 @@
 import { createBuiltInStyleIndex } from "../docx/builtInStyles.js";
+import { createListLabelCounter } from "../prosemirror/listLabels.js";
+import { createNoteReferenceNumbering, noteReferenceMarker, noteReferenceToken } from "../utils/noteReferenceLabels.js";
 //#region src/markdown/internals.ts
 /**
 * Internal helpers shared by the markdown converter: context construction and
@@ -30,11 +32,12 @@ function newContext(opts = {}, styles) {
 		imagesByPath: /* @__PURE__ */ new Map(),
 		warnings: [],
 		footnoteRefs: [],
+		noteNumbering: createNoteReferenceNumbering(),
 		commentRefs: [],
 		hyperlinkRefs: [],
 		imageCounter: 0,
-		listCounters: /* @__PURE__ */ new Map(),
-		listSeenLevels: /* @__PURE__ */ new Set()
+		nextListLabel: createListLabelCounter(),
+		listIndentWidths: []
 	};
 }
 /**
@@ -44,5 +47,23 @@ function newContext(opts = {}, styles) {
 function pushWarning(ctx, message) {
 	if (!ctx.warnings.includes(message)) ctx.warnings.push(message);
 }
+/**
+* Number a footnote or endnote reference in reading order and record its
+* note for the definitions trailer on the note's first reference. Returns the
+* bare token (`1`, `e1`) and the inline marker (`[^1]`, `[^e1]`).
+*/
+function numberNoteReference(ctx, kind, refId) {
+	const { displayNumber, first } = ctx.noteNumbering.next(kind, refId);
+	const marker = noteReferenceMarker(kind, displayNumber);
+	if (first) ctx.footnoteRefs.push({
+		refId,
+		marker,
+		kind
+	});
+	return {
+		token: noteReferenceToken(kind, displayNumber),
+		marker
+	};
+}
 //#endregion
-export { newContext, pushWarning };
+export { newContext, numberNoteReference, pushWarning };

package/dist/markdown/renderBlock.js

@@ -1,5 +1,7 @@
+import { ALT_CHUNK_READER_DIAGNOSTIC, isAltChunkMarkup } from "../docx/altChunk.js";
+import { OPAQUE_REVISION_CARRIER_READER_DIAGNOSTIC, isOpaqueNestedRowMarkup, opaqueRevisionCarrierName } from "../docx/opaqueCarrier.js";
 import { cloneParagraphWithoutPropertySource } from "../docx/paragraphPropertySource.js";
-import { renderParagraph } from "./renderParagraph.js";
+import { renderParagraphBlock } from "./renderParagraph.js";
 import { renderTable } from "./renderTable.js";
 import { panic } from "better-result";
 //#region src/markdown/renderBlock.ts
@@ -14,9 +16,12 @@ import { panic } from "better-result";
 * its break on accept and merges with the following paragraph. Word's join
 * keeps the FIRST paragraph's properties (style, list) and drops the resolved
 * mark; the surviving break is the next paragraph's, so a run of consecutive
-* deletions collapses into one paragraph. A non-paragraph next block (table,
-* SDT) is structurally incompatible and stays unmerged, matching the editor's
-* accept-change join guard (`commands/comments.ts`).
+* deletions collapses into one paragraph. A first paragraph with nothing left
+* once its deletions are accepted (a whole deleted paragraph) contributes only
+* the join, so the NEXT paragraph keeps its own properties, as the editor's
+* accept does. A non-paragraph next block (table, SDT) is structurally
+* incompatible and stays unmerged, matching the editor's accept-change join
+* guard (`commands/comments.ts`).
 */
 function mergeAcceptedParagraphBreaks(blocks) {
 	const merged = [];
@@ -24,8 +29,9 @@ function mergeAcceptedParagraphBreaks(blocks) {
 		const prev = merged.at(-1);
 		if (prev?.type === "paragraph" && prev.pPrMark?.kind === "del" && block.type === "paragraph") {
 			const next = block.pPrMark;
-			const joined = cloneParagraphWithoutPropertySource(prev, {
-				content: [...prev.content, ...block.content],
+			const content = [...prev.content, ...block.content];
+			const joined = cloneParagraphWithoutPropertySource(holdsNothingOnAccept(prev) ? block : prev, {
+				content,
 				...next ? { pPrMark: next } : {}
 			});
 			if (!next) Reflect.deleteProperty(joined, "pPrMark");
@@ -36,14 +42,33 @@ function mergeAcceptedParagraphBreaks(blocks) {
 	}
 	return merged;
 }
+/** Paragraph content that shows nothing: range boundaries and anchors. */
+const ZERO_WIDTH_CONTENT = /* @__PURE__ */ new Set([
+	"bookmarkStart",
+	"bookmarkEnd",
+	"commentRangeStart",
+	"commentRangeEnd",
+	"commentReference",
+	"moveFromRangeStart",
+	"moveFromRangeEnd",
+	"moveToRangeStart",
+	"moveToRangeEnd"
+]);
+/** Whether an item shows nothing once every change is accepted. */
+const showsNothingOnAccept = (item) => {
+	if (item.type === "deletion" || item.type === "moveFrom" || ZERO_WIDTH_CONTENT.has(item.type)) return true;
+	if (item.type === "insertion" || item.type === "moveTo") return item.content.every(showsNothingOnAccept);
+	return item.type === "run" && item.content.every((content) => content.type === "renderedPageBreak");
+};
+/** Whether a paragraph keeps no visible content once every change is accepted. */
+const holdsNothingOnAccept = (paragraph) => paragraph.content.every(showsNothingOnAccept);
 function renderBlocks(ctx, pkg, blocks) {
 	const out = [];
 	let prevWasListItem = false;
 	const ordered = ctx.opts.trackedChanges === "clean" ? mergeAcceptedParagraphBreaks(blocks) : blocks;
 	for (const block of ordered) switch (block.type) {
 		case "paragraph": {
-			const isListItem = !!block.listRendering && !block.listRendering.markerHidden;
-			const md = renderParagraph(ctx, pkg, block);
+			const { markdown: md, isListItem } = renderParagraphBlock(ctx, pkg, block);
 			if (!md) {
 				prevWasListItem = false;
 				continue;
@@ -63,7 +88,8 @@ function renderBlocks(ctx, pkg, blocks) {
 			prevWasListItem = false;
 			break;
 		}
-		case "blockSdt": {
+		case "blockSdt":
+		case "blockCustomXml": {
 			const nested = renderBlocks(ctx, pkg, block.content);
 			if (nested) {
 				if (out.length) out.push("");
@@ -72,6 +98,10 @@ function renderBlocks(ctx, pkg, blocks) {
 			break;
 		}
 		case "preservedBlock":
+			if (isAltChunkMarkup(block.xml)) out.push(block.readerText === void 0 ? ALT_CHUNK_READER_DIAGNOSTIC : `${ALT_CHUNK_READER_DIAGNOSTIC}\n\n${block.readerText}`);
+			else if (opaqueRevisionCarrierName(block.xml) !== void 0) out.push(OPAQUE_REVISION_CARRIER_READER_DIAGNOSTIC);
+			else if (isOpaqueNestedRowMarkup(block.xml)) out.push("[Unsupported nested w:tr content]");
+			break;
 		case "bookmarkStart":
 		case "bookmarkEnd": break;
 		default: panic(`Unsupported block content in markdown: ${JSON.stringify(block)}`);