@stll/folio-core 0.47.7 → 0.49.0

package/dist/prosemirror/conversion/toProseDoc.js

@@ -2,8 +2,9 @@ import { rangedCommentIds } from "../../docx/commentAnchorIndex.js";
 import { resolveColorValueToHex } from "../../docx/drawingUtils.js";
 import { isInlineSdtContent, isTrackedChangeWrapperChild } from "../../docx/inlineWrapperContent.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 { PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, createProseParagraphWithPropertySource, getDocumentParagraphPropertySourceContract, proseParagraphAttrsWithoutPropertySource, recreateProseNodeWithParagraphPropertySource, transportTableCellsWithParagraphPropertySources } from "../../docx/paragraphPropertySource.js";
 import { isBaselineVertAlign } from "../../docx/runParser.js";
+import { replayableShapeAlternateContent } from "../../docx/shapeAlternateContent.js";
 import { resolveTableLook } from "../../docx/tableLook.js";
 import { isCellMergeContinuation } from "../../docx/tableParser.js";
 import { copiedWrapPolygon } from "../../docx/wrapPolygon.js";
@@ -16,9 +17,11 @@ import { mergeParagraphFormatting, mergeParagraphTabStops } from "../../utils/pa
 import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
 import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
 import { emuToPixels, emuToStrokePixels } from "../../utils/units.js";
+import { withAlternateContent } from "../alternateContentAttrs.js";
 import { expectInlineWrapperMarkAttrs, expectTrackedChangeMarkAttrs } from "../attrs/index.js";
 import { authoredTransformAttrs } from "../authoredTransformAttrs.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
+import { withEnclosingRevision } from "../contentControlRevisions.js";
 import { planEmptyRanges } from "../emptyRangeAnchor.js";
 import { INLINE_WRAPPER_MARK_NAME } from "../extensions/marks/InlineWrapperExtension.js";
 import { textFormattingToMarks } from "../extensions/marks/markUtils.js";
@@ -34,6 +37,7 @@ 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 { continueRunIdentitiesAcrossRevisions } from "../runIdentityAcrossRevisions.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";
@@ -41,6 +45,7 @@ import { cascadeStyleTextFormatting } from "../styles/styleToggleCascade.js";
 import { canCarryTrackedRunMark, trackedRunInlineAtomDisposition } from "../trackedRunInlineAtoms.js";
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { resolveEffectiveTableCellFormatting } from "./effectiveTableCellFormatting.js";
+import { createMarkInterner } from "./markInterner.js";
 import { hasSinkChildren } from "./preservedSinkCarriers.js";
 import { sdtAttrsFromProperties } from "./sdtAttrs.js";
 import { panic } from "better-result";
@@ -85,7 +90,7 @@ const runIdentityMark = (run, nextRunIdentityId) => {
 	const payload = {
 		preservedAttributes: run.preservedAttributes,
 		preserved: run.formatting?.preserved,
-		emptyFormatting: run.formatting !== void 0 && Object.keys(run.formatting).length === 0 ? true : void 0
+		emptyFormatting: run.formatting !== void 0 && Object.keys(run.formatting).length === 0 && (run.propertyChanges?.length ?? 0) === 0 ? true : void 0
 	};
 	if (!runHasPageBreakContent(run) && !runHasMixedContent(run) && !hasRunIdentityPayload(payload)) return null;
 	return schema.mark(RUN_IDENTITY_MARK_NAME, runIdentityAttrs(nextRunIdentityId(), payload));
@@ -227,7 +232,8 @@ function toProseDoc(document, options) {
 		pageBreakRunSourceDescendants: buildPageBreakRunSourceDescendantIndex(paragraphs),
 		storyRangedCommentIds: rangedCommentIds(paragraphs),
 		openCommentIds: /* @__PURE__ */ new Set(),
-		warnPageBreakProjection: pageBreakProjectionWarn(options?.warn)
+		warnPageBreakProjection: pageBreakProjectionWarn(options?.warn),
+		createMark: createMarkInterner(schema)
 	};
 	const convertBodyBlocks = (blocks) => {
 		const out = [];
@@ -259,10 +265,12 @@ function toProseDoc(document, options) {
 	if (nodes.length === 0) nodes.push(schema.node("paragraph", {}, []));
 	const finalSectionStart = document.package.document.sections?.at(-1)?.properties.sectionStart ?? null;
 	const adjustLineHeightInTable = document.package.settings?.adjustLineHeightInTable === true;
+	const doNotUseIndentAsNumberingTabStop = document.package.settings?.doNotUseIndentAsNumberingTabStop === true;
 	const pmDoc = stampNumberedRefFieldBaselines(schema.node("doc", {
 		[PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR]: getDocumentParagraphPropertySourceContract(document) ?? null,
 		_finalSectionStart: finalSectionStart,
-		_adjustLineHeightInTable: adjustLineHeightInTable
+		_adjustLineHeightInTable: adjustLineHeightInTable,
+		_doNotUseIndentAsNumberingTabStop: doNotUseIndentAsNumberingTabStop
 	}, nodes));
 	assertValidProseMirrorDocument(pmDoc, "Document conversion produced an invalid ProseMirror document");
 	return pmDoc;
@@ -355,7 +363,10 @@ function convertBlockSdt(blockSdt, convertBlocks) {
 function convertParagraph(paragraph, styleResolver, context, extraRunFormatting, tableParagraphOverlay, textBoxAnchors) {
 	const { nextHyperlinkInstanceIndex, pairedBookmarkIds, pageBreakRunSourceDescendants, storyRangedCommentIds, openCommentIds } = context;
 	let runIdentityId = 0;
-	const nextRunIdentityId = () => runIdentityId++;
+	const runScope = {
+		nextRunIdentityId: () => runIdentityId++,
+		createMark: context.createMark
+	};
 	const { attrs, effectiveFrame } = paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOverlay);
 	reportParagraphPageBreakProjection({
 		paragraph,
@@ -452,7 +463,7 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 		historical: getHistoricalRunFormatting
 	};
 	const emitTrackedChange = (change, markType, moveKind) => {
-		emitInlineNodes(convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, nextRunIdentityId, trackedRunFormattingResolvers, styleResolver, moveKind, textBoxAnchors, wrapperStack));
+		emitInlineNodes(convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, runScope, trackedRunFormattingResolvers, styleResolver, moveKind, textBoxAnchors, wrapperStack));
 	};
 	const stacked = withInlineWrapperStacks(paragraph.content);
 	const emptyRanges = planEmptyRanges(stacked.map((item) => item.content));
@@ -476,7 +487,7 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 				emitInlineNode(schema.node("commentReference", { commentId: content.id }));
 				break;
 			case "run":
-				emitInlineNodes(convertRun(content, getInheritedRunFormatting(content.formatting), nextRunIdentityId, styleResolver, textBoxAnchors));
+				emitInlineNodes(convertRun(content, getInheritedRunFormatting(content.formatting), runScope, styleResolver, textBoxAnchors));
 				break;
 			case "hyperlink": {
 				const linkNodes = convertHyperlink(content, {
@@ -484,7 +495,7 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 					styleResolver,
 					hyperlinkIndex: nextHyperlinkInstanceIndex(),
 					textBoxAnchors,
-					nextRunIdentityId
+					runScope
 				});
 				if (linkNodes.length === 0) {
 					const emptyWrapperStacks = emptyInlineWrapperStacks(content.children);
@@ -511,12 +522,12 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 					getInheritedRunFormatting,
 					styleResolver,
 					nextHyperlinkInstanceIndex,
-					nextRunIdentityId,
+					runScope,
 					textBoxAnchors
 				}));
 				break;
 			case "inlineSdt":
-				emitInlineNode(convertInlineSdt(content, nextHyperlinkInstanceIndex, nextRunIdentityId, getInheritedRunFormatting, trackedRunFormattingResolvers, styleResolver, textBoxAnchors, stack));
+				emitInlineNode(convertInlineSdt(content, nextHyperlinkInstanceIndex, runScope, getInheritedRunFormatting, trackedRunFormattingResolvers, styleResolver, textBoxAnchors, stack));
 				break;
 			case "insertion":
 			case "moveTo":
@@ -570,7 +581,7 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 	if (emptyHyperlinks) attrs._emptyHyperlinks = emptyHyperlinks;
 	return createProseParagraphWithPropertySource(schema.nodes["paragraph"], paragraph, {
 		attrs,
-		content: inlineNodes
+		content: continueRunIdentitiesAcrossRevisions(inlineNodes)
 	});
 }
 /**
@@ -602,16 +613,20 @@ 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.
+* not a run carrier: the revision goes on the leaves it holds, and the control
+* records that the revision encloses it. The leaves alone would read the same
+* for `w:ins > w:sdt` and `w:sdt > w:ins`; the record is what lets the save leg
+* write the revision back around the control, and resolving it remove the
+* control, only for the first.
 */
 const withTrackedRunMark = (node, mark, ancestor) => {
 	if (node.type.name === "sdt") {
 		const marked = [];
 		for (let index = 0; index < node.childCount; index += 1) marked.push(withTrackedRunMark(node.child(index), mark, ancestor));
-		return recreateProseNodeWithParagraphPropertySource(node, { content: marked });
+		return recreateProseNodeWithParagraphPropertySource(node, {
+			attrs: withEnclosingRevision(node, ancestor.revisionId) ?? node.attrs,
+			content: marked
+		});
 	}
 	const nestedMark = node.marks.find(({ type }) => type.name === "insertion" || type.name === "deletion");
 	if (nestedMark) {
@@ -630,13 +645,13 @@ const withTrackedRunMark = (node, mark, ancestor) => {
 * Convert tracked change (insertion or deletion) content to PM nodes with
 * an insertion/deletion mark applied.
 */
-function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, nextRunIdentityId, runFormattingResolvers, styleResolver, moveKind = null, textBoxAnchors, wrappedBy = []) {
+function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, runScope, 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, getTrackedRunFormatting(item.formatting), nextRunIdentityId, styleResolver, textBoxAnchors));
+		if (item.type === "run") itemNodes.push(...convertRun(item, getTrackedRunFormatting(item.formatting), runScope, styleResolver, textBoxAnchors));
 		else if (item.type === "hyperlink") {
 			const currentHyperlinkIndex = nextHyperlinkInstanceIndex();
 			itemNodes.push(...convertHyperlink(item, {
@@ -644,14 +659,14 @@ function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, next
 				styleResolver,
 				hyperlinkIndex: currentHyperlinkIndex,
 				textBoxAnchors,
-				nextRunIdentityId
+				runScope
 			}));
 		} else if (item.type === "simpleField" || item.type === "complexField") {
 			const fieldNode = convertField(item, {
 				getInheritedRunFormatting: getTrackedRunFormatting,
 				styleResolver,
 				nextHyperlinkInstanceIndex,
-				nextRunIdentityId,
+				runScope,
 				textBoxAnchors
 			});
 			if (fieldNode) itemNodes.push(fieldNode);
@@ -661,9 +676,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, nextRunIdentityId, runFormattingResolvers, styleResolver, nestedMoveKind, textBoxAnchors, [...wrappedBy, ...stack]));
+			itemNodes.push(...convertTrackedChange(item, nestedMarkType, nextHyperlinkInstanceIndex, runScope, runFormattingResolvers, styleResolver, nestedMoveKind, textBoxAnchors, [...wrappedBy, ...stack]));
 		} else if (item.type === "inlineSdt") {
-			const sdtNode = convertInlineSdt(item, nextHyperlinkInstanceIndex, nextRunIdentityId, getTrackedRunFormatting, runFormattingResolvers, styleResolver, textBoxAnchors, [...wrappedBy, ...stack]);
+			const sdtNode = convertInlineSdt(item, nextHyperlinkInstanceIndex, runScope, getTrackedRunFormatting, runFormattingResolvers, styleResolver, textBoxAnchors, [...wrappedBy, ...stack]);
 			if (sdtNode) itemNodes.push(sdtNode);
 		} else if (item.type === "bookmarkStart") itemNodes.push(schema.node("bookmarkBoundary", {
 			type: "start",
@@ -1080,8 +1095,7 @@ function convertTable(table, styleResolver, context) {
 	const tableStyleId = table.formatting?.styleId;
 	const look = resolveTableLook(table.formatting?.look);
 	const tableStyle = tableStyleId ? styleResolver?.getStyle(tableStyleId) : void 0;
-	const defaultTableStyle = styleResolver?.getDefaultTableStyle();
-	const fallbackTableStyle = tableStyleId ? void 0 : defaultTableStyle;
+	const fallbackTableStyle = tableStyle ? void 0 : styleResolver?.getDefaultTableStyle();
 	const conditionalTableStyleId = tableStyle?.styleId ?? fallbackTableStyle?.styleId;
 	const resolvedTableBorders = table.formatting?.borders ?? tableStyle?.tblPr?.borders ?? fallbackTableStyle?.tblPr?.borders;
 	const fallbackTableIndent = fallbackTableStyle?.tblPr?.indent;
@@ -1466,7 +1480,8 @@ function standaloneTableCellToProseMirror(cell, nodeType) {
 			pageBreakRunSourceDescendants,
 			storyRangedCommentIds: rangedCommentIds(cell.content),
 			openCommentIds: /* @__PURE__ */ new Set(),
-			warnPageBreakProjection: noPageBreakProjectionWarning
+			warnPageBreakProjection: noPageBreakProjectionWarning,
+			createMark: createMarkInterner(schema)
 		},
 		isHeader: nodeType === "tableHeader",
 		gridWidthPercent: void 0,
@@ -1479,7 +1494,7 @@ function standaloneTableCellToProseMirror(cell, nodeType) {
 		defaultCellMargins: void 0
 	});
 }
-function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyperlinkInstanceIndex, nextRunIdentityId, textBoxAnchors }) {
+function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyperlinkInstanceIndex, runScope, textBoxAnchors }) {
 	let displayText = "";
 	let fieldFormatting;
 	let fieldPropertyChanges;
@@ -1490,7 +1505,7 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 		fieldFormatting ??= run.formatting;
 		fieldPropertyChanges ??= run.propertyChanges;
 		if (!hasStructuredSourceContent) return;
-		into.push(...convertRun(run, getInheritedRunFormatting(run.formatting, field.fieldType), nextRunIdentityId, styleResolver, textBoxAnchors));
+		into.push(...convertRun(run, getInheritedRunFormatting(run.formatting, field.fieldType), runScope, styleResolver, textBoxAnchors));
 	};
 	if (field.type === "simpleField") for (const { content, stack } of withInlineWrapperStacks(field.content)) {
 		const itemNodes = [];
@@ -1512,7 +1527,7 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 					styleResolver,
 					hyperlinkIndex: nextHyperlinkInstanceIndex(),
 					textBoxAnchors,
-					nextRunIdentityId
+					runScope
 				}));
 				break;
 			default: break;
@@ -1522,7 +1537,12 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 	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 { marks } = buildRunMarks({
+		runFormatting: fieldFormatting,
+		inherited: inheritedFormatting,
+		styleResolver,
+		createMark: runScope.createMark
+	});
 	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");
@@ -1535,7 +1555,8 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 		displayText,
 		fieldKind: field.type === "simpleField" ? "simple" : "complex",
 		fldLock: field.fldLock ?? null,
-		dirty: field.dirty ?? null
+		dirty: field.dirty ?? null,
+		fieldResultIsFallback: field.type === "complexField" ? field.fieldResultIsFallback ?? null : null
 	}, createStructuredField ? inlineNodes : void 0, marks);
 }
 /**
@@ -1602,7 +1623,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, nextRunIdentityId, getInheritedRunFormatting, trackedRunFormattingResolvers, styleResolver, textBoxAnchors, wrappedBy = []) {
+function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, runScope, getInheritedRunFormatting, trackedRunFormattingResolvers, styleResolver, textBoxAnchors, wrappedBy = []) {
 	const props = sdt.properties;
 	const inlineNodes = [];
 	const stacked = withInlineWrapperStacks(sdt.content, wrappedBy);
@@ -1618,7 +1639,7 @@ function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, nextRunIdentityId, ge
 		if (emptyRanges.closedAt.has(index)) continue;
 		switch (content.type) {
 			case "run":
-				itemNodes.push(...convertRun(content, getInheritedRunFormatting(content.formatting), nextRunIdentityId, styleResolver, textBoxAnchors));
+				itemNodes.push(...convertRun(content, getInheritedRunFormatting(content.formatting), runScope, styleResolver, textBoxAnchors));
 				break;
 			case "hyperlink": {
 				const currentHyperlinkIndex = nextHyperlinkInstanceIndex();
@@ -1627,7 +1648,7 @@ function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, nextRunIdentityId, ge
 					styleResolver,
 					hyperlinkIndex: currentHyperlinkIndex,
 					textBoxAnchors,
-					nextRunIdentityId
+					runScope
 				}));
 				break;
 			}
@@ -1637,14 +1658,14 @@ function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, nextRunIdentityId, ge
 					getInheritedRunFormatting,
 					styleResolver,
 					nextHyperlinkInstanceIndex,
-					nextRunIdentityId,
+					runScope,
 					textBoxAnchors
 				});
 				if (fieldNode) itemNodes.push(fieldNode);
 				break;
 			}
 			case "inlineSdt": {
-				const nestedSdt = convertInlineSdt(content, nextHyperlinkInstanceIndex, nextRunIdentityId, getInheritedRunFormatting, trackedRunFormattingResolvers, styleResolver, textBoxAnchors, stack);
+				const nestedSdt = convertInlineSdt(content, nextHyperlinkInstanceIndex, runScope, getInheritedRunFormatting, trackedRunFormattingResolvers, styleResolver, textBoxAnchors, stack);
 				if (nestedSdt) itemNodes.push(nestedSdt);
 				break;
 			}
@@ -1652,7 +1673,7 @@ function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, nextRunIdentityId, ge
 			case "deletion":
 			case "moveTo":
 			case "moveFrom":
-				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));
+				itemNodes.push(...convertTrackedChange(content, content.type === "insertion" || content.type === "moveTo" ? "insertion" : "deletion", nextHyperlinkInstanceIndex, runScope, trackedRunFormattingResolvers, styleResolver, content.type === "moveTo" || content.type === "moveFrom" ? content.type : null, textBoxAnchors));
 				break;
 			case "mathEquation": {
 				const mathNode = convertMathEquation(content);
@@ -1697,11 +1718,16 @@ function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, nextRunIdentityId, ge
 * @param run - The run to convert
 * @param resolvedStyleFormatting - Paragraph formatting and its explicit style-toggle state
 */
-function convertRun(run, resolvedStyleFormatting, nextRunIdentityId, styleResolver, textBoxAnchors) {
+function convertRun(run, resolvedStyleFormatting, runScope, styleResolver, textBoxAnchors) {
 	const nodes = [];
-	const { marks, mergedFormatting } = buildRunMarks(run.formatting, resolvedStyleFormatting, styleResolver);
+	const { marks, mergedFormatting } = buildRunMarks({
+		runFormatting: run.formatting,
+		inherited: resolvedStyleFormatting,
+		styleResolver,
+		createMark: runScope.createMark
+	});
 	if (run.propertyChanges && run.propertyChanges.length > 0) marks.push(schema.mark("runPropertyChange", { changes: [...run.propertyChanges] }));
-	const identity = runIdentityMark(run, nextRunIdentityId);
+	const identity = runIdentityMark(run, runScope.nextRunIdentityId);
 	if (identity) marks.push(identity);
 	for (const content of run.content) {
 		const contentNodes = convertRunContent(content, marks, mergedFormatting, textBoxAnchors, run.formatting);
@@ -2015,12 +2041,13 @@ const canReconstructAuthoredRunFormatting = ({ directFormatting, effectiveFormat
 	}
 	return true;
 };
-function buildRunMarks(runFormatting, inherited, styleResolver) {
+function buildRunMarks({ runFormatting, inherited, styleResolver, createMark }) {
 	if (runFormatting === void 0 && inherited.implicitCharacterStyleApplied === true && inherited.paragraphMarkOverrides === void 0) return {
 		marks: textFormattingToMarks(inherited.formatting, schema, {
 			overrideFormatting: void 0,
 			directFormatting: void 0,
-			authoredCarrier: "reconstruct"
+			authoredCarrier: "reconstruct",
+			createMark
 		}),
 		mergedFormatting: inherited.formatting
 	};
@@ -2064,9 +2091,10 @@ function buildRunMarks(runFormatting, inherited, styleResolver) {
 	const marks = textFormattingToMarks(mergedFormatting, schema, {
 		overrideFormatting,
 		directFormatting: runFormatting,
-		authoredCarrier
+		authoredCarrier,
+		createMark
 	});
-	if (styleId) marks.push(schema.mark("characterStyle", { styleId }));
+	if (styleId) marks.push(createMark("characterStyle", { styleId }));
 	return {
 		marks,
 		mergedFormatting
@@ -2144,7 +2172,7 @@ function convertRunContent(content, marks, formatting, textBoxAnchors, authoredF
 				const anchorId = textBoxAnchors?.get(shp);
 				return anchorId ? [schema.node("textBoxAnchor", { anchorId }).mark(marks)] : [];
 			}
-			return [withRunBoundaryMarks(convertShape(shp, carriedRunFormatting(authoredFormatting)), marks)];
+			return [withRunBoundaryMarks(withAlternateContent(convertShape(shp, carriedRunFormatting(authoredFormatting)), replayableShapeAlternateContent(content)), marks)];
 		}
 		case "footnoteRef": {
 			const footnoteMark = schema.mark("footnoteRef", {
@@ -2195,6 +2223,12 @@ function withRunBoundaryMarks(node, marks) {
 */
 const authoredEmuAttrs = (values) => Object.values(values).some((value) => value !== void 0) ? values : void 0;
 /**
+* A text box's gradient fill, copied for the reason {@link copiedDrawingAnchor}
+* is: ProseMirror keeps object-valued attrs by reference. Any other fill is
+* stated by `fillColor`, or not at all.
+*/
+const copiedGradientFill = (fill) => fill?.type === "gradient" && fill.gradient !== void 0 ? structuredClone(fill) : 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.
@@ -2334,7 +2368,7 @@ function convertImage({ image, rawXml, rawXmlMode, rawImageFingerprint, runForma
 		_docxRunFormatting: runFormatting
 	});
 }
-function convertHyperlink(hyperlink, { getInheritedRunFormatting, styleResolver, hyperlinkIndex, textBoxAnchors, nextRunIdentityId }) {
+function convertHyperlink(hyperlink, { getInheritedRunFormatting, styleResolver, hyperlinkIndex, textBoxAnchors, runScope }) {
 	const nodes = [];
 	const href = hyperlink.href || (hyperlink.anchor ? `#${hyperlink.anchor}` : "");
 	const linkMark = schema.mark("hyperlink", {
@@ -2371,9 +2405,14 @@ function convertHyperlink(hyperlink, { getInheritedRunFormatting, styleResolver,
 				break;
 			case "run": {
 				const inheritedFormatting = getInheritedRunFormatting(child.formatting);
-				const { marks: runMarks, mergedFormatting } = buildRunMarks(child.formatting, inheritedFormatting, styleResolver);
+				const { marks: runMarks, mergedFormatting } = buildRunMarks({
+					runFormatting: child.formatting,
+					inherited: inheritedFormatting,
+					styleResolver,
+					createMark: runScope.createMark
+				});
 				if (child.propertyChanges && child.propertyChanges.length > 0) runMarks.push(schema.mark("runPropertyChange", { changes: [...child.propertyChanges] }));
-				const identity = runIdentityMark(child, nextRunIdentityId);
+				const identity = runIdentityMark(child, runScope.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));
@@ -2511,17 +2550,30 @@ function convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId, c
 	const keepWrapperParagraph = isEmptyAfterExtraction && (preserveEmptyWrapper === true || hasParagraphBoundaryPayload(block, pmParagraph));
 	if (!isEmptyAfterExtraction || keepWrapperParagraph) nodes.push(pmParagraph);
 	const standalone = isEmptyAfterExtraction && !keepWrapperParagraph;
-	for (const [index, { textBox, anchorId, trackedChange, inlineSdts }] of textBoxes.entries()) nodes.push(convertTextBox(textBox, styleResolver, {
-		placement: standalone ? "standalone" : "inlineWithPrevious",
-		groupId: textBoxGroupId,
-		anchorId,
-		context,
-		trackedChange,
-		inlineSdts,
-		...standalone && index === 0 && block.preservedAttributes ? { hostPreservedAttributes: block.preservedAttributes } : {}
-	}));
+	for (const [index, { textBox, alternateContentXml, anchorId, trackedChange, inlineSdts }] of textBoxes.entries()) {
+		const textBoxNode = convertTextBox(textBox, styleResolver, {
+			placement: standalone ? "standalone" : "inlineWithPrevious",
+			groupId: textBoxGroupId,
+			anchorId,
+			context,
+			trackedChange,
+			inlineSdts,
+			...standalone && index === 0 && block.preservedAttributes ? { hostPreservedAttributes: block.preservedAttributes } : {},
+			...standalone && index === 0 ? { hostParagraph: hostParagraphAttrs(pmParagraph.attrs) } : {}
+		});
+		nodes.push(withAlternateContent(textBoxNode, alternateContentXml));
+	}
 	return nodes;
 }
+/**
+* The host paragraph's attributes without its identity. The node may be
+* copied, and a copy must not make a second claim on the same `w:p`; the
+* attribute remainder travels in the node's own `_preservedAttributes`.
+*/
+function hostParagraphAttrs(attrs) {
+	const { paraId: _paraId, textId: _textId, idStability: _idStability, _preservedAttributes, ...host } = proseParagraphAttrsWithoutPropertySource(attrs);
+	return host;
+}
 function hasContentBesidesTextBoxAnchors(paragraph) {
 	let hasContent = false;
 	paragraph.descendants((node) => {
@@ -2568,6 +2620,7 @@ function extractTextBoxes(paragraph, textBoxGroupId) {
 			textBoxAnchors.set(runContent.shape, anchorId);
 			textBoxes.push({
 				textBox: textBoxFromShape(runContent.shape, runContent.shape.textBody),
+				alternateContentXml: replayableShapeAlternateContent(runContent),
 				anchorId,
 				trackedChange: context.trackedChange,
 				inlineSdts: context.inlineSdts
@@ -2660,6 +2713,7 @@ function textBoxFromShape(shape, textBody) {
 	if (textBody.textWrap) textBox.textWrap = textBody.textWrap;
 	if (textBody.anchor) textBox.verticalAlign = textBody.anchor;
 	if (textBody.wordArt) textBox.wordArt = textBody.wordArt;
+	if (shape.groupChild) textBox.groupChild = shape.groupChild;
 	return textBox;
 }
 /**
@@ -2672,6 +2726,7 @@ function convertTextBox(textBox, styleResolver, options) {
 	const heightPx = textBoxSize?.height ? emuToPixels(textBoxSize.height) : void 0;
 	let fillColor;
 	if (textBox.fill?.color?.rgb) fillColor = `#${textBox.fill.color.rgb}`;
+	const gradientFill = copiedGradientFill(textBox.fill);
 	let outlineWidth;
 	let outlineColor;
 	let outlineStyle;
@@ -2762,6 +2817,7 @@ function convertTextBox(textBox, styleResolver, options) {
 		alt: textBox.alt,
 		title: textBox.title,
 		fillColor,
+		gradientFill,
 		outlineWidth,
 		outlineColor,
 		outlineStyle,
@@ -2782,10 +2838,12 @@ function convertTextBox(textBox, styleResolver, options) {
 		_docxPlacement: options.placement,
 		_docxGroupId: options.groupId,
 		_docxAnchorId: options.anchorId,
+		_docxGroupChild: textBox.groupChild,
 		_docxTextBodyContentState: textBox.content.length === 0 ? { type: "source-empty" } : { type: "authored" },
 		_docxTrackedChange: options.trackedChange,
 		_docxInlineSdts: options.inlineSdts.length > 0 ? options.inlineSdts : void 0,
-		_preservedAttributes: options.hostPreservedAttributes
+		_preservedAttributes: options.hostPreservedAttributes,
+		_docxHostParagraph: options.hostParagraph
 	}, contentNodes);
 }
 /**
@@ -2809,7 +2867,8 @@ function headerFooterToProseDoc(content, options) {
 		pageBreakRunSourceDescendants: buildPageBreakRunSourceDescendantIndex(content),
 		storyRangedCommentIds: rangedCommentIds(content),
 		openCommentIds: /* @__PURE__ */ new Set(),
-		warnPageBreakProjection: pageBreakProjectionWarn(options?.warn)
+		warnPageBreakProjection: pageBreakProjectionWarn(options?.warn),
+		createMark: createMarkInterner(schema)
 	};
 	const convertBlocks = (blocks) => {
 		const out = [];

package/dist/prosemirror/extensions/core/DocExtension.js

@@ -11,7 +11,8 @@ const DocExtension = createNodeExtension({
 		attrs: {
 			[PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR]: { default: null },
 			_finalSectionStart: { default: null },
-			_adjustLineHeightInTable: { default: false }
+			_adjustLineHeightInTable: { default: false },
+			_doNotUseIndentAsNumberingTabStop: { default: false }
 		},
 		content: "(paragraph | horizontalRule | pageBreak | table | textBox | blockSdt | preservedBlock | blockBookmarkBoundary)+"
 	}

package/dist/prosemirror/extensions/core/ParagraphExtension.js

@@ -228,6 +228,7 @@ const paragraphNodeSpec = {
 		listMarkerSecondSlotOffsetTwips: { default: null },
 		listLevelNumFmts: { default: null },
 		listLevelStarts: { default: null },
+		listLevelTabs: { default: null },
 		listAbstractNumId: { default: null },
 		listStartOverride: { default: null },
 		styleId: { default: null },

package/dist/prosemirror/extensions/features/AutoBidiDetectionExtension.d.ts

@@ -8,13 +8,13 @@ declare const autoBidiDetectionKey: PluginKey<any>;
  * fire for the initial document, so seeded content needs this pass.
  *
  * Like the paraId allocator this is `ignoreTrackedChanges`, so a normalized
- * paragraph the user never edits is not in `changedParaIds`. Full save (the
- * default; and the only path for Markdown/template/new docs, which have no
- * original buffer) serializes the whole PM doc, so the flag is written. The
- * selective-save path (dark `selectiveSave` flag) intentionally preserves
- * untouched original paragraphs byte-for-byte, so an imported DOCX whose Arabic
- * arrived without `w:bidi` and is saved without any edit keeps the original
- * bytes; editing the paragraph tracks it and the patch then includes `w:bidi`.
+ * paragraph the user never edits is not in `changedParaIds`. An imported DOCX
+ * whose Arabic arrived without `w:bidi` gets `{ source: "auto" }` here purely
+ * for rendering; because `directionToAuthoredBidi` treats `"auto"` the same
+ * as undecided, neither a full-repack save nor the selective-save path (dark
+ * `selectiveSave` flag) writes `w:bidi` for it when the paragraph is not
+ * otherwise edited. A manual toggle, or a paragraph whose `w:bidi` the source
+ * document already carried, is unaffected — it always round-trips.
  */
 declare const ensureBaseDirectionInState: (state: EditorState) => EditorState;
 declare const AutoBidiDetectionExtension: (options?: Partial<{}> | undefined) => Extension;

package/dist/prosemirror/extensions/features/AutoBidiDetectionExtension.js

@@ -80,13 +80,13 @@ const applyBidiUpdates = (state, updates) => {
 * fire for the initial document, so seeded content needs this pass.
 *
 * Like the paraId allocator this is `ignoreTrackedChanges`, so a normalized
-* paragraph the user never edits is not in `changedParaIds`. Full save (the
-* default; and the only path for Markdown/template/new docs, which have no
-* original buffer) serializes the whole PM doc, so the flag is written. The
-* selective-save path (dark `selectiveSave` flag) intentionally preserves
-* untouched original paragraphs byte-for-byte, so an imported DOCX whose Arabic
-* arrived without `w:bidi` and is saved without any edit keeps the original
-* bytes; editing the paragraph tracks it and the patch then includes `w:bidi`.
+* paragraph the user never edits is not in `changedParaIds`. An imported DOCX
+* whose Arabic arrived without `w:bidi` gets `{ source: "auto" }` here purely
+* for rendering; because `directionToAuthoredBidi` treats `"auto"` the same
+* as undecided, neither a full-repack save nor the selective-save path (dark
+* `selectiveSave` flag) writes `w:bidi` for it when the paragraph is not
+* otherwise edited. A manual toggle, or a paragraph whose `w:bidi` the source
+* document already carried, is unaffected — it always round-trips.
 */
 const ensureBaseDirectionInState = (state) => {
 	if (!autoBidiDetectionKey.get(state)) return state;

package/dist/prosemirror/extensions/marks/markUtils.d.ts

@@ -1,6 +1,6 @@
 import { document_d_exports } from "../../../types/document.js";
 import { Command, EditorState } from "prosemirror-state";
-import { Mark, MarkType, Schema } from "prosemirror-model";
+import { Attrs, Mark, MarkType, Schema } from "prosemirror-model";
 //#region src/prosemirror/extensions/marks/markUtils.d.ts
 type MarkAttrs = Record<string, unknown>;
 declare function marksToTextFormatting(marks: readonly Mark[]): document_d_exports.TextFormatting;
@@ -23,6 +23,8 @@ declare function isMarkActive(state: EditorState, markType: MarkType, attrs?: Re
  */
 declare function getMarkAttr(state: EditorState, markType: MarkType, attr: string): unknown;
 type AuthoredRunFormattingCarrier = "preserve" | "reconstruct";
+/** Builds a mark by type name; a conversion passes one that shares equal marks. */
+type MarkFactory = (type: string, attrs?: Attrs | null) => Mark;
 /**
  * Convert TextFormatting to ProseMirror marks
  */
@@ -32,6 +34,8 @@ type TextFormattingToMarksOptions = {
   directFormatting?: document_d_exports.TextFormatting | undefined;
   /** Whether direct authorship is reconstructible from structural marks and the style context. */
   authoredCarrier?: AuthoredRunFormattingCarrier;
+  /** Builds each mark; defaults to `schema.mark`. */
+  createMark?: MarkFactory;
 };
 declare function textFormattingToMarks(formatting: document_d_exports.TextFormatting | undefined, schema: Schema, options?: TextFormattingToMarksOptions): Mark[];
 /**
@@ -47,4 +51,4 @@ declare function createSetMarkCommand(markType: MarkType, attrs?: Record<string,
  */
 declare function createRemoveMarkCommand(markType: MarkType): Command;
 //#endregion
-export { AuthoredRunFormattingCarrier, clearFontSizeForAllScripts, clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, marksToTextFormatting, removeMark, setFontSizeForAllScripts, setMark, textFormattingToMarks, toggleMarkForAllScripts, toggleUnderlineMark };
+export { AuthoredRunFormattingCarrier, MarkFactory, clearFontSizeForAllScripts, clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, marksToTextFormatting, removeMark, setFontSizeForAllScripts, setMark, textFormattingToMarks, toggleMarkForAllScripts, toggleUnderlineMark };