@stll/folio-core 0.8.0 → 0.9.0

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) {
@@ -1073,6 +1082,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 +1471,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 +1487,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 +1495,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 +1505,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,13 +1,14 @@
 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 { resolveColor } from "../../utils/colorResolver.js";
+import { resolveShadingFill } from "../../utils/formatToStyle.js";
 import { buildRunFormattingOverrideAttrs } from "../extensions/marks/RunFormattingOverrideExtension.js";
 import { schema } from "../schema/index.js";
 //#region src/prosemirror/conversion/toProseDoc.ts
@@ -30,7 +31,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 +115,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 +237,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 +271,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 +309,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 +422,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)) ?? {};
@@ -712,7 +735,9 @@ const TABLE_BORDER_SIDES = [
 	"left",
 	"right",
 	"insideH",
-	"insideV"
+	"insideV",
+	"topLeftToBottomRight",
+	"topRightToBottomLeft"
 ];
 function resolveThemedBorderColors(borders, theme) {
 	if (!borders || !theme?.colorScheme) return borders;
@@ -741,7 +766,7 @@ function convertTableCell(cell, styleResolver, context, isHeader, gridWidthPerce
 		width = gridWidthPercent;
 		widthType = "pct";
 	}
-	const backgroundColor = formatting?.shading?.fill?.rgb ?? conditionalStyle?.tcPr?.shading?.fill?.rgb;
+	const backgroundColor = resolveShadingFill(formatting?.shading ?? conditionalStyle?.tcPr?.shading, theme).replace(/^#/u, "");
 	const baseBorders = (() => {
 		if (tableBorders) return {
 			top: isFirstRow ? tableBorders.top : tableBorders.insideH,
@@ -772,7 +797,10 @@ function convertTableCell(cell, styleResolver, context, isHeader, gridWidthPerce
 	if (width !== void 0) attrs.width = width;
 	if (widthType) attrs.widthType = widthType;
 	if (formatting?.verticalAlign) attrs.verticalAlign = formatting.verticalAlign;
-	if (backgroundColor) attrs.backgroundColor = backgroundColor;
+	if (backgroundColor) {
+		attrs.backgroundColor = backgroundColor;
+		attrs._resolvedBackgroundColor = backgroundColor;
+	}
 	if (formatting?.textDirection) attrs.textDirection = formatting.textDirection;
 	if (formatting?.noWrap !== void 0) attrs.noWrap = formatting.noWrap;
 	if (borders) attrs.borders = borders;
@@ -851,7 +879,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);
 	}
@@ -1047,7 +1077,8 @@ function convertImage(image, rawXml) {
 		borderStyle,
 		wrapText,
 		hlinkHref: image.hlinkHref,
-		_docxRawXml: rawXml
+		_docxRawXml: rawXml,
+		_docxObjectPreview: rawXml !== void 0 && /<(?:[A-Za-z_][\w.-]*:)?object(?:\s|>)/u.test(rawXml)
 	});
 }
 /**
@@ -1108,6 +1139,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,7 +1,7 @@
-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 { paragraphToStyle } from "../../../utils/formatToStyle.js";
 import { createNodeExtension } from "../create.js";
 import { collectHeadings } from "../../../utils/headingCollector.js";
 import { listAttrsFromResolvedStyle, paragraphAttrsFromResolvedStyle } from "../../styles/resolvedStyleAttrs.js";
@@ -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,6 +1,6 @@
 import { HIGHLIGHT_COLOR_VALUES } from "../../../types/documentEnumValues.js";
-import { resolveHighlightToCss } from "../../../utils/colorResolver.js";
 import { expectHighlightMarkAttrs } from "../../attrs/index.js";
+import { resolveHighlightToCss } from "../../../utils/colorResolver.js";
 import { createMarkExtension } from "../create.js";
 import { removeMark, setMark } from "./markUtils.js";
 import { panic } from "better-result";

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 };

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

@@ -0,0 +1,30 @@
+import { expectLanguageMarkAttrs } from "../../attrs/index.js";
+import { createMarkExtension } from "../create.js";
+//#region src/prosemirror/extensions/marks/LanguageExtension.ts
+/** Preserve OOXML `w:lang` and expose its primary language to the editing DOM. */
+const LanguageExtension = createMarkExtension({
+	name: "language",
+	schemaMarkName: "language",
+	markSpec: {
+		attrs: {
+			val: { default: null },
+			eastAsia: { default: null },
+			bidi: { default: null }
+		},
+		parseDOM: [{
+			tag: "span[lang]",
+			getAttrs: (dom) => typeof dom === "string" ? false : { val: dom.getAttribute("lang") ?? void 0 }
+		}],
+		toDOM(mark) {
+			const { val, eastAsia, bidi } = expectLanguageMarkAttrs(mark);
+			const language = val ?? eastAsia ?? bidi;
+			return language ? [
+				"span",
+				{ lang: language },
+				0
+			] : ["span", 0];
+		}
+	}
+});
+//#endregion
+export { LanguageExtension };

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

@@ -1,5 +1,5 @@
-import { ensureHexPrefix } from "../../../utils/colorResolver.js";
 import { expectRunShadingMarkAttrs } from "../../attrs/index.js";
+import { ensureHexPrefix } from "../../../utils/colorResolver.js";
 import { createMarkExtension } from "../create.js";
 import { normalizeCssColorKey, parseDOMHighlightColor } from "./HighlightExtension.js";
 //#region src/prosemirror/extensions/marks/RunShadingExtension.ts

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

@@ -1,5 +1,5 @@
-import { textToStyle } from "../../../utils/formatToStyle.js";
 import { expectTextColorMarkAttrs } from "../../attrs/index.js";
+import { textToStyle } from "../../../utils/formatToStyle.js";
 import { createMarkExtension } from "../create.js";
 import { removeMark, setMark } from "./markUtils.js";
 import { panic } from "better-result";

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

@@ -1,6 +1,6 @@
-import { AUTHOR_COLORS, getAuthorColorIdx } from "../../../utils/authorColors.js";
 import { expectTrackedChangeMarkAttrs } from "../../attrs/index.js";
 import { createMarkExtension } from "../create.js";
+import { AUTHOR_COLORS, getAuthorColorIdx } from "../../../utils/authorColors.js";
 //#region src/prosemirror/extensions/marks/TrackedChangeExtensions.ts
 /**
 * Tracked Change Mark Extensions — insertion and deletion marks

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

@@ -43,6 +43,17 @@ function marksToTextFormatting(marks) {
 			};
 			break;
 		}
+		case "language": {
+			const val = mark.attrs["val"];
+			const eastAsia = mark.attrs["eastAsia"];
+			const bidi = mark.attrs["bidi"];
+			formatting.language = {
+				...typeof val === "string" ? { val } : {},
+				...typeof eastAsia === "string" ? { eastAsia } : {},
+				...typeof bidi === "string" ? { bidi } : {}
+			};
+			break;
+		}
 		case "superscript":
 			formatting.vertAlign = "superscript";
 			break;
@@ -186,6 +197,7 @@ function textFormattingToMarks(formatting, schema) {
 		hAnsi: formatting.fontFamily.hAnsi,
 		asciiTheme: formatting.fontFamily.asciiTheme
 	}));
+	if (formatting.language && schema.marks["language"]) marks.push(schema.marks["language"].create(formatting.language));
 	if (formatting.vertAlign === "superscript" && schema.marks["superscript"]) marks.push(schema.marks["superscript"].create());
 	if (formatting.vertAlign === "subscript" && schema.marks["subscript"]) marks.push(schema.marks["subscript"].create());
 	if (formatting.rtl && schema.marks["rtl"]) marks.push(schema.marks["rtl"].create());

package/dist/prosemirror/extensions/nodes/ImageExtension.js

@@ -38,7 +38,8 @@ const ImageExtension = createNodeExtension({
 			borderStyle: { default: null },
 			wrapText: { default: null },
 			hlinkHref: { default: null },
-			_docxRawXml: { default: null }
+			_docxRawXml: { default: null },
+			_docxObjectPreview: { default: null }
 		},
 		parseDOM: [{
 			tag: "img[src]",

package/dist/prosemirror/extensions/nodes/TableExtension.js

@@ -1,11 +1,11 @@
 import { TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_WIDTH_TYPE_VALUES } from "../../../types/documentEnumValues.js";
-import { resolveColor } from "../../../utils/colorResolver.js";
 import { expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, mergeTableAttrs, mergeTableCellAttrs, mergeTableRowAttrs } from "../../attrs/index.js";
+import { resolveColor } from "../../../utils/colorResolver.js";
 import { createExtension, createNodeExtension } from "../create.js";
 import { panic } from "better-result";
 import { Plugin, PluginKey, Selection, TextSelection } from "prosemirror-state";
-import { Decoration, DecorationSet } from "prosemirror-view";
 import { CellSelection, TableMap, columnResizing, mergeCells, removeRow, selectedRect, splitCell, tableEditing } from "prosemirror-tables";
+import { Decoration, DecorationSet } from "prosemirror-view";
 //#region src/prosemirror/extensions/nodes/TableExtension.ts
 /**
 * Table Extension — 4 node specs + plugins + commands
@@ -310,6 +310,7 @@ const tableCellSpec = {
 		widthType: { default: null },
 		verticalAlign: { default: null },
 		backgroundColor: { default: null },
+		_resolvedBackgroundColor: { default: null },
 		borders: { default: null },
 		margins: { default: null },
 		textDirection: { default: null },
@@ -363,6 +364,7 @@ const tableHeaderSpec = {
 		widthType: { default: null },
 		verticalAlign: { default: null },
 		backgroundColor: { default: null },
+		_resolvedBackgroundColor: { default: null },
 		borders: { default: null },
 		margins: { default: null },
 		textDirection: { default: null },

package/dist/prosemirror/schema/index.d.ts

@@ -1,6 +1,6 @@
 import { ExtensionManager } from "../extensions/ExtensionManager.js";
 import { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, ParagraphAttrs, SdtAttrs, ShapeAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAttrs } from "./nodes.js";
-import { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, RunFormattingOverrideAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, UnderlineAttrs } from "./marks.js";
+import { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, LanguageAttrs, RunFormattingOverrideAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, UnderlineAttrs } from "./marks.js";
 
 //#region src/prosemirror/schema/index.d.ts
 declare const singletonManager: ExtensionManager;
@@ -12,4 +12,4 @@ type DocxSchema = typeof schema;
 type DocxNode = ReturnType<typeof schema.node>;
 type DocxMark = ReturnType<typeof schema.mark>;
 //#endregion
-export { type BlockSdtAttrs, type CharacterSpacingAttrs, type CharacterStyleAttrs, type CommentAttrs, DocxMark, DocxNode, DocxSchema, type EmphasisMarkAttrs, type FieldAttrs, type FontFamilyAttrs, type FontSizeAttrs, type FootnoteRefAttrs, type HardBreakAttrs, type HighlightAttrs, type HyperlinkAttrs, type ImageAttrs, type ImagePositionAttrs, type MathAttrs, type ParagraphAttrs, type RunFormattingOverrideAttrs, type RunShadingAttrs, type SdtAttrs, type ShapeAttrs, type StrikeAttrs, type TableAttrs, type TableCellAttrs, type TableRowAttrs, type TextBoxAttrs, type TextColorAttrs, type TextEffectAttrs, type TrackedChangeMarkAttrs, type UnderlineAttrs, schema, singletonManager };
+export { type BlockSdtAttrs, type CharacterSpacingAttrs, type CharacterStyleAttrs, type CommentAttrs, DocxMark, DocxNode, DocxSchema, type EmphasisMarkAttrs, type FieldAttrs, type FontFamilyAttrs, type FontSizeAttrs, type FootnoteRefAttrs, type HardBreakAttrs, type HighlightAttrs, type HyperlinkAttrs, type ImageAttrs, type ImagePositionAttrs, type LanguageAttrs, type MathAttrs, type ParagraphAttrs, type RunFormattingOverrideAttrs, type RunShadingAttrs, type SdtAttrs, type ShapeAttrs, type StrikeAttrs, type TableAttrs, type TableCellAttrs, type TableRowAttrs, type TextBoxAttrs, type TextColorAttrs, type TextEffectAttrs, type TrackedChangeMarkAttrs, type UnderlineAttrs, schema, singletonManager };

package/dist/prosemirror/schema/marks.d.ts

@@ -40,6 +40,11 @@ type FontFamilyAttrs = {
   eastAsiaTheme?: string;
   csTheme?: string;
 };
+type LanguageAttrs = {
+  val?: string;
+  eastAsia?: string;
+  bidi?: string;
+};
 type HighlightAttrs = {
   color: NonNullable<document_d_exports.TextFormatting["highlight"]>;
 };
@@ -115,4 +120,4 @@ type HyperlinkAttrs = {
   _docxHyperlinkIndex?: number;
 };
 //#endregion
-export { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, RunFormattingOverrideAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, UnderlineAttrs };
+export { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, LanguageAttrs, RunFormattingOverrideAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, UnderlineAttrs };

package/dist/prosemirror/schema/nodes.d.ts

@@ -13,7 +13,10 @@ type HardBreakAttrs = {
 type ParagraphAttrs = {
   paraId?: string;
   textId?: string;
-  alignment?: document_d_exports.ParagraphAlignment;
+  alignment?: document_d_exports.ParagraphAlignment; /** Effective East Asian line-edge policy (`w:kinsoku`). */
+  kinsoku?: boolean; /** Effective hanging-punctuation policy (`w:overflowPunct`). */
+  overflowPunctuation?: boolean; /** Effective paragraph opt-out from document automatic hyphenation. */
+  suppressAutoHyphens?: boolean;
   spaceBefore?: number;
   spaceAfter?: number;
   lineSpacing?: number;
@@ -46,7 +49,8 @@ type ParagraphAttrs = {
   listMarker?: string; /** Whether the list marker is hidden (w:vanish on numbering level rPr) */
   listMarkerHidden?: boolean; /** Marker font family from numbering level rPr */
   listMarkerFontFamily?: string; /** Marker font size from numbering level rPr, in points */
-  listMarkerFontSize?: number; /** Horizontal alignment of the marker around the paragraph's list anchor. */
+  listMarkerFontSize?: number; /** Marker bold state from numbering level rPr */
+  listMarkerBold?: boolean; /** Horizontal alignment of the marker around the paragraph's list anchor. */
   listMarkerAlignment?: "left" | "center" | "right";
   /**
    * `w:suff` (§17.9.25) — what follows the marker before body text.
@@ -83,7 +87,8 @@ type ParagraphAttrs = {
   shading?: document_d_exports.ShadingProperties;
   tabs?: document_d_exports.TabStop[];
   pageBreakBefore?: boolean; /** Word's cached rendered-page-break marker; preserved for round-trip only. */
-  renderedPageBreakBefore?: boolean;
+  renderedPageBreakBefore?: boolean; /** Internal import marker for a paragraph whose only run content is a hard page break. */
+  _pageBreakCarrier?: boolean;
   keepNext?: boolean;
   keepLines?: boolean;
   widowControl?: boolean; /** Contextual spacing — suppress space between same-style paragraphs */
@@ -198,7 +203,8 @@ type ImageAttrs = {
   borderStyle?: string; /** Wrap text setting from DOCX (left, right, bothSides, largest) for round-trip */
   wrapText?: NonNullable<document_d_exports.ImageWrap["wrapText"]>; /** Hyperlink URL for clickable image */
   hlinkHref?: string; /** Original OOXML for opaque/unsupported DOCX drawings. */
-  _docxRawXml?: string;
+  _docxRawXml?: string; /** Embedded-object previews use their authored box as the exact line height. */
+  _docxObjectPreview?: boolean;
 };
 /**
  * Field node attributes
@@ -375,15 +381,11 @@ type TableCellAttrs = {
   width?: number; /** Cell width type */
   widthType?: document_d_exports.TableWidthType; /** Vertical alignment */
   verticalAlign?: "top" | "center" | "bottom"; /** Background color (RGB hex) */
-  backgroundColor?: string; /** OOXML text direction (e.g. 'tbRl', 'btLr') */
+  backgroundColor?: string; /** Resolved source color. PM-only; distinguishes theme rendering from a user override. */
+  _resolvedBackgroundColor?: string; /** OOXML text direction (e.g. 'tbRl', 'btLr') */
   textDirection?: NonNullable<document_d_exports.TableCellFormatting["textDirection"]>; /** No text wrapping in cell */
   noWrap?: boolean; /** Cell borders — full BorderSpec per side (style, color, size) */
-  borders?: {
-    top?: document_d_exports.BorderSpec;
-    bottom?: document_d_exports.BorderSpec;
-    left?: document_d_exports.BorderSpec;
-    right?: document_d_exports.BorderSpec;
-  }; /** Cell margins/padding in twips per side */
+  borders?: document_d_exports.TableCellBorders; /** Cell margins/padding in twips per side */
   margins?: {
     top?: number;
     bottom?: number;