@stll/folio-core 0.37.4 → 0.38.0

package/dist/prosemirror/commands/comments.js

@@ -12,12 +12,14 @@ import { RUN_FORMATTING_MARK_NAMES } from "../runFormattingMarkNames.js";
 import { reconstructRejectedRunFormattingMarks } from "../runPropertyChangeResolution.js";
 import { paragraphRunStyleContextAt } from "../runStyleFormatting.js";
 import { getTableCellMergeChange } from "../tableCellMergeRevision.js";
+import { isTableCellRetainedInReviewView } from "../tableCellRevisionVisibility.js";
 import { reconcileTableGridAfterColumnRemoval } from "../tableGridMutation.js";
 import { holdsNoContent } from "../zeroWidthAnchors.js";
 import { hasSerializableParagraphPropertyChange, paragraphPropertiesSnapshot, paragraphRejectAttrPatch, paragraphRejectOriginalFormatting, removeParagraphPropertyChanges, sectionRejectProperties, tableCellRejectAttrPatch, tableRejectAttrPatch, tableRowRejectAttrPatch } from "./propertyChangeScope.js";
 import { hasMatchingCollapsedTableCellMerge, resolveCollapsedTableCellMerge, resolveVisibleTableCellMerge } from "./tableCellMergeResolution.js";
 import { TableMap, removeRow } from "prosemirror-tables";
-import { PARAGRAPH_MARK_CHANGE_KINDS } from "@stll/docx-core/model";
+import { Mapping } from "prosemirror-transform";
+import { PARAGRAPH_MARK_CHANGE_KINDS, REVIEW_CARRIERS } from "@stll/docx-core/model";
 //#region src/prosemirror/commands/comments.ts
 /**
 * Add a comment mark to the current selection.
@@ -120,7 +122,11 @@ function resolveChange(from, to, mode, revisionIds, execution = "legacy") {
 						if (matches.length > 0) {
 							const remaining = sectionChanges.filter((c) => revisionSet !== null && (!c.info || !revisionSet.has(c.info.id)));
 							let restored = { ...sectionProperties };
-							if (mode === "reject") for (const change of matches.toReversed()) restored = sectionRejectProperties(restored, change.previousProperties);
+							if (mode === "reject") for (const change of matches.toReversed()) restored = sectionRejectProperties({
+								live: restored,
+								previousProperties: change.previousProperties,
+								previousReferences: change.previousReferences
+							});
 							delete restored.propertyChanges;
 							if (remaining.length > 0) restored.propertyChanges = remaining;
 							nextAttrs = nextAttrs ?? { ...node.attrs };
@@ -132,7 +138,12 @@ function resolveChange(from, to, mode, revisionIds, execution = "legacy") {
 						nextAttrs,
 						paragraphPosition: pos,
 						styleResolver,
-						tr
+						tr,
+						...mode === "reject" && { shouldRebase: (inline) => {
+							const deleted = inline.marks.some(({ type }) => type.name === "deletion");
+							const direct = inline.marks.some(({ type }) => type.name === "runFormattingOverride");
+							return !deleted || !direct;
+						} }
 					});
 					else tr.setNodeMarkup(pos, void 0, nextAttrs);
 					return true;
@@ -309,11 +320,45 @@ function resolveChange(from, to, mode, revisionIds, execution = "legacy") {
 				removedEndpointCount: removedSectionEndpointCount,
 				removedReferences: removedSectionReferences
 			});
+			if (!terminalTableDeletionIsPending(tr)) resolveTerminalTableReviewCarrier(tr, mode);
 			if (tr.steps.length > 0) dispatch(tr);
 		}
 		return true;
 	};
 }
+/**
+* The receiver belongs to the deleted terminal table, not every revision in
+* the document. Keep it through independently resolved changes, then resolve
+* it as soon as that table's deletion has been decided.
+*/
+const terminalTableDeletionIsPending = (tr) => {
+	let terminalTable = null;
+	for (let index = tr.doc.childCount - 1; index >= 0; index--) {
+		const node = tr.doc.child(index);
+		if (node.type.name === "table") {
+			terminalTable = node;
+			break;
+		}
+	}
+	if (terminalTable === null) return false;
+	let pending = false;
+	terminalTable.descendants((node) => {
+		pending ||= node.type.name === "tableRow" && isTableRowRevisionAttr(node.attrs["trDel"]) || node.type.name !== "tableRow" && node.marks.some((mark) => mark.type.name === "deletion");
+		return !pending;
+	});
+	return pending;
+};
+/** Resolve the Folio-only receiver Word needs after a terminal deleted table. */
+const resolveTerminalTableReviewCarrier = (tr, mode) => {
+	const carrier = tr.doc.lastChild;
+	if (carrier?.type.name !== "paragraph" || carrier.attrs["reviewCarrier"] !== REVIEW_CARRIERS.TERMINAL_TABLE) return;
+	const position = tr.doc.content.size - carrier.nodeSize;
+	if (mode === "accept") {
+		tr.setNodeAttribute(position, "reviewCarrier", void 0);
+		return;
+	}
+	tr.delete(position, position + carrier.nodeSize);
+};
 const resolveRunPropertyChange = ({ tr, node, from, to, mark, mode, revisionSet, styleResolver }) => {
 	const { changes } = expectRunPropertyChangeMarkAttrs(mark);
 	const matches = changes.filter((change) => revisionSet === null || revisionSet.has(change.info.id));
@@ -401,11 +446,11 @@ function collectTableCellStructuralOps(node, cellPos, mode, revisionSet) {
 		revisionSet
 	});
 	else {
-		const keepsCell = marker.kind === "ins" === (mode === "accept");
+		const view = mode === "accept" ? "final" : "original";
 		operations.push({
 			type: "membership",
 			cellPos,
-			action: keepsCell ? "clear" : "remove"
+			action: isTableCellRetainedInReviewView(marker.kind, view) ? "clear" : "remove"
 		});
 	}
 	if (hasMatchingCollapsedTableCellMerge(node, revisionSet)) operations.push({
@@ -671,6 +716,23 @@ function resolveAllChangesInHeadlessState(state, mode) {
 	return resolvedState;
 }
 /**
+* Resolve through the editor command path when a caller must map a position in
+* the reviewed document back to the tracked source. The bulk resolver is
+* faster, but deliberately replaces inline content without retaining mapping.
+*/
+const resolveAllChangesInHeadlessStateWithMapping = (state, mode) => {
+	let resolvedState = state;
+	let mapping = new Mapping();
+	resolveChange(0, state.doc.content.size, mode)(state, (transaction) => {
+		resolvedState = state.apply(transaction);
+		mapping = transaction.mapping;
+	});
+	return {
+		state: resolvedState,
+		mapping
+	};
+};
+/**
 * Find the document range covered by all revision carriers with any of the
 * given ids. Returns null when none are present (already accepted/rejected, or
 * never existed). A replace operation typically passes two ids; standalone
@@ -1664,4 +1726,4 @@ function findPreviousChange(state, startPos) {
 	return result.value;
 }
 //#endregion
-export { acceptAIEditRevision, acceptAllChanges, acceptAllSuggestions, acceptChange, acceptSuggestion, addCommentMark, findAIEditRevisionRange, findChangeAtPosition, findNextChange, findParagraphBoundaryChangeAtPosition, findPreviousChange, findSuggestionRange, getSuggestions, rejectAIEditRevision, rejectAllChanges, rejectAllSuggestions, rejectChange, rejectSuggestion, removeCommentMark, resolveAllChangesInHeadlessState };
+export { acceptAIEditRevision, acceptAllChanges, acceptAllSuggestions, acceptChange, acceptSuggestion, addCommentMark, findAIEditRevisionRange, findChangeAtPosition, findNextChange, findParagraphBoundaryChangeAtPosition, findPreviousChange, findSuggestionRange, getSuggestions, rejectAIEditRevision, rejectAllChanges, rejectAllSuggestions, rejectChange, rejectSuggestion, removeCommentMark, resolveAllChangesInHeadlessState, resolveAllChangesInHeadlessStateWithMapping };

package/dist/prosemirror/commands/propertyChangeScope.d.ts

@@ -66,10 +66,16 @@ declare function paragraphRejectOriginalFormatting(previousFormatting: Paragraph
  * Rejected section properties: the stored old sectPr wholesale, preserving
  * the live header/footer references — `EG_HdrFtrReferences` is not part of
  * the `CT_SectPrBase` payload a `w:sectPrChange` stores (ECMA-376
- * §17.13.5.32), so those children survive a reject. The caller re-attaches
- * whatever `propertyChanges` remain unresolved.
+ * §17.13.5.32), so those children survive a native reject. An explicit Folio reference
+ * history replaces that selection, including restoring its absence. The
+ * caller re-attaches whatever `propertyChanges` remain unresolved.
  */
-declare function sectionRejectProperties(live: document_d_exports.SectionProperties, previousProperties: document_d_exports.SectionProperties | undefined): document_d_exports.SectionProperties;
+type SectionRejectPropertiesOptions = {
+  live: document_d_exports.SectionProperties;
+  previousProperties: document_d_exports.SectionProperties | undefined;
+  previousReferences?: document_d_exports.SectionPropertyChange["previousReferences"];
+};
+declare function sectionRejectProperties({ live, previousProperties, previousReferences }: SectionRejectPropertiesOptions): document_d_exports.SectionProperties;
 /**
  * Attr patch for rejecting a `w:tblPrChange`: the stored old tblPr wholesale
  * (`w:tblPrChange` stores the complete previous tblPr, so every tblPr-derived

package/dist/prosemirror/commands/propertyChangeScope.js

@@ -220,19 +220,13 @@ function paragraphRejectOriginalFormatting(previousFormatting, liveOriginal) {
 	if (Object.keys(result).length === 0) return null;
 	return result;
 }
-/**
-* Rejected section properties: the stored old sectPr wholesale, preserving
-* the live header/footer references — `EG_HdrFtrReferences` is not part of
-* the `CT_SectPrBase` payload a `w:sectPrChange` stores (ECMA-376
-* §17.13.5.32), so those children survive a reject. The caller re-attaches
-* whatever `propertyChanges` remain unresolved.
-*/
-function sectionRejectProperties(live, previousProperties) {
+function sectionRejectProperties({ live, previousProperties, previousReferences }) {
 	const restored = { ...previousProperties };
 	delete restored.propertyChanges;
-	if (live.headerReferences) restored.headerReferences = live.headerReferences;
+	const references = previousReferences ?? live;
+	if (references.headerReferences) restored.headerReferences = references.headerReferences;
 	else delete restored.headerReferences;
-	if (live.footerReferences) restored.footerReferences = live.footerReferences;
+	if (references.footerReferences) restored.footerReferences = references.footerReferences;
 	else delete restored.footerReferences;
 	return restored;
 }

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -1,8 +1,9 @@
-import { numPrEqual } from "../../docx/numberingParser.js";
+import { imageRawXmlFingerprint } from "../../docx/imageRawXml.js";
 import { PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, ParagraphPropertySourceValidationError, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphPropertyCapture, copyParagraphPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, isParagraphPropertySourceToken, linkParagraphPropertySourceCandidate, paragraphPropertySourceBelongsToDocument, paragraphPropertySourceTokenMatchesContract, recreateProseNodeWithParagraphPropertySource, restoreTableCellsWithParagraphPropertySources, visitDocumentStoryParagraphs, visitTableCellParagraphPropertySourceBindings } from "../../docx/paragraphPropertySource.js";
 import { visitDocxParagraphs } from "../../docx/paragraphTraversal.js";
 import { ShapeOutlineStyleSchema, narrowEnum } from "../../docx/parserEnums.js";
 import { DATE_UTC_ATTRIBUTE } from "../../docx/trackedChangeInfo.js";
+import { isStyleSourcedParagraphNumbering, modelParagraphFormattingEmission, sameAuthoredParagraphNumberingReference } from "../../internal/paragraphFormattingSerialization.js";
 import { createStyleEngine } from "../../style-engine/styleEngine.js";
 import { OUTLINE_STYLE_CSS_ALIASES, normalizeShapeTextAnchor } from "../../types/documentEnumValues.js";
 import { canonicalJson } from "../../utils/canonicalJson.js";
@@ -106,9 +107,10 @@ const uniqueParagraphsById = (content, includeTransferIds = false) => {
 const restoreParagraphPropertySource = (paragraph, baseParagraph) => {
 	copyParagraphPropertySource(paragraph, baseParagraph);
 	const baseFormatting = baseParagraph.formatting;
-	if (!baseFormatting?.numPr || !baseFormatting.numPrFromStyle || !numPrEqual(baseFormatting.numPr, baseFormatting.numPrFromStyle)) return;
-	const { numPr, numPrFromStyle, ...authoredFormatting } = baseFormatting;
-	if (canonicalJson(paragraph.formatting ?? {}) !== canonicalJson(authoredFormatting)) return;
+	if (!baseFormatting) return;
+	const { numPr, numPrFromStyle } = baseFormatting;
+	if (!numPr || !numPrFromStyle || !isStyleSourcedParagraphNumbering(numPr, numPrFromStyle)) return;
+	if (canonicalJson(modelParagraphFormattingEmission(paragraph.formatting)) !== canonicalJson(modelParagraphFormattingEmission(baseFormatting))) return;
 	paragraph.formatting = {
 		...paragraph.formatting,
 		numPr,
@@ -741,6 +743,7 @@ function convertPMParagraph(node, documentCounts, textBoxAnchorMarkers, styleRes
 	};
 	if (attrs.paraId) paragraph.paraId = attrs.paraId;
 	if (attrs.textId) paragraph.textId = attrs.textId;
+	if (attrs.reviewCarrier) paragraph.reviewCarrier = attrs.reviewCarrier;
 	const pFormatting = paragraphAttrsToFormatting(attrs);
 	if (pFormatting) paragraph.formatting = pFormatting;
 	const listRendering = listRenderingFromAttrs(attrs);
@@ -777,15 +780,6 @@ const propertyChangeFromAttrs = (change) => {
 		...currentFormatting !== void 0 && { currentFormatting }
 	};
 };
-/**
-* Whether the paragraph's numbering still comes verbatim from its style —
-* serialize no direct `<w:numPr>` then. The moment a list command changes
-* `numPr` the values diverge and the numbering serializes as direct
-* formatting, so a stale provenance value can never swallow a user edit.
-*/
-function isStyleSourcedNumPr(attrs) {
-	return attrs.numPrFromStyle != null && attrs.numPr != null && numPrEqual(attrs.numPr, attrs.numPrFromStyle);
-}
 function assignBooleanToggle(result, attrs, orig, key) {
 	const value = attrs[key] ?? void 0;
 	if (value === (orig[key] ?? void 0)) return;
@@ -834,10 +828,10 @@ function paragraphAttrsToFormatting(attrs) {
 		else Reflect.deleteProperty(result, "lineSpacingRule");
 		if (directAlignment === void 0) Reflect.deleteProperty(result, "alignment");
 		else result.alignment = directAlignment;
-		if (isStyleSourcedNumPr(attrs)) {
+		if (isStyleSourcedParagraphNumbering(attrs.numPr, attrs.numPrFromStyle)) {
 			delete result.numPr;
 			delete result.numPrFromStyle;
-		} else if (attrs.numPr !== orig.numPr && !numPrEqual(attrs.numPr, orig.numPr)) {
+		} else if (attrs.numPr !== orig.numPr && !sameAuthoredParagraphNumberingReference(attrs.numPr, orig.numPr)) {
 			if (attrs.numPr) result.numPr = attrs.numPr;
 			else delete result.numPr;
 			delete result.numPrFromStyle;
@@ -874,7 +868,7 @@ function paragraphAttrsToFormatting(attrs) {
 	if (attrs.indentRight) f.indentRight = attrs.indentRight;
 	if (attrs.indentFirstLine) f.indentFirstLine = attrs.indentFirstLine;
 	if (attrs.hangingIndent) f.hangingIndent = attrs.hangingIndent;
-	if (attrs.numPr && !isStyleSourcedNumPr(attrs)) f.numPr = attrs.numPr;
+	if (attrs.numPr && !isStyleSourcedParagraphNumbering(attrs.numPr, attrs.numPrFromStyle)) f.numPr = attrs.numPr;
 	if (attrs.styleId) f.styleId = attrs.styleId;
 	if (attrs.borders) f.borders = attrs.borders;
 	if (attrs.shading) f.shading = attrs.shading;
@@ -1145,6 +1139,10 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 				}));
 				return;
 			}
+			if (node.type.name === "math") {
+				currentTrackedChange.wrapper.content.push(createMathFromNode(node));
+				return;
+			}
 			const run = createTrackedChangeRun({
 				...formattingContext,
 				marks: otherMarks,
@@ -1718,9 +1716,6 @@ function createFieldFromNode(node, { baseParagraphFormatting, inheritedFormattin
 		case "NUMPAGES":
 			displayText = "1";
 			break;
-		default:
-			displayText = " ";
-			break;
 	}
 	const displayRun = {
 		type: "run",
@@ -1732,13 +1727,14 @@ function createFieldFromNode(node, { baseParagraphFormatting, inheritedFormattin
 	};
 	if (marks && node.type.name === "field") restoreRunPropertyChanges(displayRun, marks);
 	const fieldContent = extractedContent.length > 0 ? synchronizeFieldDisplayText(extractedContent, displayText, displayRun) : [];
+	const fallbackFieldContent = displayText ? [displayRun] : [];
 	if (attrs.fieldKind === "complex") {
 		const complex = {
 			type: "complexField",
 			instruction: attrs.instruction,
 			fieldType: attrs.fieldType,
 			fieldCode: [],
-			fieldResult: fieldContent.length > 0 ? fieldContent.filter((content) => content.type === "run") : [displayRun]
+			fieldResult: fieldContent.length > 0 ? fieldContent.filter((content) => content.type === "run") : fallbackFieldContent
 		};
 		if (attrs.fldLock) complex.fldLock = true;
 		if (attrs.dirty) complex.dirty = true;
@@ -1748,7 +1744,7 @@ function createFieldFromNode(node, { baseParagraphFormatting, inheritedFormattin
 		type: "simpleField",
 		instruction: attrs.instruction,
 		fieldType: attrs.fieldType,
-		content: fieldContent.length > 0 ? fieldContent : [displayRun]
+		content: fieldContent.length > 0 ? fieldContent : fallbackFieldContent
 	};
 	if (attrs.fldLock) simple.fldLock = true;
 	if (attrs.dirty) simple.dirty = true;
@@ -1881,7 +1877,8 @@ function createImageRun(node) {
 		} : {
 			type: "drawing",
 			image,
-			...attrs._docxRawXml ? { rawXml: attrs._docxRawXml } : {}
+			...attrs._docxRawXml ? { rawXml: attrs._docxRawXml } : {},
+			...attrs._docxRawXml ? { rawImageFingerprint: imageRawXmlFingerprint(image) } : {}
 		}]
 	};
 }
@@ -1967,6 +1964,7 @@ const RUN_FORMATTING_VISUAL_GROUPS = {
 	smallCaps: "smallCaps",
 	allCaps: "allCaps",
 	hidden: "hidden",
+	noProof: null,
 	color: "color",
 	highlight: "highlight",
 	shading: "shading",
@@ -2000,6 +1998,7 @@ const RUN_FORMATTING_FAST_PATH_DISPOSITION = {
 	smallCaps: "visual",
 	allCaps: "visual",
 	hidden: "visual",
+	noProof: "structural",
 	color: "visual",
 	highlight: "visual",
 	shading: "visual",
@@ -2189,6 +2188,7 @@ const DIRECT_OVERRIDE_FORMATTING_PROPERTIES = [
 	"emboss",
 	"fontSizeCs",
 	"hidden",
+	"noProof",
 	"imprint",
 	"italic",
 	"italicCs",

package/dist/prosemirror/conversion/toProseDoc.js

@@ -13,7 +13,7 @@ import { stampNumberedRefFieldBaselines } from "../numberedRefFields.js";
 import { pageBreakRunParagraphProjectionDispositionForFeatures } from "../pageBreakRunProjection.js";
 import { directionFromBidi } from "../paragraphDirection.js";
 import { lineSpacingProvenanceFromSpacing } from "../paragraphSpacing.js";
-import { getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting } from "../runStyleFormatting.js";
+import { getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, resolveParagraphBodyRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting } from "../runStyleFormatting.js";
 import { schema } from "../schema/index.js";
 import { COMPLEX_SCRIPT_RUN_PROPERTY_KEYS } from "../schema/marks.js";
 import { cascadeStyleTextFormatting } from "../styles/styleToggleCascade.js";
@@ -202,45 +202,14 @@ function convertParagraph(paragraph, styleResolver, context, activeCommentIds, e
 		if (!node) return;
 		emitInlineNodes([node]);
 	};
-	let styleRunFormatting;
-	let paragraphStyleRunFormatting;
-	let paragraphStyleFontFamily;
-	if (styleResolver) {
-		const resolved = styleResolver.resolveParagraphStyle(paragraph.formatting?.styleId);
-		styleRunFormatting = extraRunFormatting === void 0 ? resolved.runFormatting : withoutFontFamily(resolved.runFormatting);
-		const paragraphStyle = paragraph.formatting?.styleId ? styleResolver.getStyle(paragraph.formatting.styleId) ?? styleResolver.getDefaultParagraphStyle() : styleResolver.getDefaultParagraphStyle();
-		paragraphStyleRunFormatting = paragraphStyle?.type === "paragraph" ? paragraphStyle.rPr : void 0;
-		paragraphStyleFontFamily = resolveParagraphStyleFontFamily(paragraph.formatting?.styleId, styleResolver);
-	}
 	const paragraphRunFormatting = resolveRunFormattingWithoutDefaults(paragraph.formatting?.runProperties, styleResolver);
 	let inheritableParagraphRunFormatting;
 	if (paragraphRunFormatting && !isTocParagraph && paragraph.formatting?.styleId === void 0) inheritableParagraphRunFormatting = stripParagraphMarkFormattingForBodyRuns(paragraphRunFormatting);
-	const ordinaryStyleFormatting = paragraph.formatting?.styleId === void 0 ? mergeTextFormatting(styleRunFormatting, extraRunFormatting) : mergeTextFormatting(extraRunFormatting, styleRunFormatting);
-	const orderedToggleFormatting = cascadeStyleTextFormatting([
-		{
-			formatting: styleResolver?.getDocDefaults()?.rPr,
-			type: "defaults"
-		},
-		{
-			formatting: extraRunFormatting,
-			type: "style"
-		},
-		{
-			formatting: paragraphStyleRunFormatting,
-			type: "style"
-		}
-	], { ordinaryFormatting: ordinaryStyleFormatting });
-	let baseRunFormatting = orderedToggleFormatting.formatting;
-	if (paragraphStyleFontFamily) baseRunFormatting = mergeTextFormatting(baseRunFormatting, { fontFamily: paragraphStyleFontFamily });
-	const defaultCharacterFormatting = styleResolver?.getDefaultCharacterStyle()?.rPr;
-	const ordinaryBaseWithDefaultCharacter = mergeTextFormatting(defaultCharacterFormatting, baseRunFormatting);
-	const defaultCharacterStyleCascade = cascadeStyleTextFormatting([{
-		cascade: orderedToggleFormatting,
-		type: "carried"
-	}, {
-		formatting: defaultCharacterFormatting,
-		type: "style"
-	}], { ordinaryFormatting: ordinaryBaseWithDefaultCharacter });
+	const { baseFormatting: baseRunFormatting, baseToggleCascade: orderedToggleFormatting, defaultFormatting: ordinaryBaseWithDefaultCharacter, defaultToggleCascade: defaultCharacterStyleCascade } = resolveParagraphBodyRunFormatting({
+		styleId: paragraph.formatting?.styleId,
+		tableRunFormatting: extraRunFormatting,
+		styleResolver
+	});
 	const ordinaryDefaultRunFormatting = mergeTextFormatting(ordinaryBaseWithDefaultCharacter, inheritableParagraphRunFormatting);
 	const defaultToggleCascade = cascadeStyleTextFormatting([{
 		cascade: defaultCharacterStyleCascade,
@@ -250,8 +219,11 @@ function convertParagraph(paragraph, styleResolver, context, activeCommentIds, e
 		type: "direct"
 	}], { ordinaryFormatting: ordinaryDefaultRunFormatting });
 	const defaultRunFormatting = defaultToggleCascade.formatting;
-	if (extraRunFormatting !== void 0) if (defaultRunFormatting) attrs.defaultTextFormatting = defaultRunFormatting;
-	else delete attrs.defaultTextFormatting;
+	if (extraRunFormatting !== void 0) {
+		attrs._tableRunFormatting = extraRunFormatting;
+		if (defaultRunFormatting) attrs.defaultTextFormatting = defaultRunFormatting;
+		else delete attrs.defaultTextFormatting;
+	}
 	const getInheritedRunFormatting = (formatting, fieldType) => {
 		const hasCharacterStyle = formatting?.styleId !== void 0;
 		const inheritedBaseFormatting = hasCharacterStyle ? baseRunFormatting : ordinaryBaseWithDefaultCharacter;
@@ -350,24 +322,6 @@ function convertParagraph(paragraph, styleResolver, context, activeCommentIds, e
 		content: inlineNodes
 	});
 }
-const withoutFontFamily = (formatting) => {
-	if (!formatting?.fontFamily) return formatting;
-	const { fontFamily: _fontFamily, ...withoutFont } = formatting;
-	return Object.keys(withoutFont).length > 0 ? withoutFont : void 0;
-};
-const resolveParagraphStyleFontFamily = (styleId, styleResolver) => {
-	let style = styleId ? styleResolver.getStyle(styleId) : styleResolver.getDefaultParagraphStyle();
-	const visited = /* @__PURE__ */ new Set();
-	const styleChain = [];
-	while (style?.type === "paragraph" && !visited.has(style.styleId)) {
-		visited.add(style.styleId);
-		if (style.rPr?.fontFamily) styleChain.push({ fontFamily: style.rPr.fontFamily });
-		style = style.basedOn ? styleResolver.getStyle(style.basedOn) : void 0;
-	}
-	let formatting;
-	for (const styleFormatting of styleChain.toReversed()) formatting = mergeTextFormatting(formatting, styleFormatting);
-	return formatting?.fontFamily;
-};
 /**
 * Apply comment marks to PM nodes within a comment range.
 */
@@ -418,6 +372,9 @@ function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, next
 			textBoxAnchors
 		});
 		if (fieldNode) nodes.push(fieldNode);
+	} else if (item.type === "mathEquation") {
+		const mathNode = convertMathEquation(item);
+		if (mathNode) nodes.push(mathNode);
 	} else if (item.type === "insertion" || item.type === "deletion" || item.type === "moveFrom" || item.type === "moveTo") {
 		const nestedMarkType = item.type === "insertion" || item.type === "moveTo" ? "insertion" : "deletion";
 		const nestedMoveKind = item.type === "moveFrom" || item.type === "moveTo" ? item.type : null;
@@ -460,6 +417,7 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 	const attrs = {};
 	if (paragraph.paraId) attrs.paraId = paragraph.paraId;
 	if (paragraph.textId) attrs.textId = paragraph.textId;
+	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;
@@ -1415,6 +1373,7 @@ const RUN_FORMATTING_INFERENCE = {
 	smallCaps: "visible-boolean",
 	allCaps: "visible-boolean",
 	hidden: "visible-boolean",
+	noProof: "structural",
 	color: "color",
 	highlight: "visible-value",
 	shading: "preserve",

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

@@ -188,6 +188,7 @@ const paragraphNodeSpec = {
 		[PROSE_PARAGRAPH_SOURCE_TOKEN_ATTR]: { default: null },
 		idStability: { default: void 0 },
 		textId: { default: null },
+		reviewCarrier: { default: void 0 },
 		alignment: { default: null },
 		alignmentFromStyle: { default: void 0 },
 		kinsoku: { default: null },
@@ -240,6 +241,7 @@ const paragraphNodeSpec = {
 		contextualSpacing: { default: null },
 		runInWithNext: { default: null },
 		defaultTextFormatting: { default: null },
+		_tableRunFormatting: { default: void 0 },
 		sectionBreakType: { default: null },
 		direction: { default: null },
 		outlineLevel: { default: null },

package/dist/prosemirror/extensions/marks/RunFormattingOverrideExtension.js

@@ -19,6 +19,7 @@ function buildRunFormattingOverrideAttrs(formatting, options) {
 	if (formatting?.allCaps !== void 0) attrs.allCaps = formatting.allCaps;
 	if (formatting?.smallCaps !== void 0) attrs.smallCaps = formatting.smallCaps;
 	if (formatting?.hidden !== void 0) attrs.hidden = formatting.hidden;
+	if (formatting?.noProof !== void 0) attrs.noProof = formatting.noProof;
 	if (formatting?.emboss !== void 0) attrs.emboss = formatting.emboss;
 	if (formatting?.imprint !== void 0) attrs.imprint = formatting.imprint;
 	if (formatting?.shadow !== void 0) attrs.shadow = formatting.shadow;
@@ -58,6 +59,7 @@ function applyRunFormattingOverrideAttrs(formatting, attrs) {
 	if (attrs.allCaps !== void 0) formatting.allCaps = attrs.allCaps;
 	if (attrs.smallCaps !== void 0) formatting.smallCaps = attrs.smallCaps;
 	if (attrs.hidden !== void 0) formatting.hidden = attrs.hidden;
+	if (attrs.noProof !== void 0) formatting.noProof = attrs.noProof;
 	if (attrs.emboss !== void 0) formatting.emboss = attrs.emboss;
 	if (attrs.imprint !== void 0) formatting.imprint = attrs.imprint;
 	if (attrs.shadow !== void 0) formatting.shadow = attrs.shadow;
@@ -101,6 +103,7 @@ const RunFormattingOverrideExtension = createMarkExtension({
 			allCaps: { default: null },
 			smallCaps: { default: null },
 			hidden: { default: null },
+			noProof: { default: null },
 			emboss: { default: null },
 			imprint: { default: null },
 			shadow: { default: null },

package/dist/prosemirror/imageCommit.js

@@ -1,3 +1,5 @@
+import { expectImageAttrs, mergeImageAttrs } from "./attrs/index.js";
+import { DRAWING_RAW_XML_MODES } from "@stll/docx-core/model";
 //#region src/prosemirror/imageCommit.ts
 const MIN_IMAGE_PX = 20;
 const MAX_IMAGE_PX = 2e3;
@@ -40,6 +42,7 @@ function isFloatingImage(node) {
 function imageNodeAt(view, pmPos) {
 	const node = view.state.doc.nodeAt(pmPos);
 	if (!node || node.type.name !== "image") return null;
+	if (expectImageAttrs(node)._docxRawXmlMode === DRAWING_RAW_XML_MODES.PRESERVE_ONLY) return null;
 	return node;
 }
 /**
@@ -50,11 +53,10 @@ function commitImageResize(view, pmPos, newWidth, newHeight) {
 	try {
 		const node = imageNodeAt(view, pmPos);
 		if (!node) return null;
-		view.dispatch(view.state.tr.setNodeMarkup(pmPos, void 0, {
-			...node.attrs,
+		view.dispatch(view.state.tr.setNodeMarkup(pmPos, void 0, mergeImageAttrs(node, {
 			width: newWidth,
 			height: newHeight
-		}));
+		})));
 		return pmPos;
 	} catch {
 		return null;
@@ -69,7 +71,7 @@ function commitImageFloatMove(view, pmPos, hOffsetEmu, vOffsetEmu) {
 	try {
 		const node = imageNodeAt(view, pmPos);
 		if (!node) return null;
-		const newPosition = {
+		view.dispatch(view.state.tr.setNodeMarkup(pmPos, void 0, mergeImageAttrs(node, { position: {
 			horizontal: {
 				posOffset: hOffsetEmu,
 				relativeTo: "margin"
@@ -78,11 +80,7 @@ function commitImageFloatMove(view, pmPos, hOffsetEmu, vOffsetEmu) {
 				posOffset: vOffsetEmu,
 				relativeTo: "margin"
 			}
-		};
-		view.dispatch(view.state.tr.setNodeMarkup(pmPos, void 0, {
-			...node.attrs,
-			position: newPosition
-		}));
+		} })));
 		return pmPos;
 	} catch {
 		return null;

package/dist/prosemirror/paragraphIndentation.d.ts

@@ -0,0 +1,21 @@
+import { document_d_exports } from "../types/document.js";
+import { FolioContentParagraphIndentation } from "../compare/content-types.js";
+import { ParagraphAttrs } from "./schema/nodes.js";
+//#region src/prosemirror/paragraphIndentation.d.ts
+/** The authored `w:ind` attribute cluster. */
+type DirectParagraphIndentation = FolioContentParagraphIndentation;
+/** Project only authored `w:ind` attributes, preserving zero and false. */
+declare const paragraphIndentationFromFormatting: (formatting: document_d_exports.ParagraphFormatting | null | undefined) => DirectParagraphIndentation | undefined;
+/** Read direct indentation without materializing values inherited from a style. */
+declare const directParagraphIndentation: (attrs: ParagraphAttrs) => DirectParagraphIndentation | undefined;
+declare const paragraphIndentationEqual: (left: DirectParagraphIndentation | null | undefined, right: DirectParagraphIndentation | null | undefined) => boolean;
+/** Replace the complete direct `w:ind` cluster in canonical formatting. */
+declare const withDirectParagraphIndentation: (formatting: document_d_exports.ParagraphFormatting | null | undefined, indentation: DirectParagraphIndentation | null | undefined) => document_d_exports.ParagraphFormatting | undefined;
+type ParagraphIndentationAttrPatchOptions = {
+  direct: DirectParagraphIndentation | null | undefined;
+  inherited: DirectParagraphIndentation | null | undefined;
+};
+/** Project direct-over-inherited indentation into paragraph attrs. */
+declare const paragraphIndentationAttrPatch: ({ direct, inherited }: ParagraphIndentationAttrPatchOptions) => Record<string, unknown>;
+//#endregion
+export { DirectParagraphIndentation, directParagraphIndentation, paragraphIndentationAttrPatch, paragraphIndentationEqual, paragraphIndentationFromFormatting, withDirectParagraphIndentation };

package/dist/prosemirror/paragraphIndentation.js

@@ -0,0 +1,72 @@
+import { panic } from "better-result";
+//#region src/prosemirror/paragraphIndentation.ts
+const DIRECT_PARAGRAPH_INDENTATION_KEYS = [
+	"indentLeft",
+	"indentRight",
+	"indentFirstLine",
+	"hangingIndent"
+];
+const copyIndentationValue = ({ target, key, value }) => {
+	switch (key) {
+		case "hangingIndent":
+			if (typeof value === "boolean") target.hangingIndent = value;
+			return;
+		case "indentLeft":
+		case "indentRight":
+		case "indentFirstLine":
+			if (typeof value === "number") target[key] = value;
+			return;
+		default: return panic("Unhandled paragraph indentation property", { key });
+	}
+};
+/** Project only authored `w:ind` attributes, preserving zero and false. */
+const paragraphIndentationFromFormatting = (formatting) => {
+	if (!formatting) return;
+	const indentation = {};
+	for (const key of DIRECT_PARAGRAPH_INDENTATION_KEYS) copyIndentationValue({
+		target: indentation,
+		key,
+		value: formatting[key]
+	});
+	if (indentation.indentFirstLine !== void 0 && indentation.hangingIndent === void 0) indentation.hangingIndent = false;
+	return Object.keys(indentation).length > 0 ? indentation : void 0;
+};
+/** Read direct indentation without materializing values inherited from a style. */
+const directParagraphIndentation = (attrs) => {
+	const original = paragraphIndentationFromFormatting(attrs._originalFormatting);
+	if (!original) return;
+	const indentation = {};
+	for (const key of DIRECT_PARAGRAPH_INDENTATION_KEYS) {
+		if (original[key] === void 0) continue;
+		copyIndentationValue({
+			target: indentation,
+			key,
+			value: attrs[key]
+		});
+	}
+	return Object.keys(indentation).length > 0 ? indentation : void 0;
+};
+const paragraphIndentationEqual = (left, right) => DIRECT_PARAGRAPH_INDENTATION_KEYS.every((key) => left?.[key] === right?.[key]);
+/** Replace the complete direct `w:ind` cluster in canonical formatting. */
+const withDirectParagraphIndentation = (formatting, indentation) => {
+	const result = { ...formatting };
+	for (const key of DIRECT_PARAGRAPH_INDENTATION_KEYS) Reflect.deleteProperty(result, key);
+	if (indentation) Object.assign(result, indentation);
+	return Object.keys(result).length > 0 ? result : void 0;
+};
+/** Project direct-over-inherited indentation into paragraph attrs. */
+const paragraphIndentationAttrPatch = ({ direct, inherited }) => {
+	const effective = {
+		...inherited,
+		...direct
+	};
+	const hangingIndent = direct?.indentFirstLine === void 0 ? effective.hangingIndent ?? false : direct.hangingIndent === true;
+	return {
+		indentLeft: effective.indentLeft ?? null,
+		indentRight: effective.indentRight ?? null,
+		indentFirstLine: effective.indentFirstLine ?? null,
+		hangingIndent
+	};
+};
+//#endregion
+export { directParagraphIndentation, paragraphIndentationAttrPatch, paragraphIndentationEqual, paragraphIndentationFromFormatting, withDirectParagraphIndentation };

package/dist/prosemirror/plugins/documentNumbering.d.ts

@@ -4,5 +4,7 @@ import { EditorState, Plugin } from "prosemirror-state";
 //#region src/prosemirror/plugins/documentNumbering.d.ts
 declare const createDocumentNumberingPlugin: (definitions: document_d_exports.NumberingDefinitions | null | undefined) => Plugin;
 declare const getDocumentNumbering: (state: EditorState) => NumberingMap | null;
+/** Replace numbering state while retaining every unrelated plugin state. */
+declare const withDocumentNumbering: (state: EditorState, definitions: document_d_exports.NumberingDefinitions) => EditorState;
 //#endregion
-export { createDocumentNumberingPlugin, getDocumentNumbering };
+export { createDocumentNumberingPlugin, getDocumentNumbering, withDocumentNumbering };