@stll/folio-core 0.8.0 → 0.10.0

package/dist/prosemirror/conversion/effectiveTableCellFormatting.js

@@ -0,0 +1,131 @@
+import { resolveColor } from "../../utils/colorResolver.js";
+import { resolveShadingFill } from "../../utils/formatToStyle.js";
+//#region src/prosemirror/conversion/effectiveTableCellFormatting.ts
+const TABLE_BORDER_SIDES = [
+	"top",
+	"bottom",
+	"left",
+	"right",
+	"insideH",
+	"insideV",
+	"topLeftToBottomRight",
+	"topRightToBottomLeft"
+];
+/**
+* Resolve the display-facing table-cell cascade without mutating authored
+* OOXML formatting. Source discriminators keep inherited values distinct from
+* direct values that the editor may later override.
+*/
+const resolveEffectiveTableCellFormatting = ({ directFormatting, styleFormatting, tableBorders, position, gridWidthPercent, defaultMargins, theme }) => {
+	return {
+		width: resolveEffectiveWidth(directFormatting, gridWidthPercent),
+		background: resolveEffectiveBackground({
+			directFormatting,
+			styleFormatting,
+			theme
+		}),
+		borders: resolveEffectiveBorders({
+			directFormatting,
+			styleFormatting,
+			tableBorders,
+			position,
+			theme
+		}),
+		margins: resolveEffectiveMargins({
+			directFormatting,
+			styleFormatting,
+			defaultMargins
+		})
+	};
+};
+const resolveEffectiveWidth = (directFormatting, gridWidthPercent) => {
+	const directWidth = directFormatting?.width;
+	if (directWidth) return {
+		type: "value",
+		source: "direct",
+		value: directWidth.value,
+		widthType: directWidth.type
+	};
+	if (gridWidthPercent !== void 0) return {
+		type: "value",
+		source: "grid",
+		value: gridWidthPercent,
+		widthType: "pct"
+	};
+	return { type: "none" };
+};
+const resolveEffectiveBackground = ({ directFormatting, styleFormatting, theme }) => {
+	const directShading = directFormatting?.shading;
+	if (directShading !== void 0) return resolveBackgroundColor({
+		shading: directShading,
+		source: "direct",
+		theme
+	});
+	const styleShading = styleFormatting?.shading;
+	if (styleShading !== void 0) return resolveBackgroundColor({
+		shading: styleShading,
+		source: "style",
+		theme
+	});
+	return {
+		type: "none",
+		source: "none"
+	};
+};
+const resolveBackgroundColor = ({ shading, source, theme }) => {
+	const rgb = resolveShadingFill(shading, theme).replace(/^#/u, "");
+	if (!rgb) return {
+		type: "none",
+		source
+	};
+	return {
+		type: "color",
+		source,
+		rgb
+	};
+};
+const resolveEffectiveBorders = ({ directFormatting, styleFormatting, tableBorders, position, theme }) => {
+	const baseBorders = tableBorders ? {
+		top: position.isFirstRow ? tableBorders.top : tableBorders.insideH,
+		bottom: position.isLastRow ? tableBorders.bottom : tableBorders.insideH,
+		left: position.isFirstColumn ? tableBorders.left : tableBorders.insideV,
+		right: position.isLastColumn ? tableBorders.right : tableBorders.insideV
+	} : void 0;
+	const styleBorders = styleFormatting?.borders;
+	const directBorders = directFormatting?.borders;
+	const borders = baseBorders || styleBorders || directBorders ? {
+		...baseBorders,
+		...styleBorders,
+		...directBorders
+	} : void 0;
+	return resolveThemedBorderColors(borders, theme);
+};
+const resolveEffectiveMargins = ({ directFormatting, styleFormatting, defaultMargins }) => {
+	if (directFormatting?.margins) return cellMarginsToAttrs(directFormatting.margins);
+	if (styleFormatting?.margins) return cellMarginsToAttrs(styleFormatting.margins);
+	return defaultMargins;
+};
+const cellMarginsToAttrs = (margins) => {
+	const result = {};
+	if (margins.top?.value !== void 0) result.top = margins.top.value;
+	if (margins.bottom?.value !== void 0) result.bottom = margins.bottom.value;
+	if (margins.left?.value !== void 0) result.left = margins.left.value;
+	if (margins.right?.value !== void 0) result.right = margins.right.value;
+	return result;
+};
+const resolveThemedBorderColors = (borders, theme) => {
+	if (!borders || !theme?.colorScheme) return borders;
+	let resolved;
+	for (const side of TABLE_BORDER_SIDES) {
+		const border = borders[side];
+		if (!border?.color?.themeColor || border.color.auto) continue;
+		resolved ??= { ...borders };
+		resolved[side] = {
+			...border,
+			color: { rgb: resolveColor(border.color, theme).replace(/^#/u, "") }
+		};
+	}
+	return resolved ?? borders;
+};
+//#endregion
+export { resolveEffectiveTableCellFormatting };

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -2,11 +2,11 @@ import { OUTLINE_STYLE_CSS_ALIASES } from "../../types/documentEnumValues.js";
 import { ShapeOutlineStyleSchema, narrowEnum } from "../../docx/parserEnums.js";
 import { pixelsToEmu } from "../../utils/units.js";
 import { numPrEqual } from "../../docx/numberingParser.js";
-import { directionToBidi } from "../paragraphDirection.js";
-import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../attrs/index.js";
 import { autospacingMatchesBase, hasAutospacingBaseSide } from "../autospacingBase.js";
-import { runShadingAttrsToShading } from "./runShadingMark.js";
+import { directionToBidi } from "../paragraphDirection.js";
+import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../attrs/index.js";
 import { assertValidProseMirrorDocument } from "../validation.js";
+import { runShadingAttrsToShading } from "./runShadingMark.js";
 //#region src/prosemirror/conversion/fromProseDoc.ts
 function normalizeShapeOutlineStyle(style) {
 	if (!style) return;
@@ -210,6 +210,7 @@ function listRenderingFromAttrs(attrs) {
 		...attrs.listMarkerHidden != null && { markerHidden: attrs.listMarkerHidden },
 		...attrs.listMarkerFontFamily != null && { markerFontFamily: attrs.listMarkerFontFamily },
 		...attrs.listMarkerFontSize != null && { markerFontSize: attrs.listMarkerFontSize },
+		...attrs.listMarkerBold != null && { markerBold: attrs.listMarkerBold },
 		...attrs.listMarkerAlignment != null && { markerAlignment: attrs.listMarkerAlignment },
 		...attrs.listMarkerSuffix != null && { markerSuffix: attrs.listMarkerSuffix },
 		...attrs.listMarkerAllCaps != null && { markerAllCaps: attrs.listMarkerAllCaps },
@@ -343,6 +344,9 @@ function paragraphAttrsToFormatting(attrs) {
 		else delete result.styleId;
 		assignBooleanToggle(result, attrs, orig, "pageBreakBefore");
 		assignBooleanToggle(result, attrs, orig, "widowControl");
+		assignBooleanToggle(result, attrs, orig, "kinsoku");
+		assignBooleanToggle(result, attrs, orig, "overflowPunctuation");
+		assignBooleanToggle(result, attrs, orig, "suppressAutoHyphens");
 		if (attrs.spacingExplicit !== orig.spacingExplicit) if (attrs.spacingExplicit) result.spacingExplicit = attrs.spacingExplicit;
 		else delete result.spacingExplicit;
 		const bidi = directionToBidi(attrs.direction);
@@ -352,7 +356,7 @@ function paragraphAttrsToFormatting(attrs) {
 	}
 	const outlineLevel = Reflect.get(attrs, "outlineLevel");
 	const bidi = directionToBidi(attrs.direction);
-	if (!(attrs.alignment || shouldSerializeSpaceBefore || shouldSerializeSpaceAfter || beforeAutospacingEdited || afterAutospacingEdited || attrs.lineSpacing || attrs.indentLeft || attrs.indentRight || attrs.indentFirstLine || attrs.numPr || attrs.styleId || attrs.borders || attrs.shading || attrs.tabs || typeof outlineLevel === "number" || attrs.contextualSpacing || attrs.spacingExplicit || bidi != null || attrs.pageBreakBefore != null || attrs.widowControl != null)) return;
+	if (!(attrs.alignment || shouldSerializeSpaceBefore || shouldSerializeSpaceAfter || beforeAutospacingEdited || afterAutospacingEdited || attrs.lineSpacing || attrs.indentLeft || attrs.indentRight || attrs.indentFirstLine || attrs.numPr || attrs.styleId || attrs.borders || attrs.shading || attrs.tabs || typeof outlineLevel === "number" || attrs.contextualSpacing || attrs.spacingExplicit || bidi != null || attrs.pageBreakBefore != null || attrs.widowControl != null || attrs.kinsoku != null || attrs.overflowPunctuation != null || attrs.suppressAutoHyphens != null)) return;
 	const f = {};
 	if (attrs.alignment) f.alignment = attrs.alignment;
 	if (shouldSerializeSpaceBefore) f.spaceBefore = spaceBefore;
@@ -376,6 +380,9 @@ function paragraphAttrsToFormatting(attrs) {
 	if (bidi != null) f.bidi = bidi;
 	if (attrs.pageBreakBefore != null) f.pageBreakBefore = attrs.pageBreakBefore;
 	if (attrs.widowControl != null) f.widowControl = attrs.widowControl;
+	if (attrs.kinsoku != null) f.kinsoku = attrs.kinsoku;
+	if (attrs.overflowPunctuation != null) f.overflowPunctuation = attrs.overflowPunctuation;
+	if (attrs.suppressAutoHyphens != null) f.suppressAutoHyphens = attrs.suppressAutoHyphens;
 	return f;
 }
 /**
@@ -451,11 +458,6 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks) {
 		syncCommentRanges(node, offset);
 		const linkMark = node.marks.find((m) => m.type.name === "hyperlink");
 		const noteRefMark = node.marks.find((m) => m.type.name === "footnoteRef");
-		if (noteRefMark && !linkMark) {
-			flushCurrentInline();
-			content.push(createNoteReferenceRun(noteRefMark, node.marks));
-			return;
-		}
 		const insertionMark = node.marks.find((m) => m.type.name === "insertion");
 		const deletionMark = node.marks.find((m) => m.type.name === "deletion");
 		if (insertionMark || deletionMark) {
@@ -492,6 +494,11 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks) {
 			});
 			return;
 		}
+		if (noteRefMark && !linkMark) {
+			flushCurrentInline();
+			content.push(createNoteReferenceRun(noteRefMark, node.marks));
+			return;
+		}
 		if (linkMark) {
 			const linkKey = getLinkKey(linkMark);
 			if (currentHyperlink && currentHyperlinkKey === linkKey) {} else {
@@ -565,6 +572,8 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks) {
 	return content;
 }
 function createTrackedChangeRun(node, marks) {
+	const noteRefMark = marks.find((mark) => mark.type.name === "footnoteRef");
+	if (noteRefMark) return createNoteReferenceRun(noteRefMark, marks);
 	if (node.isText) {
 		const formatting = marksToTextFormatting(marks);
 		return {
@@ -858,7 +867,7 @@ function createInlineSdtFromNode(node) {
 	return {
 		type: "inlineSdt",
 		properties,
-		content: extractParagraphContent(node).filter((c) => c.type === "run" || c.type === "hyperlink" || c.type === "simpleField" || c.type === "complexField" || c.type === "inlineSdt" || c.type === "mathEquation")
+		content: extractParagraphContent(node).filter((c) => c.type === "run" || c.type === "hyperlink" || c.type === "simpleField" || c.type === "complexField" || c.type === "inlineSdt" || c.type === "insertion" || c.type === "deletion" || c.type === "mathEquation")
 	};
 }
 function parseSdtListItems(rawItems) {
@@ -902,6 +911,7 @@ function createImageRun(node) {
 	if (attrs.opacity != null) image.opacity = attrs.opacity;
 	const imagePosition = imagePositionFromAttrs(attrs.position);
 	if (imagePosition) image.position = imagePosition;
+	if (attrs.layoutInCell !== void 0) image.layoutInCell = attrs.layoutInCell;
 	if (attrs.borderWidth && attrs.borderWidth > 0) {
 		const outline = {
 			width: pixelsToEmu(attrs.borderWidth),
@@ -1073,6 +1083,15 @@ function marksToTextFormatting(marks) {
 			formatting.fontFamily = ff;
 			break;
 		}
+		case "language": {
+			const attrs = expectLanguageMarkAttrs(mark);
+			formatting.language = {
+				...attrs.val ? { val: attrs.val } : {},
+				...attrs.eastAsia ? { eastAsia: attrs.eastAsia } : {},
+				...attrs.bidi ? { bidi: attrs.bidi } : {}
+			};
+			break;
+		}
 		case "superscript":
 			formatting.vertAlign = "superscript";
 			break;
@@ -1453,11 +1472,9 @@ function convertPMTableCell(node, documentCounts) {
 	if (Array.isArray(attrs.tcPrChange) && attrs.tcPrChange.length > 0) cell.propertyChanges = [...attrs.tcPrChange];
 	return cell;
 }
-/**
-* Convert ProseMirror table cell attrs to TableCellFormatting
-* Borders are stored as full BorderSpec objects — no conversion needed.
-*/
+const cellShadingFromAttrs = (attrs) => attrs.backgroundColor ? { fill: { rgb: attrs.backgroundColor } } : { pattern: "nil" };
 function tableCellAttrsToFormatting(attrs) {
+	const backgroundChanged = attrs.backgroundColor !== attrs._resolvedBackgroundColor;
 	if (attrs._originalFormatting) {
 		const orig = attrs._originalFormatting;
 		const result = { ...orig };
@@ -1471,8 +1488,7 @@ function tableCellAttrsToFormatting(attrs) {
 		};
 		if (attrs.verticalAlign !== (orig.verticalAlign ?? void 0)) if (attrs.verticalAlign) result.verticalAlign = attrs.verticalAlign;
 		else delete result.verticalAlign;
-		if (attrs.backgroundColor) result.shading = { fill: { rgb: attrs.backgroundColor } };
-		else if (!attrs.backgroundColor && orig.shading) delete result.shading;
+		if (backgroundChanged) result.shading = cellShadingFromAttrs(attrs);
 		if (attrs.borders) result.borders = attrs.borders;
 		if (attrs.margins) result.margins = buildCellMarginsFromAttrs(attrs.margins);
 		if (attrs.textDirection !== (orig.textDirection ?? void 0)) if (attrs.textDirection) result.textDirection = attrs.textDirection;
@@ -1480,7 +1496,7 @@ function tableCellAttrsToFormatting(attrs) {
 		return result;
 	}
 	const cellWidth = attrs.width;
-	if (!(attrs.colspan > 1 || attrs.rowspan > 1 || cellWidth !== void 0 || attrs.verticalAlign || attrs.backgroundColor || attrs.borders || attrs.margins || attrs.textDirection)) return;
+	if (!(attrs.colspan > 1 || attrs.rowspan > 1 || cellWidth !== void 0 || attrs.verticalAlign || backgroundChanged || attrs.borders || attrs.margins || attrs.textDirection)) return;
 	const f = {};
 	if (attrs.colspan > 1) f.gridSpan = attrs.colspan;
 	if (attrs.rowspan > 1) f.vMerge = "restart";
@@ -1490,7 +1506,7 @@ function tableCellAttrsToFormatting(attrs) {
 	};
 	if (attrs.verticalAlign) f.verticalAlign = attrs.verticalAlign;
 	if (attrs.textDirection) f.textDirection = attrs.textDirection;
-	if (attrs.backgroundColor) f.shading = { fill: { rgb: attrs.backgroundColor } };
+	if (backgroundChanged) f.shading = cellShadingFromAttrs(attrs);
 	if (attrs.borders) f.borders = attrs.borders;
 	if (attrs.margins) f.margins = buildCellMarginsFromAttrs(attrs.margins);
 	return f;

package/dist/prosemirror/conversion/toProseDoc.js

@@ -1,15 +1,15 @@
 import { emuToPixels } from "../../utils/units.js";
-import { resolveColor } from "../../utils/colorResolver.js";
-import { directionFromBidi } from "../paragraphDirection.js";
+import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
+import { mergeParagraphFormatting, mergeParagraphTabStops } from "../../utils/paragraphFormattingMerge.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
-import { shadingToRunShadingAttrs } from "./runShadingMark.js";
+import { directionFromBidi } from "../paragraphDirection.js";
 import { assertValidProseMirrorDocument } from "../validation.js";
-import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
-import { mergeParagraphFormatting } from "../../utils/paragraphFormattingMerge.js";
+import { shadingToRunShadingAttrs } from "./runShadingMark.js";
 import { marksToTextFormatting } from "./fromProseDoc.js";
 import { createStyleEngine } from "../../style-engine/styleEngine.js";
 import { buildRunFormattingOverrideAttrs } from "../extensions/marks/RunFormattingOverrideExtension.js";
 import { schema } from "../schema/index.js";
+import { resolveEffectiveTableCellFormatting } from "./effectiveTableCellFormatting.js";
 //#region src/prosemirror/conversion/toProseDoc.ts
 const TOC_STYLE_ID = /^TOC\d*$/iu;
 /**
@@ -30,7 +30,16 @@ function toProseDoc(document, options) {
 		for (const block of blocks) if (block.type === "paragraph") {
 			const pbPos = paragraphPageBreakPosition(block);
 			if (pbPos === "before") out.push(schema.node("pageBreak"));
-			out.push(...convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId: nextTextBoxGroupId() }));
+			const converted = convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId: nextTextBoxGroupId() });
+			const firstConverted = converted.at(0);
+			if (pbPos === "before" && converted.length === 1 && firstConverted?.type.name === "paragraph" && firstConverted.content.size === 0 && document.package.settings?.splitPageBreakAndParagraphMark !== true) {
+				const paragraph = firstConverted;
+				converted[0] = paragraph.type.create({
+					...paragraph.attrs,
+					_pageBreakCarrier: true
+				}, paragraph.content, paragraph.marks);
+			}
+			out.push(...converted);
 			if (pbPos === "after") out.push(schema.node("pageBreak"));
 		} else if (block.type === "table") out.push(convertTable(block, styleResolver, {
 			theme,
@@ -105,13 +114,13 @@ function convertParagraph(paragraph, styleResolver, activeCommentIds, extraRunFo
 	if (styleResolver) styleRunFormatting = styleResolver.resolveParagraphStyle(paragraph.formatting?.styleId).runFormatting;
 	const paragraphRunFormatting = resolveParagraphMarkRunFormatting(paragraph.formatting?.runProperties, styleResolver);
 	let inheritableParagraphRunFormatting;
-	if (paragraphRunFormatting && !isTocParagraph) inheritableParagraphRunFormatting = stripParagraphMarkOnlyFormatting(paragraphRunFormatting);
+	if (paragraphRunFormatting && !isTocParagraph) inheritableParagraphRunFormatting = stripParagraphMarkFormattingForBodyRuns(paragraphRunFormatting);
 	const baseRunFormatting = mergeTextFormatting(styleRunFormatting, extraRunFormatting);
 	const paragraphMarkPrecedesStyle = paragraph.formatting?.styleId !== void 0;
 	const defaultRunFormatting = paragraphMarkPrecedesStyle ? mergeTextFormatting(inheritableParagraphRunFormatting, baseRunFormatting) : mergeTextFormatting(baseRunFormatting, inheritableParagraphRunFormatting);
 	const getInheritedRunFormatting = (formatting, fieldType) => {
 		if (fieldType === "TOC") return hasDirectRunFormatting(formatting) ? suppressParagraphMarkFormatting(baseRunFormatting, void 0, formatting) : baseRunFormatting;
-		if (!hasDirectRunFormatting(formatting)) return defaultRunFormatting;
+		if (!(hasDirectRunFormatting(formatting) || formatting?.styleId !== void 0)) return defaultRunFormatting;
 		return suppressParagraphMarkFormatting(baseRunFormatting, inheritableParagraphRunFormatting, formatting, paragraphMarkPrecedesStyle);
 	};
 	const emitTrackedChange = (change, markType, moveKind) => {
@@ -227,6 +236,7 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 	if (paragraph.listRendering?.markerHidden) attrs.listMarkerHidden = paragraph.listRendering.markerHidden;
 	if (paragraph.listRendering?.markerFontFamily) attrs.listMarkerFontFamily = paragraph.listRendering.markerFontFamily;
 	if (paragraph.listRendering?.markerFontSize) attrs.listMarkerFontSize = paragraph.listRendering.markerFontSize;
+	if (paragraph.listRendering?.markerBold !== void 0) attrs.listMarkerBold = paragraph.listRendering.markerBold;
 	if (paragraph.listRendering?.markerAlignment) attrs.listMarkerAlignment = paragraph.listRendering.markerAlignment;
 	if (paragraph.listRendering?.markerSuffix) attrs.listMarkerSuffix = paragraph.listRendering.markerSuffix;
 	if (paragraph.listRendering?.markerAllCaps) attrs.listMarkerAllCaps = paragraph.listRendering.markerAllCaps;
@@ -260,14 +270,17 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 		if (formatting?.spaceBefore === void 0 && tableParagraphOverlay?.spaceBefore === void 0 && paragraphStyle?.pPr?.spaceBefore === void 0 && docDefaultSpacing?.spaceBefore !== void 0) spacingFromDocDefaults.before = true;
 		if (formatting?.spaceAfter === void 0 && tableParagraphOverlay?.spaceAfter === void 0 && paragraphStyle?.pPr?.spaceAfter === void 0 && docDefaultSpacing?.spaceAfter !== void 0) spacingFromDocDefaults.after = true;
 		if (spacingFromDocDefaults.before || spacingFromDocDefaults.after) attrs.spacingFromDocDefaults = spacingFromDocDefaults;
-		const numberingStyleIndent = formatting?.numPr?.numId === 0 && stylePpr?.numPr !== void 0 && stylePpr.numPr.numId !== 0 ? void 0 : stylePpr;
-		set("indentLeft", formatting?.indentLeft ?? numberingStyleIndent?.indentLeft);
+		const effectiveIndent = mergeParagraphFormatting(formatting?.numPr?.numId === 0 && stylePpr?.numPr !== void 0 && stylePpr.numPr.numId !== 0 ? void 0 : stylePpr, formatting);
+		set("indentLeft", effectiveIndent?.indentLeft);
 		set("indentRight", formatting?.indentRight ?? stylePpr?.indentRight);
-		set("indentFirstLine", formatting?.indentFirstLine ?? numberingStyleIndent?.indentFirstLine);
-		set("hangingIndent", formatting?.hangingIndent ?? numberingStyleIndent?.hangingIndent);
+		set("indentFirstLine", effectiveIndent?.indentFirstLine);
+		set("hangingIndent", effectiveIndent?.hangingIndent);
 		set("borders", formatting?.borders ?? stylePpr?.borders);
 		set("shading", formatting?.shading ?? stylePpr?.shading);
-		set("tabs", formatting?.tabs ?? stylePpr?.tabs);
+		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);
@@ -295,6 +308,9 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 		set("borders", formatting?.borders);
 		set("shading", formatting?.shading);
 		set("tabs", formatting?.tabs);
+		set("kinsoku", formatting?.kinsoku);
+		set("overflowPunctuation", formatting?.overflowPunctuation);
+		set("suppressAutoHyphens", formatting?.suppressAutoHyphens);
 		set("pageBreakBefore", formatting?.pageBreakBefore);
 		set("keepNext", formatting?.keepNext);
 		set("keepLines", formatting?.keepLines);
@@ -405,6 +421,12 @@ function stripParagraphMarkOnlyFormatting(formatting) {
 	const { allCaps: _ac, highlight: _h, shading: _s, smallCaps: _sc, vertAlign: _va, ...rest } = formatting;
 	return Object.keys(rest).length > 0 ? rest : void 0;
 }
+function stripParagraphMarkFormattingForBodyRuns(formatting) {
+	const paragraphMarkFormatting = stripParagraphMarkOnlyFormatting(formatting);
+	if (!paragraphMarkFormatting) return;
+	const { fontFamily: _fontFamily, ...bodyRunFormatting } = paragraphMarkFormatting;
+	return Object.keys(bodyRunFormatting).length > 0 ? bodyRunFormatting : void 0;
+}
 function suppressParagraphMarkFormatting(base, paragraphMark, direct, paragraphMarkPrecedesStyle = false) {
 	if (!paragraphMark) return base;
 	const result = (paragraphMarkPrecedesStyle ? mergeTextFormatting(paragraphMark, base) : mergeTextFormatting(base, paragraphMark)) ?? {};
@@ -702,83 +724,60 @@ function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths,
 		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);
-		cells.push(convertTableCell(cell, styleResolver, context, isHeaderRow, gridWidth, cellConditionalStyle, tableBorders, isFirstRow, isLastRow, isFirstCol, isLastCol, calculatedRowSpan, preserveVMergeRestart, rowSpanInfo?.continuationCells, defaultCellMargins));
+		cells.push(convertTableCell({
+			cell,
+			styleResolver,
+			context,
+			isHeader: isHeaderRow,
+			gridWidthPercent: gridWidth,
+			conditionalStyle: cellConditionalStyle,
+			tableBorders,
+			position: {
+				isFirstRow,
+				isLastRow,
+				isFirstColumn: isFirstCol,
+				isLastColumn: isLastCol
+			},
+			calculatedRowSpan,
+			preserveVMergeRestart,
+			vMergeContinuationCells: rowSpanInfo?.continuationCells,
+			defaultCellMargins
+		}));
 	}
 	return schema.node("tableRow", attrs, cells);
 }
-const TABLE_BORDER_SIDES = [
-	"top",
-	"bottom",
-	"left",
-	"right",
-	"insideH",
-	"insideV"
-];
-function resolveThemedBorderColors(borders, theme) {
-	if (!borders || !theme?.colorScheme) return borders;
-	let resolved;
-	for (const side of TABLE_BORDER_SIDES) {
-		const border = borders[side];
-		if (!border?.color?.themeColor || border.color.auto) continue;
-		resolved ??= { ...borders };
-		resolved[side] = {
-			...border,
-			color: { rgb: resolveColor(border.color, theme).replace(/^#/u, "") }
-		};
-	}
-	return resolved ?? borders;
-}
 /**
 * Convert a TableCell to a ProseMirror table cell node
 */
-function convertTableCell(cell, styleResolver, context, isHeader, gridWidthPercent, conditionalStyle, tableBorders, isFirstRow, isLastRow, isFirstCol, isLastCol, calculatedRowSpan, preserveVMergeRestart, vMergeContinuationCells, defaultCellMargins) {
-	const { theme } = context;
+function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPercent, conditionalStyle, tableBorders, position, calculatedRowSpan, preserveVMergeRestart, vMergeContinuationCells, defaultCellMargins }) {
 	const formatting = cell.formatting;
 	const rowspan = calculatedRowSpan ?? 1;
-	let width = formatting?.width?.value;
-	let widthType = formatting?.width?.type;
-	if (width === void 0 && gridWidthPercent !== void 0) {
-		width = gridWidthPercent;
-		widthType = "pct";
-	}
-	const backgroundColor = formatting?.shading?.fill?.rgb ?? conditionalStyle?.tcPr?.shading?.fill?.rgb;
-	const baseBorders = (() => {
-		if (tableBorders) return {
-			top: isFirstRow ? tableBorders.top : tableBorders.insideH,
-			bottom: isLastRow ? tableBorders.bottom : tableBorders.insideH,
-			left: isFirstCol ? tableBorders.left : tableBorders.insideV,
-			right: isLastCol ? tableBorders.right : tableBorders.insideV
-		};
-	})();
-	const conditionalBorders = conditionalStyle?.tcPr?.borders;
-	const cellBorders = formatting?.borders;
-	const borders = resolveThemedBorderColors(baseBorders || conditionalBorders || cellBorders ? {
-		...baseBorders,
-		...conditionalBorders,
-		...cellBorders
-	} : void 0, theme);
-	const buildMarginsAttr = (src) => {
-		const m = {};
-		if (src.top?.value !== void 0) m.top = src.top.value;
-		if (src.bottom?.value !== void 0) m.bottom = src.bottom.value;
-		if (src.left?.value !== void 0) m.left = src.left.value;
-		if (src.right?.value !== void 0) m.right = src.right.value;
-		return m;
-	};
+	const effectiveFormatting = resolveEffectiveTableCellFormatting({
+		directFormatting: formatting,
+		styleFormatting: conditionalStyle?.tcPr,
+		tableBorders,
+		position,
+		gridWidthPercent,
+		defaultMargins: defaultCellMargins,
+		theme: context.theme
+	});
 	const attrs = {
 		colspan: formatting?.gridSpan ?? 1,
 		rowspan
 	};
-	if (width !== void 0) attrs.width = width;
-	if (widthType) attrs.widthType = widthType;
+	if (effectiveFormatting.width.type === "value") {
+		attrs.width = effectiveFormatting.width.value;
+		if (effectiveFormatting.width.widthType) attrs.widthType = effectiveFormatting.width.widthType;
+	}
 	if (formatting?.verticalAlign) attrs.verticalAlign = formatting.verticalAlign;
-	if (backgroundColor) attrs.backgroundColor = backgroundColor;
+	if (effectiveFormatting.background.type === "color") {
+		attrs.backgroundColor = effectiveFormatting.background.rgb;
+		attrs._resolvedBackgroundColor = effectiveFormatting.background.rgb;
+	}
 	if (formatting?.textDirection) attrs.textDirection = formatting.textDirection;
 	if (formatting?.noWrap !== void 0) attrs.noWrap = formatting.noWrap;
-	if (borders) attrs.borders = borders;
-	if (formatting?.margins) attrs.margins = buildMarginsAttr(formatting.margins);
-	else if (conditionalStyle?.tcPr?.margins) attrs.margins = buildMarginsAttr(conditionalStyle.tcPr.margins);
-	else if (defaultCellMargins) attrs.margins = defaultCellMargins;
+	if (effectiveFormatting.borders) attrs.borders = effectiveFormatting.borders;
+	if (effectiveFormatting.margins) attrs.margins = effectiveFormatting.margins;
 	if (formatting) attrs._originalFormatting = formatting;
 	if (cell.propertyChanges && cell.propertyChanges.length > 0) attrs.tcPrChange = [...cell.propertyChanges];
 	if (preserveVMergeRestart) attrs._preserveVMergeRestart = true;
@@ -851,7 +850,9 @@ function convertInlineSdt(sdt, getInheritedRunFormatting, styleResolver) {
 	} else if (content.type === "inlineSdt") {
 		const nestedSdt = convertInlineSdt(content, getInheritedRunFormatting, styleResolver);
 		if (nestedSdt) inlineNodes.push(nestedSdt);
-	} else {
+	} else if (content.type === "insertion") inlineNodes.push(...convertTrackedChange(content, "insertion", getInheritedRunFormatting, styleResolver));
+	else if (content.type === "deletion") inlineNodes.push(...convertTrackedChange(content, "deletion", getInheritedRunFormatting, styleResolver));
+	else {
 		const mathNode = convertMathEquation(content);
 		if (mathNode) inlineNodes.push(mathNode);
 	}
@@ -1042,12 +1043,14 @@ function convertImage(image, rawXml) {
 		cropBottom: image.crop?.bottom,
 		cropLeft: image.crop?.left,
 		position,
+		layoutInCell: image.layoutInCell,
 		borderWidth,
 		borderColor,
 		borderStyle,
 		wrapText,
 		hlinkHref: image.hlinkHref,
-		_docxRawXml: rawXml
+		_docxRawXml: rawXml,
+		_docxObjectPreview: rawXml !== void 0 && /<(?:[A-Za-z_][\w.-]*:)?object(?:\s|>)/u.test(rawXml)
 	});
 }
 /**
@@ -1108,6 +1111,7 @@ function textFormattingToMarks(formatting) {
 		eastAsiaTheme: formatting.fontFamily.eastAsiaTheme,
 		csTheme: formatting.fontFamily.csTheme
 	}));
+	if (formatting.language) marks.push(schema.mark("language", formatting.language));
 	if (formatting.vertAlign === "superscript") marks.push(schema.mark("superscript"));
 	else if (formatting.vertAlign === "subscript") marks.push(schema.mark("subscript"));
 	if (formatting.allCaps) marks.push(schema.mark("allCaps"));

package/dist/prosemirror/extensions/StarterKit.js

@@ -31,6 +31,7 @@ import { HiddenTextExtension } from "./marks/HiddenTextExtension.js";
 import { HighlightExtension } from "./marks/HighlightExtension.js";
 import { HyperlinkExtension } from "./marks/HyperlinkExtension.js";
 import { ItalicExtension } from "./marks/ItalicExtension.js";
+import { LanguageExtension } from "./marks/LanguageExtension.js";
 import { RtlExtension } from "./marks/RtlExtension.js";
 import { RunShadingExtension } from "./marks/RunShadingExtension.js";
 import { SmallCapsExtension } from "./marks/SmallCapsExtension.js";
@@ -79,6 +80,7 @@ function createStarterKit(options = {}) {
 	add("highlight", HighlightExtension());
 	add("fontSize", FontSizeExtension());
 	add("fontFamily", FontFamilyExtension());
+	add("language", LanguageExtension());
 	add("superscript", SuperscriptExtension());
 	add("subscript", SubscriptExtension());
 	add("hyperlink", HyperlinkExtension());

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

@@ -1,8 +1,8 @@
-import { paragraphToStyle } from "../../../utils/formatToStyle.js";
+import { autospacingMatchesBase } from "../../autospacingBase.js";
 import { directionIsRtl } from "../../paragraphDirection.js";
 import { expectParagraphAttrs } from "../../attrs/index.js";
-import { autospacingMatchesBase } from "../../autospacingBase.js";
 import { createNodeExtension } from "../create.js";
+import { paragraphToStyle } from "../../../utils/formatToStyle.js";
 import { collectHeadings } from "../../../utils/headingCollector.js";
 import { listAttrsFromResolvedStyle, paragraphAttrsFromResolvedStyle } from "../../styles/resolvedStyleAttrs.js";
 import { Fragment } from "prosemirror-model";
@@ -180,6 +180,9 @@ const paragraphNodeSpec = {
 		paraId: { default: null },
 		textId: { default: null },
 		alignment: { default: null },
+		kinsoku: { default: null },
+		overflowPunctuation: { default: null },
+		suppressAutoHyphens: { default: null },
 		spaceBefore: { default: null },
 		spaceAfter: { default: null },
 		lineSpacing: { default: null },
@@ -199,6 +202,7 @@ const paragraphNodeSpec = {
 		listMarkerHidden: { default: null },
 		listMarkerFontFamily: { default: null },
 		listMarkerFontSize: { default: null },
+		listMarkerBold: { default: null },
 		listMarkerAlignment: { default: null },
 		listMarkerSuffix: { default: null },
 		listMarkerAllCaps: { default: null },
@@ -214,6 +218,7 @@ const paragraphNodeSpec = {
 		tabs: { default: null },
 		pageBreakBefore: { default: null },
 		renderedPageBreakBefore: { default: null },
+		_pageBreakCarrier: { default: null },
 		keepNext: { default: null },
 		keepLines: { default: null },
 		widowControl: { default: null },

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

@@ -1,7 +1,7 @@
-import { detectBaseDirection } from "../../../utils/baseDirection.js";
 import { directionIsAutoManaged } from "../../paragraphDirection.js";
 import { createExtension } from "../create.js";
 import { getTransactionDirtyRange } from "../../../paged-layout/transactionDirtyRange.js";
+import { detectBaseDirection } from "../../../utils/baseDirection.js";
 import { ignoreTrackedChanges } from "./ParagraphChangeTrackerExtension.js";
 import { Plugin, PluginKey } from "prosemirror-state";
 //#region src/prosemirror/extensions/features/AutoBidiDetectionExtension.ts

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

@@ -34,6 +34,7 @@ const LIST_FORMATTING_ATTRS = [
 	"listMarkerHidden",
 	"listMarkerFontFamily",
 	"listMarkerFontSize",
+	"listMarkerBold",
 	"listMarkerAlignment",
 	"listMarkerSuffix",
 	"listLevelNumFmts",

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

@@ -16,6 +16,7 @@ const FootnoteRefExtension = createMarkExtension({
 	name: "footnoteRef",
 	schemaMarkName: "footnoteRef",
 	markSpec: {
+		inclusive: false,
 		attrs: {
 			id: {},
 			noteType: { default: "footnote" },

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

@@ -1,7 +1,7 @@
 import { HIGHLIGHT_COLOR_VALUES } from "../../../types/documentEnumValues.js";
-import { resolveHighlightToCss } from "../../../utils/colorResolver.js";
 import { expectHighlightMarkAttrs } from "../../attrs/index.js";
 import { createMarkExtension } from "../create.js";
+import { resolveHighlightToCss } from "../../../utils/colorResolver.js";
 import { removeMark, setMark } from "./markUtils.js";
 import { panic } from "better-result";
 //#region src/prosemirror/extensions/marks/HighlightExtension.ts

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

@@ -0,0 +1,7 @@
+import { MarkExtension } from "../types.js";
+
+//#region src/prosemirror/extensions/marks/LanguageExtension.d.ts
+/** Preserve OOXML `w:lang` and expose its primary language to the editing DOM. */
+declare const LanguageExtension: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+//#endregion
+export { LanguageExtension };