@stll/folio-core 0.47.4 → 0.47.6

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -272,6 +272,7 @@ function fromProseDoc(pmDoc, baseDocument, { reuse = "none" } = {}) {
 	if (tokenSources) restoreParagraphPropertySourcesByToken(blocks, tokenSources);
 	else if (baseDocument) restoreParagraphPropertySources(blocks, baseDocument.package.document.content, linkedSources.targets, linkedSources.sources);
 	const documentBody = { content: blocks };
+	if (baseDocument?.package.document.background) documentBody.background = baseDocument.package.document.background;
 	if (baseDocument?.package.document.finalSectionProperties) documentBody.finalSectionProperties = baseDocument.package.document.finalSectionProperties;
 	if (baseDocument?.package.document.sections) documentBody.sections = baseDocument.package.document.sections;
 	if (baseDocument?.package.document.comments) documentBody.comments = baseDocument.package.document.comments;
@@ -1137,6 +1138,17 @@ const inlineWrapperStackOf = (node) => {
 	const mark = node.marks.find((candidate) => candidate.type.name === INLINE_WRAPPER_MARK_NAME);
 	return mark ? expectInlineWrapperMarkAttrs(mark).stack : [];
 };
+/** The authored hyperlink that owns a suffix of the node's wrapper stack. */
+const inlineWrapperHyperlinkOriginOf = (node) => {
+	const mark = node.marks.find((candidate) => candidate.type.name === INLINE_WRAPPER_MARK_NAME);
+	if (!mark) return;
+	const attrs = expectInlineWrapperMarkAttrs(mark);
+	if (typeof attrs._docxHyperlinkIndex !== "number" || typeof attrs._docxInsideHyperlinkStackStart !== "number") return;
+	return {
+		hyperlinkIndex: attrs._docxHyperlinkIndex,
+		stackStart: attrs._docxInsideHyperlinkStackStart
+	};
+};
 const isRevisionWrapper = (item) => item.type === "insertion" || item.type === "deletion" || item.type === "moveFrom" || item.type === "moveTo";
 /** `stack` closed around `content`, outermost layer first. */
 const nestInlineWrappers = (stack, content) => {
@@ -1150,42 +1162,132 @@ const nestInlineWrappers = (stack, content) => {
 * The emitted sequence with each wrapper group nested back into the wrappers
 * `toProseDoc` lifted off it.
 *
-* The revision stays outermost. folio already writes a revision outside the
-* hyperlink it spans, the parse leg is revision-owned, and accepting or
-* rejecting one is a range operation over the revision's own content; a
-* wrapper placed outside two revisions would also have to mint one revision id
-* per wrapper. So a revision in the group keeps its place and takes the nest
-* inside it, and the items around it share a nest of their own.
+* A revision may be inside some wrapper layers and outside others. Its mark
+* records how many layers preceded it in the source, since a ProseMirror mark
+* set cannot express that order. Adjacent items with the same outer layers
+* share one wrapper rather than splitting it around each revision.
 *
 * A group with nothing in it writes no wrapper: an authored wrapper whose
 * content was deleted or rejected is gone, and an empty one says nothing.
 */
-const nestInlineWrapperGroups = (items, groups) => {
+const nestInsideHyperlink = (item, stack, hyperlinkIndex, indices) => {
+	if (item.type === "hyperlink") {
+		if (indices.get(item) !== hyperlinkIndex) return false;
+		item.children = [nestInlineWrappers(stack, item.children)];
+		return true;
+	}
+	if (isRevisionWrapper(item)) {
+		let nested = false;
+		for (const child of item.content) if (nestInsideHyperlink(child, stack, hyperlinkIndex, indices)) nested = true;
+		return nested;
+	}
+	return false;
+};
+const nestRevisionAwareInlineWrappers = (items, stack, revisionOuterWrapperCounts, layerIndex = 0) => {
+	if (layerIndex === stack.length) return [...items];
+	const nested = [];
+	let pending = [];
+	const closeLayer = () => {
+		if (pending.length === 0) return;
+		const layer = stack[layerIndex];
+		if (layer === void 0) panic("An inline wrapper layer disappeared during reconstruction");
+		nested.push(inlineWrapperMember(layer, nestRevisionAwareInlineWrappers(pending, stack, revisionOuterWrapperCounts, layerIndex + 1)));
+		pending = [];
+	};
+	for (const item of items) {
+		if (!isRevisionWrapper(item) || (revisionOuterWrapperCounts.get(item) ?? 0) > layerIndex) {
+			pending.push(item);
+			continue;
+		}
+		closeLayer();
+		item.content = [nestInlineWrappers(stack.slice(layerIndex), item.content)];
+		nested.push(item);
+	}
+	closeLayer();
+	return nested;
+};
+const sameRevisionLayer = (left, right) => left.type === right.type && left.revisionId === right.revisionId && left.author === right.author && left.date === right.date && left.utcDate === right.utcDate && left.initials === right.initials && left.outerWrapperCount === right.outerWrapperCount;
+const revisionInfoFromLayer = (layer) => ({
+	id: layer.revisionId,
+	author: layer.author,
+	...layer.date ? { date: layer.date } : {},
+	...layer.utcDate ? { utcDate: {
+		attribute: DATE_UTC_ATTRIBUTE,
+		value: layer.utcDate
+	} } : {},
+	...layer.initials ? { initials: layer.initials } : {}
+});
+const nestRevisionAncestors = (items, ancestorsByWrapper, revisionOuterWrapperCounts) => {
+	const nested = [];
+	const open = [];
+	for (const item of items) {
+		if (!isRevisionWrapper(item)) {
+			open.length = 0;
+			nested.push(item);
+			continue;
+		}
+		const ownLayer = {
+			type: item.type,
+			revisionId: item.info.id,
+			author: item.info.author,
+			...item.info.date ? { date: item.info.date } : {},
+			...item.info.utcDate ? { utcDate: item.info.utcDate.value } : {},
+			...item.info.initials ? { initials: item.info.initials } : {},
+			outerWrapperCount: revisionOuterWrapperCounts.get(item) ?? 0
+		};
+		const path = [...ancestorsByWrapper.get(item) ?? [], ownLayer];
+		let shared = 0;
+		while (shared < open.length && path[shared] && sameRevisionLayer(open[shared].layer, path[shared])) shared += 1;
+		open.length = shared;
+		for (const layer of path.slice(shared)) {
+			const wrapper = createTrackedRunWrapper(layer.type, revisionInfoFromLayer(layer));
+			revisionOuterWrapperCounts.set(wrapper, layer.outerWrapperCount);
+			const parent = open.at(-1)?.wrapper;
+			if (parent) parent.content.push(wrapper);
+			else nested.push(wrapper);
+			open.push({
+				layer,
+				wrapper
+			});
+		}
+		const owner = open.at(-1)?.wrapper;
+		if (!owner) panic("A tracked revision path has no owner");
+		owner.content.push(...item.content);
+	}
+	return nested;
+};
+const nestInlineWrapperGroups = (items, groups, hyperlinkIndices, revisionOuterWrapperCounts, ancestorsByWrapper) => {
 	const nested = [];
 	for (const [index, group] of groups.entries()) {
-		const slice = items.slice(group.start, groups[index + 1]?.start ?? items.length);
+		const slice = nestRevisionAncestors(items.slice(group.start, groups[index + 1]?.start ?? items.length), ancestorsByWrapper, revisionOuterWrapperCounts);
 		if (group.stack.length === 0) {
 			nested.push(...slice);
 			continue;
 		}
-		let pending = [];
-		const closeNest = () => {
-			if (pending.length === 0) return;
-			nested.push(nestInlineWrappers(group.stack, pending));
-			pending = [];
-		};
-		for (const item of slice) {
-			if (!isRevisionWrapper(item)) {
-				pending.push(item);
-				continue;
-			}
-			closeNest();
-			if (item.content.length > 0) item.content = [nestInlineWrappers(group.stack, item.content)];
-			nested.push(item);
+		const origin = group.origin;
+		let outerStack = group.stack;
+		if (origin !== void 0) {
+			const innerStack = group.stack.slice(origin.stackStart);
+			let nestedInsideOrigin = false;
+			for (const item of slice) if (nestInsideHyperlink(item, innerStack, origin.hyperlinkIndex, hyperlinkIndices)) nestedInsideOrigin = true;
+			if (nestedInsideOrigin) outerStack = group.stack.slice(0, origin.stackStart);
+		}
+		if (outerStack.length === 0) {
+			nested.push(...slice);
+			continue;
 		}
-		closeNest();
+		nested.push(...nestRevisionAwareInlineWrappers(slice, outerStack, revisionOuterWrapperCounts));
 	}
-	return nested;
+	const coalesced = [];
+	for (const item of nested) {
+		const previous = coalesced.at(-1);
+		if (previous && isRevisionWrapper(previous) && isRevisionWrapper(item) && previous.type === item.type && JSON.stringify(previous.info) === JSON.stringify(item.info) && revisionOuterWrapperCounts.get(previous) === revisionOuterWrapperCounts.get(item)) {
+			previous.content.push(...item.content);
+			continue;
+		}
+		coalesced.push(item);
+	}
+	return coalesced;
 };
 function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, textBoxAnchorMarkers, skipLeadingRenderedPageBreak = false, inheritedFormattingOverride) {
 	const content = [];
@@ -1214,7 +1316,16 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 	let currentHyperlinkKey = null;
 	let currentTrackedChange;
 	const sourceRunOwners = /* @__PURE__ */ new WeakMap();
+	const sourceHyperlinkIndices = /* @__PURE__ */ new WeakMap();
+	const revisionOuterWrapperCounts = /* @__PURE__ */ new WeakMap();
+	const revisionAncestorsByWrapper = /* @__PURE__ */ new WeakMap();
 	const openedComments = /* @__PURE__ */ new Set();
+	const createIndexedHyperlink = (mark) => {
+		const hyperlink = createHyperlink(mark);
+		const index = expectHyperlinkMarkAttrs(mark)._docxHyperlinkIndex;
+		if (typeof index === "number") sourceHyperlinkIndices.set(hyperlink, index);
+		return hyperlink;
+	};
 	const commentLastOffset = /* @__PURE__ */ new Map();
 	paragraph.forEach((node, offset) => {
 		for (const commentId of getCommentMarkIds(node.marks)) commentLastOffset.set(commentId, offset);
@@ -1298,14 +1409,20 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 	*/
 	const enterWrapperGroup = (node) => {
 		const stack = inlineWrapperStackOf(node);
-		const key = inlineWrapperStackKey(stack);
+		const origin = inlineWrapperHyperlinkOriginOf(node);
+		const key = [
+			inlineWrapperStackKey(stack),
+			origin?.hyperlinkIndex ?? "",
+			origin?.stackStart ?? ""
+		].join("\0");
 		if (key === wrapperGroupKey) return;
 		flushCurrentInline();
 		currentTrackedChange = void 0;
 		wrapperGroupKey = key;
 		wrapperGroups.push({
 			start: content.length,
-			stack
+			stack,
+			...origin ? { origin } : {}
 		});
 	};
 	const processInlineNode = (node, offset) => {
@@ -1332,12 +1449,6 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			content.push({ ...start }, { ...end });
 			return;
 		}
-		if (node.type.name === "moveRangeBoundary") {
-			flushCurrentInline();
-			currentTrackedChange = void 0;
-			content.push({ ...expectMoveRangeBoundaryAttrs(node) });
-			return;
-		}
 		const linkMark = node.marks.find((m) => m.type.name === "hyperlink");
 		const noteRefMark = node.marks.find((m) => m.type.name === "footnoteRef");
 		const insertionMark = node.marks.find((m) => m.type.name === "insertion");
@@ -1354,10 +1465,8 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			};
 			if (textBoxAnchorMarkers.has(anchorId)) return;
 			textBoxAnchorMarkers.set(anchorId, marker);
-			const anchoredContent = linkMark ? {
-				...createHyperlink(linkMark),
-				children: [marker]
-			} : marker;
+			const anchoredContent = linkMark ? createIndexedHyperlink(linkMark) : marker;
+			if (anchoredContent.type === "hyperlink") anchoredContent.children.push(marker);
 			const changeMark = insertionMark ?? deletionMark;
 			if (!changeMark) {
 				content.push(anchoredContent);
@@ -1374,16 +1483,13 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 				} } : {},
 				...changeAttrs.initials ? { initials: changeAttrs.initials } : {}
 			};
-			if (insertionMark) content.push({
-				type: changeAttrs.moveKind === "moveTo" ? "moveTo" : "insertion",
-				info,
-				content: [anchoredContent]
-			});
-			else content.push({
-				type: changeAttrs.moveKind === "moveFrom" ? "moveFrom" : "deletion",
-				info,
-				content: [anchoredContent]
-			});
+			let type;
+			if (insertionMark) type = changeAttrs.moveKind === "moveTo" ? "moveTo" : "insertion";
+			else type = changeAttrs.moveKind === "moveFrom" ? "moveFrom" : "deletion";
+			const wrapper = createTrackedRunWrapper(type, info, anchoredContent);
+			revisionOuterWrapperCounts.set(wrapper, changeAttrs._docxOuterWrapperCount ?? inlineWrapperStackOf(node).length);
+			revisionAncestorsByWrapper.set(wrapper, changeAttrs._docxRevisionAncestors ?? []);
+			content.push(wrapper);
 			return;
 		}
 		if (insertionMark || deletionMark) {
@@ -1405,12 +1511,15 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			let type;
 			if (insertionMark) type = changeAttrs.moveKind === "moveTo" ? "moveTo" : "insertion";
 			else type = changeAttrs.moveKind === "moveFrom" ? "moveFrom" : "deletion";
-			const trackedChangeKey = `${type}:${JSON.stringify(info)}`;
+			const outerWrapperCount = changeAttrs._docxOuterWrapperCount ?? inlineWrapperStackOf(node).length;
+			const trackedChangeKey = `${type}:${JSON.stringify(info)}:${outerWrapperCount}:${JSON.stringify(changeAttrs._docxRevisionAncestors ?? [])}`;
 			if (linkMark) {
 				const linkKey = getLinkKey(linkMark);
 				if (!currentTrackedChange || currentTrackedChange.type !== "hyperlink" || currentTrackedChange.key !== trackedChangeKey || currentTrackedChange.hyperlinkKey !== linkKey) {
-					const hyperlink = createHyperlink(linkMark);
+					const hyperlink = createIndexedHyperlink(linkMark);
 					const wrapper = createTrackedRunWrapper(type, info, hyperlink);
+					revisionOuterWrapperCounts.set(wrapper, outerWrapperCount);
+					revisionAncestorsByWrapper.set(wrapper, changeAttrs._docxRevisionAncestors ?? []);
 					content.push(wrapper);
 					currentTrackedChange = {
 						type: "hyperlink",
@@ -1444,6 +1553,8 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			}
 			if (!currentTrackedChange || currentTrackedChange.type !== "direct" || currentTrackedChange.key !== trackedChangeKey) {
 				const wrapper = createTrackedRunWrapper(type, info);
+				revisionOuterWrapperCounts.set(wrapper, outerWrapperCount);
+				revisionAncestorsByWrapper.set(wrapper, changeAttrs._docxRevisionAncestors ?? []);
 				content.push(wrapper);
 				currentTrackedChange = {
 					type: "direct",
@@ -1455,6 +1566,10 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 				currentTrackedChange.wrapper.content.push(bookmarkMarkerFromAttrs(expectBookmarkBoundaryAttrs(node)));
 				return;
 			}
+			if (node.type.name === "moveRangeBoundary") {
+				currentTrackedChange.wrapper.content.push({ ...expectMoveRangeBoundaryAttrs(node) });
+				return;
+			}
 			if (node.type.name === "field" || node.type.name === "structuredField") {
 				currentTrackedChange.wrapper.content.push(createFieldFromNode(node, {
 					...formattingContext,
@@ -1488,6 +1603,12 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			appendDirectRun(node, ownedRun, node.isText);
 			return;
 		}
+		if (node.type.name === "moveRangeBoundary") {
+			flushCurrentInline();
+			currentTrackedChange = void 0;
+			content.push({ ...expectMoveRangeBoundaryAttrs(node) });
+			return;
+		}
 		if (noteRefMark && !linkMark) {
 			flushCurrentInline();
 			content.push(createNoteReferenceRun(noteRefMark, node.marks, formattingContext));
@@ -1497,7 +1618,7 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			const linkKey = getLinkKey(linkMark);
 			if (currentHyperlink && currentHyperlinkKey === linkKey) {} else {
 				flushCurrentInline();
-				currentHyperlink = createHyperlink(linkMark);
+				currentHyperlink = createIndexedHyperlink(linkMark);
 				currentHyperlinkKey = linkKey;
 			}
 			addNodeToHyperlink({
@@ -1588,7 +1709,7 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 		type: "commentRangeEnd",
 		id: commentId
 	});
-	return nestInlineWrapperGroups(content, wrapperGroups);
+	return nestInlineWrapperGroups(content, wrapperGroups, sourceHyperlinkIndices, revisionOuterWrapperCounts, revisionAncestorsByWrapper);
 }
 function createTrackedChangeRun({ baseParagraphFormatting, inheritedFormatting, marks, node, paragraphMarkFormatting, paragraphMarkPrecedesStyle, styleResolver }) {
 	const formattingContext = {
@@ -1646,6 +1767,7 @@ function createEmptyHyperlink(attrs) {
 	if (attrs.target !== void 0) hyperlink.target = attrs.target;
 	if (attrs.history !== void 0) hyperlink.history = attrs.history;
 	if (attrs.docLocation !== void 0) hyperlink.docLocation = attrs.docLocation;
+	for (const stack of attrs._docxEmptyWrapperStacks ?? []) hyperlink.children.push(nestInlineWrappers(stack, []));
 	return hyperlink;
 }
 function getCommentMarkIds(marks) {
@@ -1948,7 +2070,7 @@ function restoreRunRecord(run, marks) {
 	}
 	const identityMark = marks.find((mark) => mark.type.name === RUN_IDENTITY_MARK_NAME);
 	if (!identityMark) return;
-	const { preservedAttributes, preserved } = expectRunIdentityMarkAttrs(identityMark);
+	const { preservedAttributes, preserved, emptyFormatting } = expectRunIdentityMarkAttrs(identityMark);
 	if (preservedAttributes && preservedAttributes.length > 0) run.preservedAttributes = preservedAttributes.map(({ namespace, name, value }) => namespace === void 0 ? {
 		name,
 		value
@@ -1961,6 +2083,7 @@ function restoreRunRecord(run, marks) {
 		...run.formatting,
 		preserved
 	};
+	if (emptyFormatting && run.formatting === void 0) run.formatting = {};
 }
 function getRunFormattingFromMarks(marks, options) {
 	if (!marks || marks.length === 0 && !options) return;
@@ -3298,6 +3421,9 @@ function convertPMTableCell(node, documentCounts, styleResolver = null) {
 		} else if (contentNode.type.name === "table") {
 			content.push(convertPMTable(contentNode, documentCounts, styleResolver));
 			previousStandaloneTextBox = null;
+		} else if (contentNode.type.name === "blockSdt") {
+			content.push(convertPMBlockSdt(contentNode, styleResolver));
+			previousStandaloneTextBox = null;
 		} else if (contentNode.type.name === "textBox") previousStandaloneTextBox = appendTextBoxBlock(content, contentNode, {
 			pendingPageBreaks: 0,
 			previousStandaloneTextBox,

package/dist/prosemirror/conversion/toProseDoc.js

@@ -16,7 +16,7 @@ import { mergeParagraphFormatting, mergeParagraphTabStops } from "../../utils/pa
 import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
 import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
 import { emuToPixels, emuToStrokePixels } from "../../utils/units.js";
-import { expectInlineWrapperMarkAttrs } from "../attrs/index.js";
+import { expectInlineWrapperMarkAttrs, expectTrackedChangeMarkAttrs } from "../attrs/index.js";
 import { authoredTransformAttrs } from "../authoredTransformAttrs.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
 import { planEmptyRanges } from "../emptyRangeAnchor.js";
@@ -77,16 +77,17 @@ const createTextBoxGroupIdFactory = () => {
 * paragraph's and the hyperlink's — so the next payload field is added once
 * rather than to whichever site the author happened to open.
 *
-* Minted when the run holds a page break (the leaves it is cut into have to be
-* rejoined into one `w:r` on save), an attribute remainder, or a `w:rPr` sink.
-* 57.5% of corpus files hold none of the three and mint nothing.
+* Minted when the run holds a page break or multiple content items including
+* an inline atom (the leaves have to be rejoined into one `w:r` on save), an
+* attribute remainder, a `w:rPr` sink, or an authored empty `w:rPr`.
 */
 const runIdentityMark = (run, nextRunIdentityId) => {
 	const payload = {
 		preservedAttributes: run.preservedAttributes,
-		preserved: run.formatting?.preserved
+		preserved: run.formatting?.preserved,
+		emptyFormatting: run.formatting !== void 0 && Object.keys(run.formatting).length === 0 ? true : void 0
 	};
-	if (!runHasPageBreakContent(run) && !hasRunIdentityPayload(payload)) return null;
+	if (!runHasPageBreakContent(run) && !runHasMixedContent(run) && !hasRunIdentityPayload(payload)) return null;
 	return schema.mark(RUN_IDENTITY_MARK_NAME, runIdentityAttrs(nextRunIdentityId(), payload));
 };
 /** Keep imported hyperlink identity unique across every nested conversion scope. */
@@ -396,8 +397,8 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 		type: "direct"
 	}], { ordinaryFormatting: ordinaryDefaultRunFormatting });
 	const defaultRunFormatting = defaultToggleCascade.formatting;
-	if (extraRunFormatting !== void 0) {
-		attrs._tableRunFormatting = extraRunFormatting;
+	if (extraRunFormatting !== void 0 || paragraph.content.length > 0) {
+		if (extraRunFormatting !== void 0) attrs._tableRunFormatting = extraRunFormatting;
 		if (defaultRunFormatting) attrs.defaultTextFormatting = defaultRunFormatting;
 		else delete attrs.defaultTextFormatting;
 	}
@@ -486,6 +487,7 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 					nextRunIdentityId
 				});
 				if (linkNodes.length === 0) {
+					const emptyWrapperStacks = emptyInlineWrapperStacks(content.children);
 					emptyHyperlinks ??= [];
 					emptyHyperlinks.push({
 						offset: inlineOffset,
@@ -495,7 +497,8 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 						...content.rId !== void 0 ? { rId: content.rId } : {},
 						...content.target !== void 0 ? { target: content.target } : {},
 						...content.history !== void 0 ? { history: content.history } : {},
-						...content.docLocation !== void 0 ? { docLocation: content.docLocation } : {}
+						...content.docLocation !== void 0 ? { docLocation: content.docLocation } : {},
+						...emptyWrapperStacks.length === 0 ? {} : { _docxEmptyWrapperStacks: emptyWrapperStacks }
 					});
 					break;
 				}
@@ -604,13 +607,21 @@ function anchorPointComment(nodes, commentId) {
 * and it is what lets the save leg hoist a revision covering all of them back
 * around the control instead of losing it.
 */
-const withTrackedRunMark = (node, mark) => {
-	if (node.marks.some(({ type }) => type.name === "insertion" || type.name === "deletion")) return node;
+const withTrackedRunMark = (node, mark, ancestor) => {
 	if (node.type.name === "sdt") {
 		const marked = [];
-		for (let index = 0; index < node.childCount; index += 1) marked.push(withTrackedRunMark(node.child(index), mark));
+		for (let index = 0; index < node.childCount; index += 1) marked.push(withTrackedRunMark(node.child(index), mark, ancestor));
 		return recreateProseNodeWithParagraphPropertySource(node, { content: marked });
 	}
+	const nestedMark = node.marks.find(({ type }) => type.name === "insertion" || type.name === "deletion");
+	if (nestedMark) {
+		const nestedAttrs = expectTrackedChangeMarkAttrs(nestedMark);
+		const updatedMark = schema.mark(nestedMark.type.name, {
+			...nestedMark.attrs,
+			_docxRevisionAncestors: [ancestor, ...nestedAttrs._docxRevisionAncestors ?? []]
+		});
+		return node.mark(updatedMark.addToSet(node.marks));
+	}
 	if (trackedRunInlineAtomDisposition(node) === "outside-wrapper") panic(`Inline atom ${JSON.stringify(node.type.name)} cannot occur in a tracked-run wrapper`);
 	if (canCarryTrackedRunMark(node)) return node.mark(mark.addToSet(node.marks));
 	return node;
@@ -650,7 +661,7 @@ function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, next
 		} else if (item.type === "insertion" || item.type === "deletion" || item.type === "moveFrom" || item.type === "moveTo") {
 			const nestedMarkType = item.type === "insertion" || item.type === "moveTo" ? "insertion" : "deletion";
 			const nestedMoveKind = item.type === "moveFrom" || item.type === "moveTo" ? item.type : null;
-			itemNodes.push(...convertTrackedChange(item, nestedMarkType, nextHyperlinkInstanceIndex, nextRunIdentityId, runFormattingResolvers, styleResolver, nestedMoveKind, textBoxAnchors));
+			itemNodes.push(...convertTrackedChange(item, nestedMarkType, nextHyperlinkInstanceIndex, nextRunIdentityId, runFormattingResolvers, styleResolver, nestedMoveKind, textBoxAnchors, [...wrappedBy, ...stack]));
 		} else if (item.type === "inlineSdt") {
 			const sdtNode = convertInlineSdt(item, nextHyperlinkInstanceIndex, nextRunIdentityId, getTrackedRunFormatting, runFormattingResolvers, styleResolver, textBoxAnchors, [...wrappedBy, ...stack]);
 			if (sdtNode) itemNodes.push(sdtNode);
@@ -667,6 +678,7 @@ function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, next
 			id: item.id,
 			displacedByCustomXml: item.displacedByCustomXml
 		}));
+		else if (item.type === "moveFromRangeStart" || item.type === "moveFromRangeEnd" || item.type === "moveToRangeStart" || item.type === "moveToRangeEnd") itemNodes.push(schema.node(MOVE_RANGE_BOUNDARY_NODE_NAME, { marker: item }));
 		else if (item.type === "preservedInline") itemNodes.push(preservedInlineNode(item));
 		else panic(`Unsupported tracked-run content: ${JSON.stringify(item)}`);
 		nodes.push(...withInlineWrapperMark(itemNodes, stack));
@@ -678,9 +690,19 @@ function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, next
 		utcDate: change.info.utcDate?.value ?? null,
 		initials: change.info.initials ?? null,
 		moveKind,
+		_docxOuterWrapperCount: wrappedBy.length,
 		...markType === "deletion" ? { _historicalFormatting: true } : {}
 	});
-	return nodes.map((node) => withTrackedRunMark(node, mark));
+	const ancestor = {
+		type: change.type,
+		revisionId: change.info.id,
+		author: change.info.author,
+		...change.info.date ? { date: change.info.date } : {},
+		...change.info.utcDate ? { utcDate: change.info.utcDate.value } : {},
+		...change.info.initials ? { initials: change.info.initials } : {},
+		outerWrapperCount: wrappedBy.length
+	};
+	return nodes.map((node) => withTrackedRunMark(node, mark, ancestor));
 }
 function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOverlay) {
 	const formatting = paragraph.formatting;
@@ -1035,6 +1057,7 @@ function blockHasMeaningfulContent(block) {
 	if (block.type === "preservedBlock") return true;
 	if (block.type === "bookmarkStart" || block.type === "bookmarkEnd") return true;
 	if (block.type === "table") return block.rows.some((row) => row.cells.some((cell) => tableCellHasMeaningfulContent(cell)));
+	if (block.type === "blockSdt") return true;
 	return block.content.some(paragraphContentHasMeaningfulContent);
 }
 function paragraphContentHasMeaningfulContent(content) {
@@ -1394,28 +1417,35 @@ function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPer
 	}
 	if (preserveVMergeRestart) attrs._preserveVMergeRestart = true;
 	if (vMergeContinuationCells && vMergeContinuationCells.length > 0) attrs._docxVMergeContinuationCells = transportTableCellsWithParagraphPropertySources(vMergeContinuationCells);
-	const contentNodes = [];
-	for (const content of cell.content) switch (content.type) {
-		case "paragraph":
-			contentNodes.push(...convertParagraphWithTextBoxes(content, styleResolver, {
-				textBoxGroupId: context.nextTextBoxGroupId(),
-				context,
-				...conditionalStyle?.rPr !== void 0 ? { extraRunFormatting: conditionalStyle.rPr } : {},
-				...conditionalStyle?.pPr !== void 0 ? { tableParagraphOverlay: conditionalStyle.pPr } : {}
-			}));
-			break;
-		case "table":
-			contentNodes.push(convertTable(content, styleResolver, context));
-			break;
-		case "preservedBlock":
-			contentNodes.push(convertPreservedBlock(content));
-			break;
-		case "bookmarkStart":
-		case "bookmarkEnd":
-			contentNodes.push(convertBlockBookmarkBoundary(content));
-			break;
-		default: panic(`Unsupported table cell content: ${JSON.stringify(content)}`);
-	}
+	const convertCellBlocks = (blocks) => {
+		const nodes = [];
+		for (const block of blocks) switch (block.type) {
+			case "paragraph":
+				nodes.push(...convertParagraphWithTextBoxes(block, styleResolver, {
+					textBoxGroupId: context.nextTextBoxGroupId(),
+					context,
+					...conditionalStyle?.rPr !== void 0 ? { extraRunFormatting: conditionalStyle.rPr } : {},
+					...conditionalStyle?.pPr !== void 0 ? { tableParagraphOverlay: conditionalStyle.pPr } : {}
+				}));
+				break;
+			case "table":
+				nodes.push(convertTable(block, styleResolver, context));
+				break;
+			case "blockSdt":
+				nodes.push(convertBlockSdt(block, convertCellBlocks));
+				break;
+			case "preservedBlock":
+				nodes.push(convertPreservedBlock(block));
+				break;
+			case "bookmarkStart":
+			case "bookmarkEnd":
+				nodes.push(convertBlockBookmarkBoundary(block));
+				break;
+			default: panic(`Unsupported table cell content: ${JSON.stringify(block)}`);
+		}
+		return nodes;
+	};
+	const contentNodes = convertCellBlocks(cell.content);
 	if (contentNodes.length === 0) contentNodes.push(schema.node("paragraph", {}, []));
 	const nodeType = isHeader ? "tableHeader" : "tableCell";
 	return schema.node(nodeType, attrs, contentNodes);
@@ -1527,27 +1557,32 @@ const withInlineWrapperStacks = (content, stack = []) => content.flatMap((item)
 	content: item,
 	stack
 }]);
-/**
-* `nodes` with `stack` recorded outside whatever wrapper they already carry.
-*
-* A revision converts its own content first, so a node that arrives here
-* already marked sat inside the item this stack wraps: the two stacks
-* concatenate, outermost first. Concatenating is what the schema forces — the
-* mark excludes itself, so a second one replaces the first, and the inner
-* wrapper would be the one lost.
-*
-* A node that holds its own leaves, a content control, is marked here as the
-* one node it is; its leaves were marked with the whole enclosing stack when
-* it was built, because the painter reads the wrapper off the leaf.
-*/
-const withInlineWrapperMark = (nodes, stack) => {
+/** Wrapper nests with no leaf to carry their stack as a ProseMirror mark. */
+const emptyInlineWrapperStacks = (content, stack = []) => content.flatMap((item) => {
+	if (item.type !== "inlineWrapper") return [];
+	const nested = [...stack, inlineWrapperLayer(item)];
+	return item.content.length === 0 ? [nested] : emptyInlineWrapperStacks(item.content, nested);
+});
+const withInlineWrapperMark = (nodes, stack, origin) => {
 	const markType = schema.marks["inlineWrapper"];
 	if (stack.length === 0 || !markType) return nodes;
 	return nodes.map((node) => {
-		if (!node.isText && (!node.isInline || !node.type.allowsMarkType(markType))) return node;
+		if (!node.isInline) return node;
 		const inner = node.marks.find((mark) => mark.type === markType);
-		const layers = inner === void 0 ? stack : [...stack, ...expectInlineWrapperMarkAttrs(inner).stack];
-		return node.mark(markType.create({ stack: layers }).addToSet(node.marks));
+		const innerAttrs = inner === void 0 ? void 0 : expectInlineWrapperMarkAttrs(inner);
+		const layers = innerAttrs === void 0 ? stack : [...stack, ...innerAttrs.stack];
+		const inheritedOrigin = typeof innerAttrs?._docxHyperlinkIndex !== "number" || typeof innerAttrs._docxInsideHyperlinkStackStart !== "number" ? void 0 : {
+			hyperlinkIndex: innerAttrs._docxHyperlinkIndex,
+			stackStart: stack.length + innerAttrs._docxInsideHyperlinkStackStart
+		};
+		const provenance = origin ?? inheritedOrigin;
+		return node.mark(markType.create({
+			stack: layers,
+			...provenance === void 0 ? {} : {
+				_docxHyperlinkIndex: provenance.hyperlinkIndex,
+				_docxInsideHyperlinkStackStart: provenance.stackStart
+			}
+		}).addToSet(node.marks));
 	});
 };
 /**
@@ -1570,9 +1605,17 @@ function convertMathEquation(math) {
 function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, nextRunIdentityId, getInheritedRunFormatting, trackedRunFormattingResolvers, styleResolver, textBoxAnchors, wrappedBy = []) {
 	const props = sdt.properties;
 	const inlineNodes = [];
-	for (const { content, stack } of withInlineWrapperStacks(sdt.content, wrappedBy)) {
+	const stacked = withInlineWrapperStacks(sdt.content, wrappedBy);
+	const emptyRanges = planEmptyRanges(stacked.map(({ content }) => content));
+	for (const [index, { content, stack }] of stacked.entries()) {
 		if (!isInlineSdtContent(content)) continue;
 		const itemNodes = [];
+		const anchored = emptyRanges.anchorAt.get(index);
+		if (anchored) {
+			inlineNodes.push(...withInlineWrapperMark([schema.node(RANGE_ANCHOR_NODE_NAME, anchored)], stack));
+			continue;
+		}
+		if (emptyRanges.closedAt.has(index)) continue;
 		switch (content.type) {
 			case "run":
 				itemNodes.push(...convertRun(content, getInheritedRunFormatting(content.formatting), nextRunIdentityId, styleResolver, textBoxAnchors));
@@ -1633,6 +1676,12 @@ function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, nextRunIdentityId, ge
 					displacedByCustomXml: content.displacedByCustomXml
 				}));
 				break;
+			case "moveFromRangeStart":
+			case "moveFromRangeEnd":
+			case "moveToRangeStart":
+			case "moveToRangeEnd":
+				itemNodes.push(schema.node(MOVE_RANGE_BOUNDARY_NODE_NAME, { marker: content }));
+				break;
 			case "preservedInline":
 				itemNodes.push(preservedInlineNode(content));
 				break;
@@ -1661,6 +1710,7 @@ function convertRun(run, resolvedStyleFormatting, nextRunIdentityId, styleResolv
 	return nodes;
 }
 const runHasPageBreakContent = (run) => run.content.some((content) => content.type === "break" && content.breakType === "page");
+const runHasMixedContent = (run) => run.content.length > 1 && run.content.some((content) => content.type !== "text");
 /**
 * Whether a field's result holds an explicit page break.
 *
@@ -2331,7 +2381,10 @@ function convertHyperlink(hyperlink, { getInheritedRunFormatting, styleResolver,
 			}
 			default: break;
 		}
-		nodes.push(...withInlineWrapperMark(childNodes, stack));
+		nodes.push(...withInlineWrapperMark(childNodes, stack, {
+			hyperlinkIndex,
+			stackStart: 0
+		}));
 	}
 	return nodes;
 }