@stll/folio-core 0.54.2 → 0.56.0

package/dist/i18n/messages.js

@@ -1,24 +1,6 @@
 import { CATALOGS as CATALOGS$1 } from "./messages/catalogs.gen.js";
+import { FOLIO_LOCALES } from "./messages/locales.js";
 //#region src/i18n/messages.ts
-const FOLIO_LOCALES = [
-	"en",
-	"de",
-	"fr",
-	"es",
-	"cs",
-	"ar",
-	"et",
-	"he",
-	"hi",
-	"hu",
-	"lt",
-	"lv",
-	"pl",
-	"pt-BR",
-	"sk",
-	"tr",
-	"zh-CN"
-];
 const CATALOGS = CATALOGS$1;
 const FOLIO_LOCALE_SET = new Set(FOLIO_LOCALES);
 const isFolioLocale = (locale) => FOLIO_LOCALE_SET.has(locale);

package/dist/internal/acceptedBlockProjection.d.ts

@@ -0,0 +1,12 @@
+import { document_d_exports } from "../types/document.js";
+//#region src/internal/acceptedBlockProjection.d.ts
+/**
+ * Read a model story through the same structural resolver as Accept All and
+ * the editor's No Markup view. The authored model is never changed.
+ */
+declare const projectAcceptedBlocks: (blocks: readonly document_d_exports.BlockContent[], pkg: document_d_exports.DocxPackage | undefined) => {
+  blocks: readonly document_d_exports.BlockContent[];
+  completeness: string;
+} | null;
+//#endregion
+export { projectAcceptedBlocks };

package/dist/internal/acceptedBlockProjection.js

@@ -0,0 +1,45 @@
+import { getCachedNumberingMap } from "../docx/numberingParser.js";
+import { proseDocToBlocks } from "../prosemirror/conversion/fromProseDoc.js";
+import { headerFooterToProseDoc } from "../prosemirror/conversion/toProseDoc.js";
+import { createStyleEngine } from "../style-engine/styleEngine.js";
+import { resolveWholeStory } from "./wholeStoryRevisionResolution.js";
+import { panic } from "better-result";
+//#region src/internal/acceptedBlockProjection.ts
+/** Inline revisions alone are already handled by the Markdown run renderer. */
+const hasBlockRevision = (blocks) => blocks.some((block) => {
+	switch (block.type) {
+		case "paragraph": return block.pPrMark !== void 0;
+		case "table": return block.rows.some((row) => row.structuralChange !== void 0 || row.cells.some((cell) => cell.structuralChange !== void 0 || hasBlockRevision(cell.content)));
+		case "blockSdt":
+		case "blockCustomXml": return hasBlockRevision(block.content);
+		case "preservedBlock":
+		case "bookmarkStart":
+		case "bookmarkEnd": return false;
+		default: return panic("Unsupported block in accepted projection", { unsupported: block });
+	}
+});
+/**
+* Read a model story through the same structural resolver as Accept All and
+* the editor's No Markup view. The authored model is never changed.
+*/
+const projectAcceptedBlocks = (blocks, pkg) => {
+	if (!hasBlockRevision(blocks)) return null;
+	const options = {
+		...pkg?.styles !== void 0 && { styles: pkg.styles },
+		...pkg?.theme !== void 0 && { theme: pkg.theme },
+		...pkg?.numbering !== void 0 && { numbering: pkg.numbering }
+	};
+	const doc = headerFooterToProseDoc([...blocks], options);
+	const result = resolveWholeStory({
+		doc,
+		mode: "accept",
+		styleResolver: createStyleEngine(pkg?.styles),
+		numbering: pkg?.numbering ? getCachedNumberingMap(pkg.numbering) : null
+	});
+	return {
+		blocks: result.resolved.eq(doc) ? blocks : proseDocToBlocks(result.resolved, [...blocks], pkg?.styles),
+		completeness: result.failed ? "partial" : "complete"
+	};
+};
+//#endregion
+export { projectAcceptedBlocks };

package/dist/internal/noteMarkerAttrs.d.ts

@@ -0,0 +1,8 @@
+import { NoteMarkerAttrs } from "../prosemirror/schema/nodes.js";
+import { ReadProseMirrorAttrsResult } from "./prosemirrorAttrBoundary.js";
+import { Node } from "prosemirror-model";
+//#region src/internal/noteMarkerAttrs.d.ts
+declare const readNoteMarkerAttrs: (node: Node) => ReadProseMirrorAttrsResult<NoteMarkerAttrs>;
+declare const expectNoteMarkerAttrs: (node: Node) => NoteMarkerAttrs;
+//#endregion
+export { expectNoteMarkerAttrs, readNoteMarkerAttrs };

package/dist/internal/noteMarkerAttrs.js

@@ -0,0 +1,16 @@
+import { attrsRecord, attrsResult, expectCachedNodeAttrs, expectNodeType } from "./prosemirrorAttrBoundary.js";
+//#region src/internal/noteMarkerAttrs.ts
+const noteMarkerAttrsCache = /* @__PURE__ */ new WeakMap();
+const readNoteMarkerAttrs = (node) => {
+	const attrs = attrsRecord(node.attrs);
+	const issues = [];
+	expectNodeType(node, "noteMarker", issues);
+	if (attrs["kind"] !== "footnote" && attrs["kind"] !== "endnote") issues.push({
+		path: "noteMarker.attrs.kind",
+		message: "Expected footnote or endnote."
+	});
+	return attrsResult(attrs, issues);
+};
+const expectNoteMarkerAttrs = (node) => expectCachedNodeAttrs(node, noteMarkerAttrsCache, readNoteMarkerAttrs, "noteMarker attrs");
+//#endregion
+export { expectNoteMarkerAttrs, readNoteMarkerAttrs };

package/dist/internal/pageBreakRunSourceDescendantIndex.js

@@ -37,6 +37,7 @@ const buildPageBreakRunSourceDescendantIndex = (rootContent) => {
 			case "footnoteRef":
 			case "instrText":
 			case "noBreakHyphen":
+			case "noteMarker":
 			case "preservedXml":
 			case "renderedPageBreak":
 			case "softHyphen":

package/dist/internal/prosemirrorAttrBoundary.d.ts

@@ -0,0 +1,21 @@
+import { Node } from "prosemirror-model";
+//#region src/internal/prosemirrorAttrBoundary.d.ts
+type ProseMirrorAttrIssue = {
+  readonly path: string;
+  readonly message: string;
+};
+type ReadProseMirrorAttrsResult<T> = {
+  ok: true;
+  value: T;
+} | {
+  ok: false;
+  issues: readonly ProseMirrorAttrIssue[];
+};
+declare const attrsRecord: (attrs: unknown) => Record<string, unknown>;
+declare const isRecord: (value: unknown) => value is Record<string, unknown>;
+declare const attrsResult: <T>(attrs: Record<string, unknown>, issues: ProseMirrorAttrIssue[]) => ReadProseMirrorAttrsResult<T>;
+declare const expectAttrs: <T>(result: ReadProseMirrorAttrsResult<T>, label: string) => T;
+declare function expectCachedNodeAttrs<T extends object>(node: Node, cache: WeakMap<Node, T>, reader: (node: Node) => ReadProseMirrorAttrsResult<T>, label: string): T;
+declare const expectNodeType: (node: Node, expected: string, issues: ProseMirrorAttrIssue[]) => void;
+//#endregion
+export { ProseMirrorAttrIssue, ReadProseMirrorAttrsResult, attrsRecord, attrsResult, expectAttrs, expectCachedNodeAttrs, expectNodeType, isRecord };

package/dist/internal/prosemirrorAttrBoundary.js

@@ -0,0 +1,50 @@
+import { panic } from "better-result";
+//#region src/internal/prosemirrorAttrBoundary.ts
+const attrsRecord = (attrs) => {
+	if (isRecord(attrs)) return attrs;
+	return {};
+};
+const isRecord = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+const attrsResult = (attrs, issues) => {
+	if (issues.length > 0) return {
+		ok: false,
+		issues
+	};
+	let normalizedAttrs;
+	return {
+		ok: true,
+		get value() {
+			if (normalizedAttrs !== void 0) return normalizedAttrs;
+			const presentAttrs = {};
+			for (const key in attrs) {
+				if (!Object.hasOwn(attrs, key)) continue;
+				const value = attrs[key];
+				if (value !== null) presentAttrs[key] = value;
+			}
+			normalizedAttrs = presentAttrs;
+			return normalizedAttrs;
+		},
+		set value(value) {
+			normalizedAttrs = value;
+		}
+	};
+};
+const expectAttrs = (result, label) => {
+	if (result.ok) return result.value;
+	panic(`Invalid ProseMirror ${label}:\n${result.issues.map((issue) => `${issue.path}: ${issue.message}`).join("\n")}`);
+};
+function expectCachedNodeAttrs(node, cache, reader, label) {
+	const cached = cache.get(node);
+	if (cached) return cached;
+	const value = expectAttrs(reader(node), label);
+	cache.set(node, value);
+	return value;
+}
+const expectNodeType = (node, expected, issues) => {
+	if (node.type.name !== expected) issues.push({
+		path: "node.type.name",
+		message: `Expected ${expected}, got ${node.type.name}.`
+	});
+};
+//#endregion
+export { attrsRecord, attrsResult, expectAttrs, expectCachedNodeAttrs, expectNodeType, isRecord };

package/dist/layout-bridge/convert/footnoteLayout.d.ts

@@ -6,6 +6,7 @@ import "./toFlowBlocks.js";
 type MeasureBlocksFn = (blocks: FlowBlock[], contentWidth: number) => Measure[];
 type ConvertFootnoteOptions = {
   styles?: document_d_exports.StyleDefinitions | null;
+  numbering?: document_d_exports.NumberingDefinitions;
   theme?: document_d_exports.Theme | null;
   defaultSize?: number;
   fontAlternates?: ToFlowBlocksOptions["fontAlternates"];

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

@@ -1,9 +1,8 @@
 import { measureParagraph } from "../../layout-engine/measure/measureParagraph.js";
 import { layoutTextBoxContent } from "../../layout-engine/measure/textBoxParagraphLayout.js";
 import { DEFAULT_TEXTBOX_MARGINS, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, isFloatingImageRun, resolveTableWidthPx } from "../../layout-engine/types.js";
-import { expectPreservedXmlAttrs } from "../../prosemirror/attrs/index.js";
 import { footnoteToProseDoc } from "../../prosemirror/conversion/toProseDoc.js";
-import { collectNoteRefs, isNoteReferenceMarkXml } from "./noteReferences.js";
+import { collectNoteRefs } from "./noteReferences.js";
 import { toFlowBlocks } from "./toFlowBlocks.js";
 //#region src/layout-bridge/convert/footnoteLayout.ts
 /** Default footnote font size in points */
@@ -203,6 +202,7 @@ function convertNoteStoryToFlowBlocks(content, options, referenceMarkText) {
 	const proseOptions = {};
 	if (options.styles) proseOptions.styles = options.styles;
 	if (options.theme !== void 0) proseOptions.theme = options.theme;
+	if (options.numbering !== void 0) proseOptions.numbering = options.numbering;
 	const pmDoc = footnoteToProseDoc(content, proseOptions);
 	const flowOptions = {};
 	if (options.defaultSize !== void 0) flowOptions.defaultSize = options.defaultSize;
@@ -225,7 +225,7 @@ function containsNoteReferenceMark(doc) {
 	let found = false;
 	doc.descendants((node) => {
 		if (found) return false;
-		if (node.type.name === "preservedXml" && isNoteReferenceMarkXml(expectPreservedXmlAttrs(node).xml)) found = true;
+		if (node.type.name === "noteMarker") found = true;
 		return !found;
 	});
 	return found;

package/dist/layout-bridge/convert/headerFooterLayout.d.ts

@@ -41,6 +41,7 @@ declare function calculateHeaderFooterMarginPushBounds(blocks: FlowBlock[], meas
 declare function calculateHeaderFooterBodyTopClearance(blocks: FlowBlock[], flowHeight: number, metrics: HeaderFooterMetrics): number | undefined;
 type ConvertHeaderFooterOptions = {
   styles?: document_d_exports.StyleDefinitions | null;
+  numbering?: document_d_exports.NumberingDefinitions;
   theme?: document_d_exports.Theme | null;
   defaultSize?: number;
   fontAlternates?: ToFlowBlocksOptions["fontAlternates"];

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

@@ -340,6 +340,7 @@ function convertHeaderFooterToContent(headerFooter, contentWidth, metrics, optio
 	const proseDocOptions = {};
 	if (options.styles) proseDocOptions.styles = options.styles;
 	if (options.theme !== void 0) proseDocOptions.theme = options.theme;
+	if (options.numbering !== void 0) proseDocOptions.numbering = options.numbering;
 	const pmDoc = headerFooter.watermarkBlockIndex === void 0 ? headerFooterToProseDoc(headerFooter.content, proseDocOptions) : headerFooterToProseDocWithDetachedWatermarkHost(headerFooter, proseDocOptions);
 	const flowOptions = {};
 	if (options.defaultSize !== void 0) flowOptions.defaultSize = options.defaultSize;

package/dist/layout-bridge/convert/noteReferences.d.ts

@@ -8,7 +8,5 @@ declare function collectNoteRefs(blocks: readonly FlowBlock[], idKey: "footnoteR
   noteId: number;
   pmPos: number;
 }[];
-/** Whether captured run-child markup is a note story's `w:footnoteRef`/`w:endnoteRef`. */
-declare function isNoteReferenceMarkXml(xml: string): boolean;
 //#endregion
-export { collectNoteRefs, isNoteReferenceMarkXml };
+export { collectNoteRefs };

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

@@ -1,5 +1,4 @@
 //#region src/layout-bridge/convert/noteReferences.ts
-const NOTE_REFERENCE_MARK_XML = /^<(?:[^\s:/>]+:)?(?:footnoteRef|endnoteRef)[\s/>]/u;
 /**
 * Runs with `idKey` set, in document order: the note references a block list
 * makes, through table cells (and tables within cells) and text boxes.
@@ -21,9 +20,5 @@ function collectNoteRefs(blocks, idKey) {
 	walk(blocks);
 	return refs;
 }
-/** Whether captured run-child markup is a note story's `w:footnoteRef`/`w:endnoteRef`. */
-function isNoteReferenceMarkXml(xml) {
-	return NOTE_REFERENCE_MARK_XML.test(xml);
-}
 //#endregion
-export { collectNoteRefs, isNoteReferenceMarkXml };
+export { collectNoteRefs };

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

@@ -3,7 +3,6 @@ import { expectFieldAttrs, expectImageAttrs, expectMathAttrs, expectParagraphAtt
 import { decodeOoxmlSymbolCharacter } from "../../utils/ooxmlSymbol.js";
 import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
 import { buildImageRun, constrainImageToPage, hasPaintableImageSource, hasRelationshipBackedImageBox } from "./imageConversion.js";
-import { isNoteReferenceMarkXml } from "./noteReferences.js";
 import { applyCharacterStyleToggleFormatting, markDefaultBlackTextColorSource, mergeRunFormatting } from "./runFormattingMerge.js";
 import { extractRunFormatting } from "./runMarkFormatting.js";
 import { paragraphRunDefaults } from "./textFormattingConversion.js";
@@ -135,9 +134,8 @@ function paragraphToRuns(node, startPos, _options, pageBreaks) {
 			});
 			return;
 		}
-		if (child.type.name === "preservedXml") {
-			const { xml, text: capturedText } = expectPreservedXmlAttrs(child);
-			const text = capturedText === "" && _options.noteReferenceMarkText !== void 0 && isNoteReferenceMarkXml(xml) ? _options.noteReferenceMarkText : capturedText;
+		if (child.type.name === "preservedXml" || child.type.name === "noteMarker") {
+			const text = child.type.name === "noteMarker" ? _options.noteReferenceMarkText ?? "" : expectPreservedXmlAttrs(child).text;
 			if (text === "") return;
 			const formatting = extractRunFormatting(effectiveMarks, theme, fontAlternates);
 			applyCharacterStyleToggleFormatting({

package/dist/layout-bridge/convert/toFlowBlocks.d.ts

@@ -1,7 +1,7 @@
 import { FlowBlock } from "../../layout-engine/types.js";
 import { formatCounter, resolveListTemplate } from "../../prosemirror/listMarker.js";
 import { ToFlowBlocksOptions, resetBlockIdCounter } from "./flowConversionShared.js";
-import { collectNoteRefs, isNoteReferenceMarkXml } from "./noteReferences.js";
+import { collectNoteRefs } from "./noteReferences.js";
 import { convertBorderSpecToLayout } from "./flowBorders.js";
 import { Node } from "prosemirror-model";
 //#region src/layout-bridge/convert/toFlowBlocks.d.ts
@@ -21,4 +21,4 @@ declare const WORD_UNSPECIFIED_FONT_SIZE = 10;
  */
 declare function toFlowBlocks(doc: Node, options?: ToFlowBlocksOptions): FlowBlock[];
 //#endregion
-export { type ToFlowBlocksOptions, WORD_UNSPECIFIED_FONT_SIZE, collectNoteRefs, convertBorderSpecToLayout, formatCounter, isNoteReferenceMarkXml, resetBlockIdCounter, resolveListTemplate, toFlowBlocks };
+export { type ToFlowBlocksOptions, WORD_UNSPECIFIED_FONT_SIZE, collectNoteRefs, convertBorderSpecToLayout, formatCounter, resetBlockIdCounter, resolveListTemplate, toFlowBlocks };

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

@@ -12,7 +12,7 @@ import { mergeRunInParagraphs, reserveLeadingEmptyOutlineHeight, suppressFinalEm
 import { convertBorderSpecToLayout } from "./flowBorders.js";
 import { nextBlockId, resetBlockIdCounter, twipsToPixels } from "./flowConversionShared.js";
 import { convertImage } from "./imageConversion.js";
-import { collectNoteRefs, isNoteReferenceMarkXml } from "./noteReferences.js";
+import { collectNoteRefs } from "./noteReferences.js";
 import { splitParagraphAtPageBreaks } from "./pageBreakSplitting.js";
 import { convertParagraph, drawsParagraphBorder } from "./paragraphConversion.js";
 import { groupParagraphFrames } from "./paragraphFrames.js";
@@ -417,4 +417,4 @@ function toFlowBlocks(doc, options = {}) {
 	}), readFinalSectionStart(doc)), options.splitPageBreakAndParagraphMark === true, sectionBreaksWithoutMarker), nextBlockId);
 }
 //#endregion
-export { WORD_UNSPECIFIED_FONT_SIZE, collectNoteRefs, convertBorderSpecToLayout, formatCounter, isNoteReferenceMarkXml, resetBlockIdCounter, resolveListTemplate, toFlowBlocks };
+export { WORD_UNSPECIFIED_FONT_SIZE, collectNoteRefs, convertBorderSpecToLayout, formatCounter, resetBlockIdCounter, resolveListTemplate, toFlowBlocks };

package/dist/managers/DocumentLoaderManager.d.ts

@@ -23,6 +23,7 @@ type DocumentLoaderHistory = {
 type DocumentLoaderCallbacks = {
   /** Editor history to reset/seed with the loaded document. */
   history: DocumentLoaderHistory;
+  getExperimentalSession?: () => "canonical" | undefined;
   /**
    * Receives the identity of the document that just landed in history. Every
    * load allocates a fresh identity, so the adapter can tell an external load

package/dist/managers/DocumentLoaderManager.js

@@ -1,6 +1,8 @@
+import { prepareCanonicalDocxInput } from "../docx/canonicalSessionInput.js";
 import { inspectDocxCompatibility } from "../docx/compatibility.js";
 import { parseDocx } from "../docx/parser.js";
 import { recordDocumentLoadPhase } from "../layout-engine/layoutInstrumentation.js";
+import { CANONICAL_GAP, usesCanonicalSession } from "../types/canonicalCapabilities.js";
 import { resetAuthorColors } from "../utils/authorColors.js";
 import { loadFontsWithMapping } from "../utils/fontLoader.js";
 //#region src/managers/DocumentLoaderManager.ts
@@ -60,7 +62,13 @@ var DocumentLoaderManager = class {
 			const parseStartedAt = performance.now();
 			let doc;
 			try {
-				doc = await parseDocx(buffer, {
+				let input = buffer;
+				if (usesCanonicalSession(this.callbacks.getExperimentalSession?.(), CANONICAL_GAP.authorityRouting)) {
+					const prepared = await prepareCanonicalDocxInput(buffer);
+					if (prepared.isErr()) throw prepared.error;
+					input = prepared.value;
+				}
+				doc = await parseDocx(input, {
 					detectVariables: false,
 					preloadFonts: false,
 					password: options.password

package/dist/markdown/escape.d.ts

@@ -25,6 +25,8 @@ declare function escapeInline(text: string): string;
  * line.
  */
 declare function escapeTableCell(text: string): string;
+/** Single-line Markdown blocks express inline breaks without their two-space syntax. */
+declare const inlineBreaksToHtml: (text: string) => string;
 declare function escapeLinkUrl(url: string): string;
 /**
  * Alt text inside `![alt](url)`. Raw (un-escaped) text, so escape the backslash
@@ -33,4 +35,4 @@ declare function escapeLinkUrl(url: string): string;
  */
 declare function escapeAltText(text: string): string;
 //#endregion
-export { escapeAltText, escapeInline, escapeLinkUrl, escapeTableCell };
+export { escapeAltText, escapeInline, escapeLinkUrl, escapeTableCell, inlineBreaksToHtml };

package/dist/markdown/escape.js

@@ -30,8 +30,15 @@ function escapeInline(text) {
 * line.
 */
 function escapeTableCell(text) {
-	return text.replace(/\|/gu, "&#124;").replace(/\r?\n/gu, "<br>");
+	return inlineBreaksToHtml(text.replace(/\|/gu, "&#124;"));
 }
+/** Single-line Markdown blocks express inline breaks without their two-space syntax. */
+const inlineBreaksToHtml = (text) => text.split(/\r?\n/u).map((line, index, lines) => {
+	if (index === lines.length - 1) return line;
+	let end = line.length;
+	while (end > 0 && line.at(end - 1) === " ") end--;
+	return line.slice(0, end);
+}).join("<br>");
 /**
 * Hyperlink URLs in inline form need parens balanced; we URL-encode the
 * problematic characters rather than escape, so the link still resolves.
@@ -55,4 +62,4 @@ function escapeAltText(text) {
 	return text.replace(/(?<ch>[\\[\]])/gu, "\\$<ch>").replace(/\r?\n/gu, " ");
 }
 //#endregion
-export { escapeAltText, escapeInline, escapeLinkUrl, escapeTableCell };
+export { escapeAltText, escapeInline, escapeLinkUrl, escapeTableCell, inlineBreaksToHtml };

package/dist/markdown/renderBlock.js

@@ -1,6 +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 { projectAcceptedBlocks } from "../internal/acceptedBlockProjection.js";
+import { pushWarning } from "./internals.js";
 import { renderParagraphBlock } from "./renderParagraph.js";
 import { renderTable } from "./renderTable.js";
 import { panic } from "better-result";
@@ -10,128 +11,14 @@ import { panic } from "better-result";
 * markdown for each block, suppressing redundant blank lines between list items
 * of the same list. Ported from eigenpal/docx-editor PR #595.
 */
-/**
-* In `trackedChanges: "clean"` mode every change is accepted, as the editor's
-* accept-all resolves the story (`internal/wholeStoryRevisionResolution.ts`).
-*
-* A paragraph whose mark is pending deletion loses its break on accept and
-* runs on into the paragraph after it, which is the paragraph left: its mark
-* ends the joined text, and a paragraph's properties (style, list) live on its
-* mark. A run of consecutive deletions collapses into that last paragraph.
-*
-* With a table right after it, its words run on into the table's first cell
-* and lead that cell's first paragraph (`prosemirror/tableRunIn.ts`), unless
-* it ends a section, keeps nothing once accepted, or that cell is pending.
-* Otherwise a paragraph that cannot join keeps its place, or goes when it
-* keeps nothing and something follows it.
-*/
-function mergeAcceptedParagraphBreaks(blocks) {
-	const reversed = [];
-	let survivor = null;
-	let tableFollows = false;
-	let followed = false;
-	const flush = () => {
-		if (survivor) reversed.push(survivor);
-		survivor = null;
-	};
-	for (let index = blocks.length - 1; index >= 0; index--) {
-		const block = blocks[index];
-		if (!block) continue;
-		if (block.type !== "paragraph") {
-			flush();
-			reversed.push(block);
-			tableFollows = block.type === "table";
-			followed ||= tableFollows;
-			continue;
-		}
-		const goes = block.pPrMark?.kind === "del" || block.pPrMark?.kind === "moveFrom";
-		if (goes && survivor) {
-			survivor = cloneParagraphWithoutPropertySource(survivor, { content: [...block.content, ...survivor.content] });
-			continue;
-		}
-		const table = reversed.at(-1);
-		if (goes && tableFollows && table?.type === "table") {
-			const ranIn = tableWithParagraphRunIn(table, block);
-			if (ranIn) {
-				reversed[reversed.length - 1] = ranIn;
-				continue;
-			}
-		}
-		flush();
-		tableFollows = false;
-		if (goes && holdsNothingOnAccept(block) && followed && index + reversed.length > 0) continue;
-		survivor = block;
-		followed = true;
-	}
-	flush();
-	return reversed.reverse();
-}
-/**
-* Whether the cell a paragraph's words would run into is itself pending (its
-* row or the cell, through nested tables' first cells), as
-* `prosemirror/tableRunIn.ts` reads it.
-*/
-const runInCellPending = (table) => {
-	const row = table.rows[0];
-	const cell = row?.cells[0];
-	if (!row || !cell) return false;
-	if (row.structuralChange !== void 0 || cell.structuralChange !== void 0) return true;
-	const first = cell.content[0];
-	return first?.type === "table" && runInCellPending(first);
-};
-/**
-* `table` with `paragraph`'s words leading its first cell's first paragraph,
-* descending into nested tables, or null when the paragraph keeps its place.
-*/
-const tableWithParagraphRunIn = (table, paragraph) => {
-	if (paragraph.sectionProperties !== void 0 || holdsNothingOnAccept(paragraph)) return null;
-	if (runInCellPending(table)) return null;
-	const runIn = (current) => {
-		const [row, ...rows] = current.rows;
-		const [cell, ...cells] = row?.cells ?? [];
-		const [first, ...rest] = cell?.content ?? [];
-		if (!row || !cell || !first) return null;
-		let led = null;
-		if (first.type === "paragraph") led = cloneParagraphWithoutPropertySource(first, { content: [...paragraph.content, ...first.content] });
-		else if (first.type === "table") led = runIn(first);
-		if (!led) return null;
-		return {
-			...current,
-			rows: [{
-				...row,
-				cells: [{
-					...cell,
-					content: [led, ...rest]
-				}, ...cells]
-			}, ...rows]
-		};
-	};
-	return runIn(table);
-};
-/** 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 outerListIndentWidths = ctx.listIndentWidths;
+	ctx.listIndentWidths = [];
 	const out = [];
 	let prevWasListItem = false;
-	const ordered = ctx.opts.trackedChanges === "clean" ? mergeAcceptedParagraphBreaks(blocks) : blocks;
+	const projection = ctx.opts.trackedChanges === "clean" ? projectAcceptedBlocks(blocks, pkg) : null;
+	if (projection?.completeness === "partial") pushWarning(ctx, "Some tracked structural changes could not be resolved.");
+	const ordered = projection?.blocks ?? blocks;
 	for (const block of ordered) switch (block.type) {
 		case "paragraph": {
 			const { markdown: md, isListItem } = renderParagraphBlock(ctx, pkg, block);
@@ -146,7 +33,9 @@ function renderBlocks(ctx, pkg, blocks) {
 			break;
 		}
 		case "table": {
+			ctx.listIndentWidths = [];
 			const md = renderTable(ctx, pkg, block);
+			ctx.listIndentWidths = [];
 			if (md) {
 				if (out.length) out.push("");
 				out.push(md);
@@ -156,22 +45,32 @@ function renderBlocks(ctx, pkg, blocks) {
 		}
 		case "blockSdt":
 		case "blockCustomXml": {
+			ctx.listIndentWidths = [];
 			const nested = renderBlocks(ctx, pkg, block.content);
 			if (nested) {
 				if (out.length) out.push("");
 				out.push(nested);
 			}
+			ctx.listIndentWidths = [];
+			prevWasListItem = false;
 			break;
 		}
-		case "preservedBlock":
+		case "preservedBlock": {
+			const previousLength = out.length;
 			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]");
+			if (out.length !== previousLength) {
+				ctx.listIndentWidths = [];
+				prevWasListItem = false;
+			}
 			break;
+		}
 		case "bookmarkStart":
 		case "bookmarkEnd": break;
 		default: panic(`Unsupported block content in markdown: ${JSON.stringify(block)}`);
 	}
+	ctx.listIndentWidths = outerListIndentWidths;
 	return out.join("\n");
 }
 //#endregion