@stll/folio-core 0.53.0 → 0.54.0

package/dist/prosemirror/conversion/toProseDoc.d.ts

@@ -1,6 +1,4 @@
 import { document_d_exports } from "../../types/document.js";
-import { StyleEngine } from "../../style-engine/styleEngine.js";
-import "../../style-engine/index.js";
 import { ParseContext } from "../../docx/parseContext.js";
 import { Node } from "prosemirror-model";
 //#region src/prosemirror/conversion/toProseDoc.d.ts
@@ -26,15 +24,10 @@ type ToProseDocOptions = {
  */
 declare function toProseDoc(document: document_d_exports.Document, options?: ToProseDocOptions): Node;
 /**
- * Resolve an embedded character-style reference without importing
- * `docDefaults`. The caller already has the paragraph cascade, including
- * document defaults, and will layer these own properties over it.
+ * Whether a cell carries content a vertical-merge continuation must not hide.
+ * The reader keeps such a continuation as a cell of its own.
  */
-type ParagraphDefaultFormattingResolver = Pick<StyleEngine, "getStyle" | "getDocDefaults" | "getDefaultParagraphStyle" | "getDefaultCharacterStyle" | "getRunStyleOwnProperties">;
-/** @internal Recompute a paragraph's inherited run defaults from authored package state. */
-declare function resolveParagraphDefaultTextFormatting(styleId: string | undefined, formatting: document_d_exports.Paragraph["formatting"] | undefined, styleResolver: ParagraphDefaultFormattingResolver, options?: {
-  includeParagraphMarkRunProperties?: boolean;
-}): document_d_exports.TextFormatting | undefined;
+declare function tableCellHasMeaningfulContent(cell: document_d_exports.TableCell): boolean;
 declare function standaloneTableCellToProseMirror(cell: document_d_exports.TableCell, nodeType: "tableCell" | "tableHeader"): Node;
 /**
  * Convert HeaderFooter content (array of Paragraph/Table blocks) to a ProseMirror document.
@@ -51,4 +44,4 @@ declare function footnoteToProseDoc(content: document_d_exports.BlockContent[],
  */
 declare function createEmptyDoc(): Node;
 //#endregion
-export { ToProseDocOptions, createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, resolveParagraphDefaultTextFormatting, standaloneTableCellToProseMirror, toProseDoc };
+export { ToProseDocOptions, createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, standaloneTableCellToProseMirror, tableCellHasMeaningfulContent, toProseDoc };

package/dist/prosemirror/conversion/toProseDoc.js

@@ -1,7 +1,6 @@
 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, proseParagraphAttrsWithoutPropertySource, recreateProseNodeWithParagraphPropertySource, transportTableCellsWithParagraphPropertySources } from "../../docx/paragraphPropertySource.js";
 import { isBaselineVertAlign } from "../../docx/runParser.js";
 import { replayableShapeAlternateContent } from "../../docx/shapeAlternateContent.js";
@@ -13,7 +12,7 @@ import { createStyleEngine } from "../../style-engine/styleEngine.js";
 import { outlineAttrForDash } from "../../types/documentEnumValues.js";
 import { cssBorderStyleForDash } from "../../utils/borderCss.js";
 import { normalizeHorizontalScalePercent } from "../../utils/horizontalScale.js";
-import { mergeParagraphFormatting, mergeParagraphTabStops } from "../../utils/paragraphFormattingMerge.js";
+import { mergeParagraphFormatting } from "../../utils/paragraphFormattingMerge.js";
 import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
 import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
 import { emuToPixels, emuToStrokePixels } from "../../utils/units.js";
@@ -35,14 +34,15 @@ import { stampNumberedRefFieldBaselines } from "../numberedRefFields.js";
 import { paragraphNumberingAttr } from "../numberingAttr.js";
 import { pageBreakRunParagraphProjectionDispositionForFeatures } from "../pageBreakRunProjection.js";
 import { directionFromBidi } from "../paragraphDirection.js";
-import { styleResolvedParagraphFormatting } from "../paragraphFormattingProvenance.js";
 import { lineSpacingProvenanceFromSpacing } from "../paragraphSpacing.js";
 import { RUN_IDENTITY_MARK_NAME, hasRunIdentityPayload, runIdentityAttrs } from "../runIdentity.js";
 import { 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";
+import { extractTableParagraphOverlay, paragraphStyleCascadeAttrs, resolveRunFormattingWithoutDefaults } from "../styles/paragraphStyleCascade.js";
 import { cascadeStyleTextFormatting } from "../styles/styleToggleCascade.js";
+import { tableCellStyleRegions, tableRowBand } from "../styles/tableStyleRegions.js";
 import { canCarryTrackedRunMark, trackedRunInlineAtomDisposition } from "../trackedRunInlineAtoms.js";
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { resolveEffectiveTableCellFormatting } from "./effectiveTableCellFormatting.js";
@@ -772,54 +772,15 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 	};
 	let stylePpr;
 	if (styleResolver) {
-		stylePpr = styleResolver.resolveParagraphStyleInTable(styleId, tableParagraphOverlay).paragraphFormatting;
-		const resolvedFormatting = styleResolvedParagraphFormatting(stylePpr);
-		if (resolvedFormatting) attrs._resolvedFormatting = resolvedFormatting;
-		set("alignment", formatting?.alignment ?? stylePpr?.alignment);
-		set("alignmentFromStyle", stylePpr?.alignment);
-		set("spaceBefore", formatting?.spaceBefore ?? stylePpr?.spaceBefore);
-		set("spaceAfter", formatting?.spaceAfter ?? stylePpr?.spaceAfter);
-		set("lineSpacing", formatting?.lineSpacing ?? stylePpr?.lineSpacing);
-		set("lineSpacingRule", formatting?.lineSpacingRule ?? stylePpr?.lineSpacingRule);
-		set("lineSpacingExplicit", lineSpacingProvenanceFromSpacing(formatting));
-		set("snapToGrid", formatting?.snapToGrid ?? stylePpr?.snapToGrid);
-		set("spacingExplicit", formatting?.spacingExplicit);
-		const paragraphStyle = styleId ? styleResolver.getStyle(styleId) ?? styleResolver.getDefaultParagraphStyle() : styleResolver.getDefaultParagraphStyle();
-		const docDefaultSpacing = styleResolver.getDocDefaults()?.pPr;
-		const spacingFromStyle = {};
-		if (formatting?.spaceBefore === void 0 && stylePpr?.spaceBefore !== void 0) spacingFromStyle.before = true;
-		if (formatting?.spaceAfter === void 0 && stylePpr?.spaceAfter !== void 0) spacingFromStyle.after = true;
-		if (spacingFromStyle.before || spacingFromStyle.after) attrs.spacingFromImplicitDefaultStyle = spacingFromStyle;
-		const spacingFromDocDefaults = {};
-		if (formatting?.spaceBefore === void 0 && tableParagraphOverlay?.spaceBefore === void 0 && paragraphStyle?.pPr?.spaceBefore === void 0 && docDefaultSpacing?.spaceBefore !== void 0) spacingFromDocDefaults.before = true;
-		if (formatting?.spaceAfter === void 0 && tableParagraphOverlay?.spaceAfter === void 0 && paragraphStyle?.pPr?.spaceAfter === void 0 && docDefaultSpacing?.spaceAfter !== void 0) spacingFromDocDefaults.after = true;
-		if (spacingFromDocDefaults.before || spacingFromDocDefaults.after) attrs.spacingFromDocDefaults = spacingFromDocDefaults;
-		const effectiveIndent = mergeParagraphFormatting(formatting?.numPr?.kind === "none" && paragraphNumberingReferenceId$1(stylePpr?.numPr) !== void 0 ? void 0 : stylePpr, formatting);
-		set("indentLeft", effectiveIndent?.indentLeft);
-		set("indentRight", formatting?.indentRight ?? stylePpr?.indentRight);
-		set("indentFirstLine", effectiveIndent?.indentFirstLine);
-		set("hangingIndent", effectiveIndent?.hangingIndent);
-		set("borders", formatting?.borders ?? stylePpr?.borders);
-		set("shading", formatting?.shading ?? stylePpr?.shading);
-		set("tabs", mergeParagraphTabStops(stylePpr?.tabs, formatting?.tabs));
-		set("kinsoku", formatting?.kinsoku ?? stylePpr?.kinsoku);
-		set("overflowPunctuation", formatting?.overflowPunctuation ?? stylePpr?.overflowPunctuation);
-		set("suppressAutoHyphens", formatting?.suppressAutoHyphens ?? stylePpr?.suppressAutoHyphens);
-		set("pageBreakBefore", formatting?.pageBreakBefore ?? stylePpr?.pageBreakBefore);
-		set("keepNext", formatting?.keepNext ?? stylePpr?.keepNext);
-		set("keepLines", formatting?.keepLines ?? stylePpr?.keepLines);
-		set("widowControl", formatting?.widowControl ?? stylePpr?.widowControl);
-		set("contextualSpacing", formatting?.contextualSpacing ?? stylePpr?.contextualSpacing);
-		set("runInWithNext", formatting?.runInWithNext ?? stylePpr?.runInWithNext);
-		set("outlineLevel", formatting?.outlineLevel ?? stylePpr?.outlineLevel);
-		set("direction", directionFromBidi(formatting?.bidi ?? stylePpr?.bidi));
-		set("defaultTextFormatting", resolveParagraphDefaultTextFormatting(styleId, formatting, styleResolver, { includeParagraphMarkRunProperties: tableOfContentsLevel === void 0 && (styleId === void 0 || paragraph.content.length === 0) }));
-		const styleNumbering = stylePpr?.numPr;
-		if (styleNumbering?.kind === "reference" && (formatting?.numPr === void 0 || formatting.numPr.kind === "levelOnly")) {
-			const merged = mergeParagraphNumbering$1(styleNumbering, formatting?.numPr);
-			if (merged !== void 0) attrs.numPr = paragraphNumberingAttr(merged);
-			attrs.numPrFromStyle = paragraphNumberingAttr(styleNumbering);
-		}
+		const cascade = paragraphStyleCascadeAttrs({
+			styleId,
+			formatting,
+			styleResolver,
+			tableParagraphOverlay,
+			includeParagraphMarkRunProperties: tableOfContentsLevel === void 0 && (styleId === void 0 || paragraph.content.length === 0)
+		});
+		stylePpr = cascade.stylePpr;
+		Object.assign(attrs, cascade.attrs);
 	} else {
 		set("alignment", formatting?.alignment);
 		set("spaceBefore", formatting?.spaceBefore);
@@ -867,21 +828,6 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 	};
 }
 /**
-* Pick the modeled paragraph fields out of a table style's (or conditional
-* region's) `w:pPr` for use as the cell-paragraph cascade overlay.
-*/
-function extractTableParagraphOverlay(pPr) {
-	if (!pPr) return;
-	const overlay = {};
-	if (pPr.spaceBefore !== void 0) overlay.spaceBefore = pPr.spaceBefore;
-	if (pPr.spaceAfter !== void 0) overlay.spaceAfter = pPr.spaceAfter;
-	if (pPr.lineSpacing !== void 0) overlay.lineSpacing = pPr.lineSpacing;
-	if (pPr.lineSpacingRule !== void 0) overlay.lineSpacingRule = pPr.lineSpacingRule;
-	if (pPr.contextualSpacing !== void 0) overlay.contextualSpacing = pPr.contextualSpacing;
-	if (pPr.frame !== void 0) overlay.frame = pPr.frame;
-	return Object.keys(overlay).length > 0 ? overlay : void 0;
-}
-/**
 * Resolve table style conditional formatting
 */
 function resolveTableStyleConditional(styleResolver, tableStyleId, conditionType) {
@@ -947,45 +893,6 @@ function resolveTextFormatting(formatting, styleResolver) {
 	if (!styleResolver) return formatting;
 	return mergeTextFormatting(styleResolver.resolveRunStyle(formatting.styleId), formatting);
 }
-function resolveRunFormattingWithoutDefaults(formatting, styleResolver) {
-	if (!formatting || !styleResolver) return formatting;
-	return cascadeStyleTextFormatting([{
-		formatting: formatting.styleId ? styleResolver.getRunStyleOwnProperties(formatting.styleId) : void 0,
-		type: "style"
-	}, {
-		formatting,
-		type: "direct"
-	}]).formatting;
-}
-/** @internal Recompute a paragraph's inherited run defaults from authored package state. */
-function resolveParagraphDefaultTextFormatting(styleId, formatting, styleResolver, options = {}) {
-	const style = styleId ? styleResolver.getStyle(styleId) ?? styleResolver.getDefaultParagraphStyle() : styleResolver.getDefaultParagraphStyle();
-	const paragraphStyleRpr = style?.type === "paragraph" ? style.rPr : void 0;
-	const rawParagraphMarkRpr = options.includeParagraphMarkRunProperties === false ? void 0 : formatting?.runProperties;
-	const paragraphRunProperties = rawParagraphMarkRpr ? stripParagraphMarkOnlyFormatting(resolveRunFormattingWithoutDefaults(rawParagraphMarkRpr, styleResolver) ?? {}) : void 0;
-	const orderedBodyToggleFormatting = cascadeStyleTextFormatting([
-		{
-			formatting: styleResolver.getDocDefaults()?.rPr,
-			type: "defaults"
-		},
-		{
-			formatting: paragraphStyleRpr,
-			type: "style"
-		},
-		{
-			formatting: styleResolver.getDefaultCharacterStyle()?.rPr,
-			type: "style"
-		}
-	], { ordinaryFormatting: mergeTextFormatting(mergeTextFormatting(styleResolver.getDocDefaults()?.rPr, styleResolver.getDefaultCharacterStyle()?.rPr), paragraphStyleRpr) });
-	const bodyRunDefaults = orderedBodyToggleFormatting.formatting;
-	return cascadeStyleTextFormatting([{
-		cascade: orderedBodyToggleFormatting,
-		type: "carried"
-	}, {
-		formatting: paragraphRunProperties,
-		type: "direct"
-	}], { ordinaryFormatting: mergeTextFormatting(bodyRunDefaults, paragraphRunProperties) }).formatting;
-}
 function calculateRowSpans(table) {
 	const result = /* @__PURE__ */ new Map();
 	const numRows = table.rows.length;
@@ -1082,6 +989,10 @@ function closeVerticalMerge(activeMerges, result, colIndex) {
 function clearActiveVerticalMerges(activeMerges, result) {
 	for (const colIndex of [...activeMerges.keys()]) closeVerticalMerge(activeMerges, result, colIndex);
 }
+/**
+* Whether a cell carries content a vertical-merge continuation must not hide.
+* The reader keeps such a continuation as a cell of its own.
+*/
 function tableCellHasMeaningfulContent(cell) {
 	return cell.content.some(blockHasMeaningfulContent);
 }
@@ -1170,24 +1081,13 @@ function convertTable(table, styleResolver, context) {
 	setCS("neCell", "neCell");
 	setCS("swCell", "swCell");
 	setCS("seCell", "seCell");
-	const bandingEnabledH = !look.noHBand;
-	const bandingEnabledV = !look.noVBand;
-	let dataRowIndex = 0;
 	const totalRows = table.rows.length;
 	const gridColumnCount = columnWidths?.length ?? 0;
 	const totalColumns = gridColumnCount > 0 ? gridColumnCount : countTableColumns(table.rows);
 	const rows = table.rows.map((row, rowIndex) => {
 		const isFirstRowStyled = rowIndex === 0 && look.firstRow;
-		const isLastRow = rowIndex === totalRows - 1 && look.lastRow;
-		const rowBandStyle = (() => {
-			if (bandingEnabledH && !isFirstRowStyled && !isLastRow) return (() => {
-				if (dataRowIndex % 2 === 0) return conditionalStyles.band1Horz;
-				return conditionalStyles.band2Horz;
-			})();
-		})();
-		if (bandingEnabledH && !isFirstRowStyled && !isLastRow) dataRowIndex++;
 		const resolvedRowJustification = tableStyle?.trPr?.justification ?? fallbackTableStyle?.trPr?.justification;
-		return convertTableRow(row, styleResolver, context, isFirstRowStyled, columnWidths, totalWidth, conditionalStyles, rowBandStyle, bandingEnabledV, look, resolvedTableBorders, rowIndex, totalRows, totalColumns, rowSpanMap, cellMarginsAttr, resolvedRowJustification);
+		return convertTableRow(row, styleResolver, context, isFirstRowStyled, columnWidths, totalWidth, conditionalStyles, tableRowBand(look, rowIndex, totalRows), look, resolvedTableBorders, rowIndex, totalRows, totalColumns, rowSpanMap, cellMarginsAttr, resolvedRowJustification);
 	});
 	return schema.node("table", attrs, rows);
 }
@@ -1217,7 +1117,7 @@ function createOmittedGridSlotCell({ colspan, slot, columnWidths, totalWidth, st
 /**
 * Convert a TableRow to a ProseMirror table row node
 */
-function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths, totalWidth, conditionalStyles, rowBandStyle, bandingEnabledV, tableLook, tableBorders, rowIndex, totalRows, totalColumns, rowSpanMap, defaultCellMargins, resolvedJustification) {
+function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths, totalWidth, conditionalStyles, rowBand, tableLook, tableBorders, rowIndex, totalRows, totalColumns, rowSpanMap, defaultCellMargins, resolvedJustification) {
 	const attrsWithoutStructuralChange = { isHeader: !!row.formatting?.header };
 	if (row.formatting?.height?.value !== void 0) attrsWithoutStructuralChange.height = row.formatting.height.value;
 	if (row.formatting?.heightRule) attrsWithoutStructuralChange.heightRule = row.formatting.heightRule;
@@ -1267,8 +1167,6 @@ function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths,
 	const isFirstRow = rowIndex === 0;
 	const isLastRow = rowIndex === (totalRows ?? 1) - 1;
 	const rowCnf = row.formatting?.conditionalFormat;
-	const rowIsFirstRow = rowCnf?.firstRow ?? isFirstRow;
-	const rowIsLastRow = rowCnf?.lastRow ?? isLastRow;
 	const totalCols = totalColumns != null && totalColumns > 0 ? totalColumns : Math.max(numCells, 1);
 	let effectiveCells = row.cells;
 	const uncoveredColumns = Math.max(0, totalCols - gridBefore - gridAfter);
@@ -1307,35 +1205,18 @@ function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths,
 		if (shouldSkip) continue;
 		const isFirstCol = colIndex - colspan === 0;
 		const isLastCol = colIndex === totalCols;
-		const cellCnf = cell.formatting?.conditionalFormat;
-		const cellIsFirstRow = cellCnf?.firstRow ?? rowIsFirstRow;
-		const cellIsLastRow = cellCnf?.lastRow ?? rowIsLastRow;
-		const cellIsFirstCol = cellCnf?.firstColumn ?? isFirstCol;
-		const cellIsLastCol = cellCnf?.lastColumn ?? isLastCol;
-		let vertBandStyle;
-		if (bandingEnabledV) {
-			const firstColOffset = tableLook?.firstColumn ? 1 : 0;
-			const bandColIndex = colIndex - colspan - firstColOffset;
-			if (bandColIndex >= 0 && !(tableLook?.lastColumn && cellIsLastCol) && !(tableLook?.firstColumn && cellIsFirstCol)) vertBandStyle = bandColIndex % 2 === 0 ? conditionalStyles?.band1Vert : conditionalStyles?.band2Vert;
-		}
-		if (cellCnf?.oddVBand) vertBandStyle = conditionalStyles?.band1Vert;
-		else if (cellCnf?.evenVBand) vertBandStyle = conditionalStyles?.band2Vert;
-		let effectiveRowBandStyle = rowBandStyle;
-		if (rowCnf?.oddHBand) effectiveRowBandStyle = conditionalStyles?.band1Horz;
-		else if (rowCnf?.evenHBand) effectiveRowBandStyle = conditionalStyles?.band2Horz;
-		if (cellCnf?.oddHBand) effectiveRowBandStyle = conditionalStyles?.band1Horz;
-		else if (cellCnf?.evenHBand) effectiveRowBandStyle = conditionalStyles?.band2Horz;
-		let cellConditionalStyle = conditionalStyles?.wholeTable;
-		cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, effectiveRowBandStyle);
-		cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, vertBandStyle);
-		if (cellIsFirstCol && (tableLook?.firstColumn || rowCnf?.firstColumn || cellCnf?.firstColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.firstCol);
-		if (cellIsLastCol && (tableLook?.lastColumn || rowCnf?.lastColumn || cellCnf?.lastColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.lastCol);
-		if (cellIsFirstRow && (tableLook?.firstRow || rowCnf?.firstRow || cellCnf?.firstRow)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.firstRow);
-		if (cellIsLastRow && (tableLook?.lastRow || rowCnf?.lastRow || cellCnf?.lastRow)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.lastRow);
-		if (cellIsFirstRow && cellIsFirstCol && (tableLook?.firstRow || rowCnf?.firstRow || cellCnf?.firstRow) && (tableLook?.firstColumn || rowCnf?.firstColumn || cellCnf?.firstColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.nwCell);
-		if (cellIsFirstRow && cellIsLastCol && (tableLook?.firstRow || rowCnf?.firstRow || cellCnf?.firstRow) && (tableLook?.lastColumn || rowCnf?.lastColumn || cellCnf?.lastColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.neCell);
-		if (cellIsLastRow && cellIsFirstCol && (tableLook?.lastRow || rowCnf?.lastRow || cellCnf?.lastRow) && (tableLook?.firstColumn || rowCnf?.firstColumn || cellCnf?.firstColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.swCell);
-		if (cellIsLastRow && cellIsLastCol && (tableLook?.lastRow || rowCnf?.lastRow || cellCnf?.lastRow) && (tableLook?.lastColumn || rowCnf?.lastColumn || cellCnf?.lastColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.seCell);
+		let cellConditionalStyle;
+		for (const region of tableCellStyleRegions({
+			look: tableLook ?? resolveTableLook(void 0),
+			rowIndex: rowIndex ?? 0,
+			totalRows: totalRows ?? 1,
+			column: colIndex - colspan,
+			colspan,
+			totalColumns: totalCols,
+			rowBand,
+			rowConditionalFormat: rowCnf,
+			cellConditionalFormat: cell.formatting?.conditionalFormat
+		})) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.[region]);
 		cells.push(convertTableCell({
 			cell,
 			styleResolver,
@@ -2959,4 +2840,4 @@ function createEmptyDoc() {
 	return schema.node("doc", null, [schema.node("paragraph", {}, [])]);
 }
 //#endregion
-export { createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, resolveParagraphDefaultTextFormatting, standaloneTableCellToProseMirror, toProseDoc };
+export { createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, standaloneTableCellToProseMirror, tableCellHasMeaningfulContent, toProseDoc };

package/dist/prosemirror/documentSchema.d.ts

@@ -0,0 +1,8 @@
+import { MarkType, Schema } from "prosemirror-model";
+//#region src/prosemirror/documentSchema.d.ts
+/** `type`'s counterpart in the schema of `state`. */
+declare const documentMarkType: (state: {
+  readonly schema: Schema;
+}, type: MarkType) => MarkType;
+//#endregion
+export { documentMarkType };

package/dist/prosemirror/documentSchema.js

@@ -0,0 +1,18 @@
+import { panic } from "better-result";
+//#region src/prosemirror/documentSchema.ts
+/**
+* The document's own mark types.
+*
+* An extension sees the schema its runtime was built with, but the editor it
+* runs in may hold a document of another schema instance with the same specs:
+* header, footer and note editors each build a runtime of their own, while
+* every document is parsed into the shared schema. Marks made from the
+* runtime's types do not belong to such a document, and a runtime type
+* compared against the document's marks never matches. Commands therefore
+* resolve the types they build with, and compare against, through the state
+* they act on.
+*/
+/** `type`'s counterpart in the schema of `state`. */
+const documentMarkType = (state, type) => type.schema === state.schema ? type : state.schema.marks[type.name] ?? panic(`The document schema has no mark ${type.name}`);
+//#endregion
+export { documentMarkType };

package/dist/prosemirror/extensions/StarterKit.js

@@ -11,6 +11,7 @@ import { EmptyParagraphFormatExtension } from "./features/EmptyParagraphFormatEx
 import { GapCursorExtension } from "./features/GapCursorExtension.js";
 import { ImageDragExtension } from "./features/ImageDragExtension.js";
 import { ImagePasteExtension } from "./features/ImagePasteExtension.js";
+import { JoinedRunStyleExtension } from "./features/JoinedRunStyleExtension.js";
 import { ListExtension } from "./features/ListExtension.js";
 import { ParaIdAllocatorExtension } from "./features/ParaIdAllocatorExtension.js";
 import { ParagraphChangeTrackerExtension } from "./features/ParagraphChangeTrackerExtension.js";
@@ -100,6 +101,7 @@ function createStarterKit(options = {}) {
 	add("list", ListExtension());
 	add("baseKeymap", BaseKeymapExtension());
 	add("emptyParagraphFormat", EmptyParagraphFormatExtension());
+	add("joinedRunStyle", JoinedRunStyleExtension());
 	add("selectionTracker", options.onSelectionChange === void 0 ? SelectionTrackerExtension() : SelectionTrackerExtension({ onSelectionChange: options.onSelectionChange }));
 	add("paraIdAllocator", ParaIdAllocatorExtension());
 	add("paragraphChangeTracker", ParagraphChangeTrackerExtension());

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

@@ -1,5 +1,6 @@
 import { BUILT_IN_STYLE_NAME } from "../../../docx/builtInStyles.js";
 import { PROSE_PARAGRAPH_SOURCE_TOKEN_ATTR } from "../../../docx/paragraphPropertySource.js";
+import { isStyleSourcedParagraphNumbering } from "../../../internal/paragraphFormattingSerialization.js";
 import { PARAGRAPH_ALIGNMENT_VALUES } from "../../../types/documentEnumValues.js";
 import { paragraphToStyle } from "../../../utils/formatToStyle.js";
 import { collectHeadings } from "../../../utils/headingCollector.js";
@@ -7,12 +8,16 @@ import { tableOfContentsStyleLevel } from "../../../utils/tableOfContentsStyle.j
 import { expectParagraphAttrs } from "../../attrs/index.js";
 import { autospacingMatchesBase } from "../../autospacingBase.js";
 import { removeSectionBreakAtSelection, setSectionBreakType } from "../../commands/sectionBreak.js";
+import { CLEARED_LIST_RENDERING_ATTRS } from "../../listMarker.js";
 import { directParagraphAlignment } from "../../paragraphAlignment.js";
 import { directionIsRtl } from "../../paragraphDirection.js";
-import { withDirectParagraphSpacing } from "../../paragraphSpacing.js";
-import { getDocumentBuiltInStyles } from "../../plugins/documentStyles.js";
+import { directParagraphIndentation } from "../../paragraphIndentation.js";
+import { directParagraphSpacing, withDirectParagraphSpacing } from "../../paragraphSpacing.js";
+import { getDocumentNumbering } from "../../plugins/documentNumbering.js";
+import { getDocumentBuiltInStyles, getDocumentStyleResolver } from "../../plugins/documentStyleState.js";
+import { rebaseParagraphRuns } from "../../rebaseParagraphRuns.js";
 import { mintSectionProperties, parseSectionBreakType, sectionBreakTypeOf } from "../../sectionCarrier.js";
-import { listAttrsFromResolvedStyle, paragraphAttrsFromResolvedStyle } from "../../styles/resolvedStyleAttrs.js";
+import { listAttrsFromResolvedStyle, listLevelIndentAttrPatch, paragraphAttrsFromResolvedStyle } from "../../styles/resolvedStyleAttrs.js";
 import { createNodeExtension } from "../create.js";
 import { headingOutlineLevel, paragraphNumberingLevel, paragraphNumberingReferenceId } from "@stll/docx-core/model";
 import { Fragment } from "prosemirror-model";
@@ -399,6 +404,51 @@ function setParagraphSpacingAttr(side, twips) {
 		return true;
 	};
 }
+const DIRECT_PARAGRAPH_TOGGLES = [
+	"outlineLevel",
+	"borders",
+	"shading",
+	"tabs",
+	"keepNext",
+	"keepLines",
+	"widowControl",
+	"pageBreakBefore",
+	"contextualSpacing"
+];
+/** The attrs a paragraph states itself, over whatever style it reads. */
+function directParagraphAttrs(attrs) {
+	const direct = {};
+	const alignment = directParagraphAlignment(attrs);
+	if (alignment !== void 0) direct["alignment"] = alignment;
+	const spacing = directParagraphSpacing(attrs);
+	for (const key of [
+		"spaceBefore",
+		"spaceAfter",
+		"lineSpacing",
+		"lineSpacingRule"
+	]) if (spacing?.[key] !== void 0) direct[key] = spacing[key];
+	const indentation = directParagraphIndentation(attrs);
+	if (indentation?.indentLeft !== void 0) direct["indentLeft"] = indentation.indentLeft;
+	if (indentation?.indentRight !== void 0) direct["indentRight"] = indentation.indentRight;
+	if (indentation?.indentFirstLine !== void 0) {
+		direct["indentFirstLine"] = Math.abs(indentation.indentFirstLine);
+		direct["hangingIndent"] = indentation.hangingIndent === true;
+	}
+	const original = attrs._originalFormatting;
+	for (const key of DIRECT_PARAGRAPH_TOGGLES) if (original?.[key] !== void 0) direct[key] = attrs[key];
+	return direct;
+}
+/**
+* The indentation a restyled paragraph still states itself: a field its
+* source stated that the new style's attrs keep a value for. Every other
+* field now reads the style's value, which a save leaves to the style.
+*/
+function restyledIndentation(styleAttrs, originalFormatting) {
+	const stated = {};
+	if (originalFormatting?.indentLeft !== void 0 && typeof styleAttrs.indentLeft === "number") stated.indentLeft = styleAttrs.indentLeft;
+	if (originalFormatting?.indentFirstLine !== void 0 && typeof styleAttrs.indentFirstLine === "number") stated.indentFirstLine = styleAttrs.indentFirstLine;
+	return stated;
+}
 function setParagraphAttrsCmd(attrs) {
 	return (state, dispatch) => {
 		const { $from, $to } = state.selection;
@@ -479,9 +529,10 @@ function makeDecreaseIndent(amount = 720) {
 				seen.add(pos);
 				const currentIndent = node.attrs["indentLeft"] || 0;
 				const newIndent = Math.max(0, currentIndent - amount);
+				const numbered = paragraphNumberingReferenceId(expectParagraphAttrs(node).numPr ?? void 0) !== void 0;
 				tr = tr.setNodeMarkup(pos, void 0, {
 					...node.attrs,
-					indentLeft: newIndent > 0 ? newIndent : null
+					indentLeft: newIndent > 0 || numbered ? newIndent : null
 				});
 			}
 		});
@@ -489,79 +540,61 @@ function makeDecreaseIndent(amount = 720) {
 		return true;
 	};
 }
-function makeApplyStyle(schema) {
+function makeApplyStyle() {
 	return (styleId, resolvedAttrs) => (state, dispatch) => {
 		const { $from, $to } = state.selection;
 		if (!dispatch) return true;
 		let tr = state.tr;
 		const seen = /* @__PURE__ */ new Set();
-		const styleMarks = [];
-		if (resolvedAttrs?.runFormatting) {
-			const rpr = resolvedAttrs.runFormatting;
-			if (rpr.bold && schema.marks["bold"]) styleMarks.push(schema.marks["bold"].create());
-			if (rpr.italic && schema.marks["italic"]) styleMarks.push(schema.marks["italic"].create());
-			if (rpr.fontSize && schema.marks["fontSize"]) styleMarks.push(schema.marks["fontSize"].create({ size: rpr.fontSize }));
-			if (rpr.fontFamily && schema.marks["fontFamily"]) styleMarks.push(schema.marks["fontFamily"].create({
-				ascii: rpr.fontFamily.ascii,
-				hAnsi: rpr.fontFamily.hAnsi,
-				asciiTheme: rpr.fontFamily.asciiTheme
-			}));
-			if (rpr.color && !rpr.color.auto && schema.marks["textColor"]) styleMarks.push(schema.marks["textColor"].create({
-				rgb: rpr.color.rgb,
-				themeColor: rpr.color.themeColor,
-				themeTint: rpr.color.themeTint,
-				themeShade: rpr.color.themeShade
-			}));
-			if (rpr.underline && rpr.underline.style !== "none" && schema.marks["underline"]) styleMarks.push(schema.marks["underline"].create({
-				style: rpr.underline.style,
-				color: rpr.underline.color
-			}));
-			if ((rpr.strike || rpr.doubleStrike) && schema.marks["strike"]) styleMarks.push(schema.marks["strike"].create({ double: rpr.doubleStrike || false }));
-		}
-		const styleControlledMarks = [
-			schema.marks["bold"],
-			schema.marks["italic"],
-			schema.marks["fontSize"],
-			schema.marks["fontFamily"],
-			schema.marks["textColor"],
-			schema.marks["underline"],
-			schema.marks["strike"]
-		].filter(Boolean);
 		state.doc.nodesBetween($from.pos, $to.pos, (node, pos) => {
 			if (node.type.name === "paragraph" && !seen.has(pos)) {
 				seen.add(pos);
 				const newAttrs = {
 					...node.attrs,
 					styleId,
-					_tableOfContentsLevel: tableOfContentsStyleLevel({ styleId }) ?? null
+					_tableOfContentsLevel: styleId ? tableOfContentsStyleLevel({ styleId }) ?? null : null
 				};
 				if (resolvedAttrs) {
-					Object.assign(newAttrs, paragraphAttrsFromResolvedStyle(resolvedAttrs, {
-						styleId,
+					const current = expectParagraphAttrs(node);
+					const styleAttrs = paragraphAttrsFromResolvedStyle(resolvedAttrs, {
+						styleId: styleId ?? "",
 						...resolvedAttrs.styleName ? { styleName: resolvedAttrs.styleName } : {}
-					}));
-					const originalFormatting = {
-						...expectParagraphAttrs(node)._originalFormatting,
-						styleId
-					};
-					Reflect.deleteProperty(originalFormatting, "alignment");
-					newAttrs["_originalFormatting"] = withDirectParagraphSpacing(originalFormatting, void 0);
-					newAttrs["spacingExplicit"] = null;
+					});
+					Object.assign(newAttrs, styleAttrs);
+					if (!styleId) newAttrs["_tableOfContentsLevel"] = null;
+					const originalFormatting = { ...current._originalFormatting };
+					if (styleId) originalFormatting.styleId = styleId;
+					else Reflect.deleteProperty(originalFormatting, "styleId");
+					let restyledOriginal = originalFormatting;
+					if (styleId) {
+						Reflect.deleteProperty(originalFormatting, "alignment");
+						Reflect.deleteProperty(originalFormatting, "outlineLevel");
+						restyledOriginal = withDirectParagraphSpacing(originalFormatting, void 0);
+						newAttrs["spacingExplicit"] = null;
+					} else Object.assign(newAttrs, directParagraphAttrs(current));
+					newAttrs["_originalFormatting"] = restyledOriginal ?? null;
 					const listAttrs = listAttrsFromResolvedStyle(resolvedAttrs, resolvedAttrs.numbering);
+					const directNumId = current.numPrFromStyle == null ? paragraphNumberingReferenceId(current.numPr ?? void 0) : void 0;
 					if (listAttrs) Object.assign(newAttrs, listAttrs);
+					else if (isStyleSourcedParagraphNumbering(current.numPr, current.numPrFromStyle)) Object.assign(newAttrs, CLEARED_LIST_RENDERING_ATTRS, {
+						numPr: null,
+						numPrFromStyle: null
+					});
+					else if (directNumId !== void 0) Object.assign(newAttrs, listLevelIndentAttrPatch(restyledIndentation(styleAttrs, restyledOriginal), {
+						numId: directNumId,
+						ilvl: paragraphNumberingLevel(current.numPr ?? void 0) ?? 0
+					}, resolvedAttrs.numbering ?? getDocumentNumbering(state)));
 				}
 				tr = tr.setNodeMarkup(pos, void 0, newAttrs);
-				if (resolvedAttrs) {
-					const paragraphStart = pos + 1;
-					const paragraphEnd = pos + node.nodeSize - 1;
-					if (paragraphEnd > paragraphStart) {
-						for (const markType of styleControlledMarks) tr = tr.removeMark(paragraphStart, paragraphEnd, markType);
-						for (const mark of styleMarks) tr = tr.addMark(paragraphStart, paragraphEnd, mark);
-					}
-				}
+				rebaseParagraphRuns({
+					tr,
+					position: pos,
+					previous: node,
+					styleResolver: getDocumentStyleResolver(state),
+					storedMarks: state.storedMarks ?? state.selection.$from.marks()
+				});
 			}
 		});
-		if (styleMarks.length > 0) tr = tr.setStoredMarks(styleMarks);
 		dispatch(tr.scrollIntoView());
 		return true;
 	};
@@ -594,8 +627,8 @@ const ParagraphExtension = createNodeExtension({
 	name: "paragraph",
 	schemaNodeName: "paragraph",
 	nodeSpec: paragraphNodeSpec,
-	onSchemaReady(ctx) {
-		const applyStyleFn = makeApplyStyle(ctx.schema);
+	onSchemaReady() {
+		const applyStyleFn = makeApplyStyle();
 		return { commands: {
 			setAlignment: (alignment) => makeSetAlignment(alignment),
 			alignLeft: () => makeSetAlignment("left"),
@@ -617,10 +650,18 @@ const ParagraphExtension = createNodeExtension({
 				hangingIndent: hanging ?? false
 			}),
 			applyStyle: (styleId, resolvedAttrs) => applyStyleFn(styleId, resolvedAttrs),
-			clearStyle: () => setParagraphAttrsCmd({
-				styleId: null,
-				_tableOfContentsLevel: null
-			}),
+			clearStyle: () => (state, dispatch) => {
+				const resolver = getDocumentStyleResolver(state);
+				if (!resolver) return applyStyleFn(null)(state, dispatch);
+				const resolved = resolver.resolveParagraphStyle(null);
+				const styleName = resolver.getDefaultParagraphStyle()?.name;
+				return applyStyleFn(null, {
+					...resolved.paragraphFormatting && { paragraphFormatting: resolved.paragraphFormatting },
+					...resolved.runFormatting && { runFormatting: resolved.runFormatting },
+					...styleName && { styleName },
+					numbering: getDocumentNumbering(state)
+				})(state, dispatch);
+			},
 			insertSectionBreak: (breakType) => setSectionBreakType(breakType),
 			removeSectionBreak: () => removeSectionBreakAtSelection,
 			generateTOC: ({ title }) => (state, dispatch) => {

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

@@ -1,7 +1,7 @@
 import { mergeTextFormatting } from "../../../utils/textFormattingMerge.js";
 import { expectCharacterStyleMarkAttrs, expectRunFormattingOverrideMarkAttrs } from "../../attrs/index.js";
 import { keepSectionBreaksOnSurvivingMarks } from "../../commands/sectionBreak.js";
-import { getDocumentStyleResolver } from "../../plugins/documentStyles.js";
+import { getDocumentStyleResolver } from "../../plugins/documentStyleState.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../../runFormattingMarkNames.js";
 import { authoredRunFormattingFromAttrs } from "../../runFormattingProvenance.js";
 import { paragraphAttrsFromResolvedStyle } from "../../styles/resolvedStyleAttrs.js";