@stll/folio-core 0.7.0 → 0.9.0

package/dist/prosemirror/attrs/index.js

@@ -18,6 +18,11 @@ const IMAGE_CSS_FLOATS = [
 	"right",
 	"none"
 ];
+const TEXT_BOX_AUTO_FIT_VALUES = [
+	"none",
+	"normal",
+	"shape"
+];
 const FIELD_KINDS = ["simple", "complex"];
 const MATH_DISPLAYS = ["inline", "block"];
 const SHAPE_FILL_TYPES = [
@@ -123,6 +128,7 @@ const highlightAttrsCache = /* @__PURE__ */ new WeakMap();
 const runShadingAttrsCache = /* @__PURE__ */ new WeakMap();
 const fontSizeAttrsCache = /* @__PURE__ */ new WeakMap();
 const fontFamilyAttrsCache = /* @__PURE__ */ new WeakMap();
+const languageAttrsCache = /* @__PURE__ */ new WeakMap();
 const characterSpacingAttrsCache = /* @__PURE__ */ new WeakMap();
 const characterStyleAttrsCache = /* @__PURE__ */ new WeakMap();
 const emphasisMarkAttrsCache = /* @__PURE__ */ new WeakMap();
@@ -140,6 +146,9 @@ const readParagraphAttrs = (node) => {
 	optionalString(attrs, "textId", "paragraph.attrs.textId", issues);
 	optionalOneOf(attrs, "alignment", "paragraph.attrs.alignment", issues, PARAGRAPH_ALIGNMENT_VALUES);
 	optionalString(attrs, "styleId", "paragraph.attrs.styleId", issues);
+	optionalBoolean(attrs, "kinsoku", "paragraph.attrs.kinsoku", issues);
+	optionalBoolean(attrs, "overflowPunctuation", "paragraph.attrs.overflowPunctuation", issues);
+	optionalBoolean(attrs, "suppressAutoHyphens", "paragraph.attrs.suppressAutoHyphens", issues);
 	optionalNumber(attrs, "spaceBefore", "paragraph.attrs.spaceBefore", issues);
 	optionalNumber(attrs, "spaceAfter", "paragraph.attrs.spaceAfter", issues);
 	optionalNumber(attrs, "lineSpacing", "paragraph.attrs.lineSpacing", issues);
@@ -156,6 +165,12 @@ const readParagraphAttrs = (node) => {
 	optionalBoolean(attrs, "listMarkerHidden", "paragraph.attrs.listMarkerHidden", issues);
 	optionalString(attrs, "listMarkerFontFamily", "paragraph.attrs.listMarkerFontFamily", issues);
 	optionalNumber(attrs, "listMarkerFontSize", "paragraph.attrs.listMarkerFontSize", issues);
+	optionalBoolean(attrs, "listMarkerBold", "paragraph.attrs.listMarkerBold", issues);
+	optionalOneOf(attrs, "listMarkerAlignment", "paragraph.attrs.listMarkerAlignment", issues, [
+		"left",
+		"center",
+		"right"
+	]);
 	optionalString(attrs, "listMarkerSuffix", "paragraph.attrs.listMarkerSuffix", issues);
 	optionalBoolean(attrs, "listMarkerAllCaps", "paragraph.attrs.listMarkerAllCaps", issues);
 	optionalNumber(attrs, "listImplicitChildLevelAdvances", "paragraph.attrs.listImplicitChildLevelAdvances", issues);
@@ -254,13 +269,16 @@ const readTableCellAttrs = (node) => {
 	optionalOneOf(attrs, "widthType", "tableCell.attrs.widthType", issues, TABLE_WIDTH_TYPE_VALUES);
 	optionalOneOf(attrs, "verticalAlign", "tableCell.attrs.verticalAlign", issues, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES);
 	optionalString(attrs, "backgroundColor", "tableCell.attrs.backgroundColor", issues);
+	optionalString(attrs, "_resolvedBackgroundColor", "tableCell.attrs._resolvedBackgroundColor", issues);
 	optionalOneOf(attrs, "textDirection", "tableCell.attrs.textDirection", issues, TABLE_CELL_TEXT_DIRECTION_VALUES);
 	optionalBoolean(attrs, "noWrap", "tableCell.attrs.noWrap", issues);
 	optionalBorderMap(attrs, "borders", "tableCell.attrs.borders", issues, [
 		"top",
 		"bottom",
 		"left",
-		"right"
+		"right",
+		"topLeftToBottomRight",
+		"topRightToBottomLeft"
 	]);
 	optionalInsetMap(attrs, "margins", "tableCell.attrs.margins", issues);
 	optionalRecord(attrs, "_originalFormatting", "tableCell.attrs._originalFormatting", issues);
@@ -294,6 +312,7 @@ const readImageAttrs = (node) => {
 	optionalOneOf(attrs, "wrapText", "image.attrs.wrapText", issues, IMAGE_WRAP_TEXT_VALUES);
 	optionalString(attrs, "hlinkHref", "image.attrs.hlinkHref", issues);
 	optionalString(attrs, "_docxRawXml", "image.attrs._docxRawXml", issues);
+	optionalBoolean(attrs, "_docxObjectPreview", "image.attrs._docxObjectPreview", issues);
 	return attrsResult(attrs, issues);
 };
 const expectImageAttrs = (node) => expectCachedNodeAttrs(node, imageAttrsCache, readImageAttrs, "image attrs");
@@ -410,6 +429,7 @@ const readTextBoxAttrs = (node) => {
 	expectNodeType(node, "textBox", issues);
 	optionalNumber(attrs, "width", "textBox.attrs.width", issues);
 	optionalNumber(attrs, "height", "textBox.attrs.height", issues);
+	optionalOneOf(attrs, "autoFit", "textBox.attrs.autoFit", issues, TEXT_BOX_AUTO_FIT_VALUES);
 	optionalString(attrs, "textBoxId", "textBox.attrs.textBoxId", issues);
 	optionalString(attrs, "fillColor", "textBox.attrs.fillColor", issues);
 	optionalNumber(attrs, "outlineWidth", "textBox.attrs.outlineWidth", issues);
@@ -509,6 +529,16 @@ const readFontFamilyMarkAttrs = (mark) => {
 	return attrsResult(attrs, issues);
 };
 const expectFontFamilyMarkAttrs = (mark) => expectCachedMarkAttrs(mark, fontFamilyAttrsCache, readFontFamilyMarkAttrs, "font family attrs");
+const readLanguageMarkAttrs = (mark) => {
+	const attrs = attrsRecord(mark.attrs);
+	const issues = [];
+	expectMarkType(mark, "language", issues);
+	optionalString(attrs, "val", "language.attrs.val", issues);
+	optionalString(attrs, "eastAsia", "language.attrs.eastAsia", issues);
+	optionalString(attrs, "bidi", "language.attrs.bidi", issues);
+	return attrsResult(attrs, issues);
+};
+const expectLanguageMarkAttrs = (mark) => expectCachedMarkAttrs(mark, languageAttrsCache, readLanguageMarkAttrs, "language attrs");
 const readCharacterSpacingMarkAttrs = (mark) => {
 	const attrs = attrsRecord(mark.attrs);
 	const issues = [];
@@ -1218,4 +1248,4 @@ const optionalEmptyHyperlinkArray = (value, issues) => {
 	}
 };
 //#endregion
-export { 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, mergeImageAttrs, mergeParagraphAttrs, mergeTableAttrs, mergeTableCellAttrs, mergeTableRowAttrs, readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readMathAttrs, readParagraphAttrs, readRunFormattingOverrideMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs };
+export { 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, mergeImageAttrs, mergeParagraphAttrs, mergeTableAttrs, mergeTableCellAttrs, mergeTableRowAttrs, readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readLanguageMarkAttrs, readMathAttrs, readParagraphAttrs, readRunFormattingOverrideMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs };

package/dist/prosemirror/commands/propertyChangeScope.js

@@ -1,5 +1,5 @@
-import { directionFromBidi } from "../paragraphDirection.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
+import { directionFromBidi } from "../paragraphDirection.js";
 //#region src/prosemirror/commands/propertyChangeScope.ts
 /**
 * Paragraph attrs governed by a `w:pPrChange` — the attrs

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,8 @@ 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 },
 		...attrs.listImplicitChildLevelAdvances != null && { implicitChildLevelAdvances: attrs.listImplicitChildLevelAdvances },
@@ -342,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);
@@ -351,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;
@@ -375,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;
 }
 /**
@@ -450,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) {
@@ -491,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 {
@@ -564,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 {
@@ -857,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) {
@@ -1072,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;
@@ -1452,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 };
@@ -1470,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;
@@ -1479,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";
@@ -1489,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;
@@ -1516,6 +1532,7 @@ function convertPMTextBox(node) {
 				type: "paragraph",
 				content: []
 			}],
+			...attrs.autoFit !== void 0 ? { autoFit: attrs.autoFit } : {},
 			margins: (() => {
 				const m = {};
 				if (typeof attrs.marginTop === "number") m.top = pixelsToEmu(attrs.marginTop);

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,8 @@ 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;
 	if (paragraph.listRendering?.implicitChildLevelAdvances !== void 0) attrs.listImplicitChildLevelAdvances = paragraph.listRendering.implicitChildLevelAdvances;
@@ -259,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;
-		set("indentLeft", formatting?.indentLeft ?? stylePpr?.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);
-		const styleFirstLine = formatting?.numPr?.numId === 0 && stylePpr?.numPr !== void 0 && stylePpr.numPr.numId !== 0 ? void 0 : stylePpr;
-		set("indentFirstLine", formatting?.indentFirstLine ?? styleFirstLine?.indentFirstLine);
-		set("hangingIndent", formatting?.hangingIndent ?? styleFirstLine?.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);
@@ -294,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);
@@ -301,7 +319,7 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 		set("runInWithNext", formatting?.runInWithNext);
 		set("outlineLevel", formatting?.outlineLevel);
 		set("direction", directionFromBidi(formatting?.bidi));
-		set("defaultTextFormatting", resolveTextFormatting(formatting?.runProperties, styleResolver));
+		set("defaultTextFormatting", stripParagraphMarkOnlyFormatting(resolveTextFormatting(formatting?.runProperties, styleResolver) ?? {}));
 	}
 	if (paragraph.sectionProperties) {
 		attrs._sectionProperties = paragraph.sectionProperties;
@@ -401,33 +419,39 @@ function hasDirectRunFormatting(formatting) {
 	return Object.entries(formatting).some(([key, value]) => key !== "styleId" && value !== void 0);
 }
 function stripParagraphMarkOnlyFormatting(formatting) {
-	const { allCaps: _ac, highlight: _h, shading: _s, smallCaps: _sc, ...rest } = 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)) ?? {};
-	suppressBooleanParagraphMark(result, paragraphMark, direct, "bold");
-	suppressBooleanParagraphMark(result, paragraphMark, direct, "italic");
-	suppressBooleanParagraphMark(result, paragraphMark, direct, "strike");
-	suppressBooleanParagraphMark(result, paragraphMark, direct, "doubleStrike");
-	suppressBooleanParagraphMark(result, paragraphMark, direct, "allCaps");
-	suppressBooleanParagraphMark(result, paragraphMark, direct, "smallCaps");
-	suppressBooleanParagraphMark(result, paragraphMark, direct, "hidden");
-	suppressBooleanParagraphMark(result, paragraphMark, direct, "emboss");
-	suppressBooleanParagraphMark(result, paragraphMark, direct, "imprint");
-	suppressBooleanParagraphMark(result, paragraphMark, direct, "shadow");
-	suppressBooleanParagraphMark(result, paragraphMark, direct, "outline");
-	suppressBooleanParagraphMark(result, paragraphMark, direct, "rtl");
+	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "bold");
+	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "italic");
+	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "strike");
+	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "doubleStrike");
+	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "allCaps");
+	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "smallCaps");
+	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "hidden");
+	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "emboss");
+	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "imprint");
+	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "shadow");
+	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "outline");
+	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "rtl");
 	if (paragraphMark.fontSize !== void 0 && direct?.fontSize === void 0 && base?.fontSize !== void 0) result.fontSize = base.fontSize;
 	if (paragraphMark.fontSizeCs !== void 0 && direct?.fontSizeCs === void 0 && base?.fontSizeCs !== void 0) result.fontSizeCs = base.fontSizeCs;
 	if (paragraphMark.underline !== void 0 && direct?.underline === void 0) result.underline = { style: "none" };
 	if (paragraphMark.spacing !== void 0 && direct?.spacing === void 0) result.spacing = 0;
 	return Object.keys(result).length > 0 ? result : void 0;
 }
-function suppressBooleanParagraphMark(result, paragraphMark, direct, key) {
+function suppressBooleanParagraphMark(result, base, paragraphMark, direct, key) {
 	if (paragraphMark[key] === void 0 || direct?.[key] !== void 0) return;
-	result[key] = false;
+	result[key] = base?.[key] ?? false;
 }
 function resolveTextFormatting(formatting, styleResolver) {
 	if (!formatting) return styleResolver?.resolveRunStyle(null);
@@ -456,7 +480,7 @@ function calculateRowSpans(table) {
 			clearActiveVerticalMerges(activeMerges, result);
 			continue;
 		}
-		let colIndex = 0;
+		let colIndex = row.formatting?.gridBefore ?? 0;
 		const rowCells = row.cells.map((cell) => {
 			const colspan = cell.formatting?.gridSpan ?? 1;
 			const vMerge = cell.formatting?.vMerge;
@@ -616,8 +640,9 @@ function convertTable(table, styleResolver, context) {
 function countTableColumns(rows) {
 	let maxColumns = 0;
 	for (const row of rows) {
-		let rowColumns = 0;
+		let rowColumns = row.formatting?.gridBefore ?? 0;
 		for (const cell of row.cells) rowColumns += cell.formatting?.gridSpan ?? 1;
+		rowColumns += row.formatting?.gridAfter ?? 0;
 		maxColumns = Math.max(maxColumns, rowColumns);
 	}
 	return maxColumns;
@@ -651,7 +676,7 @@ function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths,
 		if (totalCols > 1) fallback.formatting = { gridSpan: totalCols };
 		effectiveCells = [fallback];
 	}
-	let colIndex = 0;
+	let colIndex = row.formatting?.gridBefore ?? 0;
 	const cells = [];
 	for (const cellIndex_item of effectiveCells) {
 		const cell = cellIndex_item;
@@ -710,7 +735,9 @@ const TABLE_BORDER_SIDES = [
 	"left",
 	"right",
 	"insideH",
-	"insideV"
+	"insideV",
+	"topLeftToBottomRight",
+	"topRightToBottomLeft"
 ];
 function resolveThemedBorderColors(borders, theme) {
 	if (!borders || !theme?.colorScheme) return borders;
@@ -739,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,
@@ -770,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;
@@ -849,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);
 	}
@@ -1045,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)
 	});
 }
 /**
@@ -1106,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"));
@@ -1264,6 +1298,7 @@ function extractTextBoxesFromParagraph(paragraph) {
 				if (shape.fill) textBox.fill = shape.fill;
 				if (shape.outline) textBox.outline = shape.outline;
 				if (shape.textBody.margins) textBox.margins = shape.textBody.margins;
+				if (shape.textBody.autoFit) textBox.autoFit = shape.textBody.autoFit;
 				textBoxes.push(textBox);
 			}
 		}
@@ -1332,6 +1367,7 @@ function convertTextBox(textBox, styleResolver, options = {}) {
 	return schema.node("textBox", {
 		width: widthPx,
 		height: heightPx,
+		autoFit: textBox.autoFit,
 		textBoxId: textBox.id,
 		fillColor,
 		outlineWidth,

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,8 @@ const paragraphNodeSpec = {
 		listMarkerHidden: { default: null },
 		listMarkerFontFamily: { default: null },
 		listMarkerFontSize: { default: null },
+		listMarkerBold: { default: null },
+		listMarkerAlignment: { default: null },
 		listMarkerSuffix: { default: null },
 		listMarkerAllCaps: { default: null },
 		listImplicitChildLevelAdvances: { default: null },
@@ -213,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,8 @@ const LIST_FORMATTING_ATTRS = [
 	"listMarkerHidden",
 	"listMarkerFontFamily",
 	"listMarkerFontSize",
+	"listMarkerBold",
+	"listMarkerAlignment",
 	"listMarkerSuffix",
 	"listLevelNumFmts",
 	"listLevelStarts",