@stll/folio-core 0.37.5 → 0.38.0

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -1,8 +1,9 @@
+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, paragraphNumberingReferencesEqual } from "../../internal/paragraphFormattingSerialization.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";
@@ -742,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);
@@ -829,7 +831,7 @@ function paragraphAttrsToFormatting(attrs) {
 		if (isStyleSourcedParagraphNumbering(attrs.numPr, attrs.numPrFromStyle)) {
 			delete result.numPr;
 			delete result.numPrFromStyle;
-		} else if (attrs.numPr !== orig.numPr && !paragraphNumberingReferencesEqual(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;
@@ -1137,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,
@@ -1710,9 +1716,6 @@ function createFieldFromNode(node, { baseParagraphFormatting, inheritedFormattin
 		case "NUMPAGES":
 			displayText = "1";
 			break;
-		default:
-			displayText = " ";
-			break;
 	}
 	const displayRun = {
 		type: "run",
@@ -1724,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;
@@ -1740,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;
@@ -1873,7 +1877,8 @@ function createImageRun(node) {
 		} : {
 			type: "drawing",
 			image,
-			...attrs._docxRawXml ? { rawXml: attrs._docxRawXml } : {}
+			...attrs._docxRawXml ? { rawXml: attrs._docxRawXml } : {},
+			...attrs._docxRawXml ? { rawImageFingerprint: imageRawXmlFingerprint(image) } : {}
 		}]
 	};
 }
@@ -1959,6 +1964,7 @@ const RUN_FORMATTING_VISUAL_GROUPS = {
 	smallCaps: "smallCaps",
 	allCaps: "allCaps",
 	hidden: "hidden",
+	noProof: null,
 	color: "color",
 	highlight: "highlight",
 	shading: "shading",
@@ -1992,6 +1998,7 @@ const RUN_FORMATTING_FAST_PATH_DISPOSITION = {
 	smallCaps: "visual",
 	allCaps: "visual",
 	hidden: "visual",
+	noProof: "structural",
 	color: "visual",
 	highlight: "visual",
 	shading: "visual",
@@ -2181,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 };

package/dist/prosemirror/plugins/documentNumbering.js

@@ -14,5 +14,11 @@ const createDocumentNumberingPlugin = (definitions) => {
 	});
 };
 const getDocumentNumbering = (state) => documentNumberingKey.getState(state) ?? null;
+/** Replace numbering state while retaining every unrelated plugin state. */
+const withDocumentNumbering = (state, definitions) => {
+	const previous = documentNumberingKey.get(state);
+	const retained = state.plugins.filter((plugin) => plugin !== previous);
+	return state.reconfigure({ plugins: retained }).reconfigure({ plugins: [...retained, createDocumentNumberingPlugin(definitions)] });
+};
 //#endregion
-export { createDocumentNumberingPlugin, getDocumentNumbering };
+export { createDocumentNumberingPlugin, getDocumentNumbering, withDocumentNumbering };

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

@@ -13,5 +13,7 @@ declare const documentStylesKey: PluginKey<StyleResolver | null>;
 declare function createDocumentStylesPlugin(styles: document_d_exports.StyleDefinitions | StyleResolver | null | undefined): Plugin;
 /** Read the document's StyleResolver, or null when the plugin isn't installed. */
 declare function getDocumentStyleResolver(state: EditorState): StyleResolver | null;
+/** Reconfigure so ProseMirror replaces the keyed plugin's resolver state. */
+declare const withDocumentStyles: (state: EditorState, styles: document_d_exports.StyleDefinitions | StyleResolver | null | undefined) => EditorState;
 //#endregion
-export { createDocumentStylesPlugin, documentStylesKey, getDocumentStyleResolver };
+export { createDocumentStylesPlugin, documentStylesKey, getDocumentStyleResolver, withDocumentStyles };

package/dist/prosemirror/plugins/documentStyles.js

@@ -42,5 +42,11 @@ function createDocumentStylesPlugin(styles) {
 function getDocumentStyleResolver(state) {
 	return documentStylesKey.getState(state) ?? null;
 }
+/** Reconfigure so ProseMirror replaces the keyed plugin's resolver state. */
+const withDocumentStyles = (state, styles) => {
+	const previous = documentStylesKey.get(state);
+	const retained = state.plugins.filter((plugin) => plugin !== previous);
+	return state.reconfigure({ plugins: retained }).reconfigure({ plugins: [...retained, createDocumentStylesPlugin(styles)] });
+};
 //#endregion
-export { createDocumentStylesPlugin, documentStylesKey, getDocumentStyleResolver };
+export { createDocumentStylesPlugin, documentStylesKey, getDocumentStyleResolver, withDocumentStyles };

package/dist/prosemirror/rebaseParagraphRunFormatting.d.ts

@@ -1,9 +1,11 @@
 import { RunStyleResolver } from "./runStyleFormatting.js";
 import { Transaction } from "prosemirror-state";
+import { Node } from "prosemirror-model";
 //#region src/prosemirror/rebaseParagraphRunFormatting.d.ts
 type RebaseParagraphRunFormattingOptions = {
   nextAttrs: Record<string, unknown>;
   paragraphPosition: number;
+  shouldRebase?: (node: Node) => boolean;
   styleResolver: RunStyleResolver;
   tr: Transaction;
 };
@@ -11,6 +13,6 @@ type RebaseParagraphRunFormattingOptions = {
  * Change paragraph attrs and re-resolve inherited run marks in the new style
  * context without turning the old rendered style into direct run formatting.
  */
-declare const setParagraphAttrsWithRebasedRunFormatting: ({ nextAttrs, paragraphPosition, styleResolver, tr }: RebaseParagraphRunFormattingOptions) => Transaction;
+declare const setParagraphAttrsWithRebasedRunFormatting: ({ nextAttrs, paragraphPosition, shouldRebase, styleResolver, tr }: RebaseParagraphRunFormattingOptions) => Transaction;
 //#endregion
 export { setParagraphAttrsWithRebasedRunFormatting };

package/dist/prosemirror/rebaseParagraphRunFormatting.js

@@ -9,7 +9,7 @@ import { Mark } from "prosemirror-model";
 * Change paragraph attrs and re-resolve inherited run marks in the new style
 * context without turning the old rendered style into direct run formatting.
 */
-const setParagraphAttrsWithRebasedRunFormatting = ({ nextAttrs, paragraphPosition, styleResolver, tr }) => {
+const setParagraphAttrsWithRebasedRunFormatting = ({ nextAttrs, paragraphPosition, shouldRebase, styleResolver, tr }) => {
 	const paragraph = tr.doc.nodeAt(paragraphPosition);
 	if (!paragraph || paragraph.type.name !== "paragraph") return panic("Cannot rebase run formatting outside a paragraph", {
 		nodeType: paragraph?.type.name,
@@ -19,6 +19,7 @@ const setParagraphAttrsWithRebasedRunFormatting = ({ nextAttrs, paragraphPositio
 	const nextContext = paragraphRunStyleContext(paragraph.type.create(nextAttrs, paragraph.content, paragraph.marks), styleResolver);
 	const changes = [];
 	const collectRebasedRepresentation = ({ node, position }) => {
+		if (shouldRebase && !shouldRebase(node)) return;
 		const nextMarks = reconcileRunFormattingMarks({
 			authoredFormatting: readAuthoredRunFormatting({
 				context: previousContext,

package/dist/prosemirror/runFormattingInlineCarriers.d.ts

@@ -1,4 +1,5 @@
-import { Node } from "prosemirror-model";
+import { Transaction } from "prosemirror-state";
+import { Mark, Node } from "prosemirror-model";
 //#region src/prosemirror/runFormattingInlineCarriers.d.ts
 type RunFormattingInlineAtomDisposition = "break-run" | "field-run" | "not-a-run" | "page-break-carrier" | "structured-field" | "symbol-run" | "tab-run" | "text-run";
 /**
@@ -24,6 +25,8 @@ declare const RUN_FORMATTING_INLINE_ATOM_DISPOSITIONS: Readonly<{
   readonly text: "text-run";
   readonly textBoxAnchor: "not-a-run";
 }>;
+declare const runFormattingInlineControlCharacter: (node: Node) => string | null;
+declare const runFormattingInlineControlNodeName: (character: string) => string | null;
 declare const runFormattingInlineAtomDisposition: (node: Node) => RunFormattingInlineAtomDisposition | null;
 type RunFormattingCarrierRepresentation = {
   node: Node;
@@ -41,6 +44,16 @@ type SelectedRunFormattingCarrierRepresentation = RunFormattingCarrierRepresenta
   from: number;
   to: number;
 };
+type ApplyMarksToRunFormattingRepresentationOptions = {
+  tr: Transaction;
+  representation: RunFormattingCarrierRepresentation & {
+    from: number;
+    to: number;
+  };
+  marks: readonly Mark[];
+};
+/** Apply a mark set without changing a carrier's text or serialized ownership. */
+declare const applyMarksToRunFormattingRepresentation: ({ tr, representation, marks }: ApplyMarksToRunFormattingRepresentationOptions) => void;
 /**
  * Expand one logical carrier into every editor node that materializes its run
  * properties. A structured field is owned by its outer atom, while its result
@@ -61,4 +74,4 @@ declare const selectRunFormattingCarrierRepresentations: ({ doc, from, to }: Sel
 /** Deterministic visible text for one logical formatting revision carrier. */
 declare const runFormattingCarrierReviewText: (carrier: RunFormattingCarrier) => string;
 //#endregion
-export { RUN_FORMATTING_INLINE_ATOM_DISPOSITIONS, RunFormattingCarrier, RunFormattingCarrierRepresentation, RunFormattingInlineAtomDisposition, SelectedRunFormattingCarrierRepresentation, expandRunFormattingCarrier, runFormattingCarrierReviewText, runFormattingInlineAtomDisposition, selectRunFormattingCarrierRepresentations };
+export { RUN_FORMATTING_INLINE_ATOM_DISPOSITIONS, RunFormattingCarrier, RunFormattingCarrierRepresentation, RunFormattingInlineAtomDisposition, SelectedRunFormattingCarrierRepresentation, applyMarksToRunFormattingRepresentation, expandRunFormattingCarrier, runFormattingCarrierReviewText, runFormattingInlineAtomDisposition, runFormattingInlineControlCharacter, runFormattingInlineControlNodeName, selectRunFormattingCarrierRepresentations };

package/dist/prosemirror/runFormattingInlineCarriers.js

@@ -1,6 +1,7 @@
 import { decodeOoxmlSymbolCharacter } from "../utils/ooxmlSymbol.js";
 import { expectFieldAttrs, expectSymbolAttrs } from "./attrs/index.js";
 import { panic } from "better-result";
+import { Mark } from "prosemirror-model";
 //#region src/prosemirror/runFormattingInlineCarriers.ts
 /**
 * How every inline atom maps to a serialized run-formatting carrier.
@@ -26,12 +27,41 @@ const RUN_FORMATTING_INLINE_ATOM_DISPOSITIONS = Object.freeze({
 	textBoxAnchor: "not-a-run"
 });
 const dispositionsByName = new Map(Object.entries(RUN_FORMATTING_INLINE_ATOM_DISPOSITIONS));
+const CONTROL_CHARACTER_BY_DISPOSITION = Object.freeze({
+	"break-run": "\n",
+	"field-run": null,
+	"not-a-run": null,
+	"page-break-carrier": null,
+	"structured-field": null,
+	"symbol-run": null,
+	"tab-run": "	",
+	"text-run": null
+});
+const runFormattingInlineControlCharacter = (node) => {
+	const disposition = runFormattingInlineAtomDisposition(node);
+	if (disposition === null) return null;
+	return CONTROL_CHARACTER_BY_DISPOSITION[disposition] ?? null;
+};
+const runFormattingInlineControlNodeName = (character) => {
+	return Object.entries(RUN_FORMATTING_INLINE_ATOM_DISPOSITIONS).find(([, disposition]) => CONTROL_CHARACTER_BY_DISPOSITION[disposition] === character)?.[0] ?? null;
+};
 const runFormattingInlineAtomDisposition = (node) => {
 	if (!node.isInline || !node.isAtom) return null;
 	const disposition = dispositionsByName.get(node.type.name);
 	if (!disposition) return panic(`Inline atom ${JSON.stringify(node.type.name)} has no run-formatting disposition`);
 	return disposition;
 };
+/** Apply a mark set without changing a carrier's text or serialized ownership. */
+const applyMarksToRunFormattingRepresentation = ({ tr, representation, marks }) => {
+	const { node, position, from, to } = representation;
+	if (Mark.sameSet(node.marks, marks)) return;
+	if (!node.isText) {
+		tr.setNodeMarkup(position, void 0, node.attrs, marks);
+		return;
+	}
+	for (const current of node.marks) if (!marks.some((candidate) => candidate.eq(current))) tr.removeMark(from, to, current.type);
+	for (const next of marks) if (!node.marks.some((candidate) => candidate.eq(next))) tr.addMark(from, to, next);
+};
 /**
 * Expand one logical carrier into every editor node that materializes its run
 * properties. A structured field is owned by its outer atom, while its result
@@ -105,9 +135,9 @@ const selectRunFormattingCarrierRepresentations = ({ doc, from, to }) => {
 /** Deterministic visible text for one logical formatting revision carrier. */
 const runFormattingCarrierReviewText = (carrier) => {
 	switch (carrier.disposition) {
+		case "tab-run":
+		case "break-run": return CONTROL_CHARACTER_BY_DISPOSITION[carrier.disposition];
 		case "text-run": return carrier.node.text ?? "";
-		case "tab-run": return "	";
-		case "break-run": return "\n";
 		case "page-break-carrier": return "";
 		case "symbol-run": {
 			const { char } = expectSymbolAttrs(carrier.node);
@@ -118,4 +148,4 @@ const runFormattingCarrierReviewText = (carrier) => {
 	}
 };
 //#endregion
-export { RUN_FORMATTING_INLINE_ATOM_DISPOSITIONS, expandRunFormattingCarrier, runFormattingCarrierReviewText, runFormattingInlineAtomDisposition, selectRunFormattingCarrierRepresentations };
+export { RUN_FORMATTING_INLINE_ATOM_DISPOSITIONS, applyMarksToRunFormattingRepresentation, expandRunFormattingCarrier, runFormattingCarrierReviewText, runFormattingInlineAtomDisposition, runFormattingInlineControlCharacter, runFormattingInlineControlNodeName, selectRunFormattingCarrierRepresentations };

package/dist/prosemirror/runStyleFormatting.d.ts

@@ -1,6 +1,7 @@
 import { document_d_exports } from "../types/document.js";
 import { StyleEngine } from "../style-engine/styleEngine.js";
 import "../style-engine/index.js";
+import { cascadeStyleTextFormatting } from "./styles/styleToggleCascade.js";
 import { Mark, Node } from "prosemirror-model";
 //#region src/prosemirror/runStyleFormatting.d.ts
 declare const hasDirectRunFormatting: (formatting: document_d_exports.TextFormatting | undefined) => boolean;
@@ -25,7 +26,19 @@ type ParagraphRunStyleContext = {
   paragraphMarkFormatting: document_d_exports.TextFormatting | undefined;
   paragraphMarkPrecedesStyle: boolean;
 };
-type RunStyleResolver = Pick<StyleEngine, "getDefaultCharacterStyle" | "getDocDefaults" | "getRunStyleOwnProperties" | "resolveParagraphStyle">;
+type RunStyleResolver = Pick<StyleEngine, "getDefaultCharacterStyle" | "getDefaultParagraphStyle" | "getDocDefaults" | "getRunStyleOwnProperties" | "getStyle" | "resolveParagraphStyle">;
+type ResolveParagraphBodyRunFormattingOptions = {
+  styleId: string | undefined;
+  styleResolver?: RunStyleResolver | null | undefined;
+  tableRunFormatting?: document_d_exports.TextFormatting | undefined;
+};
+/** Resolve the table, paragraph, and character style cascade before paragraph-mark properties. */
+declare const resolveParagraphBodyRunFormatting: ({ styleId, styleResolver, tableRunFormatting }: ResolveParagraphBodyRunFormattingOptions) => {
+  baseFormatting: document_d_exports.TextFormatting | undefined;
+  baseToggleCascade: ReturnType<typeof cascadeStyleTextFormatting>;
+  defaultFormatting: document_d_exports.TextFormatting | undefined;
+  defaultToggleCascade: ReturnType<typeof cascadeStyleTextFormatting>;
+};
 declare const paragraphRunStyleContext: (paragraph: Node, styleResolver?: RunStyleResolver | null) => ParagraphRunStyleContext;
 type ParagraphFormattingForRunOptions = {
   context: ParagraphRunStyleContext;
@@ -47,4 +60,4 @@ type ResolveEffectiveRunStyleFormattingOptions = {
 /** Resolve the non-direct run cascade from shared document styles and the current paragraph. */
 declare const resolveEffectiveRunStyleFormatting: ({ marks, paragraphFormatting, styleResolver }: ResolveEffectiveRunStyleFormattingOptions) => document_d_exports.TextFormatting | undefined;
 //#endregion
-export { ParagraphRunStyleContext, RunStyleResolver, getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, paragraphFormattingForRun, paragraphRunStyleContext, paragraphRunStyleContextAt, resolveEffectiveRunStyleFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting };
+export { ParagraphRunStyleContext, RunStyleResolver, getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, paragraphFormattingForRun, paragraphRunStyleContext, paragraphRunStyleContextAt, resolveEffectiveRunStyleFormatting, resolveParagraphBodyRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting };