@stll/folio-core 0.62.0 → 0.63.1

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -1,10 +1,11 @@
+import { removeCommentMarkers } from "../../docx/commentAnchorIndex.js";
 import { joinCommentRangesAcrossParagraphs } from "../../docx/commentRangeJoin.js";
 import { completeCommentReferences } from "../../docx/commentReferenceCompletion.js";
 import { buildSections } from "../../docx/documentParser.js";
 import { normalizeFoldedListNumbers } from "../../docx/foldedListNumberFields.js";
 import { getDocumentSourceStyles } from "../../docx/headerFooterVerbatim.js";
 import { EDITED_PREVIEW_FINGERPRINT, imageRawXmlFingerprint } from "../../docx/imageRawXml.js";
-import { isInlineSdtContent, isSimpleFieldContent } from "../../docx/inlineWrapperContent.js";
+import { isHyperlinkContent, isInlineSdtContent, isSimpleFieldContent } from "../../docx/inlineWrapperContent.js";
 import { paragraphNumberingReferenceId, sameStatedParagraphNumbering as sameStatedParagraphNumbering$1 } from "../../docx/numberingReference.js";
 import { PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, ParagraphPropertySourceValidationError, assignParagraphIndentationProjection, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphPropertyCapture, copyParagraphPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, inspectParagraphSourceIdentity, isParagraphPropertySourceToken, linkParagraphPropertySourceCandidate, paragraphFormattingWithAuthoredIndentation, paragraphPropertySourceTokenMatchesContract, recreateProseNodeWithParagraphPropertySource, restoreTableCellsWithParagraphPropertySources, visitDocumentStoryParagraphs, visitTableCellParagraphPropertySourceBindings } from "../../docx/paragraphPropertySource.js";
 import { BLOCK_TREE_DESCENT, visitBlockTreeRecords, visitDocxParagraphs } from "../../docx/paragraphTraversal.js";
@@ -20,18 +21,22 @@ import { canonicalJson } from "../../utils/canonicalJson.js";
 import { getFindParagraphText } from "../../utils/findReplace.js";
 import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
 import { emuToPixels, emuToStrokePixels, pixelsToEmu } from "../../utils/units.js";
-import { unchangedAlternateContentXml } from "../alternateContentAttrs.js";
+import { editedAlternateContent, unchangedAlternateContentXml } from "../alternateContentAttrs.js";
 import { expectBlockCustomXmlAttrs, expectBlockSdtAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectFieldAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectInlineWrapperMarkAttrs, expectMathAttrs, expectPageBreakRunAttrs, expectParagraphAttrs, expectPreservedBlockAttrs, expectPreservedXmlAttrs, expectRunIdentityMarkAttrs, expectRunPropertyChangeMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectSymbolAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTrackedChangeMarkAttrs } from "../attrs/index.js";
 import { readAuthoredTransform } from "../authoredTransformAttrs.js";
 import { autospacingMatchesBase, hasAutospacingBaseSide } from "../autospacingBase.js";
 import { bookmarkMarkerFromAttrs, expectBookmarkBoundaryAttrs } from "../bookmarkBoundaryAttrs.js";
 import { paragraphRejectAttrPatch, paragraphRejectOriginalFormatting, removeParagraphPropertyChanges } from "../commands/propertyChangeScope.js";
+import { trackedCommentBoundaryOwner } from "../commentBoundaryOwnership.js";
+import { expectCommentRangeBoundaryAttrs } from "../commentRangeBoundaryAttrs.js";
 import { expectCommentReferenceAttrs } from "../commentReferenceAttrs.js";
 import { enclosingRevisionIds } from "../contentControlRevisions.js";
 import { INLINE_WRAPPER_MARK_NAME } from "../extensions/marks/InlineWrapperExtension.js";
 import { textFormattingToMarks } from "../extensions/marks/markUtils.js";
+import "../extensions/nodes/CommentRangeBoundaryExtension.js";
 import "../extensions/nodes/MoveRangeBoundaryExtension.js";
 import "../extensions/nodes/RangeAnchorExtension.js";
+import { fieldCommentCoverage } from "../fieldRepresentation.js";
 import { inlineWrapperMember, inlineWrapperStackKey } from "../inlineWrapperStack.js";
 import { completeNumberingForDoc } from "../listInstanceReferences.js";
 import { LIST_RENDERING_ATTR_KEYS, hasListRendering, listRenderingFromAttrs as listRenderingFromAttrs$1 } from "../listRenderingAttrs.js";
@@ -52,13 +57,14 @@ import { PRESERVED_XML_LEVELS } from "../schema/nodes.js";
 import { parseShapeGeometryAdjustments } from "../shapeGeometryAdjustments.js";
 import { expectTextBoxAnchorAttrs } from "../textBoxAnchorAttrs.js";
 import { textBoxHostParagraph } from "../textBoxHostParagraph.js";
-import { enclosingInsertionAncestors, inlineWrapperStackOf } from "../trackedRevisionPath.js";
+import { enclosingInsertionAncestors, inlineWrapperStackOf, trackedRevisionLayerOf } from "../trackedRevisionPath.js";
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { hasSinkChildren } from "./preservedSinkCarriers.js";
 import { decodeSdtListItems, sdtPropertiesFromAttrs, sdtPropertiesMatchAttrs } from "./sdtAttrs.js";
 import { TaggedError, panic } from "better-result";
-import { DRAWING_RAW_XML_MODES, relationshipIdOf } from "@stll/docx-core/model";
+import { DRAWING_RAW_XML_MODES, finalizeParagraphFormatting, relationshipIdOf, setDocumentBodyComments } from "@stll/docx-core/model";
 import { Fragment } from "prosemirror-model";
+import { survivingComments } from "@stll/docx-core/ops";
 //#region src/prosemirror/conversion/fromProseDoc.ts
 /**
 * ProseMirror to Document Conversion
@@ -274,7 +280,8 @@ const restoreLinkedParagraphPropertySources = (content) => {
 		sources: new Set(targetsBySource.keys())
 	};
 };
-var SaveStylesheetSourceMismatch = class extends TaggedError("SaveStylesheetSourceMismatch") {};
+const SaveStylesheetSourceMismatchBase = TaggedError("SaveStylesheetSourceMismatch");
+var SaveStylesheetSourceMismatch = class extends SaveStylesheetSourceMismatchBase {};
 const parsedPackageStyles = (document, liveStyles) => {
 	const source = getDocumentSourceStyles(document, liveStyles);
 	switch (source.type) {
@@ -352,7 +359,8 @@ const saveStylesheet = (source, baseDocument) => {
 		default: return panic(`Unexpected stylesheet source: ${JSON.stringify(source)}`);
 	}
 };
-var MissingSaveStylesheet = class extends TaggedError("MissingSaveStylesheet") {};
+const MissingSaveStylesheetBase = TaggedError("MissingSaveStylesheet");
+var MissingSaveStylesheet = class extends MissingSaveStylesheetBase {};
 const assertSaveStylesheetAvailable = ({ pmDoc, styles, baseDocument, stylesheetSource }) => {
 	if (styles !== void 0) return;
 	if (stylesheetSource.type === "package" && baseDocument !== void 0) return;
@@ -396,11 +404,14 @@ function fromProseDoc(pmDoc, baseDocument, { stylesheetSource, reuse = "none" })
 	const linkedSources = restoreLinkedParagraphPropertySources(blocks);
 	if (tokenSources) restoreParagraphPropertySourcesByToken(blocks, tokenSources);
 	else if (baseDocument) restoreParagraphPropertySources(blocks, baseDocument.package.document.content, linkedSources.targets, linkedSources.sources);
+	visitDocxParagraphs({ documentBody: { content: blocks } }, (paragraph) => {
+		if (finalizeParagraphFormatting(paragraph.formatting) === void 0) delete paragraph.formatting;
+	});
 	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 = buildSections(blocks, documentBody.finalSectionProperties);
-	if (baseDocument?.package.document.comments) documentBody.comments = baseDocument.package.document.comments;
+	if (baseDocument?.package.document.comments) setDocumentBodyComments(documentBody, baseDocument.package.document.comments);
 	const numbering = completeNumberingForDoc(baseDocument?.package.numbering, pmDoc);
 	if (baseDocument) {
 		const updatedDocument = {
@@ -412,6 +423,17 @@ function fromProseDoc(pmDoc, baseDocument, { stylesheetSource, reuse = "none" })
 				...numbering ? { numbering } : {}
 			}
 		};
+		const projectedCommentIds = /* @__PURE__ */ new Set();
+		pmDoc.descendants((node) => {
+			for (const commentId of getCommentMarkIds(node.marks)) projectedCommentIds.add(commentId);
+		});
+		const comments = survivingComments(updatedDocument, projectedCommentIds);
+		const keptIds = new Set(comments.map(({ id }) => id));
+		const retiredIds = new Set((updatedDocument.package.document.comments ?? []).filter(({ id }) => !keptIds.has(id)).map(({ id }) => id));
+		if (retiredIds.size > 0) {
+			updatedDocument.package.document.content = removeCommentMarkers(updatedDocument.package.document.content, retiredIds);
+			setDocumentBodyComments(updatedDocument.package.document, comments);
+		}
 		copyDocumentParagraphPropertySourceContract(updatedDocument, baseDocument);
 		return updatedDocument;
 	}
@@ -453,11 +475,12 @@ function stripSuggestedInlineMarks(marks, readFormattingContext) {
 			},
 			...previousFormatting !== void 0 ? { directFormatting: previousFormatting } : {}
 		});
-		const effectivePreviousFormatting = mergeTextFormatting(preservedCharacterStyleAttrs ? resolveEffectiveRunStyleFormatting({
+		const styleFormatting = preservedCharacterStyleAttrs ? resolveEffectiveRunStyleFormatting({
 			marks,
 			paragraphFormatting,
 			styleResolver
-		}) : paragraphFormatting, previousFormatting);
+		}) : paragraphFormatting;
+		const effectivePreviousFormatting = mergeTextFormatting(styleFormatting, previousFormatting);
 		next = next.filter((mark) => !RUN_FORMATTING_MARK_NAMES.has(mark.type.name));
 		for (const restored of textFormattingToMarks(effectivePreviousFormatting, suggestedRunPropertyChange.type.schema, {
 			overrideFormatting: previousFormatting,
@@ -705,6 +728,9 @@ function extractBlocks(inputDoc, refResolution = "resolve", styleResolver = null
 		} else if (node.type.name === "blockBookmarkBoundary") {
 			blocks.push(blockBookmarkMarker(node));
 			previousStandaloneTextBox = null;
+		} else if (node.type.name === "blockMoveRangeBoundary") {
+			blocks.push({ ...expectMoveRangeBoundaryAttrs(node) });
+			previousStandaloneTextBox = null;
 		}
 	});
 	if (pendingPageBreaks > 0 && !appendPendingPageBreaksToPreviousParagraph()) flushPendingPageBreaks();
@@ -955,15 +981,14 @@ function replaceTextBoxAnchorInBlocks(blocks, marker, textBoxRun) {
 * The inline list a text-box anchor run can be spliced out of, or nothing when
 * the item holds no such list.
 *
-* A complex field keeps its runs in `fieldCode`/`fieldResult`, two arrays
-* rather than one, and an anchor has never been placed in either; splicing one
-* would have to pick a side. The marker stays where it is and
-* `removeUnresolvedTextBoxAnchors` leaves it, as before.
+* Only a complex field's displayed result is projected into the editor, so
+* its anchors belong to `fieldResult`; its instruction runs stay untouched.
 */
 const textBoxAnchorHost = (item) => {
 	switch (item.type) {
 		case "hyperlink": return item.children;
 		case "simpleField": return item.content;
+		case "complexField": return item.fieldResult;
 		case "inlineSdt":
 		case "insertion":
 		case "deletion":
@@ -971,7 +996,6 @@ const textBoxAnchorHost = (item) => {
 		case "moveTo":
 		case "inlineWrapper": return item.content;
 		case "run":
-		case "complexField":
 		case "bookmarkStart":
 		case "bookmarkEnd":
 		case "commentRangeStart":
@@ -987,16 +1011,22 @@ const textBoxAnchorHost = (item) => {
 	}
 };
 function editTextBoxAnchorInContent(content, marker, replacement) {
+	const anchorSlot = marker.content.at(0);
+	if (!anchorSlot) return false;
 	for (const [index, item] of content.entries()) {
-		if (item === marker) {
-			content.splice(index, 1, ...replacement ? [replacement] : []);
-			return true;
+		if (item.type === "run") {
+			const slotIndex = item.content.indexOf(anchorSlot);
+			if (slotIndex >= 0) {
+				item.content.splice(slotIndex, 1, ...replacement?.content ?? []);
+				if (item.content.length === 0) content.splice(index, 1);
+				return true;
+			}
 		}
 		const nestedContent = textBoxAnchorHost(item);
 		if (!nestedContent) continue;
 		const hadContent = nestedContent.length > 0;
 		if (editTextBoxAnchorInContent(nestedContent, marker, replacement)) {
-			if (!replacement && hadContent && nestedContent.length === 0) content.splice(index, 1);
+			if (!replacement && hadContent && nestedContent.length === 0 && item.type !== "simpleField" && item.type !== "complexField") content.splice(index, 1);
 			return true;
 		}
 	}
@@ -1126,6 +1156,9 @@ function convertPMParagraph(node, documentCounts, textBoxAnchorMarkers, styleRes
 	if (attrs._propertyChanges && attrs._propertyChanges.length > 0) paragraph.propertyChanges = attrs._propertyChanges.map(propertyChangeFromAttrs);
 	if (attrs.pPrMark) paragraph.pPrMark = attrs.pPrMark;
 	if (attrs._preservedAttributes && attrs._preservedAttributes.length > 0) paragraph.preservedAttributes = attrs._preservedAttributes;
+	const finalizedFormatting = finalizeParagraphFormatting(paragraph.formatting);
+	if (finalizedFormatting === void 0) delete paragraph.formatting;
+	else paragraph.formatting = finalizedFormatting;
 	linkParagraphPropertySourceCandidate(paragraph, node);
 	return paragraph;
 }
@@ -1203,7 +1236,7 @@ function assignParagraphIndentation(result, attrs, orig) {
 		else result[key] = value;
 	}
 	const hanging = result.indentFirstLine !== void 0 && attrs.hangingIndent === true;
-	if (!changed && hanging === (orig.hangingIndent === true)) return;
+	if (!changed && hanging === (orig.hangingIndent === true) && !(result.indentFirstLine !== void 0 && orig.hangingIndent === false)) return;
 	if (hanging) result.hangingIndent = true;
 	else Reflect.deleteProperty(result, "hangingIndent");
 }
@@ -1237,16 +1270,24 @@ function paragraphAttrsToFormatting(attrs) {
 			if (typeof spaceAfter === "number") result.spaceAfter = spaceAfter;
 			else delete result.spaceAfter;
 		}
-		if (orig.spaceBefore !== void 0 || attrs.spacingExplicit?.before) if (typeof spaceBefore === "number") result.spaceBefore = spaceBefore;
-		else Reflect.deleteProperty(result, "spaceBefore");
-		if (orig.spaceAfter !== void 0 || attrs.spacingExplicit?.after) if (typeof spaceAfter === "number") result.spaceAfter = spaceAfter;
-		else Reflect.deleteProperty(result, "spaceAfter");
+		if (orig.spaceBefore !== void 0 || attrs.spacingExplicit?.before) {
+			if (typeof spaceBefore === "number") result.spaceBefore = spaceBefore;
+			else Reflect.deleteProperty(result, "spaceBefore");
+		}
+		if (orig.spaceAfter !== void 0 || attrs.spacingExplicit?.after) {
+			if (typeof spaceAfter === "number") result.spaceAfter = spaceAfter;
+			else Reflect.deleteProperty(result, "spaceAfter");
+		}
 		const originalHasDirectLineSpacing = orig.lineSpacing !== void 0;
-		if (hasDirectLineSpacing || originalHasDirectLineSpacing) if (typeof attrs.lineSpacing === "number") result.lineSpacing = attrs.lineSpacing;
-		else Reflect.deleteProperty(result, "lineSpacing");
+		if (hasDirectLineSpacing || originalHasDirectLineSpacing) {
+			if (typeof attrs.lineSpacing === "number") result.lineSpacing = attrs.lineSpacing;
+			else Reflect.deleteProperty(result, "lineSpacing");
+		}
 		const originalHasDirectLineSpacingRule = orig.lineSpacingRule !== void 0;
-		if (hasDirectLineSpacingRule || originalHasDirectLineSpacingRule) if (attrs.lineSpacingRule) result.lineSpacingRule = attrs.lineSpacingRule;
-		else Reflect.deleteProperty(result, "lineSpacingRule");
+		if (hasDirectLineSpacingRule || originalHasDirectLineSpacingRule) {
+			if (attrs.lineSpacingRule) result.lineSpacingRule = attrs.lineSpacingRule;
+			else Reflect.deleteProperty(result, "lineSpacingRule");
+		}
 		if (directAlignment === void 0) Reflect.deleteProperty(result, "alignment");
 		else result.alignment = directAlignment;
 		const statedNumbering = attrs.numPr;
@@ -1257,9 +1298,14 @@ function paragraphAttrsToFormatting(attrs) {
 			if (statedNumbering !== void 0) result.numPr = statedNumbering;
 			else delete result.numPr;
 			delete result.numPrFromStyle;
+		} else if (!sameStatedParagraphNumbering$1(attrs.numPrFromStyle ?? void 0, orig.numPrFromStyle)) {
+			if (attrs.numPrFromStyle == null) delete result.numPrFromStyle;
+			else result.numPrFromStyle = attrs.numPrFromStyle;
+		}
+		if (attrs.styleId !== (orig.styleId ?? void 0)) {
+			if (attrs.styleId) result.styleId = attrs.styleId;
+			else delete result.styleId;
 		}
-		if (attrs.styleId !== (orig.styleId ?? void 0)) if (attrs.styleId) result.styleId = attrs.styleId;
-		else delete result.styleId;
 		assignParagraphIndentation(result, attrs, orig);
 		assignBooleanToggle(result, attrs, orig, "pageBreakBefore");
 		assignBooleanToggle(result, attrs, orig, "widowControl");
@@ -1268,14 +1314,20 @@ function paragraphAttrsToFormatting(attrs) {
 		assignBooleanToggle(result, attrs, orig, "runInWithNext");
 		assignBooleanToggle(result, attrs, orig, "snapToGrid");
 		assignBooleanToggle(result, attrs, orig, "kinsoku");
+		assignBooleanToggle(result, attrs, orig, "autoSpaceDE");
+		assignBooleanToggle(result, attrs, orig, "autoSpaceDN");
 		assignBooleanToggle(result, attrs, orig, "overflowPunctuation");
 		assignBooleanToggle(result, attrs, orig, "suppressAutoHyphens");
-		if (attrs.spacingExplicit !== orig.spacingExplicit) if (attrs.spacingExplicit) result.spacingExplicit = attrs.spacingExplicit;
-		else delete result.spacingExplicit;
+		if (attrs.spacingExplicit !== orig.spacingExplicit) {
+			if (attrs.spacingExplicit) result.spacingExplicit = attrs.spacingExplicit;
+			else delete result.spacingExplicit;
+		}
 		const bidi = authoredParagraphValue("bidi", directionToAuthoredBidi(attrs.direction), orig, attrs._resolvedFormatting);
-		if (bidi !== (orig.bidi ?? void 0)) if (bidi === void 0) delete result.bidi;
-		else result.bidi = bidi;
-		return result;
+		if (bidi !== (orig.bidi ?? void 0)) {
+			if (bidi === void 0) delete result.bidi;
+			else result.bidi = bidi;
+		}
+		return finalizeParagraphFormatting(result);
 	}
 	const resolved = attrs._resolvedFormatting;
 	const authored = (field, value) => authoredParagraphValue(field, value ?? void 0, void 0, resolved);
@@ -1300,9 +1352,11 @@ function paragraphAttrsToFormatting(attrs) {
 	const keepLines = authored("keepLines", attrs.keepLines);
 	const runInWithNext = authored("runInWithNext", attrs.runInWithNext);
 	const kinsoku = authored("kinsoku", attrs.kinsoku);
+	const autoSpaceDE = authored("autoSpaceDE", attrs.autoSpaceDE);
+	const autoSpaceDN = authored("autoSpaceDN", attrs.autoSpaceDN);
 	const overflowPunctuation = authored("overflowPunctuation", attrs.overflowPunctuation);
 	const suppressAutoHyphens = authored("suppressAutoHyphens", attrs.suppressAutoHyphens);
-	if (!(directAlignment !== void 0 || shouldSerializeSpaceBefore || shouldSerializeSpaceAfter || beforeAutospacingEdited || afterAutospacingEdited || hasDirectLineSpacing || hasDirectLineSpacingRule || snapToGrid != null || indentLeft !== void 0 || indentRight || indentFirstLine !== void 0 || attrs.numPr || attrs.styleId || borders || shading || tabs || outlineLevel !== void 0 || contextualSpacing || attrs.spacingExplicit || bidi != null || pageBreakBefore != null || widowControl != null || keepNext != null || keepLines != null || runInWithNext != null || kinsoku != null || overflowPunctuation != null || suppressAutoHyphens != null)) return;
+	if (!(directAlignment !== void 0 || shouldSerializeSpaceBefore || shouldSerializeSpaceAfter || beforeAutospacingEdited || afterAutospacingEdited || hasDirectLineSpacing || hasDirectLineSpacingRule || snapToGrid != null || indentLeft !== void 0 || indentRight || indentFirstLine !== void 0 || attrs.numPr || attrs.styleId || borders || shading || tabs || outlineLevel !== void 0 || contextualSpacing || attrs.spacingExplicit || bidi != null || pageBreakBefore != null || widowControl != null || keepNext != null || keepLines != null || runInWithNext != null || kinsoku != null || autoSpaceDE != null || autoSpaceDN != null || overflowPunctuation != null || suppressAutoHyphens != null)) return;
 	const f = {};
 	if (directAlignment !== void 0) f.alignment = directAlignment;
 	if (shouldSerializeSpaceBefore) f.spaceBefore = spaceBefore;
@@ -1331,9 +1385,11 @@ function paragraphAttrsToFormatting(attrs) {
 	if (keepLines != null) f.keepLines = keepLines;
 	if (runInWithNext != null) f.runInWithNext = runInWithNext;
 	if (kinsoku != null) f.kinsoku = kinsoku;
+	if (autoSpaceDE != null) f.autoSpaceDE = autoSpaceDE;
+	if (autoSpaceDN != null) f.autoSpaceDN = autoSpaceDN;
 	if (overflowPunctuation != null) f.overflowPunctuation = overflowPunctuation;
 	if (suppressAutoHyphens != null) f.suppressAutoHyphens = suppressAutoHyphens;
-	return f;
+	return finalizeParagraphFormatting(f);
 }
 function createTrackedRunWrapper({ type, info, child, resolutionJoins }) {
 	const content = child ? [child] : [];
@@ -1528,7 +1584,7 @@ const nestInlineWrapperGroups = (items, groups, hyperlinkIndices, revisionOuterW
 	}
 	return coalesced;
 };
-function extractParagraphContent(originalParagraph, _documentCounts, emptyHyperlinks, textBoxAnchorMarkers, skipLeadingRenderedPageBreak = false, inheritedFormattingOverride) {
+function extractParagraphContent(originalParagraph, _documentCounts, emptyHyperlinks, textBoxAnchorMarkers, skipLeadingRenderedPageBreak = false, inheritedFormattingOverride, structuredCommentRangeScope) {
 	const paragraph = coalesceNoteReferenceOccurrences(originalParagraph);
 	const content = [];
 	const paragraphStyleContext = inheritedFormattingOverride === void 0 && paragraph.type.name === "paragraph" ? savedParagraphRunStyleContext(paragraph) : void 0;
@@ -1559,7 +1615,8 @@ function extractParagraphContent(originalParagraph, _documentCounts, emptyHyperl
 	const sourceHyperlinkIndices = /* @__PURE__ */ new WeakMap();
 	const revisionOuterWrapperCounts = /* @__PURE__ */ new WeakMap();
 	const revisionAncestorsByWrapper = /* @__PURE__ */ new WeakMap();
-	const openedComments = /* @__PURE__ */ new Set();
+	const openedComments = new Set(structuredCommentRangeScope?.openedBefore ?? []);
+	let precedingTrackedCommentRangeBoundaries;
 	const createIndexedHyperlink = (mark) => {
 		const hyperlink = createHyperlink(mark);
 		const index = expectHyperlinkMarkAttrs(mark)._docxHyperlinkIndex;
@@ -1567,9 +1624,20 @@ function extractParagraphContent(originalParagraph, _documentCounts, emptyHyperl
 		return hyperlink;
 	};
 	const commentLastOffset = /* @__PURE__ */ new Map();
+	let hasInlineSdt = false;
 	paragraph.forEach((node, offset) => {
+		hasInlineSdt ||= node.type.name === "sdt";
 		for (const commentId of getCommentMarkIds(node.marks)) commentLastOffset.set(commentId, offset);
 	});
+	let structuredCommentLastOffset = structuredCommentRangeScope?.lastOffsetByCommentId ?? /* @__PURE__ */ new Map();
+	if (!structuredCommentRangeScope && hasInlineSdt) {
+		const lastOffsetByCommentId = /* @__PURE__ */ new Map();
+		paragraph.descendants((node, offset) => {
+			for (const commentId of getCommentMarkIds(node.marks)) lastOffsetByCommentId.set(commentId, offset);
+			return true;
+		});
+		structuredCommentLastOffset = lastOffsetByCommentId;
+	}
 	const flushCurrentInline = () => {
 		if (currentRun) {
 			content.push(currentRun);
@@ -1605,8 +1673,80 @@ function extractParagraphContent(originalParagraph, _documentCounts, emptyHyperl
 		currentMarksKey = marksKey;
 		rememberSourceRunOwner(run, node, sourceRunOwners);
 	};
+	const trackedBoundary = (node) => {
+		const boundaryInsertionMark = node.marks.find((mark) => mark.type.name === "insertion");
+		const boundaryDeletionMark = node.marks.find((mark) => mark.type.name === "deletion");
+		const boundaryChangeMark = boundaryDeletionMark ?? boundaryInsertionMark;
+		if (!boundaryChangeMark) return void 0;
+		const changeAttrs = expectTrackedChangeMarkAttrs(boundaryChangeMark);
+		const info = {
+			id: changeAttrs.revisionId,
+			author: changeAttrs.author || "Unknown",
+			...changeAttrs.date ? { date: changeAttrs.date } : {},
+			...changeAttrs.utcDate ? { utcDate: {
+				attribute: DATE_UTC_ATTRIBUTE,
+				value: changeAttrs.utcDate
+			} } : {},
+			...changeAttrs.initials ? { initials: changeAttrs.initials } : {}
+		};
+		let type;
+		if (boundaryDeletionMark) type = changeAttrs.moveKind === "moveFrom" ? "moveFrom" : "deletion";
+		else type = changeAttrs.moveKind === "moveTo" ? "moveTo" : "insertion";
+		const revisionAncestors = enclosingInsertionAncestors({
+			insertionMark: boundaryDeletionMark ? boundaryInsertionMark : void 0,
+			ancestors: changeAttrs._docxRevisionAncestors ?? [],
+			node
+		});
+		const outerWrapperCount = changeAttrs._docxOuterWrapperCount ?? inlineWrapperStackOf(node).length;
+		return {
+			changeAttrs,
+			info,
+			key: `${type}:${JSON.stringify(info)}:${outerWrapperCount}:${JSON.stringify(revisionAncestors)}:${JSON.stringify(changeAttrs._docxResolutionJoins ?? void 0)}`,
+			outerWrapperCount,
+			revisionAncestors,
+			type
+		};
+	};
+	const establishTrackedBoundaryOwner = (node, sourceHost = "revision") => {
+		const boundary = trackedBoundary(node);
+		if (!boundary) return;
+		flushCurrentInline();
+		const { changeAttrs, info, key, outerWrapperCount, revisionAncestors, type } = boundary;
+		const linkMark = sourceHost === "indexed-hyperlink" ? node.marks.find((mark) => mark.type.name === "hyperlink") : void 0;
+		if (linkMark && currentTrackedChange?.type === "hyperlink" && currentTrackedChange.key === key && currentTrackedChange.hyperlinkKey === getLinkKey(linkMark)) return;
+		if (!linkMark && currentTrackedChange?.type === "direct" && currentTrackedChange.key === key) return;
+		const hyperlink = linkMark ? createIndexedHyperlink(linkMark) : void 0;
+		const wrapper = createTrackedRunWrapper({
+			type,
+			info,
+			...hyperlink ? { child: hyperlink } : {},
+			resolutionJoins: changeAttrs._docxResolutionJoins ?? void 0
+		});
+		revisionOuterWrapperCounts.set(wrapper, outerWrapperCount);
+		revisionAncestorsByWrapper.set(wrapper, revisionAncestors);
+		content.push(wrapper);
+		if (hyperlink && linkMark) {
+			currentTrackedChange = {
+				type: "hyperlink",
+				key,
+				wrapper,
+				hyperlink,
+				hyperlinkKey: getLinkKey(linkMark)
+			};
+			return;
+		}
+		currentTrackedChange = {
+			type: "direct",
+			key,
+			wrapper
+		};
+	};
 	const syncCommentRanges = (node, offset) => {
-		const nodeCommentIds = getCommentMarkIds(node.marks);
+		const nodeCommentIds = (node.type.name === "structuredField" && fieldCommentCoverage(expectFieldAttrs(node).fieldKind) === "children" || node.type.name === "sdt") && node.childCount > 0 ? getCommentMarkIds(node.child(0).marks) : getCommentMarkIds(node.marks);
+		const nodeTrackedBoundary = trackedBoundary(node);
+		const sourceCommentRangeBoundaries = precedingTrackedCommentRangeBoundaries;
+		const nodeCommentRangeBoundaries = nodeTrackedBoundary?.changeAttrs._docxCommentRangeBoundaries;
+		precedingTrackedCommentRangeBoundaries = nodeCommentRangeBoundaries;
 		const toClose = [];
 		for (const commentId of openedComments) {
 			const lastOffset = commentLastOffset.get(commentId) ?? offset;
@@ -1616,21 +1756,60 @@ function extractParagraphContent(originalParagraph, _documentCounts, emptyHyperl
 		for (const commentId of nodeCommentIds) if (!openedComments.has(commentId)) toOpen.push(commentId);
 		if (toClose.length === 0 && toOpen.length === 0) return;
 		flushCurrentInline();
-		currentTrackedChange = void 0;
 		for (const commentId of byCommentId(toClose)) {
-			content.push({
+			const fallbackOwner = nodeTrackedBoundary && currentTrackedChange?.type === "direct" && currentTrackedChange.key === nodeTrackedBoundary.key ? "revision" : "parent";
+			const sourceOwnsBoundary = trackedCommentBoundaryOwner({
+				boundaries: sourceCommentRangeBoundaries,
+				type: "end",
+				commentId,
+				fallback: fallbackOwner
+			}) === "revision";
+			const closingBoundaryOwner = currentTrackedChange?.type === "direct" && sourceOwnsBoundary ? currentTrackedChange.wrapper.content : content;
+			closingBoundaryOwner.push({
 				type: "commentRangeEnd",
 				id: commentId
 			});
 			openedComments.delete(commentId);
+			if (closingBoundaryOwner === content) currentTrackedChange = void 0;
 		}
+		if (currentTrackedChange?.type === "hyperlink") currentTrackedChange = void 0;
 		for (const commentId of byCommentId(toOpen)) {
-			content.push({
+			const owner = trackedCommentBoundaryOwner({
+				boundaries: nodeCommentRangeBoundaries,
+				type: "start",
+				commentId,
+				fallback: nodeTrackedBoundary ? "revision" : "parent"
+			});
+			if (owner === "revision") establishTrackedBoundaryOwner(node);
+			const openingBoundaryOwner = owner === "revision" && currentTrackedChange ? currentTrackedChange.wrapper.content : content;
+			openingBoundaryOwner.push({
 				type: "commentRangeStart",
 				id: commentId
 			});
 			openedComments.add(commentId);
+			if (openingBoundaryOwner === content) currentTrackedChange = void 0;
+		}
+	};
+	const commentsAfterStructuredNode = (node, offset) => {
+		const candidates = new Set(openedComments);
+		for (const commentId of getCommentMarkIds(node.marks)) candidates.add(commentId);
+		node.descendants((descendant) => {
+			for (const commentId of getCommentMarkIds(descendant.marks)) candidates.add(commentId);
+			return true;
+		});
+		const after = /* @__PURE__ */ new Set();
+		for (const commentId of candidates) {
+			const lastOffset = structuredCommentLastOffset.get(commentId);
+			const paragraphOffsetBase = structuredCommentRangeScope?.paragraphOffsetBase ?? 0;
+			if (lastOffset !== void 0 && lastOffset >= paragraphOffsetBase + offset + node.nodeSize) after.add(commentId);
 		}
+		return after;
+	};
+	const syncStructuredCommentExit = (node, offset) => {
+		if (node.type.name !== "structuredField" && node.type.name !== "sdt" || node.childCount === 0) return;
+		const finalCommentIds = node.type.name === "sdt" ? commentsAfterStructuredNode(node, offset) : getCommentMarkIds((fieldCommentCoverage(expectFieldAttrs(node).fieldKind) === "field" ? node : node.child(node.childCount - 1)).marks);
+		openedComments.clear();
+		for (const commentId of finalCommentIds) openedComments.add(commentId);
 	};
 	const flushEmptyHyperlinksThroughOffset = (offset) => {
 		while (nextEmptyHyperlink < sortedEmptyHyperlinks.length) {
@@ -1677,78 +1856,157 @@ function extractParagraphContent(originalParagraph, _documentCounts, emptyHyperl
 		}
 		leadingRenderedPageBreakPending = false;
 		enterWrapperGroup(node);
-		syncCommentRanges(node, offset);
+		if (node.type.name !== "commentRangeBoundary" && (node.type.name !== "sdt" || node.childCount === 0)) syncCommentRanges(node, offset);
+		const linkMark = node.marks.find((mark) => mark.type.name === "hyperlink");
+		if (node.type.name === "commentRangeBoundary") {
+			const { marker } = expectCommentRangeBoundaryAttrs(node);
+			precedingTrackedCommentRangeBoundaries = trackedBoundary(node)?.changeAttrs._docxCommentRangeBoundaries;
+			if (node.marks.some((mark) => mark.type.name === "insertion" || mark.type.name === "deletion")) {
+				flushCurrentInline();
+				establishTrackedBoundaryOwner(node, "indexed-hyperlink");
+				if (currentTrackedChange?.type === "hyperlink") currentTrackedChange.hyperlink.children.push(marker);
+				else if (currentTrackedChange) currentTrackedChange.wrapper.content.push(marker);
+				else content.push(marker);
+			} else if (linkMark) {
+				currentTrackedChange = void 0;
+				const linkKey = getLinkKey(linkMark);
+				if (!currentHyperlink || currentHyperlinkKey !== linkKey) {
+					flushCurrentInline();
+					currentHyperlink = createIndexedHyperlink(linkMark);
+					currentHyperlinkKey = linkKey;
+				}
+				currentHyperlink.children.push(marker);
+			} else {
+				flushCurrentInline();
+				currentTrackedChange = void 0;
+				content.push(marker);
+			}
+			if (marker.type === "commentRangeStart") openedComments.add(marker.id);
+			else openedComments.delete(marker.id);
+			return;
+		}
 		if (node.type.name === "commentReference") {
-			flushCurrentInline();
-			currentTrackedChange = void 0;
-			content.push({
+			establishTrackedBoundaryOwner(node, "indexed-hyperlink");
+			const reference = {
 				type: "commentReference",
 				id: expectCommentReferenceAttrs(node).commentId
-			});
+			};
+			const tracked = node.marks.some((mark) => mark.type.name === "insertion" || mark.type.name === "deletion");
+			if (tracked && currentTrackedChange) {
+				flushCurrentInline();
+				if (currentTrackedChange.type === "hyperlink") currentTrackedChange.hyperlink.children.push(reference);
+				else currentTrackedChange.wrapper.content.push(reference);
+			} else if (linkMark && !tracked) {
+				currentTrackedChange = void 0;
+				const linkKey = getLinkKey(linkMark);
+				if (!currentHyperlink || currentHyperlinkKey !== linkKey) {
+					flushCurrentInline();
+					currentHyperlink = createIndexedHyperlink(linkMark);
+					currentHyperlinkKey = linkKey;
+				}
+				currentHyperlink.children.push(reference);
+			} else {
+				flushCurrentInline();
+				currentTrackedChange = void 0;
+				content.push(reference);
+			}
+			return;
+		}
+		if (node.type.name === "moveRangeBoundary") {
+			const marker = { ...expectMoveRangeBoundaryAttrs(node) };
+			const tracked = node.marks.some((mark) => mark.type.name === "insertion" || mark.type.name === "deletion");
+			if (linkMark && !isHyperlinkContent(marker)) panic("A linked move boundary is not admitted by its hyperlink.");
+			if (tracked) {
+				establishTrackedBoundaryOwner(node, "indexed-hyperlink");
+				if (currentTrackedChange?.type === "hyperlink") currentTrackedChange.hyperlink.children.push(marker);
+				else if (currentTrackedChange) currentTrackedChange.wrapper.content.push(marker);
+				else content.push(marker);
+			} else if (linkMark) {
+				currentTrackedChange = void 0;
+				const linkKey = getLinkKey(linkMark);
+				if (!currentHyperlink || currentHyperlinkKey !== linkKey) {
+					flushCurrentInline();
+					currentHyperlink = createIndexedHyperlink(linkMark);
+					currentHyperlinkKey = linkKey;
+				}
+				currentHyperlink.children.push(marker);
+			} else {
+				flushCurrentInline();
+				currentTrackedChange = void 0;
+				content.push(marker);
+			}
 			return;
 		}
 		if (node.type.name === "rangeAnchor") {
-			flushCurrentInline();
-			currentTrackedChange = void 0;
 			const { start, end } = expectRangeAnchorAttrs(node);
-			content.push({ ...start }, { ...end });
+			if (linkMark && (!isHyperlinkContent(start) || !isHyperlinkContent(end))) panic("A linked range anchor must contain boundaries its hyperlink admits.");
+			if (node.marks.some((mark) => mark.type.name === "insertion" || mark.type.name === "deletion")) {
+				establishTrackedBoundaryOwner(node, "indexed-hyperlink");
+				if (currentTrackedChange?.type === "hyperlink") currentTrackedChange.hyperlink.children.push({ ...start }, { ...end });
+				else if (currentTrackedChange) currentTrackedChange.wrapper.content.push({ ...start }, { ...end });
+				else content.push({ ...start }, { ...end });
+			} else if (linkMark) {
+				currentTrackedChange = void 0;
+				const linkKey = getLinkKey(linkMark);
+				if (!currentHyperlink || currentHyperlinkKey !== linkKey) {
+					flushCurrentInline();
+					currentHyperlink = createIndexedHyperlink(linkMark);
+					currentHyperlinkKey = linkKey;
+				}
+				currentHyperlink.children.push({ ...start }, { ...end });
+			} else {
+				flushCurrentInline();
+				currentTrackedChange = void 0;
+				content.push({ ...start }, { ...end });
+			}
 			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");
 		const deletionMark = node.marks.find((m) => m.type.name === "deletion");
 		if (!insertionMark && !deletionMark) currentTrackedChange = void 0;
+		let anchorRun;
 		if (node.type.name === "textBoxAnchor") {
-			flushCurrentInline();
-			currentTrackedChange = void 0;
-			if (!textBoxAnchorMarkers) return;
+			if (!textBoxAnchorMarkers) {
+				flushCurrentInline();
+				currentTrackedChange = void 0;
+				return;
+			}
 			const { anchorId } = expectTextBoxAnchorAttrs(node);
+			if (textBoxAnchorMarkers.has(anchorId)) {
+				flushCurrentInline();
+				currentTrackedChange = void 0;
+				return;
+			}
 			const marker = {
 				type: "run",
-				content: []
+				content: [{
+					type: "preservedXml",
+					xml: "",
+					text: ""
+				}]
 			};
-			if (textBoxAnchorMarkers.has(anchorId)) return;
+			const formatting = getAtomRunFormattingFromMarks(node.marks, formattingContext);
+			if (formatting) marker.formatting = formatting;
+			restoreRunRecord(marker, node.marks);
 			textBoxAnchorMarkers.set(anchorId, marker);
-			const anchoredContent = linkMark ? createIndexedHyperlink(linkMark) : marker;
-			if (anchoredContent.type === "hyperlink") anchoredContent.children.push(marker);
-			const changeMark = insertionMark ?? deletionMark;
-			if (!changeMark) {
-				content.push(anchoredContent);
-				return;
-			}
-			const changeAttrs = expectTrackedChangeMarkAttrs(changeMark);
-			const info = {
-				id: changeAttrs.revisionId,
-				author: changeAttrs.author || "Unknown",
-				...changeAttrs.date ? { date: changeAttrs.date } : {},
-				...changeAttrs.utcDate ? { utcDate: {
-					attribute: DATE_UTC_ATTRIBUTE,
-					value: changeAttrs.utcDate
-				} } : {},
-				...changeAttrs.initials ? { initials: changeAttrs.initials } : {}
-			};
-			let type;
-			if (insertionMark) type = changeAttrs.moveKind === "moveTo" ? "moveTo" : "insertion";
-			else type = changeAttrs.moveKind === "moveFrom" ? "moveFrom" : "deletion";
-			const wrapper = createTrackedRunWrapper({
-				type,
-				info,
-				child: anchoredContent,
-				resolutionJoins: changeAttrs._docxResolutionJoins ?? void 0
-			});
-			revisionOuterWrapperCounts.set(wrapper, changeAttrs._docxOuterWrapperCount ?? inlineWrapperStackOf(node).length);
-			revisionAncestorsByWrapper.set(wrapper, changeAttrs._docxRevisionAncestors ?? []);
-			content.push(wrapper);
-			return;
+			anchorRun = marker;
 		}
 		if (insertionMark || deletionMark) {
 			flushCurrentInline();
-			const changeMark = deletionMark ?? insertionMark;
+			const deletionLayer = deletionMark ? trackedRevisionLayerOf(deletionMark, node) : void 0;
+			const insertionAttrs = insertionMark ? expectTrackedChangeMarkAttrs(insertionMark) : void 0;
+			const changeMark = deletionLayer !== void 0 && insertionAttrs?._docxRevisionAncestors?.some(({ revisionId, type }) => revisionId === deletionLayer.revisionId && type === deletionLayer.type) === true && insertionMark ? insertionMark : deletionMark ?? insertionMark;
 			if (!changeMark) return;
 			const changeAttrs = expectTrackedChangeMarkAttrs(changeMark);
+			const runFormattingContext = changeMark === deletionMark && changeAttrs._historicalFormatting ? {
+				...formattingContext,
+				inheritedFormatting: formattingContext.baseParagraphFormatting ?? formattingContext.inheritedFormatting,
+				paragraphMarkFormatting: void 0,
+				paragraphMarkPrecedesStyle: false
+			} : formattingContext;
 			const revisionAncestors = enclosingInsertionAncestors({
-				insertionMark: deletionMark ? insertionMark : void 0,
+				insertionMark: changeMark === deletionMark ? insertionMark : void 0,
 				ancestors: changeAttrs._docxRevisionAncestors ?? [],
 				node
 			});
@@ -1803,8 +2061,8 @@ function extractParagraphContent(originalParagraph, _documentCounts, emptyHyperl
 					currentTrackedChange.hyperlink.children.push(createPreservedInline(node));
 					return;
 				}
-				const run = createTrackedChangeRun({
-					...formattingContext,
+				const run = anchorRun ?? createTrackedChangeRun({
+					...runFormattingContext,
 					marks: otherMarks,
 					node
 				});
@@ -1830,10 +2088,6 @@ function extractParagraphContent(originalParagraph, _documentCounts, emptyHyperl
 				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,
@@ -1850,29 +2104,23 @@ function extractParagraphContent(originalParagraph, _documentCounts, emptyHyperl
 				currentTrackedChange.wrapper.content.push(createPreservedInline(node));
 				return;
 			}
-			const run = createTrackedChangeRun({
-				...formattingContext,
+			const run = anchorRun ?? createTrackedChangeRun({
+				...runFormattingContext,
 				marks: otherMarks,
 				node
 			});
 			if (run) appendRunToTrackedWrapper(currentTrackedChange.wrapper, run, node, sourceRunOwners);
 			return;
 		}
-		const ownedRun = linkMark || runIdentityId(node) === void 0 ? null : createTrackedChangeRun({
+		const ownedRun = linkMark ? null : anchorRun ?? (runIdentityId(node) === void 0 ? null : createTrackedChangeRun({
 			...formattingContext,
 			marks: node.marks,
 			node
-		});
+		}));
 		if (ownedRun) {
 			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));
@@ -1885,7 +2133,8 @@ function extractParagraphContent(originalParagraph, _documentCounts, emptyHyperl
 				currentHyperlink = createIndexedHyperlink(linkMark);
 				currentHyperlinkKey = linkKey;
 			}
-			addNodeToHyperlink({
+			if (anchorRun) appendRunToHyperlink(currentHyperlink, anchorRun, node, sourceRunOwners);
+			else addNodeToHyperlink({
 				...formattingContext,
 				hyperlink: currentHyperlink,
 				node,
@@ -1944,9 +2193,19 @@ function extractParagraphContent(originalParagraph, _documentCounts, emptyHyperl
 				marks: node.marks,
 				textBoxAnchorMarkers
 			}));
+			syncStructuredCommentExit(node, offset);
 		} else if (node.type.name === "sdt") {
 			flushCurrentInline();
-			content.push(createInlineSdtFromNode(node, textBoxAnchorMarkers, formattingContext));
+			content.push(createInlineSdtFromNode({
+				node,
+				paragraphOffsetBase: (structuredCommentRangeScope?.paragraphOffsetBase ?? 0) + offset + 1,
+				lastOffsetByCommentId: structuredCommentLastOffset,
+				...textBoxAnchorMarkers === void 0 ? {} : { textBoxAnchorMarkers },
+				formattingContext,
+				openedBefore: openedComments,
+				openedAfter: commentsAfterStructuredNode(node, offset)
+			}));
+			syncStructuredCommentExit(node, offset);
 		} else if (node.type.name === "math") {
 			flushCurrentInline();
 			content.push(createMathFromNode(node));
@@ -1976,10 +2235,18 @@ function extractParagraphContent(originalParagraph, _documentCounts, emptyHyperl
 	});
 	flushEmptyHyperlinksThroughOffset(Number.POSITIVE_INFINITY);
 	flushCurrentInline();
-	for (const commentId of byCommentId(openedComments)) content.push({
-		type: "commentRangeEnd",
-		id: commentId
-	});
+	for (const commentId of byCommentId(openedComments)) {
+		if (structuredCommentRangeScope?.openedAfter.has(commentId)) continue;
+		(currentTrackedChange?.type === "direct" && trackedCommentBoundaryOwner({
+			boundaries: precedingTrackedCommentRangeBoundaries,
+			type: "end",
+			commentId,
+			fallback: "parent"
+		}) === "revision" ? currentTrackedChange.wrapper.content : content).push({
+			type: "commentRangeEnd",
+			id: commentId
+		});
+	}
 	return nestInlineWrapperGroups(content, wrapperGroups, sourceHyperlinkIndices, revisionOuterWrapperCounts, revisionAncestorsByWrapper);
 }
 function createTrackedChangeRun({ baseParagraphFormatting, inheritedFormatting, marks, node, paragraphMarkFormatting, paragraphMarkPrecedesStyle, styleResolver }) {
@@ -2080,16 +2347,7 @@ function buildDocumentTrackedChangeCounts(pmDoc) {
 * Create a unique key for a link mark
 */
 function getLinkKey(mark) {
-	const attrs = expectHyperlinkMarkAttrs(mark);
-	return [
-		attrs.href,
-		attrs.rId ?? "",
-		attrs.tooltip ?? "",
-		attrs.target ?? "",
-		attrs.history === void 0 ? "" : String(attrs.history),
-		attrs.docLocation ?? "",
-		attrs._docxHyperlinkIndex ?? ""
-	].join("\0");
+	return JSON.stringify(expectHyperlinkMarkAttrs(mark));
 }
 /**
 * Create a unique key for a set of marks (excluding hyperlink)
@@ -2120,6 +2378,7 @@ function createHyperlink(linkMark) {
 	const hyperlink = {
 		type: "hyperlink",
 		href,
+		...attrs.anchor === void 0 ? {} : { anchor: attrs.anchor },
 		...metadata,
 		children: []
 	};
@@ -2546,7 +2805,7 @@ function createFieldFromNode(node, { baseParagraphFormatting, inheritedFormattin
 		}],
 		...formatting && Object.keys(formatting).length > 0 ? { formatting } : {}
 	};
-	if (marks && node.type.name === "field") restoreRunRecord(displayRun, marks);
+	if (marks) restoreRunRecord(displayRun, marks);
 	const fieldContent = extractedContent.length > 0 ? synchronizeFieldDisplayText(extractedContent, displayText, displayRun) : [];
 	const fallbackFieldContent = displayText ? [displayRun] : reconcileEmptyFieldResultRuns(attrs._docxEmptyResultRuns, displayRun);
 	if (attrs.fieldKind === "complex") {
@@ -2690,12 +2949,15 @@ const hoistUniformRevision = (sdt, enclosingIds) => {
 		}]
 	};
 };
-/**
-* Create an InlineSdt from a PM sdt node
-*/
-function createInlineSdtFromNode(node, textBoxAnchorMarkers, formattingContext) {
-	const properties = sdtPropertiesFromAttrs(expectSdtAttrs(node));
-	const content = extractParagraphContent(node, void 0, void 0, textBoxAnchorMarkers, false, formattingContext).filter(isInlineSdtContent);
+function createInlineSdtFromNode({ node, paragraphOffsetBase, lastOffsetByCommentId, textBoxAnchorMarkers, formattingContext, openedBefore, openedAfter }) {
+	const attrs = expectSdtAttrs(node);
+	const properties = sdtPropertiesFromAttrs(attrs);
+	const content = extractParagraphContent(node, void 0, void 0, textBoxAnchorMarkers, false, formattingContext, node.childCount === 0 ? void 0 : {
+		openedBefore,
+		openedAfter,
+		paragraphOffsetBase,
+		lastOffsetByCommentId
+	}).filter(isInlineSdtContent);
 	return hoistUniformRevision({
 		type: "inlineSdt",
 		properties,
@@ -2832,13 +3094,23 @@ const drawingFromImageAttrs = (image, attrs) => {
 };
 const shapeContentFromNode = ({ node, shape, captured }) => {
 	const xml = unchangedAlternateContentXml(node, captured);
-	return xml === void 0 ? {
+	if (xml !== void 0) return {
+		type: "shape",
+		shape,
+		alternateContent: refingerprintShapeAlternateContent(shape, xml)
+	};
+	const editedCapture = editedAlternateContent(node, captured);
+	return editedCapture?.shapeFingerprint === void 0 || editedCapture.structureFingerprint === void 0 ? {
 		type: "shape",
 		shape
 	} : {
 		type: "shape",
 		shape,
-		alternateContent: refingerprintShapeAlternateContent(shape, xml)
+		alternateContent: {
+			verbatimXml: editedCapture.xml,
+			verbatimFingerprint: editedCapture.shapeFingerprint,
+			verbatimStructureFingerprint: editedCapture.structureFingerprint
+		}
 	};
 };
 /**
@@ -2960,16 +3232,18 @@ function convertPMTable(node, documentCounts, styleResolver = null) {
 	const formatting = tableAttrsToFormatting(attrs) || void 0;
 	if (!formatting?.borders && !attrs._originalFormatting) {
 		const inferredBorders = inferTableBorders(rows);
-		if (inferredBorders) if (formatting) formatting.borders = inferredBorders;
-		else {
-			const minTable = {
-				type: "table",
-				formatting: { borders: inferredBorders },
-				rows
-			};
-			if (attrs.columnWidths) minTable.columnWidths = attrs.columnWidths;
-			restoreCarriedTableAttrs(minTable, attrs);
-			return minTable;
+		if (inferredBorders) {
+			if (formatting) formatting.borders = inferredBorders;
+			else {
+				const minTable = {
+					type: "table",
+					formatting: { borders: inferredBorders },
+					rows
+				};
+				if (attrs.columnWidths) minTable.columnWidths = attrs.columnWidths;
+				restoreCarriedTableAttrs(minTable, attrs);
+				return minTable;
+			}
 		}
 	}
 	const table = {
@@ -3044,25 +3318,37 @@ function tableAttrsToFormatting(attrs) {
 	if (attrs._originalFormatting) {
 		const orig = attrs._originalFormatting;
 		const result = { ...orig };
-		if (attrs.styleId !== (orig.styleId ?? void 0)) if (attrs.styleId) result.styleId = attrs.styleId;
-		else delete result.styleId;
-		if (attrs.justification !== (orig.justification ?? void 0)) if (attrs.justification) result.justification = attrs.justification;
-		else delete result.justification;
-		if (attrs.floating !== (orig.floating ?? void 0)) if (attrs.floating) result.floating = attrs.floating;
-		else delete result.floating;
-		if (attrs.look !== (orig.look ?? void 0)) if (attrs.look) result.look = attrs.look;
-		else delete result.look;
-		if (attrs.borders !== (orig.borders ?? void 0)) if (attrs.borders) result.borders = attrs.borders;
-		else delete result.borders;
+		if (attrs.styleId !== (orig.styleId ?? void 0)) {
+			if (attrs.styleId) result.styleId = attrs.styleId;
+			else delete result.styleId;
+		}
+		if (attrs.justification !== (orig.justification ?? void 0)) {
+			if (attrs.justification) result.justification = attrs.justification;
+			else delete result.justification;
+		}
+		if (attrs.floating !== (orig.floating ?? void 0)) {
+			if (attrs.floating) result.floating = attrs.floating;
+			else delete result.floating;
+		}
+		if (attrs.look !== (orig.look ?? void 0)) {
+			if (attrs.look) result.look = attrs.look;
+			else delete result.look;
+		}
+		if (attrs.borders !== (orig.borders ?? void 0)) {
+			if (attrs.borders) result.borders = attrs.borders;
+			else delete result.borders;
+		}
 		const tableWidth = attrs.width;
 		const tableWidthType = attrs.widthType;
 		const origWidthVal = orig.width?.value;
 		const origWidthType = orig.width?.type;
-		if (tableWidth !== origWidthVal || tableWidthType !== origWidthType) if (tableWidth !== void 0 || tableWidthType !== void 0) result.width = {
-			value: tableWidth ?? 0,
-			type: tableWidthType ?? "dxa"
-		};
-		else delete result.width;
+		if (tableWidth !== origWidthVal || tableWidthType !== origWidthType) {
+			if (tableWidth !== void 0 || tableWidthType !== void 0) result.width = {
+				value: tableWidth ?? 0,
+				type: tableWidthType ?? "dxa"
+			};
+			else delete result.width;
+		}
 		if (attrs.cellMargins && !sameResolvedValue(attrs.cellMargins, attrs._resolvedCellMargins)) result.cellMargins = buildCellMarginsFromAttrs(attrs.cellMargins);
 		return result;
 	}
@@ -3207,17 +3493,25 @@ function tableRowAttrsToFormatting(attrs) {
 	if (attrs._originalFormatting) {
 		const orig = attrs._originalFormatting;
 		const result = { ...orig };
-		if (attrs.height !== (orig.height?.value ?? void 0)) if (attrs.height) result.height = {
-			value: attrs.height,
-			type: "dxa"
-		};
-		else delete result.height;
-		if (attrs.heightRule !== (orig.heightRule ?? void 0)) if (attrs.heightRule) result.heightRule = attrs.heightRule;
-		else delete result.heightRule;
-		if (attrs.isHeader !== (orig.header ?? void 0)) if (attrs.isHeader) result.header = attrs.isHeader;
-		else delete result.header;
-		if (attrs.hidden !== orig.hidden) if (attrs.hidden === void 0) delete result.hidden;
-		else result.hidden = attrs.hidden;
+		if (attrs.height !== (orig.height?.value ?? void 0)) {
+			if (attrs.height) result.height = {
+				value: attrs.height,
+				type: "dxa"
+			};
+			else delete result.height;
+		}
+		if (attrs.heightRule !== (orig.heightRule ?? void 0)) {
+			if (attrs.heightRule) result.heightRule = attrs.heightRule;
+			else delete result.heightRule;
+		}
+		if (attrs.isHeader !== (orig.header ?? void 0)) {
+			if (attrs.isHeader) result.header = attrs.isHeader;
+			else delete result.header;
+		}
+		if (attrs.hidden !== orig.hidden) {
+			if (attrs.hidden === void 0) delete result.hidden;
+			else result.hidden = attrs.hidden;
+		}
 		return result;
 	}
 	if (!(attrs.height || attrs.isHeader || attrs.hidden !== void 0)) return;
@@ -3267,6 +3561,9 @@ function convertPMTableCell(node, documentCounts, styleResolver = null) {
 		} else if (contentNode.type.name === "blockBookmarkBoundary") {
 			content.push(blockBookmarkMarker(contentNode));
 			previousStandaloneTextBox = null;
+		} else if (contentNode.type.name === "blockMoveRangeBoundary") {
+			content.push({ ...expectMoveRangeBoundaryAttrs(contentNode) });
+			previousStandaloneTextBox = null;
 		}
 	});
 	removeUnresolvedTextBoxAnchors(content, textBoxAnchorMarkers);
@@ -3318,13 +3615,17 @@ function tableCellAttrsToFormatting(attrs) {
 		const authoredWidth = attrs._authoredWidth;
 		if (authoredWidth) result.width = authoredWidth;
 		else delete result.width;
-		if (attrs.verticalAlign !== (orig.verticalAlign ?? void 0)) if (attrs.verticalAlign) result.verticalAlign = attrs.verticalAlign;
-		else delete result.verticalAlign;
+		if (attrs.verticalAlign !== (orig.verticalAlign ?? void 0)) {
+			if (attrs.verticalAlign) result.verticalAlign = attrs.verticalAlign;
+			else delete result.verticalAlign;
+		}
 		if (backgroundChanged) result.shading = cellShadingFromAttrs(attrs);
 		if (attrs.borders && !sameResolvedValue(attrs.borders, attrs._resolvedBorders)) result.borders = attrs.borders;
 		if (attrs.margins && !sameResolvedValue(attrs.margins, attrs._resolvedMargins)) result.margins = buildCellMarginsFromAttrs(attrs.margins);
-		if (attrs.textDirection !== (orig.textDirection ?? void 0)) if (attrs.textDirection) result.textDirection = attrs.textDirection;
-		else delete result.textDirection;
+		if (attrs.textDirection !== (orig.textDirection ?? void 0)) {
+			if (attrs.textDirection) result.textDirection = attrs.textDirection;
+			else delete result.textDirection;
+		}
 		return Object.keys(result).length > 0 ? result : void 0;
 	}
 	const authoredWidth = attrs._authoredWidth;
@@ -3372,6 +3673,11 @@ function convertPMTextBox(node, styleResolver = null) {
 		else if (child.type.name === "table") childBlocks.push(convertPMTable(child, void 0, styleResolver));
 	});
 	const textBodyContent = projectTextBoxBodyContent(attrs._docxTextBodyContentState, childBlocks);
+	const margins = {};
+	if (typeof attrs.marginTop === "number") margins.top = emuFromPixels(attrs.marginTop, "marginTop", authoredEmu, emuToPixels);
+	if (typeof attrs.marginBottom === "number") margins.bottom = emuFromPixels(attrs.marginBottom, "marginBottom", authoredEmu, emuToPixels);
+	if (typeof attrs.marginLeft === "number") margins.left = emuFromPixels(attrs.marginLeft, "marginLeft", authoredEmu, emuToPixels);
+	if (typeof attrs.marginRight === "number") margins.right = emuFromPixels(attrs.marginRight, "marginRight", authoredEmu, emuToPixels);
 	const shape = {
 		type: "shape",
 		shapeType: "textBox",
@@ -3385,14 +3691,7 @@ function convertPMTextBox(node, styleResolver = null) {
 			...attrs.autoFit !== void 0 ? { autoFit: attrs.autoFit } : {},
 			...attrs.textWrap !== void 0 ? { textWrap: attrs.textWrap } : {},
 			...verticalAlign !== void 0 ? { anchor: verticalAlign } : {},
-			margins: (() => {
-				const m = {};
-				if (typeof attrs.marginTop === "number") m.top = emuFromPixels(attrs.marginTop, "marginTop", authoredEmu, emuToPixels);
-				if (typeof attrs.marginBottom === "number") m.bottom = emuFromPixels(attrs.marginBottom, "marginBottom", authoredEmu, emuToPixels);
-				if (typeof attrs.marginLeft === "number") m.left = emuFromPixels(attrs.marginLeft, "marginLeft", authoredEmu, emuToPixels);
-				if (typeof attrs.marginRight === "number") m.right = emuFromPixels(attrs.marginRight, "marginRight", authoredEmu, emuToPixels);
-				return m;
-			})()
+			...Object.keys(margins).length > 0 ? { margins } : {}
 		}
 	};
 	if (attrs.textBoxId) shape.id = attrs.textBoxId;