@stll/folio-core 0.62.0 → 0.63.0

package/dist/prosemirror/conversion/toProseDoc.js

@@ -4,6 +4,7 @@ import { isInlineSdtContent, isTrackedChangeWrapperChild } from "../../docx/inli
 import { listRenderingDefinitionsMatch, resolveListRenderingDefinition } from "../../docx/listRendering.js";
 import { getCachedNumberingMap } from "../../docx/numberingParser.js";
 import { PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, createProseParagraphWithPropertySource, getDocumentParagraphPropertySourceContract, paragraphFormattingWithAuthoredIndentation, proseParagraphAttrsWithoutPropertySource, recreateProseNodeWithParagraphPropertySource, transportTableCellsWithParagraphPropertySources } from "../../docx/paragraphPropertySource.js";
+import { visitInlineContentSlots, visitInlineContentSlotsInContent } from "../../docx/paragraphTraversal.js";
 import { isBaselineVertAlign } from "../../docx/runParser.js";
 import { replayableShapeAlternateContent } from "../../docx/shapeAlternateContent.js";
 import { resolveTableLook } from "../../docx/tableLook.js";
@@ -23,14 +24,18 @@ import { withAlternateContent } from "../alternateContentAttrs.js";
 import { expectInlineWrapperMarkAttrs, expectTrackedChangeMarkAttrs } from "../attrs/index.js";
 import { authoredTransformAttrs } from "../authoredTransformAttrs.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
+import { bookmarkBoundaryAttrsFromMarker } from "../bookmarkBoundaryAttrs.js";
+import { trackedCommentBoundaryOwner } from "../commentBoundaryOwnership.js";
 import { withEnclosingRevision } from "../contentControlRevisions.js";
 import { emptyFieldRunPropertyChanges } from "../emptyFieldResultRuns.js";
 import { planEmptyRanges } from "../emptyRangeAnchor.js";
 import { textFormattingToMarks } from "../extensions/marks/markUtils.js";
+import { BLOCK_MOVE_RANGE_BOUNDARY_NODE_NAME } from "../extensions/nodes/BlockMoveRangeBoundaryExtension.js";
+import { COMMENT_RANGE_BOUNDARY_NODE_NAME } from "../extensions/nodes/CommentRangeBoundaryExtension.js";
 import { MOVE_RANGE_BOUNDARY_NODE_NAME } from "../extensions/nodes/MoveRangeBoundaryExtension.js";
 import { RANGE_ANCHOR_NODE_NAME } from "../extensions/nodes/RangeAnchorExtension.js";
 import "../extensions/nodes/SdtExtension.js";
-import { fieldRequiresStructuredContent } from "../fieldRepresentation.js";
+import { fieldCommentCoverage, fieldRequiresStructuredContent } from "../fieldRepresentation.js";
 import { getInlineDisplayText } from "../inlineDisplayText.js";
 import { inlineWrapperLayer } from "../inlineWrapperStack.js";
 import { CLEARED_LIST_RENDERING_ATTRS } from "../listMarker.js";
@@ -42,8 +47,9 @@ import { pageBreakRunParagraphProjectionDispositionForFeatures } from "../pageBr
 import { directionFromBidi } from "../paragraphDirection.js";
 import { paragraphIndentationFromFormatting } from "../paragraphIndentation.js";
 import { lineSpacingProvenanceFromSpacing } from "../paragraphSpacing.js";
+import { isRunContentProjectionNode } from "../runContentProjection.js";
 import { RUN_IDENTITY_MARK_NAME, hasRunIdentityPayload, runIdentityAttrs } from "../runIdentity.js";
-import { continueSourceCarrierIdentitiesAcrossRevisions } from "../runIdentityAcrossRevisions.js";
+import { continueSourceCarrierIdentitiesAcrossInsertedParagraphMarks, continueSourceCarrierIdentitiesAcrossRevisions } from "../runIdentityAcrossRevisions.js";
 import { getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, isParagraphMarkSuppressionEligible, resolveParagraphInheritedRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting } from "../runStyleFormatting.js";
 import { schema } from "../schema/index.js";
 import { PRESERVED_XML_LEVELS } from "../schema/nodes.js";
@@ -61,19 +67,6 @@ import { sdtAttrsFromProperties } from "./sdtAttrs.js";
 import { panic } from "better-result";
 import { DRAWING_RAW_XML_MODES, PARSE_WARNING_CODES } from "@stll/docx-core/model";
 //#region src/prosemirror/conversion/toProseDoc.ts
-/**
-* Document to ProseMirror Conversion
-*
-* Converts our Document type (from DOCX parsing) to a ProseMirror document.
-* Preserves all formatting attributes for round-trip fidelity.
-*
-* Style Resolution:
-* When styles are provided, paragraph properties are resolved from the style chain:
-* - Document defaults (docDefaults)
-* - Normal style (if no explicit styleId)
-* - Style chain (basedOn inheritance)
-* - Inline properties (highest priority)
-*/
 const DETACHED_WATERMARK_HOST = Symbol.for("stll.detachedWatermarkHost");
 const noPageBreakProjectionWarning = () => {};
 const pageBreakProjectionWarn = (warn) => warn === void 0 ? noPageBreakProjectionWarning : (detail) => {
@@ -162,6 +155,13 @@ const collectPairedBookmarkIds = (blocks) => {
 			case "bookmarkEnd":
 				countBoundary(child.id, "end");
 				break;
+			case "commentRangeStart":
+			case "commentRangeEnd": break;
+			case "commentReference":
+			case "moveFromRangeStart":
+			case "moveFromRangeEnd":
+			case "moveToRangeStart":
+			case "moveToRangeEnd": break;
 			case "run":
 				visitRun(child);
 				break;
@@ -235,6 +235,10 @@ const collectPairedBookmarkIds = (blocks) => {
 			case "bookmarkEnd":
 				countBoundary(block.id, "end");
 				break;
+			case "moveFromRangeStart":
+			case "moveFromRangeEnd":
+			case "moveToRangeStart":
+			case "moveToRangeEnd": break;
 			default: panic(`Unsupported block content: ${JSON.stringify(block)}`);
 		}
 	};
@@ -295,6 +299,12 @@ function toProseDoc(document, options) {
 			case "bookmarkEnd":
 				out.push(convertBlockBookmarkBoundary(block));
 				break;
+			case "moveFromRangeStart":
+			case "moveFromRangeEnd":
+			case "moveToRangeStart":
+			case "moveToRangeEnd":
+				out.push(convertBlockMoveRangeBoundary(block));
+				break;
 			default: panic(`Unsupported block content: ${JSON.stringify(block)}`);
 		}
 		return out;
@@ -309,7 +319,7 @@ function toProseDoc(document, options) {
 		_finalSectionStart: finalSectionStart,
 		_adjustLineHeightInTable: adjustLineHeightInTable,
 		_doNotUseIndentAsNumberingTabStop: doNotUseIndentAsNumberingTabStop
-	}, nodes));
+	}, [...continueSourceCarrierIdentitiesAcrossInsertedParagraphMarks(nodes)]));
 	assertValidProseMirrorDocument(pmDoc, "Document conversion produced an invalid ProseMirror document");
 	return pmDoc;
 }
@@ -335,18 +345,11 @@ function convertPreservedBlock(block) {
 * has gone.
 */
 function convertBlockBookmarkBoundary(block) {
-	return schema.node("blockBookmarkBoundary", block.type === "bookmarkStart" ? {
-		type: "start",
-		id: block.id,
-		name: block.name,
-		colFirst: block.colFirst,
-		colLast: block.colLast,
-		displacedByCustomXml: block.displacedByCustomXml
-	} : {
-		type: "end",
-		id: block.id,
-		displacedByCustomXml: block.displacedByCustomXml
-	});
+	return schema.node("blockBookmarkBoundary", bookmarkBoundaryAttrsFromMarker(block));
+}
+/** A move range marker standing between blocks, kept between the same two. */
+function convertBlockMoveRangeBoundary(block) {
+	return schema.node(BLOCK_MOVE_RANGE_BOUNDARY_NODE_NAME, { marker: block });
 }
 /**
 * Carry an inline child folio does not model into the editor as an opaque atom.
@@ -485,9 +488,11 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 	let bookmarksArr;
 	let emptyHyperlinks;
 	let wrapperStack = [];
-	const emitInlineNodes = (nodes) => {
+	let paragraphContainsInlineSdt = false;
+	const emitInlineNodes = (nodes, commentsAlreadyApplied = false) => {
 		if (nodes.length === 0) return;
-		const markedNodes = applyCommentMarks(withInlineWrapperMark(nodes, wrapperStack), openCommentIds);
+		const wrappedNodes = withInlineWrapperMark(nodes, wrapperStack);
+		const markedNodes = commentsAlreadyApplied ? wrappedNodes : applyCommentMarks(wrappedNodes, openCommentIds);
 		inlineNodes.push(...markedNodes);
 		for (const node of markedNodes) inlineOffset += node.nodeSize;
 	};
@@ -559,9 +564,12 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 		historical: getHistoricalRunFormatting
 	};
 	const emitTrackedChange = (change, markType, moveKind) => {
-		emitInlineNodes(convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, runScope, trackedRunFormattingResolvers, styleResolver, moveKind, textBoxAnchors, wrapperStack));
+		emitInlineNodes(convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, runScope, trackedRunFormattingResolvers, styleResolver, moveKind, textBoxAnchors, wrapperStack, openCommentIds, { preserveSdtBoundaryOccurrences: paragraphContainsInlineSdt }), true);
 	};
 	const stacked = withInlineWrapperStacks(paragraph.content);
+	visitInlineContentSlots(paragraph, ({ item }) => {
+		if (item.type === "inlineSdt") paragraphContainsInlineSdt = true;
+	});
 	const emptyRanges = planEmptyRanges(stacked.map((item) => item.content));
 	for (const [index, { content, stack }] of stacked.entries()) {
 		wrapperStack = stack;
@@ -574,9 +582,11 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 		switch (content.type) {
 			case "commentRangeStart":
 				openCommentIds.add(content.id);
+				if (paragraphContainsInlineSdt) emitInlineNodes([schema.node(COMMENT_RANGE_BOUNDARY_NODE_NAME, { marker: content })], true);
 				break;
 			case "commentRangeEnd":
 				openCommentIds.delete(content.id);
+				if (paragraphContainsInlineSdt) emitInlineNodes([schema.node(COMMENT_RANGE_BOUNDARY_NODE_NAME, { marker: content })], true);
 				break;
 			case "commentReference":
 				if (!storyRangedCommentIds.has(content.id)) anchorPointComment(inlineNodes, content.id);
@@ -591,7 +601,8 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 					styleResolver,
 					hyperlinkIndex: nextHyperlinkInstanceIndex(),
 					textBoxAnchors,
-					runScope
+					runScope,
+					openCommentIds
 				});
 				if (linkNodes.length === 0) {
 					const emptyWrapperStacks = emptyInlineWrapperStacks(content.children);
@@ -609,21 +620,22 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 					});
 					break;
 				}
-				emitInlineNodes(linkNodes);
+				emitInlineNodes(linkNodes, true);
 				break;
 			}
 			case "simpleField":
 			case "complexField":
-				emitInlineNode(convertField(content, {
+				emitInlineNodes([convertField(content, {
 					getInheritedRunFormatting,
 					styleResolver,
 					nextHyperlinkInstanceIndex,
 					runScope,
-					textBoxAnchors
-				}));
+					textBoxAnchors,
+					openCommentIds
+				})].filter((node) => node !== null), true);
 				break;
 			case "inlineSdt":
-				emitInlineNode(convertInlineSdt(content, nextHyperlinkInstanceIndex, runScope, getInheritedRunFormatting, trackedRunFormattingResolvers, styleResolver, textBoxAnchors, stack));
+				emitInlineNodes([convertInlineSdt(content, nextHyperlinkInstanceIndex, runScope, getInheritedRunFormatting, trackedRunFormattingResolvers, styleResolver, textBoxAnchors, stack, openCommentIds)].filter((node) => node !== null), true);
 				break;
 			case "insertion":
 			case "moveTo":
@@ -637,15 +649,8 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 				emitInlineNode(convertMathEquation(content));
 				break;
 			case "bookmarkStart":
-				if (pairedBookmarkIds.has(content.id)) {
-					emitInlineNode(schema.node("bookmarkBoundary", {
-						type: "start",
-						id: content.id,
-						name: content.name,
-						colFirst: content.colFirst,
-						colLast: content.colLast,
-						displacedByCustomXml: content.displacedByCustomXml
-					}));
+				if (pairedBookmarkIds.has(content.id) || content.copyOriginAncestors !== void 0) {
+					emitInlineNode(schema.node("bookmarkBoundary", bookmarkBoundaryAttrsFromMarker(content)));
 					break;
 				}
 				if (!bookmarksArr) bookmarksArr = [];
@@ -655,11 +660,7 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 				});
 				break;
 			case "bookmarkEnd":
-				if (pairedBookmarkIds.has(content.id)) emitInlineNode(schema.node("bookmarkBoundary", {
-					type: "end",
-					id: content.id,
-					displacedByCustomXml: content.displacedByCustomXml
-				}));
+				if (pairedBookmarkIds.has(content.id) || content.copyOriginAncestors !== void 0) emitInlineNode(schema.node("bookmarkBoundary", bookmarkBoundaryAttrsFromMarker(content)));
 				break;
 			case "moveFromRangeStart":
 			case "moveFromRangeEnd":
@@ -737,17 +738,52 @@ const withTrackedRunMark = (node, mark, ancestor) => {
 	if (canCarryTrackedRunMark(node)) return node.mark(mark.addToSet(node.marks));
 	return node;
 };
-/**
-* Convert tracked change (insertion or deletion) content to PM nodes with
-* an insertion/deletion mark applied.
-*/
-function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, runScope, runFormattingResolvers, styleResolver, moveKind = null, textBoxAnchors, wrappedBy = []) {
+function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, runScope, runFormattingResolvers, styleResolver, moveKind, textBoxAnchors, wrappedBy, openCommentIds, options = {}) {
 	const nodes = [];
+	const preserveParentBoundaryOwnership = options.preserveParentBoundaryOwnership ?? true;
+	const commentRangeBoundaries = [];
+	const commentsOpenBeforeRevision = new Set(openCommentIds);
+	const recordCommentBoundary = (type, commentId, owner) => {
+		commentRangeBoundaries.push({
+			type,
+			commentId,
+			owner: trackedCommentBoundaryOwner({
+				boundaries: commentRangeBoundaries,
+				type,
+				commentId,
+				fallback: owner
+			})
+		});
+	};
 	const getTrackedRunFormatting = markType === "deletion" ? runFormattingResolvers.historical : runFormattingResolvers.current;
-	for (const { content: item, stack } of withInlineWrapperStacks(change.content)) {
+	const stacked = withInlineWrapperStacks(change.content);
+	let containsInlineSdt = false;
+	if (options.preserveSdtBoundaryOccurrences === void 0) visitInlineContentSlotsInContent(change.content, ({ item }) => {
+		if (item.type === "inlineSdt") containsInlineSdt = true;
+	});
+	const preserveBoundaryOccurrences = options.preserveSdtBoundaryOccurrences ?? containsInlineSdt;
+	const emptyRanges = planEmptyRanges(stacked.map(({ content }) => content));
+	for (const [index, { content: item, stack }] of stacked.entries()) {
 		if (!isTrackedChangeWrapperChild(item)) continue;
 		const itemNodes = [];
-		if (item.type === "run") itemNodes.push(...convertRun(item, getTrackedRunFormatting(item.formatting), runScope, styleResolver, textBoxAnchors));
+		let commentsAlreadyApplied = false;
+		const anchored = emptyRanges.anchorAt.get(index);
+		if (anchored) itemNodes.push(schema.node(RANGE_ANCHOR_NODE_NAME, anchored));
+		else if (emptyRanges.closedAt.has(index)) continue;
+		else if (item.type === "commentRangeStart") {
+			openCommentIds.add(item.id);
+			if (preserveBoundaryOccurrences) {
+				itemNodes.push(schema.node(COMMENT_RANGE_BOUNDARY_NODE_NAME, { marker: item }));
+				commentsAlreadyApplied = true;
+			} else recordCommentBoundary("start", item.id, "revision");
+		} else if (item.type === "commentRangeEnd") {
+			openCommentIds.delete(item.id);
+			if (preserveBoundaryOccurrences) {
+				itemNodes.push(schema.node(COMMENT_RANGE_BOUNDARY_NODE_NAME, { marker: item }));
+				commentsAlreadyApplied = true;
+			} else recordCommentBoundary("end", item.id, "revision");
+		} else if (item.type === "commentReference") itemNodes.push(schema.node("commentReference", { commentId: item.id }));
+		else if (item.type === "run") itemNodes.push(...convertRun(item, getTrackedRunFormatting(item.formatting), runScope, styleResolver, textBoxAnchors));
 		else if (item.type === "hyperlink") {
 			const currentHyperlinkIndex = nextHyperlinkInstanceIndex();
 			itemNodes.push(...convertHyperlink(item, {
@@ -755,45 +791,47 @@ function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, runS
 				styleResolver,
 				hyperlinkIndex: currentHyperlinkIndex,
 				textBoxAnchors,
-				runScope
+				runScope,
+				openCommentIds
 			}));
+			commentsAlreadyApplied = true;
 		} else if (item.type === "simpleField" || item.type === "complexField") {
 			const fieldNode = convertField(item, {
 				getInheritedRunFormatting: getTrackedRunFormatting,
 				styleResolver,
 				nextHyperlinkInstanceIndex,
 				runScope,
-				textBoxAnchors
+				textBoxAnchors,
+				openCommentIds
 			});
 			if (fieldNode) itemNodes.push(fieldNode);
+			commentsAlreadyApplied = true;
 		} else if (item.type === "mathEquation") {
 			const mathNode = convertMathEquation(item);
 			if (mathNode) itemNodes.push(mathNode);
 		} 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, runScope, runFormattingResolvers, styleResolver, nestedMoveKind, textBoxAnchors, [...wrappedBy, ...stack]));
+			itemNodes.push(...convertTrackedChange(item, nestedMarkType, nextHyperlinkInstanceIndex, runScope, runFormattingResolvers, styleResolver, nestedMoveKind, textBoxAnchors, [...wrappedBy, ...stack], openCommentIds, {
+				preserveParentBoundaryOwnership,
+				preserveSdtBoundaryOccurrences: preserveBoundaryOccurrences
+			}));
+			commentsAlreadyApplied = true;
 		} else if (item.type === "inlineSdt") {
-			const sdtNode = convertInlineSdt(item, nextHyperlinkInstanceIndex, runScope, getTrackedRunFormatting, runFormattingResolvers, styleResolver, textBoxAnchors, [...wrappedBy, ...stack]);
+			const sdtNode = convertInlineSdt(item, nextHyperlinkInstanceIndex, runScope, getTrackedRunFormatting, runFormattingResolvers, styleResolver, textBoxAnchors, [...wrappedBy, ...stack], openCommentIds);
 			if (sdtNode) itemNodes.push(sdtNode);
-		} else if (item.type === "bookmarkStart") itemNodes.push(schema.node("bookmarkBoundary", {
-			type: "start",
-			id: item.id,
-			name: item.name,
-			colFirst: item.colFirst,
-			colLast: item.colLast,
-			displacedByCustomXml: item.displacedByCustomXml
-		}));
-		else if (item.type === "bookmarkEnd") itemNodes.push(schema.node("bookmarkBoundary", {
-			type: "end",
-			id: item.id,
-			displacedByCustomXml: item.displacedByCustomXml
-		}));
+			commentsAlreadyApplied = true;
+		} else if (item.type === "bookmarkStart") itemNodes.push(schema.node("bookmarkBoundary", bookmarkBoundaryAttrsFromMarker(item)));
+		else if (item.type === "bookmarkEnd") itemNodes.push(schema.node("bookmarkBoundary", bookmarkBoundaryAttrsFromMarker(item)));
 		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));
+		const wrappedNodes = withInlineWrapperMark(itemNodes, stack);
+		nodes.push(...commentsAlreadyApplied ? wrappedNodes : applyCommentMarks(wrappedNodes, openCommentIds));
 	}
+	if (preserveParentBoundaryOwnership) for (const commentId of commentsOpenBeforeRevision) recordCommentBoundary("start", commentId, "parent");
+	const boundaryCommentIds = new Set(commentRangeBoundaries.map(({ commentId }) => commentId));
+	for (const commentId of boundaryCommentIds) if (openCommentIds.has(commentId)) recordCommentBoundary("end", commentId, "parent");
 	const mark = schema.marks[markType].create({
 		revisionId: change.info.id,
 		author: change.info.author,
@@ -803,6 +841,7 @@ function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, runS
 		moveKind,
 		_docxOuterWrapperCount: wrappedBy.length,
 		_docxResolutionJoins: change.resolutionJoins ?? null,
+		_docxCommentRangeBoundaries: commentRangeBoundaries.length > 0 ? commentRangeBoundaries : void 0,
 		...markType === "deletion" ? { _historicalFormatting: true } : {}
 	});
 	const ancestor = {
@@ -880,6 +919,8 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 		set("shading", formatting?.shading);
 		set("tabs", formatting?.tabs);
 		set("kinsoku", formatting?.kinsoku);
+		set("autoSpaceDE", formatting?.autoSpaceDE);
+		set("autoSpaceDN", formatting?.autoSpaceDN);
 		set("overflowPunctuation", formatting?.overflowPunctuation);
 		set("suppressAutoHyphens", formatting?.suppressAutoHyphens);
 		set("pageBreakBefore", formatting?.pageBreakBefore);
@@ -918,7 +959,9 @@ function resolveTableStyleConditional(styleResolver, tableStyleId, conditionType
 	if (!style?.tblStylePr) return;
 	const conditional = style.tblStylePr.find((p) => p.type === conditionType);
 	if (!conditional) return;
-	const mergedRunProps = mergeTextFormatting(conditional.pPr?.runProperties ? resolveRunFormattingWithoutDefaults(conditional.pPr.runProperties, styleResolver) : void 0, conditional.rPr ? resolveRunFormattingWithoutDefaults(conditional.rPr, styleResolver) : void 0);
+	const runPropsFromPpr = conditional.pPr?.runProperties ? resolveRunFormattingWithoutDefaults(conditional.pPr.runProperties, styleResolver) : void 0;
+	const resolvedRpr = conditional.rPr ? resolveRunFormattingWithoutDefaults(conditional.rPr, styleResolver) : void 0;
+	const mergedRunProps = mergeTextFormatting(runPropsFromPpr, resolvedRpr);
 	const paragraphOverlay = extractTableParagraphOverlay(conditional.pPr);
 	const result = {};
 	if (conditional.tcPr) result.tcPr = conditional.tcPr;
@@ -930,7 +973,9 @@ function resolveTableBaseStyle(styleResolver, tableStyleId) {
 	if (!styleResolver || !tableStyleId) return;
 	const style = styleResolver.getStyle(tableStyleId);
 	if (!style) return;
-	const mergedRunProps = mergeTextFormatting(style.pPr?.runProperties ? resolveRunFormattingWithoutDefaults(style.pPr.runProperties, styleResolver) : void 0, style.rPr ? resolveRunFormattingWithoutDefaults(style.rPr, styleResolver) : void 0);
+	const runPropsFromPpr = style.pPr?.runProperties ? resolveRunFormattingWithoutDefaults(style.pPr.runProperties, styleResolver) : void 0;
+	const resolvedRpr = style.rPr ? resolveRunFormattingWithoutDefaults(style.rPr, styleResolver) : void 0;
+	const mergedRunProps = mergeTextFormatting(runPropsFromPpr, resolvedRpr);
 	const paragraphOverlay = extractTableParagraphOverlay(style.pPr);
 	const result = {};
 	if (style.tcPr) result.tcPr = style.tcPr;
@@ -973,7 +1018,8 @@ function mergeConditionalStyles(base, override) {
 function resolveTextFormatting(formatting, styleResolver) {
 	if (!formatting) return styleResolver?.resolveRunStyle(null);
 	if (!styleResolver) return formatting;
-	return mergeTextFormatting(styleResolver.resolveRunStyle(formatting.styleId), formatting);
+	const styleFormatting = styleResolver.resolveRunStyle(formatting.styleId);
+	return mergeTextFormatting(styleFormatting, formatting);
 }
 function convertTable(table, styleResolver, context) {
 	for (const row of table.rows) for (const cell of row.cells) {
@@ -1325,6 +1371,12 @@ function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPer
 			case "bookmarkEnd":
 				nodes.push(convertBlockBookmarkBoundary(block));
 				break;
+			case "moveFromRangeStart":
+			case "moveFromRangeEnd":
+			case "moveToRangeStart":
+			case "moveToRangeEnd":
+				nodes.push(convertBlockMoveRangeBoundary(block));
+				break;
 			default: panic(`Unsupported table cell content: ${JSON.stringify(block)}`);
 		}
 		return nodes;
@@ -1368,11 +1420,11 @@ function standaloneTableCellToProseMirror(cell, nodeType) {
 		defaultCellMargins: void 0
 	});
 }
-function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyperlinkInstanceIndex, runScope, textBoxAnchors }) {
+function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyperlinkInstanceIndex, runScope, textBoxAnchors, openCommentIds }) {
 	let fieldFormatting;
 	let fieldPropertyChanges;
 	const inlineNodes = [];
-	const hasPageBreakContent = fieldResultHasPageBreakContent(field);
+	const commentsOpenBeforeField = new Set(openCommentIds);
 	const resultRuns = field.type === "complexField" ? field.fieldResult : field.content.flatMap((content) => content.type === "run" ? [content] : []);
 	const appendRun = (run, into) => {
 		fieldFormatting ??= run.formatting;
@@ -1418,6 +1470,7 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 	};
 	if (field.type === "simpleField") for (const { content, stack } of withInlineWrapperStacks(field.content)) {
 		const itemNodes = [];
+		let commentsAlreadyApplied = false;
 		switch (content.type) {
 			case "run":
 				appendRun(content, itemNodes);
@@ -1435,8 +1488,10 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 					styleResolver,
 					hyperlinkIndex: nextHyperlinkInstanceIndex(),
 					textBoxAnchors,
-					runScope
+					runScope,
+					openCommentIds
 				}));
+				commentsAlreadyApplied = true;
 				break;
 			case "insertion":
 			case "deletion":
@@ -1446,13 +1501,22 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 				itemNodes.push(...convertTrackedChange(content, content.type === "insertion" || content.type === "moveTo" ? "insertion" : "deletion", nextHyperlinkInstanceIndex, runScope, {
 					current: getInheritedRunFormatting,
 					historical: getInheritedRunFormatting
-				}, styleResolver, content.type === "moveFrom" || content.type === "moveTo" ? content.type : null, textBoxAnchors));
+				}, styleResolver, content.type === "moveFrom" || content.type === "moveTo" ? content.type : null, textBoxAnchors, [], openCommentIds, { preserveParentBoundaryOwnership: false }));
+				commentsAlreadyApplied = true;
+				break;
+			case "commentRangeStart":
+				openCommentIds.add(content.id);
 				break;
-			default: break;
+			case "commentRangeEnd": openCommentIds.delete(content.id);
 		}
-		inlineNodes.push(...withInlineWrapperMark(itemNodes, stack));
+		const wrappedNodes = withInlineWrapperMark(itemNodes, stack);
+		inlineNodes.push(...commentsAlreadyApplied ? wrappedNodes : applyCommentMarks(wrappedNodes, openCommentIds));
+	}
+	else for (const run of field.fieldResult) {
+		const runNodes = [];
+		appendRun(run, runNodes);
+		inlineNodes.push(...runNodes);
 	}
-	else for (const run of field.fieldResult) appendRun(run, inlineNodes);
 	if (!fieldFormatting && field.type === "complexField" && field.fieldResult.length === 0) fieldFormatting = field.formatting;
 	const inheritedFormatting = getInheritedRunFormatting(fieldFormatting, field.fieldType);
 	const { marks } = buildRunMarks({
@@ -1461,12 +1525,12 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 		styleResolver,
 		createMark: runScope.createMark
 	});
-	const createStructuredField = (field.type === "simpleField" || hasPageBreakContent) && fieldRequiresStructuredContent(inlineNodes);
+	const createStructuredField = fieldRequiresStructuredContent(inlineNodes);
 	const displayText = getInlineDisplayText(schema.node("paragraph", null, inlineNodes));
 	const emptyResultRuns = displayText === "" && resultRuns.length > 0 && (field.type === "complexField" || field.content.length === resultRuns.length) && resultRuns.every((run) => run.content.every((item) => item.type === "text" && item.text === "")) ? resultRuns : void 0;
 	const resultPropertyChanges = emptyResultRuns ? emptyFieldRunPropertyChanges(emptyResultRuns) : fieldPropertyChanges;
 	if (!createStructuredField && resultPropertyChanges && resultPropertyChanges.length > 0) marks.push(schema.mark("runPropertyChange", { changes: [...resultPropertyChanges] }));
-	return schema.node(createStructuredField ? "structuredField" : "field", {
+	const fieldNode = schema.node(createStructuredField ? "structuredField" : "field", {
 		fieldType: field.fieldType,
 		instruction: field.instruction,
 		displayText,
@@ -1481,6 +1545,7 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 			runs: field.fieldCode
 		} : null
 	}, createStructuredField ? inlineNodes : void 0, marks);
+	return createStructuredField && fieldCommentCoverage(field.type === "simpleField" ? "simple" : "complex") === "children" ? fieldNode : applyCommentMarks([fieldNode], commentsOpenBeforeField).at(0) ?? fieldNode;
 }
 /**
 * Lift the transparent wrappers out of an inline content list, remembering for
@@ -1546,14 +1611,16 @@ function convertMathEquation(math) {
 * its own leaves, so nothing outside can mark them afterwards: the caller's
 * stack has to reach them here, under the wrappers written inside the control.
 */
-function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, runScope, getInheritedRunFormatting, trackedRunFormattingResolvers, styleResolver, textBoxAnchors, wrappedBy = []) {
+function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, runScope, getInheritedRunFormatting, trackedRunFormattingResolvers, styleResolver, textBoxAnchors, wrappedBy, openCommentIds) {
 	const props = sdt.properties;
 	const inlineNodes = [];
+	const commentsOpenBeforeSdt = new Set(openCommentIds);
 	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 = [];
+		let commentsAlreadyApplied = false;
 		const anchored = emptyRanges.anchorAt.get(index);
 		if (anchored) {
 			inlineNodes.push(...withInlineWrapperMark([schema.node(RANGE_ANCHOR_NODE_NAME, anchored)], stack));
@@ -1561,6 +1628,19 @@ function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, runScope, getInherite
 		}
 		if (emptyRanges.closedAt.has(index)) continue;
 		switch (content.type) {
+			case "commentRangeStart":
+				openCommentIds.add(content.id);
+				itemNodes.push(schema.node(COMMENT_RANGE_BOUNDARY_NODE_NAME, { marker: content }));
+				commentsAlreadyApplied = true;
+				break;
+			case "commentRangeEnd":
+				openCommentIds.delete(content.id);
+				itemNodes.push(schema.node(COMMENT_RANGE_BOUNDARY_NODE_NAME, { marker: content }));
+				commentsAlreadyApplied = true;
+				break;
+			case "commentReference":
+				itemNodes.push(schema.node("commentReference", { commentId: content.id }));
+				break;
 			case "run":
 				itemNodes.push(...convertRun(content, getInheritedRunFormatting(content.formatting), runScope, styleResolver, textBoxAnchors));
 				break;
@@ -1571,8 +1651,10 @@ function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, runScope, getInherite
 					styleResolver,
 					hyperlinkIndex: currentHyperlinkIndex,
 					textBoxAnchors,
-					runScope
+					runScope,
+					openCommentIds
 				}));
+				commentsAlreadyApplied = true;
 				break;
 			}
 			case "simpleField":
@@ -1582,21 +1664,28 @@ function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, runScope, getInherite
 					styleResolver,
 					nextHyperlinkInstanceIndex,
 					runScope,
-					textBoxAnchors
+					textBoxAnchors,
+					openCommentIds
 				});
 				if (fieldNode) itemNodes.push(fieldNode);
+				commentsAlreadyApplied = true;
 				break;
 			}
 			case "inlineSdt": {
-				const nestedSdt = convertInlineSdt(content, nextHyperlinkInstanceIndex, runScope, getInheritedRunFormatting, trackedRunFormattingResolvers, styleResolver, textBoxAnchors, stack);
+				const nestedSdt = convertInlineSdt(content, nextHyperlinkInstanceIndex, runScope, getInheritedRunFormatting, trackedRunFormattingResolvers, styleResolver, textBoxAnchors, stack, openCommentIds);
 				if (nestedSdt) itemNodes.push(nestedSdt);
+				commentsAlreadyApplied = true;
 				break;
 			}
 			case "insertion":
 			case "deletion":
 			case "moveTo":
 			case "moveFrom":
-				itemNodes.push(...convertTrackedChange(content, content.type === "insertion" || content.type === "moveTo" ? "insertion" : "deletion", nextHyperlinkInstanceIndex, runScope, trackedRunFormattingResolvers, styleResolver, content.type === "moveTo" || content.type === "moveFrom" ? content.type : null, textBoxAnchors));
+				itemNodes.push(...convertTrackedChange(content, content.type === "insertion" || content.type === "moveTo" ? "insertion" : "deletion", nextHyperlinkInstanceIndex, runScope, trackedRunFormattingResolvers, styleResolver, content.type === "moveTo" || content.type === "moveFrom" ? content.type : null, textBoxAnchors, stack, openCommentIds, {
+					preserveParentBoundaryOwnership: false,
+					preserveSdtBoundaryOccurrences: true
+				}));
+				commentsAlreadyApplied = true;
 				break;
 			case "mathEquation": {
 				const mathNode = convertMathEquation(content);
@@ -1604,21 +1693,10 @@ function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, runScope, getInherite
 				break;
 			}
 			case "bookmarkStart":
-				itemNodes.push(schema.node("bookmarkBoundary", {
-					type: "start",
-					id: content.id,
-					name: content.name,
-					colFirst: content.colFirst,
-					colLast: content.colLast,
-					displacedByCustomXml: content.displacedByCustomXml
-				}));
+				itemNodes.push(schema.node("bookmarkBoundary", bookmarkBoundaryAttrsFromMarker(content)));
 				break;
 			case "bookmarkEnd":
-				itemNodes.push(schema.node("bookmarkBoundary", {
-					type: "end",
-					id: content.id,
-					displacedByCustomXml: content.displacedByCustomXml
-				}));
+				itemNodes.push(schema.node("bookmarkBoundary", bookmarkBoundaryAttrsFromMarker(content)));
 				break;
 			case "moveFromRangeStart":
 			case "moveFromRangeEnd":
@@ -1631,9 +1709,11 @@ function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, runScope, getInherite
 				break;
 			default: panic(`Unsupported inline SDT content: ${JSON.stringify(content)}`);
 		}
-		inlineNodes.push(...withInlineWrapperMark(itemNodes, stack));
+		const wrappedNodes = withInlineWrapperMark(itemNodes, stack);
+		inlineNodes.push(...commentsAlreadyApplied ? wrappedNodes : applyCommentMarks(wrappedNodes, openCommentIds));
 	}
-	return schema.node("sdt", sdtAttrsFromProperties(props), inlineNodes.length > 0 ? inlineNodes : void 0);
+	const sdtNode = schema.node("sdt", sdtAttrsFromProperties(props), inlineNodes.length > 0 ? inlineNodes : void 0);
+	return sdtNode.childCount > 0 ? sdtNode : applyCommentMarks([sdtNode], commentsOpenBeforeSdt).at(0) ?? sdtNode;
 }
 /**
 * Convert a Run to ProseMirror text nodes with marks
@@ -1661,6 +1741,7 @@ function convertRun(run, resolvedStyleFormatting, runScope, styleResolver, textB
 			authoredFormatting: run.formatting,
 			nextNoteReferenceOccurrenceId: runScope.nextNoteReferenceOccurrenceId
 		});
+		for (const node of contentNodes) if (!isRunContentProjectionNode(content.type, node.type.name)) panic(`Run content ${content.type} projected unsupported inline node ${node.type.name}`);
 		nodes.push(...contentNodes);
 	}
 	return nodes;
@@ -2101,7 +2182,7 @@ function convertRunContent({ content, marks, formatting, textBoxAnchors, authore
 				const anchorId = textBoxAnchors?.get(shp);
 				return anchorId ? [schema.node("textBoxAnchor", { anchorId }).mark(marks)] : [];
 			}
-			return [withRunBoundaryMarks(withAlternateContent(convertShape(shp, carriedRunFormatting(authoredFormatting)), replayableShapeAlternateContent(content)), marks)];
+			return [withRunBoundaryMarks(withAlternateContent(convertShape(shp, carriedRunFormatting(authoredFormatting)), replayableShapeAlternateContent(content), content.alternateContent), marks)];
 		}
 		case "footnoteRef": {
 			const footnoteMark = schema.mark("footnoteRef", {
@@ -2199,12 +2280,13 @@ function convertImage({ image, rawXml, rawXmlMode, rawImageFingerprint, runForma
 	let cssFloat;
 	if (wrapType === "inline") cssFloat = "none";
 	else if (wrapType === "topAndBottom") cssFloat = "none";
-	else if (wrapType === "square" || wrapType === "tight" || wrapType === "through") if (wrapText === "left") cssFloat = "right";
-	else if (wrapText === "right") cssFloat = "left";
-	else if (hAlign === "left") cssFloat = "left";
-	else if (hAlign === "right") cssFloat = "right";
-	else cssFloat = "none";
-	else cssFloat = "none";
+	else if (wrapType === "square" || wrapType === "tight" || wrapType === "through") {
+		if (wrapText === "left") cssFloat = "right";
+		else if (wrapText === "right") cssFloat = "left";
+		else if (hAlign === "left") cssFloat = "left";
+		else if (hAlign === "right") cssFloat = "right";
+		else cssFloat = "none";
+	} else cssFloat = "none";
 	let displayMode;
 	if (wrapType === "inline") displayMode = "inline";
 	else if (wrapType === "topAndBottom") displayMode = "block";
@@ -2300,11 +2382,12 @@ function convertImage({ image, rawXml, rawXmlMode, rawImageFingerprint, runForma
 		_docxRunFormatting: runFormatting
 	});
 }
-function convertHyperlink(hyperlink, { getInheritedRunFormatting, styleResolver, hyperlinkIndex, textBoxAnchors, runScope }) {
+function convertHyperlink(hyperlink, { getInheritedRunFormatting, styleResolver, hyperlinkIndex, textBoxAnchors, runScope, openCommentIds }) {
 	const nodes = [];
 	const href = hyperlink.href || (hyperlink.anchor ? `#${hyperlink.anchor}` : "");
 	const linkMark = schema.mark("hyperlink", {
 		href,
+		anchor: hyperlink.anchor,
 		tooltip: hyperlink.tooltip,
 		rId: hyperlink.rId,
 		target: hyperlink.target,
@@ -2314,7 +2397,27 @@ function convertHyperlink(hyperlink, { getInheritedRunFormatting, styleResolver,
 	});
 	for (const { content: child, stack } of withInlineWrapperStacks(hyperlink.children)) {
 		const childNodes = [];
+		let commentsAlreadyApplied = false;
 		switch (child.type) {
+			case "commentRangeStart":
+				openCommentIds.add(child.id);
+				childNodes.push(schema.node(COMMENT_RANGE_BOUNDARY_NODE_NAME, { marker: child }, void 0, [linkMark]));
+				commentsAlreadyApplied = true;
+				break;
+			case "commentRangeEnd":
+				openCommentIds.delete(child.id);
+				childNodes.push(schema.node(COMMENT_RANGE_BOUNDARY_NODE_NAME, { marker: child }, void 0, [linkMark]));
+				commentsAlreadyApplied = true;
+				break;
+			case "commentReference":
+				childNodes.push(schema.node("commentReference", { commentId: child.id }, void 0, [linkMark]));
+				break;
+			case "moveFromRangeStart":
+			case "moveFromRangeEnd":
+			case "moveToRangeStart":
+			case "moveToRangeEnd":
+				childNodes.push(schema.node(MOVE_RANGE_BOUNDARY_NODE_NAME, { marker: child }, void 0, [linkMark]));
+				break;
 			case "bookmarkStart":
 				childNodes.push(schema.node("bookmarkBoundary", {
 					type: "start",
@@ -2357,12 +2460,12 @@ function convertHyperlink(hyperlink, { getInheritedRunFormatting, styleResolver,
 				}));
 				break;
 			}
-			default: break;
 		}
-		nodes.push(...withInlineWrapperMark(childNodes, stack, {
+		const wrappedNodes = withInlineWrapperMark(childNodes, stack, {
 			hyperlinkIndex,
 			stackStart: 0
-		}));
+		});
+		nodes.push(...commentsAlreadyApplied ? wrappedNodes : applyCommentMarks(wrappedNodes, openCommentIds));
 	}
 	return nodes;
 }
@@ -2489,7 +2592,7 @@ function convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId, c
 	const keepWrapperParagraph = isEmptyAfterExtraction && (preserveEmptyWrapper === true || hasParagraphBoundaryPayload(block, pmParagraph));
 	if (!isEmptyAfterExtraction || keepWrapperParagraph) nodes.push(pmParagraph);
 	const standalone = isEmptyAfterExtraction && !keepWrapperParagraph;
-	for (const [index, { textBox, alternateContentXml, anchorId, trackedChange, inlineSdts }] of textBoxes.entries()) {
+	for (const [index, { textBox, alternateContent, anchorId, trackedChange, inlineSdts }] of textBoxes.entries()) {
 		const textBoxNode = convertTextBox(textBox, styleResolver, {
 			placement: standalone ? "standalone" : "inlineWithPrevious",
 			groupId: textBoxGroupId,
@@ -2500,7 +2603,7 @@ function convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId, c
 			...standalone && index === 0 && block.preservedAttributes ? { hostPreservedAttributes: block.preservedAttributes } : {},
 			...standalone && index === 0 ? { hostParagraph: hostParagraphAttrs(pmParagraph.attrs) } : {}
 		});
-		nodes.push(withAlternateContent(textBoxNode, alternateContentXml));
+		nodes.push(withAlternateContent(textBoxNode, alternateContent?.verbatimXml, alternateContent));
 	}
 	return nodes;
 }
@@ -2539,93 +2642,99 @@ function extractTextBoxesFromParagraph(paragraph, textBoxGroupId) {
 	if (!mayContainTextBox(paragraph)) return NO_EXTRACTED_TEXT_BOXES;
 	return extractTextBoxes(paragraph, textBoxGroupId);
 }
-function mayContainTextBox(paragraph) {
-	for (const item of paragraph.content) {
-		if (item.type !== "run") {
-			if (item.type === "inlineSdt" || item.type === "hyperlink" || item.type === "insertion" || item.type === "deletion" || item.type === "moveFrom" || item.type === "moveTo") return true;
+/** Walk the same projected child inventory for the fast path and collector. */
+function visitTextBoxRuns({ items, context, visitRun }) {
+	for (const item of items) {
+		if (item.type === "run") {
+			if (visitRun(item, context)) return true;
 			continue;
 		}
-		for (const content of item.content) if (content.type === "shape" && content.shape.textBody) return true;
-	}
-	return false;
-}
-function extractTextBoxes(paragraph, textBoxGroupId) {
-	const textBoxes = [];
-	const textBoxAnchors = /* @__PURE__ */ new Map();
-	const visitRun = (run, context) => {
-		for (const runContent of run.content) {
-			if (runContent.type !== "shape" || !runContent.shape.textBody) continue;
-			const anchorId = `${textBoxGroupId}:${textBoxes.length}`;
-			textBoxAnchors.set(runContent.shape, anchorId);
-			textBoxes.push({
-				textBox: textBoxFromShape(runContent.shape, runContent.shape.textBody),
-				alternateContentXml: replayableShapeAlternateContent(runContent),
-				anchorId,
-				trackedChange: context.trackedChange,
-				inlineSdts: context.inlineSdts
-			});
+		if (item.type === "complexField") {
+			for (const run of item.fieldResult) if (visitRun(run, context)) return true;
+			continue;
 		}
-	};
-	const visitHyperlink = (hyperlink, context) => {
-		for (const child of hyperlink.children) if (child.type === "run") visitRun(child, context);
-	};
-	const visitTrackedChange = (change, context) => {
-		const trackedChange = {
-			type: change.type,
-			info: change.info
-		};
-		for (const item of change.content) {
-			if (item.type === "run") {
-				visitRun(item, {
+		if (item.type === "simpleField") {
+			if (visitTextBoxRuns({
+				items: item.content,
+				context,
+				visitRun
+			})) return true;
+			continue;
+		}
+		if (item.type === "insertion" || item.type === "deletion" || item.type === "moveFrom" || item.type === "moveTo") {
+			const trackedChange = {
+				type: item.type,
+				info: item.info
+			};
+			if (visitTextBoxRuns({
+				items: item.content,
+				context: {
 					...context,
 					trackedChange
-				});
-				continue;
-			}
-			if (item.type === "hyperlink") visitHyperlink(item, {
-				...context,
-				trackedChange
-			});
-		}
-	};
-	const visitInlineSdt = (sdt, context) => {
-		const inlineSdts = [...context.inlineSdts, sdtAttrsFromProperties(sdt.properties)];
-		const nestedContext = {
-			...context,
-			inlineSdts
-		};
-		for (const item of sdt.content) {
-			if (item.type === "run") {
-				visitRun(item, nestedContext);
-				continue;
-			}
-			if (item.type === "inlineSdt") {
-				visitInlineSdt(item, nestedContext);
-				continue;
-			}
-			if (item.type === "hyperlink") {
-				visitHyperlink(item, nestedContext);
-				continue;
-			}
-			if (item.type === "insertion" || item.type === "deletion" || item.type === "moveFrom" || item.type === "moveTo") visitTrackedChange(item, nestedContext);
-		}
-	};
-	const rootContext = { inlineSdts: [] };
-	for (const item of paragraph.content) {
-		if (item.type === "run") {
-			visitRun(item, rootContext);
+				},
+				visitRun
+			})) return true;
 			continue;
 		}
 		if (item.type === "inlineSdt") {
-			visitInlineSdt(item, rootContext);
+			const inlineSdts = [...context.inlineSdts, sdtAttrsFromProperties(item.properties)];
+			if (visitTextBoxRuns({
+				items: item.content,
+				context: {
+					...context,
+					inlineSdts
+				},
+				visitRun
+			})) return true;
 			continue;
 		}
 		if (item.type === "hyperlink") {
-			visitHyperlink(item, rootContext);
+			if (visitTextBoxRuns({
+				items: item.children,
+				context,
+				visitRun
+			})) return true;
 			continue;
 		}
-		if (item.type === "insertion" || item.type === "deletion" || item.type === "moveFrom" || item.type === "moveTo") visitTrackedChange(item, rootContext);
+		if (item.type === "inlineWrapper") {
+			if (visitTextBoxRuns({
+				items: item.content,
+				context,
+				visitRun
+			})) return true;
+		}
 	}
+	return false;
+}
+function mayContainTextBox(paragraph) {
+	return visitTextBoxRuns({
+		items: paragraph.content,
+		context: { inlineSdts: [] },
+		visitRun: (run) => run.content.some((content) => content.type === "shape" && content.shape.textBody)
+	});
+}
+function extractTextBoxes(paragraph, textBoxGroupId) {
+	const textBoxes = [];
+	const textBoxAnchors = /* @__PURE__ */ new Map();
+	visitTextBoxRuns({
+		items: paragraph.content,
+		context: { inlineSdts: [] },
+		visitRun: (run, context) => {
+			for (const runContent of run.content) {
+				if (runContent.type !== "shape" || !runContent.shape.textBody) continue;
+				const anchorId = `${textBoxGroupId}:${textBoxes.length}`;
+				textBoxAnchors.set(runContent.shape, anchorId);
+				textBoxes.push({
+					textBox: textBoxFromShape(runContent.shape, runContent.shape.textBody),
+					alternateContent: replayableShapeAlternateContent(runContent) === void 0 ? void 0 : runContent.alternateContent,
+					anchorId,
+					trackedChange: context.trackedChange,
+					inlineSdts: context.inlineSdts
+				});
+			}
+			return false;
+		}
+	});
 	return {
 		textBoxes,
 		textBoxAnchors
@@ -2714,12 +2823,13 @@ function convertTextBox(textBox, styleResolver, options) {
 	let cssFloat;
 	if (wrapType === void 0 || wrapType === "inline") cssFloat = "none";
 	else if (wrapType === "topAndBottom") cssFloat = "none";
-	else if (wrapType === "square" || wrapType === "tight" || wrapType === "through") if (wrapText === "left") cssFloat = "right";
-	else if (wrapText === "right") cssFloat = "left";
-	else if (hAlign === "left") cssFloat = "left";
-	else if (hAlign === "right") cssFloat = "right";
-	else cssFloat = "none";
-	else cssFloat = "none";
+	else if (wrapType === "square" || wrapType === "tight" || wrapType === "through") {
+		if (wrapText === "left") cssFloat = "right";
+		else if (wrapText === "right") cssFloat = "left";
+		else if (hAlign === "left") cssFloat = "left";
+		else if (hAlign === "right") cssFloat = "right";
+		else cssFloat = "none";
+	} else cssFloat = "none";
 	let displayMode;
 	if (wrapType === void 0 || wrapType === "inline") displayMode = "inline";
 	else if (wrapType === "topAndBottom") displayMode = "block";
@@ -2851,13 +2961,19 @@ function headerFooterToProseDoc(content, options) {
 			case "bookmarkEnd":
 				out.push(convertBlockBookmarkBoundary(block));
 				break;
+			case "moveFromRangeStart":
+			case "moveFromRangeEnd":
+			case "moveToRangeStart":
+			case "moveToRangeEnd":
+				out.push(convertBlockMoveRangeBoundary(block));
+				break;
 			default: panic(`Unsupported block content: ${JSON.stringify(block)}`);
 		}
 		return out;
 	};
 	nodes.push(...convertBlocks(content));
 	if (nodes.length === 0) nodes.push(schema.node("paragraph", {}, []));
-	const pmDoc = stampNumberedRefFieldBaselines(schema.node("doc", null, nodes));
+	const pmDoc = stampNumberedRefFieldBaselines(schema.node("doc", null, [...continueSourceCarrierIdentitiesAcrossInsertedParagraphMarks(nodes)]));
 	assertValidProseMirrorDocument(pmDoc, "Header/footer conversion produced an invalid ProseMirror document");
 	return pmDoc;
 }
@@ -2871,4 +2987,4 @@ function createEmptyDoc() {
 	return schema.node("doc", null, [schema.node("paragraph", {}, [])]);
 }
 //#endregion
-export { collectPairedBookmarkIds, createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, standaloneTableCellToProseMirror, toProseDoc };
+export { collectPairedBookmarkIds, createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, hostParagraphAttrs, standaloneTableCellToProseMirror, toProseDoc };