@stll/folio-core 0.46.0 → 0.47.1

package/dist/prosemirror/conversion/toProseDoc.js

@@ -1,13 +1,16 @@
 import { rangedCommentIds } from "../../docx/commentAnchorIndex.js";
 import { resolveColorValueToHex } from "../../docx/drawingUtils.js";
 import { isInlineSdtContent, isTrackedChangeWrapperChild } from "../../docx/inlineWrapperContent.js";
-import { isNumberingReference } from "../../docx/numberingReference.js";
+import { mergeParagraphNumbering as mergeParagraphNumbering$1, paragraphNumberingReferenceId as paragraphNumberingReferenceId$1 } from "../../docx/numberingReference.js";
 import { PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, createProseParagraphWithPropertySource, getDocumentParagraphPropertySourceContract, recreateProseNodeWithParagraphPropertySource, transportTableCellsWithParagraphPropertySources } from "../../docx/paragraphPropertySource.js";
 import { isBaselineVertAlign } from "../../docx/runParser.js";
 import { resolveTableLook } from "../../docx/tableLook.js";
 import { isCellMergeContinuation } from "../../docx/tableParser.js";
+import { copiedWrapPolygon } from "../../docx/wrapPolygon.js";
 import { buildPageBreakRunSourceDescendantIndex } from "../../internal/pageBreakRunSourceDescendantIndex.js";
 import { createStyleEngine } from "../../style-engine/styleEngine.js";
+import { outlineAttrForDash } from "../../types/documentEnumValues.js";
+import { cssBorderStyleForDash } from "../../utils/borderCss.js";
 import { normalizeHorizontalScalePercent } from "../../utils/horizontalScale.js";
 import { mergeParagraphFormatting, mergeParagraphTabStops } from "../../utils/paragraphFormattingMerge.js";
 import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
@@ -16,14 +19,21 @@ import { emuToPixels, emuToStrokePixels } from "../../utils/units.js";
 import { expectInlineWrapperMarkAttrs } from "../attrs/index.js";
 import { authoredTransformAttrs } from "../authoredTransformAttrs.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
+import { planEmptyRanges } from "../emptyRangeAnchor.js";
+import { INLINE_WRAPPER_MARK_NAME } from "../extensions/marks/InlineWrapperExtension.js";
 import { textFormattingToMarks } from "../extensions/marks/markUtils.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 { inlineWrapperLayer } from "../inlineWrapperStack.js";
 import { listRenderingAttrPatch } from "../listRenderingAttrs.js";
 import { stampNumberedRefFieldBaselines } from "../numberedRefFields.js";
+import { paragraphNumberingAttr } from "../numberingAttr.js";
 import { pageBreakRunParagraphProjectionDispositionForFeatures } from "../pageBreakRunProjection.js";
 import { directionFromBidi } from "../paragraphDirection.js";
 import { styleResolvedParagraphFormatting } from "../paragraphFormattingProvenance.js";
 import { lineSpacingProvenanceFromSpacing } from "../paragraphSpacing.js";
+import { RUN_IDENTITY_MARK_NAME, hasRunIdentityPayload, runIdentityAttrs } from "../runIdentity.js";
 import { getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, resolveParagraphBodyRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting } from "../runStyleFormatting.js";
 import { schema } from "../schema/index.js";
 import { PRESERVED_XML_LEVELS } from "../schema/nodes.js";
@@ -31,6 +41,7 @@ import { cascadeStyleTextFormatting } from "../styles/styleToggleCascade.js";
 import { canCarryTrackedRunMark, trackedRunInlineAtomDisposition } from "../trackedRunInlineAtoms.js";
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { resolveEffectiveTableCellFormatting } from "./effectiveTableCellFormatting.js";
+import { hasSinkChildren } from "./preservedSinkCarriers.js";
 import { sdtAttrsFromProperties } from "./sdtAttrs.js";
 import { panic } from "better-result";
 import { DRAWING_RAW_XML_MODES, PARSE_WARNING_CODES } from "@stll/docx-core/model";
@@ -58,6 +69,26 @@ const createTextBoxGroupIdFactory = () => {
 	let index = 0;
 	return () => `${salt}:${index++}`;
 };
+/**
+* The identity mark for one authored `w:r`, or `null` when it carries nothing
+* worth a mark.
+*
+* The only place the mark is minted. Both run-converting paths call it — the
+* paragraph's and the hyperlink's — so the next payload field is added once
+* rather than to whichever site the author happened to open.
+*
+* Minted when the run holds a page break (the leaves it is cut into have to be
+* rejoined into one `w:r` on save), an attribute remainder, or a `w:rPr` sink.
+* 57.5% of corpus files hold none of the three and mint nothing.
+*/
+const runIdentityMark = (run, nextRunIdentityId) => {
+	const payload = {
+		preservedAttributes: run.preservedAttributes,
+		preserved: run.formatting?.preserved
+	};
+	if (!runHasPageBreakContent(run) && !hasRunIdentityPayload(payload)) return null;
+	return schema.mark(RUN_IDENTITY_MARK_NAME, runIdentityAttrs(nextRunIdentityId(), payload));
+};
 /** Keep imported hyperlink identity unique across every nested conversion scope. */
 const createHyperlinkInstanceIndexAllocator = () => {
 	let index = 0;
@@ -101,6 +132,9 @@ const collectPairedBookmarkIds = (blocks) => {
 				visitRun(child);
 				break;
 			case "preservedInline": break;
+			case "inlineWrapper":
+				for (const wrapped of child.content) visitParagraphContent(wrapped);
+				break;
 			default: panic(`Unsupported hyperlink child: ${JSON.stringify(child)}`);
 		}
 	};
@@ -119,8 +153,7 @@ const collectPairedBookmarkIds = (blocks) => {
 				visitHyperlink(content);
 				return;
 			case "simpleField":
-				for (const child of content.content) if (child.type === "hyperlink") visitHyperlink(child);
-				else if (child.type === "run") visitRun(child);
+				for (const child of content.content) visitParagraphContent(child);
 				return;
 			case "complexField":
 				for (const run of [...content.fieldCode ?? [], ...content.fieldResult]) visitRun(run);
@@ -151,12 +184,22 @@ const collectPairedBookmarkIds = (blocks) => {
 				for (const content of block.content) visitParagraphContent(content);
 				break;
 			case "table":
-				for (const row of block.rows) for (const cell of row.cells) visitBlocks(cell.content);
+				for (const { marker } of block.bookmarks ?? []) countBoundary(marker.id, marker.type === "bookmarkStart" ? "start" : "end");
+				for (const row of block.rows) {
+					for (const { marker } of row.bookmarks ?? []) countBoundary(marker.id, marker.type === "bookmarkStart" ? "start" : "end");
+					for (const cell of row.cells) visitBlocks(cell.content);
+				}
 				break;
 			case "blockSdt":
 				visitBlocks(block.content);
 				break;
 			case "preservedBlock": break;
+			case "bookmarkStart":
+				countBoundary(block.id, "start");
+				break;
+			case "bookmarkEnd":
+				countBoundary(block.id, "end");
+				break;
 			default: panic(`Unsupported block content: ${JSON.stringify(block)}`);
 		}
 	};
@@ -203,6 +246,10 @@ function toProseDoc(document, options) {
 			case "preservedBlock":
 				out.push(convertPreservedBlock(block));
 				break;
+			case "bookmarkStart":
+			case "bookmarkEnd":
+				out.push(convertBlockBookmarkBoundary(block));
+				break;
 			default: panic(`Unsupported block content: ${JSON.stringify(block)}`);
 		}
 		return out;
@@ -229,6 +276,29 @@ function convertPreservedBlock(block) {
 	return schema.node("preservedBlock", { xml: block.xml });
 }
 /**
+* Carry a bookmark marker that stands between two blocks into the editor.
+*
+* Unconditional, unlike the inline atom: an unpaired inline boundary falls
+* back to the paragraph's `bookmarks` attribute, and a marker between blocks
+* has no paragraph to fall back to. Dropping it is the loss this node exists
+* to prevent, and the integrity pass removes a boundary whose partner really
+* 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
+	});
+}
+/**
 * Carry an inline child folio does not model into the editor as an opaque atom.
 *
 * The same atom the run level uses, tagged with the level it came from: the
@@ -246,8 +316,8 @@ function preservedInlineNode(content) {
 /**
 * Convert a `BlockSdt` model node into a `blockSdt` PM node, recursively
 * converting its children with the caller-supplied block converter. Pass
-* `rawPropertiesXml` / `rawEndPropertiesXml` through as attrs so the
-* serializer can replay them verbatim after a save.
+* the preserved `w:sdtPr` children and the verbatim `<w:sdtEndPr>` through
+* as attrs so the serializer can put them back after a save.
 */
 function convertBlockSdt(blockSdt, convertBlocks) {
 	const props = blockSdt.properties;
@@ -258,15 +328,16 @@ function convertBlockSdt(blockSdt, convertBlocks) {
 		id: props.id ?? null,
 		lock: props.lock ?? null,
 		placeholder: props.placeholder ?? null,
-		showingPlaceholder: props.showingPlaceholder ?? false,
+		showingPlaceholder: props.showingPlaceholder ?? null,
 		dateFormat: props.dateFormat ?? null,
 		dateValueISO: props.dateValueISO ?? null,
 		listItems: props.listItems ? JSON.stringify(props.listItems) : null,
 		dropdownLastValue: props.dropdownLastValue ?? null,
 		checked: props.checked ?? null,
 		_originallyEmpty: blockSdt.content.length === 0,
-		rawPropertiesXml: props.rawPropertiesXml ?? null,
+		_preserved: props.preserved ?? null,
 		rawEndPropertiesXml: props.rawEndPropertiesXml ?? null,
+		endProperties: props.endProperties ?? null,
 		rawSdtChildrenBeforeContent: props.rawSdtChildrenBeforeContent ?? null,
 		rawSdtChildrenAfterContent: props.rawSdtChildrenAfterContent ?? null
 	};
@@ -282,8 +353,8 @@ function convertBlockSdt(blockSdt, convertBlocks) {
 */
 function convertParagraph(paragraph, styleResolver, context, extraRunFormatting, tableParagraphOverlay, textBoxAnchors) {
 	const { nextHyperlinkInstanceIndex, pairedBookmarkIds, pageBreakRunSourceDescendants, storyRangedCommentIds, openCommentIds } = context;
-	let pageBreakRunOwnerId = 0;
-	const nextPageBreakRunOwnerId = () => pageBreakRunOwnerId++;
+	let runIdentityId = 0;
+	const nextRunIdentityId = () => runIdentityId++;
 	const { attrs, effectiveFrame } = paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOverlay);
 	reportParagraphPageBreakProjection({
 		paragraph,
@@ -365,11 +436,33 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 			toggleCascade: inheritedToggleCascade
 		};
 	};
+	const getHistoricalRunFormatting = (formatting) => {
+		const hasCharacterStyle = formatting?.styleId !== void 0;
+		const inheritedBaseFormatting = hasCharacterStyle ? baseRunFormatting : ordinaryBaseWithDefaultCharacter;
+		const inheritedToggleCascade = hasCharacterStyle ? orderedToggleFormatting : defaultCharacterStyleCascade;
+		return {
+			formatting: inheritedBaseFormatting,
+			...!hasCharacterStyle ? { implicitCharacterStyleApplied: true } : {},
+			toggleCascade: inheritedToggleCascade
+		};
+	};
+	const trackedRunFormattingResolvers = {
+		current: getInheritedRunFormatting,
+		historical: getHistoricalRunFormatting
+	};
 	const emitTrackedChange = (change, markType, moveKind) => {
-		emitInlineNodes(convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, nextPageBreakRunOwnerId, getInheritedRunFormatting, styleResolver, moveKind, textBoxAnchors, wrapperStack));
+		emitInlineNodes(convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, nextRunIdentityId, trackedRunFormattingResolvers, styleResolver, moveKind, textBoxAnchors, wrapperStack));
 	};
-	for (const { content, stack } of withInlineWrapperStacks(paragraph.content)) {
+	const stacked = withInlineWrapperStacks(paragraph.content);
+	const emptyRanges = planEmptyRanges(stacked.map((item) => item.content));
+	for (const [index, { content, stack }] of stacked.entries()) {
 		wrapperStack = stack;
+		const anchored = emptyRanges.anchorAt.get(index);
+		if (anchored) {
+			emitInlineNode(schema.node(RANGE_ANCHOR_NODE_NAME, anchored));
+			continue;
+		}
+		if (emptyRanges.closedAt.has(index)) continue;
 		switch (content.type) {
 			case "commentRangeStart":
 				openCommentIds.add(content.id);
@@ -382,7 +475,7 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 				emitInlineNode(schema.node("commentReference", { commentId: content.id }));
 				break;
 			case "run":
-				emitInlineNodes(convertRun(content, getInheritedRunFormatting(content.formatting), nextPageBreakRunOwnerId, styleResolver, textBoxAnchors));
+				emitInlineNodes(convertRun(content, getInheritedRunFormatting(content.formatting), nextRunIdentityId, styleResolver, textBoxAnchors));
 				break;
 			case "hyperlink": {
 				const linkNodes = convertHyperlink(content, {
@@ -390,7 +483,7 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 					styleResolver,
 					hyperlinkIndex: nextHyperlinkInstanceIndex(),
 					textBoxAnchors,
-					nextPageBreakRunOwnerId
+					nextRunIdentityId
 				});
 				if (linkNodes.length === 0) {
 					emptyHyperlinks ??= [];
@@ -412,12 +505,12 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 					getInheritedRunFormatting,
 					styleResolver,
 					nextHyperlinkInstanceIndex,
-					nextPageBreakRunOwnerId,
+					nextRunIdentityId,
 					textBoxAnchors
 				}));
 				break;
 			case "inlineSdt":
-				emitInlineNode(convertInlineSdt(content, nextHyperlinkInstanceIndex, nextPageBreakRunOwnerId, getInheritedRunFormatting, styleResolver, textBoxAnchors, stack));
+				emitInlineNode(convertInlineSdt(content, nextHyperlinkInstanceIndex, nextRunIdentityId, getInheritedRunFormatting, trackedRunFormattingResolvers, styleResolver, textBoxAnchors, stack));
 				break;
 			case "insertion":
 			case "moveTo":
@@ -458,7 +551,9 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 			case "moveFromRangeStart":
 			case "moveFromRangeEnd":
 			case "moveToRangeStart":
-			case "moveToRangeEnd": break;
+			case "moveToRangeEnd":
+				emitInlineNode(schema.node(MOVE_RANGE_BOUNDARY_NODE_NAME, { marker: content }));
+				break;
 			case "preservedInline":
 				emitInlineNode(preservedInlineNode(content));
 				break;
@@ -498,30 +593,51 @@ function anchorPointComment(nodes, commentId) {
 	}
 }
 /**
+* One node of a revision's content with the revision recorded on it.
+*
+* An inline content control is an `inline*` node rather than an atom, so it is
+* not a run carrier: the revision goes on the leaves it holds. That is what
+* makes `w:ins > w:sdt` and `w:sdt > w:ins` the same marks on the same leaves,
+* and it is what lets the save leg hoist a revision covering all of them back
+* around the control instead of losing it.
+*/
+const withTrackedRunMark = (node, mark) => {
+	if (node.marks.some(({ type }) => type.name === "insertion" || type.name === "deletion")) return node;
+	if (node.type.name === "sdt") {
+		const marked = [];
+		for (let index = 0; index < node.childCount; index += 1) marked.push(withTrackedRunMark(node.child(index), mark));
+		return recreateProseNodeWithParagraphPropertySource(node, { content: marked });
+	}
+	if (trackedRunInlineAtomDisposition(node) === "outside-wrapper") panic(`Inline atom ${JSON.stringify(node.type.name)} cannot occur in a tracked-run wrapper`);
+	if (canCarryTrackedRunMark(node)) return node.mark(mark.addToSet(node.marks));
+	return node;
+};
+/**
 * Convert tracked change (insertion or deletion) content to PM nodes with
 * an insertion/deletion mark applied.
 */
-function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, nextPageBreakRunOwnerId, getInheritedRunFormatting, styleResolver, moveKind = null, textBoxAnchors, wrappedBy = []) {
+function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, nextRunIdentityId, runFormattingResolvers, styleResolver, moveKind = null, textBoxAnchors, wrappedBy = []) {
 	const nodes = [];
+	const getTrackedRunFormatting = markType === "deletion" ? runFormattingResolvers.historical : runFormattingResolvers.current;
 	for (const { content: item, stack } of withInlineWrapperStacks(change.content)) {
 		if (!isTrackedChangeWrapperChild(item)) continue;
 		const itemNodes = [];
-		if (item.type === "run") itemNodes.push(...convertRun(item, getInheritedRunFormatting(item.formatting), nextPageBreakRunOwnerId, styleResolver, textBoxAnchors));
+		if (item.type === "run") itemNodes.push(...convertRun(item, getTrackedRunFormatting(item.formatting), nextRunIdentityId, styleResolver, textBoxAnchors));
 		else if (item.type === "hyperlink") {
 			const currentHyperlinkIndex = nextHyperlinkInstanceIndex();
 			itemNodes.push(...convertHyperlink(item, {
-				getInheritedRunFormatting,
+				getInheritedRunFormatting: getTrackedRunFormatting,
 				styleResolver,
 				hyperlinkIndex: currentHyperlinkIndex,
 				textBoxAnchors,
-				nextPageBreakRunOwnerId
+				nextRunIdentityId
 			}));
 		} else if (item.type === "simpleField" || item.type === "complexField") {
 			const fieldNode = convertField(item, {
-				getInheritedRunFormatting,
+				getInheritedRunFormatting: getTrackedRunFormatting,
 				styleResolver,
 				nextHyperlinkInstanceIndex,
-				nextPageBreakRunOwnerId,
+				nextRunIdentityId,
 				textBoxAnchors
 			});
 			if (fieldNode) itemNodes.push(fieldNode);
@@ -531,9 +647,9 @@ function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, next
 		} else if (item.type === "insertion" || item.type === "deletion" || item.type === "moveFrom" || item.type === "moveTo") {
 			const nestedMarkType = item.type === "insertion" || item.type === "moveTo" ? "insertion" : "deletion";
 			const nestedMoveKind = item.type === "moveFrom" || item.type === "moveTo" ? item.type : null;
-			itemNodes.push(...convertTrackedChange(item, nestedMarkType, nextHyperlinkInstanceIndex, nextPageBreakRunOwnerId, getInheritedRunFormatting, styleResolver, nestedMoveKind, textBoxAnchors));
+			itemNodes.push(...convertTrackedChange(item, nestedMarkType, nextHyperlinkInstanceIndex, nextRunIdentityId, runFormattingResolvers, styleResolver, nestedMoveKind, textBoxAnchors));
 		} else if (item.type === "inlineSdt") {
-			const sdtNode = convertInlineSdt(item, nextHyperlinkInstanceIndex, nextPageBreakRunOwnerId, getInheritedRunFormatting, styleResolver, textBoxAnchors, [...wrappedBy, ...stack]);
+			const sdtNode = convertInlineSdt(item, nextHyperlinkInstanceIndex, nextRunIdentityId, getTrackedRunFormatting, runFormattingResolvers, styleResolver, textBoxAnchors, [...wrappedBy, ...stack]);
 			if (sdtNode) itemNodes.push(sdtNode);
 		} else if (item.type === "bookmarkStart") itemNodes.push(schema.node("bookmarkBoundary", {
 			type: "start",
@@ -558,14 +674,10 @@ function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, next
 		date: change.info.date ?? null,
 		utcDate: change.info.utcDate?.value ?? null,
 		initials: change.info.initials ?? null,
-		moveKind
-	});
-	return nodes.map((node) => {
-		if (node.marks.some(({ type }) => type.name === "insertion" || type.name === "deletion")) return node;
-		if (trackedRunInlineAtomDisposition(node) === "outside-wrapper") panic(`Inline atom ${JSON.stringify(node.type.name)} cannot occur in a tracked-run wrapper`);
-		if (canCarryTrackedRunMark(node)) return node.mark(mark.addToSet(node.marks));
-		return node;
+		moveKind,
+		...markType === "deletion" ? { _historicalFormatting: true } : {}
 	});
+	return nodes.map((node) => withTrackedRunMark(node, mark));
 }
 function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOverlay) {
 	const formatting = paragraph.formatting;
@@ -581,11 +693,21 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 	if (paragraph.reviewCarrier) attrs.reviewCarrier = paragraph.reviewCarrier;
 	if (styleId) attrs.styleId = styleId;
 	if (tableOfContentsLevel !== void 0) attrs._tableOfContentsLevel = tableOfContentsLevel;
-	if (formatting?.numPr) attrs.numPr = formatting.numPr;
-	if (formatting?.numPrFromStyle) attrs.numPrFromStyle = formatting.numPrFromStyle;
+	if (formatting?.numPr) attrs.numPr = paragraphNumberingAttr(formatting.numPr);
+	if (formatting?.numPrFromStyle) attrs.numPrFromStyle = paragraphNumberingAttr(formatting.numPrFromStyle);
 	if (paragraph.listRendering) Object.assign(attrs, listRenderingAttrPatch(paragraph.listRendering));
 	if (formatting) attrs._originalFormatting = formatting;
-	if (paragraph.propertyChanges && paragraph.propertyChanges.length > 0) attrs._propertyChanges = [...paragraph.propertyChanges];
+	if (paragraph.propertyChanges && paragraph.propertyChanges.length > 0) attrs._propertyChanges = paragraph.propertyChanges.map(({ previousFormatting, ...change }) => {
+		if (previousFormatting === void 0) return change;
+		const { numPr, ...rest } = previousFormatting;
+		return {
+			...change,
+			previousFormatting: numPr === void 0 ? rest : {
+				...rest,
+				numPr: paragraphNumberingAttr(numPr)
+			}
+		};
+	});
 	if (paragraph.preservedAttributes && paragraph.preservedAttributes.length > 0) attrs._preservedAttributes = paragraph.preservedAttributes;
 	if (paragraph.pPrMark) attrs.pPrMark = paragraph.pPrMark;
 	const set = (key, val) => {
@@ -615,7 +737,7 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 		if (formatting?.spaceBefore === void 0 && tableParagraphOverlay?.spaceBefore === void 0 && paragraphStyle?.pPr?.spaceBefore === void 0 && docDefaultSpacing?.spaceBefore !== void 0) spacingFromDocDefaults.before = true;
 		if (formatting?.spaceAfter === void 0 && tableParagraphOverlay?.spaceAfter === void 0 && paragraphStyle?.pPr?.spaceAfter === void 0 && docDefaultSpacing?.spaceAfter !== void 0) spacingFromDocDefaults.after = true;
 		if (spacingFromDocDefaults.before || spacingFromDocDefaults.after) attrs.spacingFromDocDefaults = spacingFromDocDefaults;
-		const effectiveIndent = mergeParagraphFormatting(formatting?.numPr?.numId === 0 && isNumberingReference(stylePpr?.numPr?.numId) ? void 0 : stylePpr, formatting);
+		const effectiveIndent = mergeParagraphFormatting(formatting?.numPr?.kind === "none" && paragraphNumberingReferenceId$1(stylePpr?.numPr) !== void 0 ? void 0 : stylePpr, formatting);
 		set("indentLeft", effectiveIndent?.indentLeft);
 		set("indentRight", formatting?.indentRight ?? stylePpr?.indentRight);
 		set("indentFirstLine", effectiveIndent?.indentFirstLine);
@@ -635,12 +757,11 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 		set("outlineLevel", formatting?.outlineLevel ?? stylePpr?.outlineLevel);
 		set("direction", directionFromBidi(formatting?.bidi ?? stylePpr?.bidi));
 		set("defaultTextFormatting", resolveParagraphDefaultTextFormatting(styleId, formatting, styleResolver, { includeParagraphMarkRunProperties: tableOfContentsLevel === void 0 && (styleId === void 0 || paragraph.content.length === 0) }));
-		if (stylePpr?.numPr && formatting?.numPr?.numId === void 0 && isNumberingReference(stylePpr.numPr.numId)) {
-			attrs.numPr = {
-				...stylePpr.numPr,
-				...formatting?.numPr
-			};
-			attrs.numPrFromStyle = stylePpr.numPr;
+		const styleNumbering = stylePpr?.numPr;
+		if (styleNumbering?.kind === "reference" && (formatting?.numPr === void 0 || formatting.numPr.kind === "levelOnly")) {
+			const merged = mergeParagraphNumbering$1(styleNumbering, formatting?.numPr);
+			if (merged !== void 0) attrs.numPr = paragraphNumberingAttr(merged);
+			attrs.numPrFromStyle = paragraphNumberingAttr(styleNumbering);
 		}
 	} else {
 		set("alignment", formatting?.alignment);
@@ -670,11 +791,7 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 		set("direction", directionFromBidi(formatting?.bidi));
 		set("defaultTextFormatting", stripParagraphMarkOnlyFormatting(resolveTextFormatting(formatting?.runProperties, styleResolver) ?? {}));
 	}
-	if (paragraph.sectionProperties) {
-		attrs._sectionProperties = paragraph.sectionProperties;
-		const st = paragraph.sectionProperties.sectionStart;
-		if (st === "nextPage" || st === "continuous" || st === "oddPage" || st === "evenPage") attrs.sectionBreakType = st;
-	}
+	if (paragraph.sectionProperties) attrs._sectionProperties = paragraph.sectionProperties;
 	if (paragraph.renderedPageBreakBefore) attrs.renderedPageBreakBefore = true;
 	const beforeAutospacing = formatting?.beforeAutospacing ?? stylePpr?.beforeAutospacing;
 	const afterAutospacing = formatting?.afterAutospacing ?? stylePpr?.afterAutospacing;
@@ -913,6 +1030,7 @@ function tableCellHasMeaningfulContent(cell) {
 }
 function blockHasMeaningfulContent(block) {
 	if (block.type === "preservedBlock") return true;
+	if (block.type === "bookmarkStart" || block.type === "bookmarkEnd") return true;
 	if (block.type === "table") return block.rows.some((row) => row.cells.some((cell) => tableCellHasMeaningfulContent(cell)));
 	return block.content.some(paragraphContentHasMeaningfulContent);
 }
@@ -972,6 +1090,8 @@ function convertTable(table, styleResolver, context) {
 	if (resolvedTableBidi !== void 0) attrs._resolvedBidi = resolvedTableBidi;
 	attrs._originalFormatting = table.formatting ?? {};
 	if (table.propertyChanges && table.propertyChanges.length > 0) attrs.tblPrChange = [...table.propertyChanges];
+	if (table.bookmarks && table.bookmarks.length > 0) attrs._bookmarks = table.bookmarks;
+	if (hasSinkChildren(table.preserved)) attrs._preserved = table.preserved;
 	const conditionalStyles = {};
 	const setCS = (key, type) => {
 		const val = resolveTableStyleConditional(styleResolver, conditionalTableStyleId, type);
@@ -1023,6 +1143,19 @@ function countTableColumns(rows) {
 	}
 	return maxColumns;
 }
+function createOmittedGridSlotCell({ colspan, slot, columnWidths, totalWidth, startColumn }) {
+	const attrs = {
+		colspan,
+		rowspan: 1,
+		_omittedGridSlot: slot
+	};
+	if (columnWidths && totalWidth && totalWidth > 0) {
+		const slotWidth = columnWidths.slice(startColumn, startColumn + colspan).reduce((sum, width) => sum + width, 0);
+		attrs.width = Math.round(slotWidth / totalWidth * 100);
+		attrs.widthType = "pct";
+	}
+	return schema.node("tableCell", attrs, [schema.node("paragraph")]);
+}
 /**
 * Convert a TableRow to a ProseMirror table row node
 */
@@ -1030,11 +1163,16 @@ function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths,
 	const attrsWithoutStructuralChange = { isHeader: !!row.formatting?.header };
 	if (row.formatting?.height?.value !== void 0) attrsWithoutStructuralChange.height = row.formatting.height.value;
 	if (row.formatting?.heightRule) attrsWithoutStructuralChange.heightRule = row.formatting.heightRule;
-	if (row.formatting?.hidden) attrsWithoutStructuralChange.hidden = true;
+	if (row.formatting?.hidden !== void 0) attrsWithoutStructuralChange.hidden = row.formatting.hidden;
 	if (resolvedJustification) attrsWithoutStructuralChange._resolvedJustification = resolvedJustification;
 	if (row.formatting) attrsWithoutStructuralChange._originalFormatting = row.formatting;
+	if (row.tablePropertyExceptions) attrsWithoutStructuralChange._tablePropertyExceptions = row.tablePropertyExceptions;
+	if (row.tablePropertyExceptionChanges && row.tablePropertyExceptionChanges.length > 0) attrsWithoutStructuralChange.tblPrExChange = [...row.tablePropertyExceptionChanges];
 	if (row.propertyChanges && row.propertyChanges.length > 0) attrsWithoutStructuralChange.trPrChange = [...row.propertyChanges];
 	if (row.preservedAttributes && row.preservedAttributes.length > 0) attrsWithoutStructuralChange._preservedAttributes = row.preservedAttributes;
+	if (row.bookmarks && row.bookmarks.length > 0) attrsWithoutStructuralChange._bookmarks = row.bookmarks;
+	if (row.contentControls && row.contentControls.length > 0) attrsWithoutStructuralChange.contentControls = row.contentControls;
+	if (hasSinkChildren(row.preserved)) attrsWithoutStructuralChange._preserved = row.preserved;
 	let attrs = attrsWithoutStructuralChange;
 	const rowStructuralChange = row.structuralChange;
 	if (rowStructuralChange) {
@@ -1065,6 +1203,8 @@ function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths,
 		}
 	}
 	const numCells = row.cells.length;
+	const gridBefore = row.formatting?.gridBefore ?? 0;
+	const gridAfter = row.formatting?.gridAfter ?? 0;
 	const isFirstRow = rowIndex === 0;
 	const isLastRow = rowIndex === (totalRows ?? 1) - 1;
 	const rowCnf = row.formatting?.conditionalFormat;
@@ -1072,16 +1212,24 @@ function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths,
 	const rowIsLastRow = rowCnf?.lastRow ?? isLastRow;
 	const totalCols = totalColumns != null && totalColumns > 0 ? totalColumns : Math.max(numCells, 1);
 	let effectiveCells = row.cells;
-	if (effectiveCells.length === 0) {
+	const uncoveredColumns = Math.max(0, totalCols - gridBefore - gridAfter);
+	if (effectiveCells.length === 0 && uncoveredColumns > 0) {
 		const fallback = {
 			type: "tableCell",
 			content: []
 		};
-		if (totalCols > 1) fallback.formatting = { gridSpan: totalCols };
+		if (uncoveredColumns > 1) fallback.formatting = { gridSpan: uncoveredColumns };
 		effectiveCells = [fallback];
 	}
-	let colIndex = row.formatting?.gridBefore ?? 0;
+	let colIndex = gridBefore;
 	const cells = [];
+	if (gridBefore > 0) cells.push(createOmittedGridSlotCell({
+		colspan: gridBefore,
+		slot: "before",
+		columnWidths,
+		totalWidth,
+		startColumn: 0
+	}));
 	for (const cellIndex_item of effectiveCells) {
 		const cell = cellIndex_item;
 		const colspan = cell.formatting?.gridSpan ?? 1;
@@ -1149,6 +1297,13 @@ function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths,
 			defaultCellMargins
 		}));
 	}
+	if (gridAfter > 0) cells.push(createOmittedGridSlotCell({
+		colspan: gridAfter,
+		slot: "after",
+		columnWidths,
+		totalWidth,
+		startColumn: colIndex
+	}));
 	return schema.node("tableRow", attrs, cells);
 }
 /**
@@ -1173,6 +1328,10 @@ function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPer
 	if (effectiveFormatting.width.type === "value") {
 		attrs.width = effectiveFormatting.width.value;
 		if (effectiveFormatting.width.widthType) attrs.widthType = effectiveFormatting.width.widthType;
+		if (effectiveFormatting.width.source === "direct") attrs._authoredWidth = {
+			value: effectiveFormatting.width.value,
+			type: effectiveFormatting.width.widthType
+		};
 	}
 	if (formatting?.verticalAlign) attrs.verticalAlign = formatting.verticalAlign;
 	if (effectiveFormatting.background.type === "color") {
@@ -1193,6 +1352,7 @@ function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPer
 	}
 	if (formatting) attrs._originalFormatting = formatting;
 	if (cell.propertyChanges && cell.propertyChanges.length > 0) attrs.tcPrChange = [...cell.propertyChanges];
+	if (cell.contentControls && cell.contentControls.length > 0) attrs.contentControls = cell.contentControls;
 	const cellStructuralChange = cell.structuralChange;
 	if (cellStructuralChange) {
 		const info = {
@@ -1246,6 +1406,10 @@ function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPer
 		case "preservedBlock":
 			contentNodes.push(convertPreservedBlock(content));
 			break;
+		case "bookmarkStart":
+		case "bookmarkEnd":
+			contentNodes.push(convertBlockBookmarkBoundary(content));
+			break;
 		default: panic(`Unsupported table cell content: ${JSON.stringify(content)}`);
 	}
 	if (contentNodes.length === 0) contentNodes.push(schema.node("paragraph", {}, []));
@@ -1281,49 +1445,55 @@ function standaloneTableCellToProseMirror(cell, nodeType) {
 		defaultCellMargins: void 0
 	});
 }
-function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyperlinkInstanceIndex, nextPageBreakRunOwnerId, textBoxAnchors }) {
+function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyperlinkInstanceIndex, nextRunIdentityId, textBoxAnchors }) {
 	let displayText = "";
 	let fieldFormatting;
 	let fieldPropertyChanges;
 	const inlineNodes = [];
-	const hasStructuredSourceContent = fieldResultHasPageBreakContent(field) || field.type === "simpleField" && field.content.some((content) => content.type === "hyperlink" || content.type === "preservedInline");
-	const appendRun = (run) => {
+	const hasStructuredSourceContent = fieldResultHasPageBreakContent(field) || field.type === "simpleField" && field.content.some((content) => content.type === "hyperlink" || content.type === "preservedInline" || content.type === "inlineWrapper");
+	const appendRun = (run, into) => {
 		for (const content of run.content) if (content.type === "text") displayText += content.text;
 		fieldFormatting ??= run.formatting;
 		fieldPropertyChanges ??= run.propertyChanges;
 		if (!hasStructuredSourceContent) return;
-		inlineNodes.push(...convertRun(run, getInheritedRunFormatting(run.formatting, field.fieldType), nextPageBreakRunOwnerId, styleResolver, textBoxAnchors));
+		into.push(...convertRun(run, getInheritedRunFormatting(run.formatting, field.fieldType), nextRunIdentityId, styleResolver, textBoxAnchors));
 	};
-	if (field.type === "simpleField") for (const content of field.content) {
-		if (content.type === "run") {
-			appendRun(content);
-			continue;
-		}
-		if (content.type === "preservedInline") {
-			inlineNodes.push(preservedInlineNode(content));
-			continue;
-		}
-		for (const child of content.children) if (child.type === "run") {
-			for (const runContent of child.content) if (runContent.type === "text") displayText += runContent.text;
-			fieldFormatting ??= child.formatting;
-			fieldPropertyChanges ??= child.propertyChanges;
+	if (field.type === "simpleField") for (const { content, stack } of withInlineWrapperStacks(field.content)) {
+		const itemNodes = [];
+		switch (content.type) {
+			case "run":
+				appendRun(content, itemNodes);
+				break;
+			case "preservedInline":
+				itemNodes.push(preservedInlineNode(content));
+				break;
+			case "hyperlink":
+				for (const { content: child } of withInlineWrapperStacks(content.children)) if (child.type === "run") {
+					for (const runContent of child.content) if (runContent.type === "text") displayText += runContent.text;
+					fieldFormatting ??= child.formatting;
+					fieldPropertyChanges ??= child.propertyChanges;
+				}
+				itemNodes.push(...convertHyperlink(content, {
+					getInheritedRunFormatting: (formatting) => getInheritedRunFormatting(formatting, field.fieldType),
+					styleResolver,
+					hyperlinkIndex: nextHyperlinkInstanceIndex(),
+					textBoxAnchors,
+					nextRunIdentityId
+				}));
+				break;
+			default: break;
 		}
-		inlineNodes.push(...convertHyperlink(content, {
-			getInheritedRunFormatting: (formatting) => getInheritedRunFormatting(formatting, field.fieldType),
-			styleResolver,
-			hyperlinkIndex: nextHyperlinkInstanceIndex(),
-			textBoxAnchors,
-			nextPageBreakRunOwnerId
-		}));
+		inlineNodes.push(...withInlineWrapperMark(itemNodes, stack));
 	}
-	else for (const run of field.fieldResult) appendRun(run);
+	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(fieldFormatting, inheritedFormatting, styleResolver);
 	const hasConvertedHyperlinkContent = inlineNodes.some((node) => node.marks.some((mark) => mark.type.name === "hyperlink"));
 	const hasConvertedPageBreakContent = inlineNodes.some((node) => node.type.name === "pageBreakRun");
 	const hasConvertedPreservedContent = inlineNodes.some((node) => node.type.name === "preservedXml");
-	const createStructuredField = hasConvertedPageBreakContent || hasConvertedPreservedContent || hasStructuredSourceContent && hasConvertedHyperlinkContent;
+	const hasConvertedWrapperContent = inlineNodes.some((node) => node.marks.some((mark) => mark.type.name === INLINE_WRAPPER_MARK_NAME));
+	const createStructuredField = hasConvertedPageBreakContent || hasConvertedPreservedContent || hasStructuredSourceContent && (hasConvertedHyperlinkContent || hasConvertedWrapperContent);
 	if (!createStructuredField && fieldPropertyChanges && fieldPropertyChanges.length > 0) marks.push(schema.mark("runPropertyChange", { changes: [...fieldPropertyChanges] }));
 	return schema.node(createStructuredField ? "structuredField" : "field", {
 		fieldType: field.fieldType,
@@ -1393,7 +1563,7 @@ 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, nextPageBreakRunOwnerId, getInheritedRunFormatting, styleResolver, textBoxAnchors, wrappedBy = []) {
+function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, nextRunIdentityId, getInheritedRunFormatting, trackedRunFormattingResolvers, styleResolver, textBoxAnchors, wrappedBy = []) {
 	const props = sdt.properties;
 	const inlineNodes = [];
 	for (const { content, stack } of withInlineWrapperStacks(sdt.content, wrappedBy)) {
@@ -1401,7 +1571,7 @@ function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, nextPageBreakRunOwner
 		const itemNodes = [];
 		switch (content.type) {
 			case "run":
-				itemNodes.push(...convertRun(content, getInheritedRunFormatting(content.formatting), nextPageBreakRunOwnerId, styleResolver, textBoxAnchors));
+				itemNodes.push(...convertRun(content, getInheritedRunFormatting(content.formatting), nextRunIdentityId, styleResolver, textBoxAnchors));
 				break;
 			case "hyperlink": {
 				const currentHyperlinkIndex = nextHyperlinkInstanceIndex();
@@ -1410,7 +1580,7 @@ function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, nextPageBreakRunOwner
 					styleResolver,
 					hyperlinkIndex: currentHyperlinkIndex,
 					textBoxAnchors,
-					nextPageBreakRunOwnerId
+					nextRunIdentityId
 				}));
 				break;
 			}
@@ -1420,14 +1590,14 @@ function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, nextPageBreakRunOwner
 					getInheritedRunFormatting,
 					styleResolver,
 					nextHyperlinkInstanceIndex,
-					nextPageBreakRunOwnerId,
+					nextRunIdentityId,
 					textBoxAnchors
 				});
 				if (fieldNode) itemNodes.push(fieldNode);
 				break;
 			}
 			case "inlineSdt": {
-				const nestedSdt = convertInlineSdt(content, nextHyperlinkInstanceIndex, nextPageBreakRunOwnerId, getInheritedRunFormatting, styleResolver, textBoxAnchors, stack);
+				const nestedSdt = convertInlineSdt(content, nextHyperlinkInstanceIndex, nextRunIdentityId, getInheritedRunFormatting, trackedRunFormattingResolvers, styleResolver, textBoxAnchors, stack);
 				if (nestedSdt) itemNodes.push(nestedSdt);
 				break;
 			}
@@ -1435,13 +1605,30 @@ function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, nextPageBreakRunOwner
 			case "deletion":
 			case "moveTo":
 			case "moveFrom":
-				itemNodes.push(...convertTrackedChange(content, content.type === "insertion" || content.type === "moveTo" ? "insertion" : "deletion", nextHyperlinkInstanceIndex, nextPageBreakRunOwnerId, getInheritedRunFormatting, styleResolver, content.type === "moveTo" || content.type === "moveFrom" ? content.type : null, textBoxAnchors));
+				itemNodes.push(...convertTrackedChange(content, content.type === "insertion" || content.type === "moveTo" ? "insertion" : "deletion", nextHyperlinkInstanceIndex, nextRunIdentityId, trackedRunFormattingResolvers, styleResolver, content.type === "moveTo" || content.type === "moveFrom" ? content.type : null, textBoxAnchors));
 				break;
 			case "mathEquation": {
 				const mathNode = convertMathEquation(content);
 				if (mathNode) itemNodes.push(mathNode);
 				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
+				}));
+				break;
+			case "bookmarkEnd":
+				itemNodes.push(schema.node("bookmarkBoundary", {
+					type: "end",
+					id: content.id,
+					displacedByCustomXml: content.displacedByCustomXml
+				}));
+				break;
 			case "preservedInline":
 				itemNodes.push(preservedInlineNode(content));
 				break;
@@ -1457,11 +1644,12 @@ function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, nextPageBreakRunOwner
 * @param run - The run to convert
 * @param resolvedStyleFormatting - Paragraph formatting and its explicit style-toggle state
 */
-function convertRun(run, resolvedStyleFormatting, nextPageBreakRunOwnerId, styleResolver, textBoxAnchors) {
+function convertRun(run, resolvedStyleFormatting, nextRunIdentityId, styleResolver, textBoxAnchors) {
 	const nodes = [];
 	const { marks, mergedFormatting } = buildRunMarks(run.formatting, resolvedStyleFormatting, styleResolver);
 	if (run.propertyChanges && run.propertyChanges.length > 0) marks.push(schema.mark("runPropertyChange", { changes: [...run.propertyChanges] }));
-	if (run.content.some((content) => content.type === "break" && content.breakType === "page")) marks.push(schema.mark("pageBreakRunOwner", { id: nextPageBreakRunOwnerId() }));
+	const identity = runIdentityMark(run, nextRunIdentityId);
+	if (identity) marks.push(identity);
 	for (const content of run.content) {
 		const contentNodes = convertRunContent(content, marks, mergedFormatting, textBoxAnchors, run.formatting);
 		nodes.push(...contentNodes);
@@ -1477,14 +1665,15 @@ const runHasPageBreakContent = (run) => run.content.some((content) => content.ty
 * predicate for the two, because a reporter that disagreed with the converter
 * would name a loss nobody suffered.
 */
-const fieldResultHasPageBreakContent = (field) => field.type === "simpleField" ? field.content.some((content) => {
+const inlineHasPageBreakContent = (items) => items.some((content) => {
 	switch (content.type) {
 		case "run": return runHasPageBreakContent(content);
-		case "hyperlink": return content.children.some((child) => child.type === "run" && runHasPageBreakContent(child));
-		case "preservedInline": return false;
-		default: panic(`Unsupported simple-field content: ${JSON.stringify(content)}`);
+		case "hyperlink": return inlineHasPageBreakContent(content.children);
+		case "inlineWrapper": return inlineHasPageBreakContent(content.content);
+		default: return false;
 	}
-}) : field.fieldResult.some(runHasPageBreakContent);
+});
+const fieldResultHasPageBreakContent = (field) => field.type === "simpleField" ? inlineHasPageBreakContent(field.content) : field.fieldResult.some(runHasPageBreakContent);
 function reportPageBreakSourceRunContent(run, warn) {
 	if (!runHasPageBreakContent(run)) return;
 	reportRunContentBesidePageBreak(run, "page-break-bearing-run", warn);
@@ -1646,7 +1835,7 @@ const PAGE_BREAK_OWNER_DESCRIPTIONS = {
 * Record what a page-break-bearing run loses when the editor re-cuts it.
 *
 * The run is split into one node per inline atom and rebuilt from the
-* `pageBreakRunOwner` mark, and the kinds below have no node of their own:
+* `runIdentity` mark, and the kinds below have no node of their own:
 * a hyphen returns as its character, a field character or instruction leaves
 * no trace, and a text-box shape is hoisted to its own block. Every one of
 * those losses is what the same run suffers with no page break in it, so
@@ -1707,7 +1896,8 @@ const RUN_FORMATTING_INFERENCE = {
 	shadow: "visible-boolean",
 	rtl: "visible-boolean",
 	cs: "structural",
-	styleId: "structural"
+	styleId: "structural",
+	preserved: "structural"
 };
 const sameFormattingValue = (left, right) => {
 	if (left === right) return true;
@@ -1932,8 +2122,14 @@ function convertRunContent(content, marks, formatting, textBoxAnchors, authoredF
 		}).mark(marks)];
 	}
 }
+/**
+* The marks that name an element the atom has to stay inside: a `w:hyperlink`
+* and the authored `w:r` itself. A leaf that carries one has to hold the whole
+* mark set, because the save leg rebuilds those elements around it.
+*/
+const RUN_BOUNDARY_MARK_NAMES = /* @__PURE__ */ new Set(["hyperlink", RUN_IDENTITY_MARK_NAME]);
 function withRunBoundaryMarks(node, marks) {
-	if (!marks.some(({ type }) => type.name === "hyperlink" || type.name === "pageBreakRunOwner")) return node;
+	if (!marks.some(({ type }) => RUN_BOUNDARY_MARK_NAMES.has(type.name))) return node;
 	return node.mark(marks);
 }
 /**
@@ -1941,6 +2137,28 @@ function withRunBoundaryMarks(node, marks) {
 * none of these values and there is accordingly nothing to carry.
 */
 const authoredEmuAttrs = (values) => Object.values(values).some((value) => value !== void 0) ? values : void 0;
+/**
+* A copy of the anchor record: ProseMirror keeps object-valued attrs by
+* reference, so sharing it with the source would let a mutation of either reach
+* the other outside a transaction.
+*/
+const copiedDrawingAnchor = (anchor) => anchor === void 0 ? void 0 : {
+	...anchor,
+	...anchor.simplePosition === void 0 ? {} : { simplePosition: { ...anchor.simplePosition } }
+};
+/**
+* A copy of the inset-slot record, for the reason {@link copiedDrawingAnchor}
+* is copied: ProseMirror keeps object-valued attrs by reference.
+*/
+const copiedWrapDistanceSlots = (slots) => slots === void 0 ? void 0 : {
+	...slots.drawing === void 0 ? {} : { drawing: { ...slots.drawing } },
+	...slots.wrapChild === void 0 ? {} : { wrapChild: { ...slots.wrapChild } }
+};
+/** A copy of the effect-extent slots, for {@link copiedWrapDistanceSlots}'s reason. */
+const copiedEffectExtentSlots = (slots) => slots === void 0 ? void 0 : {
+	...slots.drawing === void 0 ? {} : { drawing: { ...slots.drawing } },
+	...slots.wrapChild === void 0 ? {} : { wrapChild: { ...slots.wrapChild } }
+};
 /** The wrap insets of a drawing, keyed by the pixel attribute each becomes. */
 const wrapDistanceEmu = (wrap) => ({
 	distTop: wrap?.distT,
@@ -1998,22 +2216,11 @@ function convertImage({ image, rawXml, rawXmlMode, rawImageFingerprint, runForma
 	if (image.outline && image.outline.width) {
 		borderWidth = emuToStrokePixels(image.outline.width);
 		if (image.outline.color?.rgb) borderColor = `#${image.outline.color.rgb}`;
-		borderStyle = image.outline.style ? {
-			solid: "solid",
-			dot: "dotted",
-			dash: "dashed",
-			lgDash: "dashed",
-			dashDot: "dashed",
-			lgDashDot: "dashed",
-			lgDashDotDot: "dashed",
-			sysDot: "dotted",
-			sysDash: "dashed",
-			sysDashDot: "dashed",
-			sysDashDotDot: "dashed"
-		}[image.outline.style] || "solid" : "solid";
+		borderStyle = cssBorderStyleForDash(image.outline.dash);
 	}
 	return schema.node("image", {
 		src: image.src || "",
+		preview: image.preview,
 		docPrName: image.docPrName,
 		alt: image.alt,
 		title: image.title,
@@ -2040,7 +2247,10 @@ function convertImage({ image, rawXml, rawXmlMode, rawImageFingerprint, runForma
 		paddingBottom: image.padding?.bottom,
 		paddingLeft: image.padding?.left,
 		position,
-		layoutInCell: image.layoutInCell,
+		anchor: copiedDrawingAnchor(image.anchor),
+		wrapDistanceSlots: copiedWrapDistanceSlots(image.wrap.distanceSlots),
+		wrapEffectExtentSlots: copiedEffectExtentSlots(image.wrap.effectExtentSlots),
+		wrapPolygon: copiedWrapPolygon(image.wrap.polygon),
 		decorative: image.decorative,
 		hidden: image.hidden,
 		docPrExtensions: image.docPrExtensions ? [...image.docPrExtensions] : void 0,
@@ -2057,6 +2267,9 @@ function convertImage({ image, rawXml, rawXmlMode, rawImageFingerprint, runForma
 		wrapText,
 		hlinkHref: image.hlinkHref,
 		hlinkRId: image.hlinkRId,
+		hlinkClickSource: image.hlinkClickSource ? { ...image.hlinkClickSource } : void 0,
+		hlinkHoverXml: image.hlinkHoverXml,
+		docPrId: image.id,
 		_docxRawXml: rawXml,
 		_docxRawXmlMode: rawXmlMode,
 		_docxRawImageFingerprint: rawImageFingerprint,
@@ -2064,7 +2277,7 @@ function convertImage({ image, rawXml, rawXmlMode, rawImageFingerprint, runForma
 		_docxRunFormatting: runFormatting
 	});
 }
-function convertHyperlink(hyperlink, { getInheritedRunFormatting, styleResolver, hyperlinkIndex, textBoxAnchors, nextPageBreakRunOwnerId }) {
+function convertHyperlink(hyperlink, { getInheritedRunFormatting, styleResolver, hyperlinkIndex, textBoxAnchors, nextRunIdentityId }) {
 	const nodes = [];
 	const href = hyperlink.href || (hyperlink.anchor ? `#${hyperlink.anchor}` : "");
 	const linkMark = schema.mark("hyperlink", {
@@ -2073,38 +2286,42 @@ function convertHyperlink(hyperlink, { getInheritedRunFormatting, styleResolver,
 		rId: hyperlink.rId,
 		_docxHyperlinkIndex: hyperlinkIndex
 	});
-	for (const child of hyperlink.children) {
-		if (child.type === "bookmarkStart") {
-			nodes.push(schema.node("bookmarkBoundary", {
-				type: "start",
-				id: child.id,
-				name: child.name,
-				colFirst: child.colFirst,
-				colLast: child.colLast,
-				displacedByCustomXml: child.displacedByCustomXml
-			}, void 0, [linkMark]));
-			continue;
-		}
-		if (child.type === "bookmarkEnd") {
-			nodes.push(schema.node("bookmarkBoundary", {
-				type: "end",
-				id: child.id,
-				displacedByCustomXml: child.displacedByCustomXml
-			}, void 0, [linkMark]));
-			continue;
-		}
-		if (child.type === "preservedInline") {
-			nodes.push(preservedInlineNode(child).mark([linkMark]));
-			continue;
-		}
-		if (child.type === "run") {
-			const inheritedFormatting = getInheritedRunFormatting(child.formatting);
-			const { marks: runMarks, mergedFormatting } = buildRunMarks(child.formatting, inheritedFormatting, styleResolver);
-			if (child.propertyChanges && child.propertyChanges.length > 0) runMarks.push(schema.mark("runPropertyChange", { changes: [...child.propertyChanges] }));
-			if (child.content.some((content) => content.type === "break" && content.breakType === "page")) runMarks.push(schema.mark("pageBreakRunOwner", { id: nextPageBreakRunOwnerId() }));
-			const allMarks = [...runMarks, linkMark];
-			for (const content of child.content) nodes.push(...convertRunContent(content, allMarks, mergedFormatting, textBoxAnchors, child.formatting));
+	for (const { content: child, stack } of withInlineWrapperStacks(hyperlink.children)) {
+		const childNodes = [];
+		switch (child.type) {
+			case "bookmarkStart":
+				childNodes.push(schema.node("bookmarkBoundary", {
+					type: "start",
+					id: child.id,
+					name: child.name,
+					colFirst: child.colFirst,
+					colLast: child.colLast,
+					displacedByCustomXml: child.displacedByCustomXml
+				}, void 0, [linkMark]));
+				break;
+			case "bookmarkEnd":
+				childNodes.push(schema.node("bookmarkBoundary", {
+					type: "end",
+					id: child.id,
+					displacedByCustomXml: child.displacedByCustomXml
+				}, void 0, [linkMark]));
+				break;
+			case "preservedInline":
+				childNodes.push(preservedInlineNode(child).mark([linkMark]));
+				break;
+			case "run": {
+				const inheritedFormatting = getInheritedRunFormatting(child.formatting);
+				const { marks: runMarks, mergedFormatting } = buildRunMarks(child.formatting, inheritedFormatting, styleResolver);
+				if (child.propertyChanges && child.propertyChanges.length > 0) runMarks.push(schema.mark("runPropertyChange", { changes: [...child.propertyChanges] }));
+				const identity = runIdentityMark(child, nextRunIdentityId);
+				if (identity) runMarks.push(identity);
+				const allMarks = [...runMarks, linkMark];
+				for (const content of child.content) childNodes.push(...convertRunContent(content, allMarks, mergedFormatting, textBoxAnchors, child.formatting));
+				break;
+			}
+			default: break;
 		}
+		nodes.push(...withInlineWrapperMark(childNodes, stack));
 	}
 	return nodes;
 }
@@ -2152,7 +2369,7 @@ function convertShape(shape, runFormatting) {
 			outlineColorValue = shape.outline.color;
 			outlineColor = resolveColorValueToHex(shape.outline.color);
 		}
-		outlineStyle = shape.outline.style;
+		outlineStyle = outlineAttrForDash(shape.outline.dash);
 		outlineCap = shape.outline.cap;
 		outlineJoin = shape.outline.join;
 		outlineHeadEnd = shape.outline.headEnd;
@@ -2183,6 +2400,10 @@ function convertShape(shape, runFormatting) {
 		geometryAdjustments: shape.geometryAdjustments === void 0 ? void 0 : JSON.stringify(shape.geometryAdjustments),
 		shapeId: shape.id,
 		shapeName: shape.name,
+		anchor: copiedDrawingAnchor(shape.anchor),
+		wrapDistanceSlots: copiedWrapDistanceSlots(shape.wrap?.distanceSlots),
+		wrapEffectExtentSlots: copiedEffectExtentSlots(shape.wrap?.effectExtentSlots),
+		wrapPolygon: copiedWrapPolygon(shape.wrap?.polygon),
 		alt: shape.alt,
 		title: shape.title,
 		width: widthPx,
@@ -2367,6 +2588,7 @@ function textBoxFromShape(shape, textBody) {
 	if (shape.title !== void 0) textBox.title = shape.title;
 	if (shape.position) textBox.position = shape.position;
 	if (shape.wrap) textBox.wrap = shape.wrap;
+	if (shape.anchor) textBox.anchor = shape.anchor;
 	if (shape.fill) textBox.fill = shape.fill;
 	if (shape.outline) textBox.outline = shape.outline;
 	if (shape.transform) textBox.transform = shape.transform;
@@ -2393,7 +2615,7 @@ function convertTextBox(textBox, styleResolver, options) {
 	if (textBox.outline && textBox.outline.width) {
 		outlineWidth = emuToStrokePixels(textBox.outline.width);
 		if (textBox.outline.color?.rgb) outlineColor = `#${textBox.outline.color.rgb}`;
-		outlineStyle = textBox.outline.style || "solid";
+		outlineStyle = outlineAttrForDash(textBox.outline.dash) ?? "solid";
 	}
 	const transformAttrs = authoredTransformAttrs(textBox.transform);
 	const marginTop = textBox.margins?.top !== void 0 ? emuToPixels(textBox.margins.top) : void 0;
@@ -2464,6 +2686,10 @@ function convertTextBox(textBox, styleResolver, options) {
 			marginRight: textBox.margins?.right,
 			...wrapDistanceEmu(textBox.wrap)
 		}),
+		anchor: copiedDrawingAnchor(textBox.anchor),
+		wrapDistanceSlots: copiedWrapDistanceSlots(textBox.wrap?.distanceSlots),
+		wrapEffectExtentSlots: copiedEffectExtentSlots(textBox.wrap?.effectExtentSlots),
+		wrapPolygon: copiedWrapPolygon(textBox.wrap?.polygon),
 		autoFit: textBox.autoFit,
 		wordArt: textBox.wordArt,
 		textWrap: textBox.textWrap,
@@ -2552,6 +2778,10 @@ function headerFooterToProseDoc(content, options) {
 			case "preservedBlock":
 				out.push(convertPreservedBlock(block));
 				break;
+			case "bookmarkStart":
+			case "bookmarkEnd":
+				out.push(convertBlockBookmarkBoundary(block));
+				break;
 			default: panic(`Unsupported block content: ${JSON.stringify(block)}`);
 		}
 		return out;