@stll/folio-core 0.8.0 → 0.10.0

package/dist/layout-painter/renderTable.js

@@ -1,8 +1,12 @@
 import { emuToPixels } from "../utils/units.js";
 import { getTableRowLeadingWidth, isFloatingImageRun, isFloatingTextBoxBlock, tableColumnsArePinned } from "../layout-engine/types.js";
 import { measureParagraph } from "../layout-engine/measure/measureParagraph.js";
+import { resolveAnchoredImagePosition } from "./anchoredImagePosition.js";
+import { applyImageVisualAttrs, hasImageCrop, hasImageVisualAttrs } from "./renderImage.js";
+import { borderStrokeToCss, resolveCssBorderStroke } from "./borderStroke.js";
 import { getAutomaticTextColorForBackground } from "./documentColors.js";
 import { renderParagraphFragment } from "./renderParagraph.js";
+import { createTableCellFlowState, finishTableCellFlow, placeTableCellBlock } from "../layout-engine/measure/tableCellFlow.js";
 import { buildTableCellFloatingZones, getTableCellContentWidth, getTableCellFloatingImages } from "../layout-engine/measure/tableCellFloating.js";
 import { renderTextBoxFragment } from "./renderTextBox.js";
 //#region src/layout-painter/renderTable.ts
@@ -28,13 +32,21 @@ const TABLE_CLASS_NAMES = {
 	tableEdgeHandleBottom: "layout-table-edge-handle-bottom",
 	tableEdgeHandleRight: "layout-table-edge-handle-right"
 };
-function renderCellContent(cell, cellMeasure, context, doc) {
+const CELL_DIAGONAL_BORDER_CLASS = "layout-table-cell-diagonal-border";
+function renderCellContent({ cell, cellMeasure, context, doc, contentWidthOverride, pageContentPosition }) {
 	const contentEl = doc.createElement("div");
 	contentEl.className = TABLE_CLASS_NAMES.cellContent;
 	contentEl.style.position = "relative";
-	const contentWidth = getTableCellContentWidth(cell, cellMeasure);
+	const contentWidth = contentWidthOverride ?? getTableCellContentWidth(cell, cellMeasure);
 	contentEl.style.width = `${contentWidth}px`;
-	const cellFloatingImages = getTableCellFloatingImages(cell, cellMeasure, contentWidth);
+	const cellFloatingImages = getTableCellFloatingImages(cell, cellMeasure, contentWidth, pageContentPosition ? (run, paragraphY) => {
+		const position = resolveAnchoredImagePosition(run, pageContentPosition.y + paragraphY, pageContentPosition.geometry);
+		return {
+			x: position.x - pageContentPosition.x,
+			y: position.y - pageContentPosition.y,
+			side: position.side
+		};
+	} : void 0);
 	const floatingZones = buildTableCellFloatingZones(cellFloatingImages, contentWidth);
 	const floatingLayers = [];
 	if (cellFloatingImages.length > 0) {
@@ -62,14 +74,24 @@ function renderCellContent(cell, cellMeasure, context, doc) {
 			imgEl.style.width = `${img.width}px`;
 			imgEl.style.height = `${img.height}px`;
 			imgEl.style.display = "block";
+			imgEl.style.maxWidth = "none";
+			imgEl.style.maxHeight = "none";
 			if (img.alt) imgEl.alt = img.alt;
 			if (img.transform) imgEl.style.transform = img.transform;
+			if (hasImageVisualAttrs(img)) {
+				if (hasImageCrop(img)) {
+					imgContainer.style.width = `${img.width}px`;
+					imgContainer.style.height = `${img.height}px`;
+					imgContainer.style.overflow = "hidden";
+				}
+				applyImageVisualAttrs(imgEl, img);
+			}
 			imgContainer.append(imgEl);
 			floatingLayer.append(imgContainer);
 		}
 		floatingLayers.push(floatingLayer);
 	}
-	let cumulativeY = 0;
+	const flowState = createTableCellFlowState();
 	let anchorParagraphY = 0;
 	let floatingTextBoxesLayer;
 	for (let i = 0; i < cell.blocks.length; i++) {
@@ -78,17 +100,18 @@ function renderCellContent(cell, cellMeasure, context, doc) {
 		if (block?.kind === "paragraph" && measure?.kind === "paragraph") {
 			const paragraphBlock = block;
 			let paragraphMeasure = measure;
-			if (floatingZones.length > 0) paragraphMeasure = measureParagraph(paragraphBlock, contentWidth, {
+			if (floatingZones.length > 0 || contentWidthOverride !== void 0) paragraphMeasure = measureParagraph(paragraphBlock, contentWidth, {
 				floatingZones,
-				paragraphYOffset: cumulativeY
+				paragraphYOffset: placeTableCellBlock({ ...flowState }, paragraphBlock, paragraphMeasure).contentTop
 			});
+			const placement = placeTableCellBlock(flowState, paragraphBlock, paragraphMeasure);
 			const syntheticFragment = {
 				kind: "paragraph",
 				blockId: paragraphBlock.id,
 				x: 0,
 				y: 0,
 				width: contentWidth,
-				height: paragraphMeasure.totalHeight,
+				height: placement.contentHeight,
 				fromLine: 0,
 				toLine: paragraphMeasure.lines.length,
 				...paragraphBlock.pmStart !== void 0 ? { pmStart: paragraphBlock.pmStart } : {},
@@ -101,18 +124,23 @@ function renderCellContent(cell, cellMeasure, context, doc) {
 			const fragEl = renderParagraphFragment(syntheticFragment, paragraphBlock, paragraphMeasure, cellContext, { document: doc });
 			fragEl.style.position = "relative";
 			fragEl.style.boxSizing = "border-box";
-			fragEl.style.height = `${paragraphMeasure.totalHeight}px`;
-			const spaceBefore = paragraphBlock.attrs?.spacing?.before ?? 0;
-			if (spaceBefore > 0) fragEl.style.paddingTop = `${spaceBefore}px`;
+			fragEl.style.height = `${placement.leadingSpacing + placement.contentHeight}px`;
+			if (placement.leadingSpacing > 0) fragEl.style.paddingTop = `${placement.leadingSpacing}px`;
 			contentEl.append(fragEl);
-			anchorParagraphY = cumulativeY;
-			cumulativeY += paragraphMeasure.totalHeight;
+			anchorParagraphY = placement.contentTop;
 		} else if (block?.kind === "table" && measure?.kind === "table") {
-			const nestedTableEl = renderNestedTable(block, measure, context, doc);
+			const tableBlock = block;
+			const tableMeasure = measure;
+			const nestedTableEl = renderNestedTable(tableBlock, tableMeasure, context, doc);
 			nestedTableEl.style.position = "relative";
+			const placement = placeTableCellBlock(flowState, tableBlock, tableMeasure);
+			if (placement.leadingSpacing > 0) {
+				const spacer = doc.createElement("div");
+				spacer.style.height = `${placement.leadingSpacing}px`;
+				contentEl.append(spacer);
+			}
 			contentEl.append(nestedTableEl);
-			cumulativeY += measure.totalHeight;
-			anchorParagraphY = cumulativeY;
+			anchorParagraphY = flowState.height;
 		} else if (block?.kind === "textBox" && measure?.kind === "textBox") {
 			const textBoxBlock = block;
 			const textBoxMeasure = measure;
@@ -137,14 +165,20 @@ function renderCellContent(cell, cellMeasure, context, doc) {
 				floatingTextBoxesLayer.append(textBoxEl);
 				continue;
 			}
+			const placement = placeTableCellBlock(flowState, textBoxBlock, textBoxMeasure);
+			if (placement.leadingSpacing > 0) {
+				const spacer = doc.createElement("div");
+				spacer.style.height = `${placement.leadingSpacing}px`;
+				contentEl.append(spacer);
+			}
 			textBoxEl.style.position = "relative";
 			textBoxEl.style.left = "0";
 			textBoxEl.style.top = "0";
 			contentEl.append(textBoxEl);
-			cumulativeY += textBoxMeasure.height;
-			anchorParagraphY = cumulativeY;
+			anchorParagraphY = flowState.height;
 		}
 	}
+	contentEl.style.height = `${finishTableCellFlow(flowState)}px`;
 	if (floatingTextBoxesLayer) floatingLayers.push(floatingTextBoxesLayer);
 	return {
 		content: contentEl,
@@ -217,7 +251,21 @@ function renderNestedTable(block, measure, context, doc) {
 			y += rowMeasure.height;
 			continue;
 		}
-		const rowEl = renderTableRow(row, rowMeasure, rowIndex, y, measure.columnWidths, block.rows.length, context, doc, spanningCells, rowYPositions, void 0, block.bidi, columnsPinned, cellGrid);
+		const rowEl = renderTableRow({
+			row,
+			rowMeasure,
+			rowIndex,
+			y,
+			columnWidths: measure.columnWidths,
+			totalRows: block.rows.length,
+			context,
+			doc,
+			spanningCells,
+			rowYPositions,
+			bidi: block.bidi === true,
+			columnsPinned,
+			cellGrid
+		});
 		tableEl.append(rowEl);
 		y += rowMeasure.height;
 	}
@@ -229,18 +277,46 @@ function renderNestedTable(block, measure, context, doc) {
 */
 function applyBorder(el, side, border) {
 	const styleProp = `border${side.charAt(0).toUpperCase() + side.slice(1)}`;
-	if (!border || border.style === "none" || border.style === "nil" || border.width === 0) el.style[styleProp] = "none";
-	else {
-		const width = border.width ?? 1;
-		const color = border.color ?? "#000000";
-		const style = border.style ?? "solid";
-		el.style[styleProp] = `${width}px ${style} ${color}`;
+	if (!border || border.style === "none" || border.style === "nil") el.style[styleProp] = "none";
+	else el.style[styleProp] = borderStrokeToCss(border);
+}
+function renderCellDiagonalBorder({ border, direction, cellWidth, cellHeight, doc }) {
+	if (!hasVisibleBorder(border)) return null;
+	const line = doc.createElement("div");
+	const stroke = resolveCssBorderStroke(border ?? {});
+	const strokeWidth = stroke.width;
+	const color = stroke.color;
+	const length = Math.hypot(cellWidth, cellHeight);
+	const angle = Math.atan2(cellHeight, cellWidth);
+	line.className = CELL_DIAGONAL_BORDER_CLASS;
+	line.dataset["direction"] = direction;
+	line.style.position = "absolute";
+	line.style.left = "0";
+	line.style.top = direction === "top-left-to-bottom-right" ? `${-strokeWidth / 2}px` : `${cellHeight - strokeWidth / 2}px`;
+	line.style.width = `${length}px`;
+	line.style.height = `${strokeWidth}px`;
+	line.style.transformOrigin = "0 50%";
+	line.style.transform = `rotate(${direction === "top-left-to-bottom-right" ? angle : -angle}rad)`;
+	line.style.pointerEvents = "none";
+	line.style.zIndex = "1";
+	switch (border?.style) {
+		case "dashed":
+			line.style.backgroundImage = `repeating-linear-gradient(to right, ${color} 0, ${color} ${strokeWidth * 3}px, transparent ${strokeWidth * 3}px, transparent ${strokeWidth * 5}px)`;
+			break;
+		case "dotted":
+			line.style.backgroundImage = `radial-gradient(circle at ${strokeWidth / 2}px 50%, ${color} ${strokeWidth / 2}px, transparent ${strokeWidth / 2}px)`;
+			line.style.backgroundSize = `${strokeWidth * 2}px ${strokeWidth}px`;
+			break;
+		case "double":
+			line.style.backgroundImage = `linear-gradient(to bottom, ${color} 0, ${color} 33%, transparent 33%, transparent 67%, ${color} 67%, ${color} 100%)`;
+			break;
+		default:
+			line.style.backgroundColor = color;
+			break;
 	}
+	return line;
 }
-/**
-* Render a single table cell
-*/
-function renderTableCell(cell, cellMeasure, x, rowHeight, borderFlags, columnsPinned, context, doc) {
+function renderTableCell({ cell, cellMeasure, x, rowHeight, borderFlags, columnsPinned, context, doc, contentClip, pageContentPosition }) {
 	const cellEl = doc.createElement("div");
 	cellEl.className = TABLE_CLASS_NAMES.cell;
 	cellEl.style.position = "absolute";
@@ -283,13 +359,55 @@ function renderTableCell(cell, cellMeasure, x, rowHeight, borderFlags, columnsPi
 			default: break;
 		}
 	}
-	const renderedContent = renderCellContent(cell, cellMeasure, context, doc);
+	const contentWidthOverride = cell.textDirection === "btLr" ? Math.max(1, rowHeight - padTop - padBottom) : void 0;
+	const renderedContent = renderCellContent({
+		cell,
+		cellMeasure,
+		context,
+		doc,
+		...contentWidthOverride !== void 0 ? { contentWidthOverride } : {},
+		...pageContentPosition ? { pageContentPosition: {
+			geometry: pageContentPosition.geometry,
+			x: pageContentPosition.x + padLeft,
+			y: pageContentPosition.y + padTop
+		} } : {}
+	});
+	if (cell.textDirection === "btLr") {
+		renderedContent.content.style.position = "absolute";
+		renderedContent.content.style.left = "50%";
+		renderedContent.content.style.top = "50%";
+		renderedContent.content.style.transform = "translate(-50%, -50%) rotate(-90deg)";
+	}
 	if (renderedContent.floatingLayers.length > 0) {
 		renderedContent.content.style.height = "100%";
 		renderedContent.content.style.overflow = "hidden";
 		cellEl.style.overflow = "visible";
 	}
+	if (contentClip) {
+		const contentHeight = Math.max(0, rowHeight - padTop - padBottom);
+		const clipTop = Math.min(contentHeight, Math.max(0, contentClip.top - padTop));
+		const clipBottom = Math.min(contentHeight, Math.max(clipTop, contentClip.bottom - padTop));
+		renderedContent.content.style.height = `${contentHeight}px`;
+		renderedContent.content.style.overflow = "hidden";
+		renderedContent.content.style.clipPath = `inset(${clipTop}px 0 ${contentHeight - clipBottom}px 0)`;
+	}
 	cellEl.append(renderedContent.content);
+	const topLeftToBottomRight = renderCellDiagonalBorder({
+		border: cell.borders?.topLeftToBottomRight,
+		direction: "top-left-to-bottom-right",
+		cellWidth: cellMeasure.width,
+		cellHeight: rowHeight,
+		doc
+	});
+	if (topLeftToBottomRight) cellEl.append(topLeftToBottomRight);
+	const topRightToBottomLeft = renderCellDiagonalBorder({
+		border: cell.borders?.topRightToBottomLeft,
+		direction: "top-right-to-bottom-left",
+		cellWidth: cellMeasure.width,
+		cellHeight: rowHeight,
+		doc
+	});
+	if (topRightToBottomLeft) cellEl.append(topRightToBottomLeft);
 	for (const floatingLayer of renderedContent.floatingLayers) {
 		floatingLayer.style.left = `${padLeft}px`;
 		floatingLayer.style.top = `${padTop}px`;
@@ -323,11 +441,8 @@ function buildTableCellGrid(block, columnCount) {
 	}
 	return grid;
 }
-const hasVisibleBorder = (border) => border !== void 0 && border.width !== 0 && border.style !== "none" && border.style !== "nil";
-/**
-* Render a table row with rowSpan support
-*/
-function renderTableRow(row, rowMeasure, rowIndex, y, columnWidths, totalRows, context, doc, spanningCells, rowYPositions, isFirstRowInFragment, bidi = false, columnsPinned = false, cellGrid) {
+const hasVisibleBorder = (border) => border !== void 0 && border.style !== "none" && border.style !== "nil";
+function renderTableRow({ row, rowMeasure, rowIndex, y, columnWidths, totalRows, context, doc, spanningCells, rowYPositions, isFirstRowInFragment, bidi = false, columnsPinned = false, cellGrid, contentClip, pageContentPosition }) {
 	const rowEl = doc.createElement("div");
 	rowEl.className = TABLE_CLASS_NAMES.row;
 	const tableWidth = bidi ? columnWidths.reduce((sum, columnWidth) => sum + columnWidth, 0) : 0;
@@ -374,12 +489,27 @@ function renderTableRow(row, rowMeasure, rowIndex, y, columnWidths, totalRows, c
 		const leftCell = cellGrid?.get(tableCellGridKey(rowIndex, leftNeighborColumn));
 		const drawTop = isFirstRow || !hasVisibleBorder(aboveCell?.borders?.bottom);
 		const drawLeft = isFirstCol || !hasVisibleBorder(leftCell?.borders?.right);
-		const cellEl = renderTableCell(cell, cellMeasure, cellLeft, cellHeight, {
-			drawTop,
-			isLastRow,
-			drawLeft,
-			isLastCol
-		}, columnsPinned, context, doc);
+		const cellEl = renderTableCell({
+			cell,
+			cellMeasure,
+			x: cellLeft,
+			rowHeight: cellHeight,
+			borderFlags: {
+				drawTop,
+				isLastRow,
+				drawLeft,
+				isLastCol
+			},
+			columnsPinned,
+			context,
+			doc,
+			...contentClip ? { contentClip } : {},
+			...pageContentPosition ? { pageContentPosition: {
+				geometry: pageContentPosition.geometry,
+				x: pageContentPosition.x + cellLeft,
+				y: pageContentPosition.y
+			} } : {}
+		});
 		cellEl.dataset["cellIndex"] = String(cellIndex);
 		cellEl.dataset["columnIndex"] = String(columnIndex);
 		if (rowSpan > 1) cellEl.dataset["rowSpan"] = String(rowSpan);
@@ -418,6 +548,11 @@ function renderTableRow(row, rowMeasure, rowIndex, y, columnWidths, totalRows, c
 */
 function renderTableFragment(fragment, block, measure, context, options = {}) {
 	const doc = options.document ?? document;
+	const tablePageContentPosition = options.pageGeometry ? {
+		geometry: options.pageGeometry,
+		x: fragment.x - options.pageGeometry.marginLeft,
+		y: fragment.y - options.pageGeometry.marginTop
+	} : void 0;
 	const tableEl = doc.createElement("div");
 	tableEl.className = TABLE_CLASS_NAMES.table;
 	tableEl.style.position = "absolute";
@@ -469,7 +604,26 @@ function renderTableFragment(fragment, block, measure, context, options = {}) {
 			y += hdrRowMeasure.height;
 			continue;
 		}
-		const rowEl = renderTableRow(hdrRow, hdrRowMeasure, hdrIdx, y, measure.columnWidths, block.rows.length, context, doc, spanningCells, rowYPositions, hdrIdx === 0, block.bidi, columnsPinned, cellGrid);
+		const rowEl = renderTableRow({
+			row: hdrRow,
+			rowMeasure: hdrRowMeasure,
+			rowIndex: hdrIdx,
+			y,
+			columnWidths: measure.columnWidths,
+			totalRows: block.rows.length,
+			context,
+			doc,
+			spanningCells,
+			rowYPositions,
+			isFirstRowInFragment: hdrIdx === 0,
+			bidi: block.bidi === true,
+			columnsPinned,
+			cellGrid,
+			...tablePageContentPosition ? { pageContentPosition: {
+				...tablePageContentPosition,
+				y: tablePageContentPosition.y + y
+			} } : {}
+		});
 		rowEl.dataset["repeatedHeader"] = "true";
 		tableEl.append(rowEl);
 		y += hdrRowMeasure.height;
@@ -496,8 +650,34 @@ function renderTableFragment(fragment, block, measure, context, options = {}) {
 			y += rowMeasure.height;
 			continue;
 		}
-		const isFirstRowInFragment = headerRowCount > 0 && fragment.continuesFromPrev ? false : fragment.continuesFromPrev && rowIndex === fragment.fromRow;
-		const rowEl = renderTableRow(row, rowMeasure, rowIndex, y, measure.columnWidths, block.rows.length, context, doc, spanningCells, rowYPositions, isFirstRowInFragment, block.bidi, columnsPinned, cellGrid);
+		const isFirstRowInFragment = headerRowCount > 0 && fragment.continuesFromPrev ? false : fragment.continuesFromPrev === true && rowIndex === fragment.fromRow;
+		const rowTopClip = rowIndex === fragment.fromRow ? fragment.topClip : void 0;
+		const rowBottomClip = rowIndex === fragment.toRow - 1 ? fragment.bottomClip : void 0;
+		const contentClip = rowTopClip !== void 0 || rowBottomClip !== void 0 ? {
+			top: rowTopClip ?? 0,
+			bottom: rowBottomClip ?? rowMeasure.height
+		} : void 0;
+		const rowEl = renderTableRow({
+			row,
+			rowMeasure,
+			rowIndex,
+			y,
+			columnWidths: measure.columnWidths,
+			totalRows: block.rows.length,
+			context,
+			doc,
+			spanningCells,
+			rowYPositions,
+			isFirstRowInFragment,
+			bidi: block.bidi === true,
+			columnsPinned,
+			cellGrid,
+			...contentClip ? { contentClip } : {},
+			...tablePageContentPosition ? { pageContentPosition: {
+				...tablePageContentPosition,
+				y: tablePageContentPosition.y + y
+			} } : {}
+		});
 		contentParent.append(rowEl);
 		y += rowMeasure.height;
 	}

package/dist/managers/DocumentLoaderManager.d.ts

@@ -1,6 +1,6 @@
 import { document_d_exports } from "../types/document.js";
-import { DocxCompatibility } from "../docx/compatibility.js";
 import { DocxInput } from "../utils/docxInput.js";
+import { DocxCompatibility } from "../docx/compatibility.js";
 
 //#region src/managers/DocumentLoaderManager.d.ts
 type DocumentLoadState = {

package/dist/managers/DocumentLoaderManager.js

@@ -1,7 +1,7 @@
-import { inspectDocxCompatibility } from "../docx/compatibility.js";
-import { resetAuthorColors } from "../utils/authorColors.js";
 import { loadFontsWithMapping } from "../utils/fontLoader.js";
 import { parseDocx } from "../docx/parser.js";
+import { inspectDocxCompatibility } from "../docx/compatibility.js";
+import { resetAuthorColors } from "../utils/authorColors.js";
 import { recordDocumentLoadPhase } from "../layout-engine/layoutInstrumentation.js";
 //#region src/managers/DocumentLoaderManager.ts
 /**

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

@@ -1,5 +1,5 @@
 import { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, MathAttrs, ParagraphAttrs, SdtAttrs, ShapeAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAttrs } from "../schema/nodes.js";
-import { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, RunFormattingOverrideAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, UnderlineAttrs } from "../schema/marks.js";
+import { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, LanguageAttrs, RunFormattingOverrideAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, UnderlineAttrs } from "../schema/marks.js";
 import { Mark, Node } from "prosemirror-model";
 
 //#region src/prosemirror/attrs/index.d.ts
@@ -54,6 +54,8 @@ declare const readFontSizeMarkAttrs: (mark: Mark) => ReadProseMirrorAttrsResult<
 declare const expectFontSizeMarkAttrs: (mark: Mark) => FontSizeAttrs;
 declare const readFontFamilyMarkAttrs: (mark: Mark) => ReadProseMirrorAttrsResult<FontFamilyAttrs>;
 declare const expectFontFamilyMarkAttrs: (mark: Mark) => FontFamilyAttrs;
+declare const readLanguageMarkAttrs: (mark: Mark) => ReadProseMirrorAttrsResult<LanguageAttrs>;
+declare const expectLanguageMarkAttrs: (mark: Mark) => LanguageAttrs;
 declare const readCharacterSpacingMarkAttrs: (mark: Mark) => ReadProseMirrorAttrsResult<CharacterSpacingAttrs>;
 declare const expectCharacterSpacingMarkAttrs: (mark: Mark) => CharacterSpacingAttrs;
 declare const readEmphasisMarkAttrs: (mark: Mark) => ReadProseMirrorAttrsResult<EmphasisMarkAttrs>;
@@ -77,4 +79,4 @@ declare const mergeTableAttrs: (node: Node, patch: NodeAttrPatch<TableAttrs>) =>
 declare const mergeTableRowAttrs: (node: Node, patch: NodeAttrPatch<TableRowAttrs>) => TableRowAttrs;
 declare const mergeTableCellAttrs: (node: Node, patch: NodeAttrPatch<TableCellAttrs>) => TableCellAttrs;
 //#endregion
-export { ProseMirrorAttrIssue, ReadProseMirrorAttrsResult, 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 { ProseMirrorAttrIssue, ReadProseMirrorAttrsResult, 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/attrs/index.js

@@ -128,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();
@@ -145,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);
@@ -161,6 +165,7 @@ 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",
@@ -264,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);
@@ -298,12 +306,14 @@ const readImageAttrs = (node) => {
 	optionalNumber(attrs, "distLeft", "image.attrs.distLeft", issues);
 	optionalNumber(attrs, "distRight", "image.attrs.distRight", issues);
 	optionalImagePosition(attrs, "position", "image.attrs.position", issues);
+	optionalBoolean(attrs, "layoutInCell", "image.attrs.layoutInCell", issues);
 	optionalNumber(attrs, "borderWidth", "image.attrs.borderWidth", issues);
 	optionalString(attrs, "borderColor", "image.attrs.borderColor", issues);
 	optionalString(attrs, "borderStyle", "image.attrs.borderStyle", issues);
 	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");
@@ -520,6 +530,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 = [];
@@ -1229,4 +1249,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/effectiveTableCellFormatting.d.ts

@@ -0,0 +1,62 @@
+import { document_d_exports } from "../../types/document.js";
+
+//#region src/prosemirror/conversion/effectiveTableCellFormatting.d.ts
+type TableCellMarginsAttrs = {
+  top?: number;
+  bottom?: number;
+  left?: number;
+  right?: number;
+};
+type EffectiveTableCellWidth = {
+  type: "none";
+} | {
+  type: "value";
+  source: "direct" | "grid";
+  value: number;
+  widthType: document_d_exports.TableWidthType;
+};
+type EffectiveTableCellBackground = {
+  type: "none";
+  source: "none" | "direct" | "style";
+} | {
+  type: "color";
+  source: "direct" | "style";
+  rgb: string;
+};
+type EffectiveTableCellFormatting = Readonly<{
+  width: EffectiveTableCellWidth;
+  background: EffectiveTableCellBackground;
+  borders: document_d_exports.TableCellBorders | undefined;
+  margins: TableCellMarginsAttrs | undefined;
+}>;
+type TableCellPosition = {
+  isFirstRow?: boolean;
+  isLastRow?: boolean;
+  isFirstColumn?: boolean;
+  isLastColumn?: boolean;
+};
+type ResolveEffectiveTableCellFormattingOptions = {
+  directFormatting: document_d_exports.TableCellFormatting | undefined;
+  styleFormatting: document_d_exports.TableCellFormatting | undefined;
+  tableBorders: document_d_exports.TableBorders | undefined;
+  position: TableCellPosition;
+  gridWidthPercent: number | undefined;
+  defaultMargins: TableCellMarginsAttrs | undefined;
+  theme: document_d_exports.Theme | null | undefined;
+};
+/**
+ * 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.
+ */
+declare const resolveEffectiveTableCellFormatting: ({
+  directFormatting,
+  styleFormatting,
+  tableBorders,
+  position,
+  gridWidthPercent,
+  defaultMargins,
+  theme
+}: ResolveEffectiveTableCellFormattingOptions) => EffectiveTableCellFormatting;
+//#endregion
+export { TableCellMarginsAttrs, TableCellPosition, resolveEffectiveTableCellFormatting };