@stll/folio-core 0.7.0 → 0.8.0

package/dist/layout-painter/renderTable.js

@@ -1,5 +1,5 @@
 import { emuToPixels } from "../utils/units.js";
-import { isFloatingImageRun, isFloatingTextBoxBlock, tableColumnsArePinned } from "../layout-engine/types.js";
+import { getTableRowLeadingWidth, isFloatingImageRun, isFloatingTextBoxBlock, tableColumnsArePinned } from "../layout-engine/types.js";
 import { measureParagraph } from "../layout-engine/measure/measureParagraph.js";
 import { getAutomaticTextColorForBackground } from "./documentColors.js";
 import { renderParagraphFragment } from "./renderParagraph.js";
@@ -207,6 +207,7 @@ function renderNestedTable(block, measure, context, doc) {
 	rowYPositions.push(yPos);
 	const spanningCells = /* @__PURE__ */ new Map();
 	const columnsPinned = tableColumnsArePinned(block);
+	const cellGrid = buildTableCellGrid(block, measure.columnWidths.length);
 	let y = 0;
 	for (let rowIndex = 0; rowIndex < block.rows.length; rowIndex++) {
 		const row = block.rows[rowIndex];
@@ -216,7 +217,7 @@ 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);
+		const rowEl = renderTableRow(row, rowMeasure, rowIndex, y, measure.columnWidths, block.rows.length, context, doc, spanningCells, rowYPositions, void 0, block.bidi, columnsPinned, cellGrid);
 		tableEl.append(rowEl);
 		y += rowMeasure.height;
 	}
@@ -255,10 +256,10 @@ function renderTableCell(cell, cellMeasure, x, rowHeight, borderFlags, columnsPi
 	const padLeft = cell.padding?.left ?? 7;
 	cellEl.style.padding = `${padTop}px ${padRight}px ${padBottom}px ${padLeft}px`;
 	if (cell.borders) {
-		if (borderFlags.isFirstRow) applyBorder(cellEl, "top", cell.borders.top);
+		if (borderFlags.drawTop) applyBorder(cellEl, "top", cell.borders.top);
 		applyBorder(cellEl, "right", cell.borders.right);
 		applyBorder(cellEl, "bottom", cell.borders.bottom);
-		if (borderFlags.isFirstCol) applyBorder(cellEl, "left", cell.borders.left);
+		if (borderFlags.drawLeft) applyBorder(cellEl, "left", cell.borders.left);
 	}
 	if (cell.background) {
 		cellEl.style.backgroundColor = cell.background;
@@ -303,10 +304,30 @@ function renderTableCell(cell, cellMeasure, x, rowHeight, borderFlags, columnsPi
 	}
 	return cellEl;
 }
+const tableCellGridKey = (rowIndex, columnIndex) => `${rowIndex}:${columnIndex}`;
+function buildTableCellGrid(block, columnCount) {
+	const grid = /* @__PURE__ */ new Map();
+	for (let rowIndex = 0; rowIndex < block.rows.length; rowIndex++) {
+		const row = block.rows[rowIndex];
+		if (!row) continue;
+		let columnIndex = 0;
+		for (const cell of row.cells) {
+			while (grid.has(tableCellGridKey(rowIndex, columnIndex))) columnIndex += 1;
+			const colSpan = cell.colSpan ?? 1;
+			const rowSpan = cell.rowSpan ?? 1;
+			const rowEnd = Math.min(block.rows.length, rowIndex + rowSpan);
+			const columnEnd = Math.min(columnCount, columnIndex + colSpan);
+			for (let gridRow = rowIndex; gridRow < rowEnd; gridRow++) for (let gridColumn = columnIndex; gridColumn < columnEnd; gridColumn++) grid.set(tableCellGridKey(gridRow, gridColumn), cell);
+			columnIndex += colSpan;
+		}
+	}
+	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) {
+function renderTableRow(row, rowMeasure, rowIndex, y, columnWidths, totalRows, context, doc, spanningCells, rowYPositions, isFirstRowInFragment, bidi = false, columnsPinned = false, cellGrid) {
 	const rowEl = doc.createElement("div");
 	rowEl.className = TABLE_CLASS_NAMES.row;
 	const tableWidth = bidi ? columnWidths.reduce((sum, columnWidth) => sum + columnWidth, 0) : 0;
@@ -320,8 +341,9 @@ function renderTableRow(row, rowMeasure, rowIndex, y, columnWidths, totalRows, c
 	if (spanningCells) {
 		for (const [, spanCell] of spanningCells) if (spanCell.startRow < rowIndex && spanCell.startRow + spanCell.rowSpan > rowIndex) for (let c = 0; c < spanCell.colSpan; c++) occupiedColumns.add(spanCell.columnIndex + c);
 	}
-	let x = 0;
-	let columnIndex = 0;
+	const gridBefore = row.gridBefore ?? 0;
+	let x = getTableRowLeadingWidth(row, columnWidths);
+	let columnIndex = gridBefore;
 	while (occupiedColumns.has(columnIndex)) {
 		x += columnWidths[columnIndex] ?? 0;
 		columnIndex++;
@@ -345,11 +367,18 @@ function renderTableRow(row, rowMeasure, rowIndex, y, columnWidths, totalRows, c
 		const isLastRow = rowIndex + rowSpan >= totalRows;
 		const atLogicalStart = columnIndex === 0;
 		const atLogicalEnd = columnIndex + colSpan >= columnWidths.length;
+		const isFirstCol = bidi ? atLogicalEnd : atLogicalStart;
+		const isLastCol = bidi ? atLogicalStart : atLogicalEnd;
+		const aboveCell = cellGrid?.get(tableCellGridKey(rowIndex - 1, columnIndex));
+		const leftNeighborColumn = bidi ? columnIndex + colSpan : columnIndex - 1;
+		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, {
-			isFirstRow,
+			drawTop,
 			isLastRow,
-			isFirstCol: bidi ? atLogicalEnd : atLogicalStart,
-			isLastCol: bidi ? atLogicalStart : atLogicalEnd
+			drawLeft,
+			isLastCol
 		}, columnsPinned, context, doc);
 		cellEl.dataset["cellIndex"] = String(cellIndex);
 		cellEl.dataset["columnIndex"] = String(columnIndex);
@@ -429,6 +458,7 @@ function renderTableFragment(fragment, block, measure, context, options = {}) {
 	rowYPositions.push(yPos);
 	const spanningCells = /* @__PURE__ */ new Map();
 	const columnsPinned = tableColumnsArePinned(block);
+	const cellGrid = buildTableCellGrid(block, measure.columnWidths.length);
 	const headerRowCount = fragment.headerRowCount ?? 0;
 	let y = 0;
 	if (headerRowCount > 0 && fragment.continuesFromPrev) for (let hdrIdx = 0; hdrIdx < headerRowCount; hdrIdx++) {
@@ -439,7 +469,7 @@ 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);
+		const rowEl = renderTableRow(hdrRow, hdrRowMeasure, hdrIdx, y, measure.columnWidths, block.rows.length, context, doc, spanningCells, rowYPositions, hdrIdx === 0, block.bidi, columnsPinned, cellGrid);
 		rowEl.dataset["repeatedHeader"] = "true";
 		tableEl.append(rowEl);
 		y += hdrRowMeasure.height;
@@ -467,7 +497,7 @@ function renderTableFragment(fragment, block, measure, context, options = {}) {
 			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);
+		const rowEl = renderTableRow(row, rowMeasure, rowIndex, y, measure.columnWidths, block.rows.length, context, doc, spanningCells, rowYPositions, isFirstRowInFragment, block.bidi, columnsPinned, cellGrid);
 		contentParent.append(rowEl);
 		y += rowMeasure.height;
 	}

package/dist/layout-painter/renderTextBox.js

@@ -1,5 +1,6 @@
 import { DEFAULT_TEXTBOX_MARGINS } from "../layout-engine/types.js";
 import { renderParagraphFragment } from "./renderParagraph.js";
+import { layoutTextBoxParagraphs } from "../layout-engine/measure/textBoxParagraphLayout.js";
 //#region src/layout-painter/renderTextBox.ts
 /**
 * Text Box Renderer
@@ -38,28 +39,37 @@ function renderTextBoxFragment(fragment, block, measure, context, options = {})
 	if (fragment.pmStart !== void 0) containerEl.dataset["pmStart"] = String(fragment.pmStart);
 	if (fragment.pmEnd !== void 0) containerEl.dataset["pmEnd"] = String(fragment.pmEnd);
 	const innerWidth = fragment.width - margins.left - margins.right;
-	let yOffset = 0;
+	const paragraphLayout = layoutTextBoxParagraphs(block.content, measure.innerMeasures);
 	for (let i = 0; i < block.content.length; i++) {
 		const paraBlock = block.content[i];
 		const paraMeasure = measure.innerMeasures[i];
-		if (!paraBlock || !paraMeasure) continue;
-		const paraEl = renderParagraphFragment({
+		const placement = paragraphLayout.placements[i];
+		if (!paraBlock || !paraMeasure || !placement) continue;
+		const paraFragment = {
 			kind: "paragraph",
 			blockId: paraBlock.id,
 			x: 0,
-			y: yOffset,
+			y: 0,
 			width: innerWidth,
-			height: paraMeasure.totalHeight,
+			height: placement.contentHeight,
 			...paraBlock.pmStart !== void 0 ? { pmStart: paraBlock.pmStart } : {},
 			...paraBlock.pmEnd !== void 0 ? { pmEnd: paraBlock.pmEnd } : {},
 			fromLine: 0,
 			toLine: paraMeasure.lines.length
-		}, paraBlock, paraMeasure, context, { document: doc });
+		};
+		const prevBorders = block.content[i - 1]?.attrs?.borders;
+		const nextBorders = block.content[i + 1]?.attrs?.borders;
+		const paraEl = renderParagraphFragment(paraFragment, paraBlock, paraMeasure, context, {
+			document: doc,
+			...prevBorders !== void 0 ? { prevBorders } : {},
+			...nextBorders !== void 0 ? { nextBorders } : {}
+		});
 		paraEl.style.position = "relative";
 		paraEl.style.left = "0";
 		paraEl.style.top = "0";
+		paraEl.style.height = `${placement.contentHeight}px`;
+		paraEl.style.marginTop = `${placement.leadingSpacing}px`;
 		containerEl.append(paraEl);
-		yOffset += paraMeasure.totalHeight;
 	}
 	return containerEl;
 }

package/dist/managers/DocumentLoaderManager.js

@@ -1,8 +1,8 @@
+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 { recordDocumentLoadPhase } from "../layout-engine/layoutInstrumentation.js";
-import { inspectDocxCompatibility } from "../docx/compatibility.js";
 //#region src/managers/DocumentLoaderManager.ts
 /**
 * DocumentLoaderManager

package/dist/paged-layout/sectionBlockWidths.d.ts

@@ -11,6 +11,9 @@ type PerBlockMeasureInputs = {
   widths: number[];
   marginTops: number[];
   pageHeights: number[];
+  pageWidths: number[];
+  marginLefts: number[];
+  marginRights: number[];
   marginBottoms: number[];
 };
 /**

package/dist/paged-layout/sectionBlockWidths.js

@@ -35,6 +35,9 @@ function computePerBlockMeasureInputs({ blocks, bodyConfig, finalConfig }) {
 	const widths = [];
 	const marginTops = [];
 	const pageHeights = [];
+	const pageWidths = [];
+	const marginLefts = [];
+	const marginRights = [];
 	const marginBottoms = [];
 	for (let i = 0; i < blocks.length; i++) {
 		const config = sectionConfigs[sectionIdx] ?? finalConfig;
@@ -42,6 +45,9 @@ function computePerBlockMeasureInputs({ blocks, bodyConfig, finalConfig }) {
 		widths.push(colWidth(contentWidth(config), columns, columnIndex));
 		marginTops.push(config.margins.top);
 		pageHeights.push(config.pageSize.h);
+		pageWidths.push(config.pageSize.w);
+		marginLefts.push(config.margins.left);
+		marginRights.push(config.margins.right);
 		marginBottoms.push(config.margins.bottom);
 		if (sectionIdx < breakIndices.length && i === breakIndices[sectionIdx]) {
 			sectionIdx++;
@@ -53,6 +59,9 @@ function computePerBlockMeasureInputs({ blocks, bodyConfig, finalConfig }) {
 		widths,
 		marginTops,
 		pageHeights,
+		pageWidths,
+		marginLefts,
+		marginRights,
 		marginBottoms
 	};
 }

package/dist/paged-layout/sectionGeometry.js

@@ -9,7 +9,7 @@ const DEFAULT_MARGINS = {
 	bottom: 96,
 	left: 96
 };
-const twipsToPixels = (twips) => Math.round(twips / 1440 * 96);
+const twipsToPixels = (twips) => twips / 1440 * 96;
 /**
 * Convert an offset-like twip dimension to px. Explicit 0 is meaningful for
 * page margins and header/footer distances; only absence should use fallback.

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 = [
@@ -156,6 +161,11 @@ const readParagraphAttrs = (node) => {
 	optionalBoolean(attrs, "listMarkerHidden", "paragraph.attrs.listMarkerHidden", issues);
 	optionalString(attrs, "listMarkerFontFamily", "paragraph.attrs.listMarkerFontFamily", issues);
 	optionalNumber(attrs, "listMarkerFontSize", "paragraph.attrs.listMarkerFontSize", 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);
@@ -410,6 +420,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);

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -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.listMarkerAlignment != null && { markerAlignment: attrs.listMarkerAlignment },
 		...attrs.listMarkerSuffix != null && { markerSuffix: attrs.listMarkerSuffix },
 		...attrs.listMarkerAllCaps != null && { markerAllCaps: attrs.listMarkerAllCaps },
 		...attrs.listImplicitChildLevelAdvances != null && { implicitChildLevelAdvances: attrs.listImplicitChildLevelAdvances },
@@ -1516,6 +1517,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

@@ -227,6 +227,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?.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,11 +260,11 @@ 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 numberingStyleIndent = formatting?.numPr?.numId === 0 && stylePpr?.numPr !== void 0 && stylePpr.numPr.numId !== 0 ? void 0 : stylePpr;
+		set("indentLeft", formatting?.indentLeft ?? numberingStyleIndent?.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", formatting?.indentFirstLine ?? numberingStyleIndent?.indentFirstLine);
+		set("hangingIndent", formatting?.hangingIndent ?? numberingStyleIndent?.hangingIndent);
 		set("borders", formatting?.borders ?? stylePpr?.borders);
 		set("shading", formatting?.shading ?? stylePpr?.shading);
 		set("tabs", formatting?.tabs ?? stylePpr?.tabs);
@@ -301,7 +302,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 +402,33 @@ 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 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 +457,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 +617,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 +653,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;
@@ -1264,6 +1266,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 +1335,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/core/ParagraphExtension.js

@@ -199,6 +199,7 @@ const paragraphNodeSpec = {
 		listMarkerHidden: { default: null },
 		listMarkerFontFamily: { default: null },
 		listMarkerFontSize: { default: null },
+		listMarkerAlignment: { default: null },
 		listMarkerSuffix: { default: null },
 		listMarkerAllCaps: { default: null },
 		listImplicitChildLevelAdvances: { default: null },

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

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

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

@@ -4,26 +4,76 @@ import { ignoreTrackedChanges } from "./ParagraphChangeTrackerExtension.js";
 import { Plugin, PluginKey } from "prosemirror-state";
 //#region src/prosemirror/extensions/features/ParaIdAllocatorExtension.ts
 const paraIdAllocatorKey = new PluginKey("paraIdAllocator");
-const collectParaIdUpdates = (doc) => {
-	const seen = /* @__PURE__ */ new Set();
-	const updates = [];
+const isUsableParaId = (value) => typeof value === "string" && value.length > 0 && value !== "00000000";
+/**
+* For every valid paraId in the pre-transaction doc, the position its
+* paragraph ends up at after `transactions` — the occurrence that
+* rightfully keeps the id when the new doc holds duplicates. Ids whose
+* paragraph start was deleted by the steps are left out.
+*/
+const mapKeeperPositions = (oldDoc, transactions) => {
+	const keepers = /* @__PURE__ */ new Map();
+	oldDoc.descendants((node, pos) => {
+		if (node.type.name !== "paragraph") return true;
+		const id = node.attrs["paraId"];
+		if (!isUsableParaId(id) || keepers.has(id)) return false;
+		let mapped = pos;
+		let deleted = false;
+		for (const tr of transactions) {
+			const result = tr.mapping.mapResult(mapped);
+			if (result.deleted) {
+				deleted = true;
+				break;
+			}
+			mapped = result.pos;
+		}
+		if (!deleted) keepers.set(id, mapped);
+		return false;
+	});
+	return keepers;
+};
+const collectParaIdUpdates = (doc, keeperPositions) => {
+	const missing = [];
+	const occurrencesById = /* @__PURE__ */ new Map();
 	doc.descendants((node, pos) => {
-		if (node.type.name !== "paragraph") return;
+		if (node.type.name !== "paragraph") return true;
 		const id = node.attrs["paraId"];
-		if (typeof id !== "string" || id.length === 0 || seen.has(id)) {
-			let newId = generateHexId();
-			while (seen.has(newId)) newId = generateHexId();
-			seen.add(newId);
-			updates.push({
+		if (!isUsableParaId(id)) missing.push({
+			pos,
+			attrs: node.attrs
+		});
+		else {
+			const occurrences = occurrencesById.get(id) ?? [];
+			occurrences.push({
 				pos,
-				attrs: {
-					...node.attrs,
-					paraId: newId
-				}
+				attrs: node.attrs
 			});
-		} else seen.add(id);
+			occurrencesById.set(id, occurrences);
+		}
 		return false;
 	});
+	const needFreshId = [...missing];
+	for (const [id, occurrences] of occurrencesById) {
+		if (occurrences.length === 1) continue;
+		const keeperPos = keeperPositions?.get(id);
+		const keeper = occurrences.find((occurrence) => occurrence.pos === keeperPos) ?? occurrences[0];
+		for (const occurrence of occurrences) if (occurrence !== keeper) needFreshId.push(occurrence);
+	}
+	const taken = new Set(occurrencesById.keys());
+	const updates = [];
+	for (const { pos, attrs } of needFreshId) {
+		let newId = generateHexId();
+		while (taken.has(newId)) newId = generateHexId();
+		taken.add(newId);
+		updates.push({
+			pos,
+			attrs: {
+				...attrs,
+				paraId: newId
+			}
+		});
+	}
+	updates.sort((a, b) => a.pos - b.pos);
 	return updates;
 };
 const ensureParaIdsInState = (state) => {
@@ -38,12 +88,14 @@ const ensureParaIdsInState = (state) => {
 };
 const createParaIdAllocatorPlugin = () => new Plugin({
 	key: paraIdAllocatorKey,
-	appendTransaction(transactions, _oldState, newState) {
+	appendTransaction(transactions, oldState, newState) {
 		if (!transactions.some((t) => t.docChanged)) return null;
-		const updates = collectParaIdUpdates(newState.doc);
+		const keeperPositions = mapKeeperPositions(oldState.doc, transactions);
+		const updates = collectParaIdUpdates(newState.doc, keeperPositions);
 		if (updates.length === 0) return null;
 		const tr = newState.tr;
 		for (const u of updates) tr.setNodeMarkup(u.pos, void 0, u.attrs);
+		ignoreTrackedChanges(tr);
 		tr.setMeta(paraIdAllocatorKey, "allocated");
 		tr.setMeta("addToHistory", false);
 		return tr;

package/dist/prosemirror/extensions/nodes/TextBoxExtension.d.ts

@@ -6,7 +6,8 @@ import { ImagePositionAttrs } from "../../schema/nodes.js";
 //#region src/prosemirror/extensions/nodes/TextBoxExtension.d.ts
 type TextBoxAttrs = {
   /** Width in pixels */width?: number; /** Height in pixels */
-  height?: number; /** Unique identifier */
+  height?: number; /** Text fitting behavior */
+  autoFit?: document_d_exports.ShapeTextBody["autoFit"]; /** Unique identifier */
   textBoxId?: string; /** Fill color as CSS color */
   fillColor?: string; /** Outline width in pixels */
   outlineWidth?: number; /** Outline color as CSS color */

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

@@ -15,6 +15,9 @@ function parseTextBoxPosition(raw) {
 function parseTextBoxWrapType(raw) {
 	for (const value of IMAGE_WRAP_TYPE_VALUES) if (value === raw) return value;
 }
+function parseTextBoxAutoFit(raw) {
+	if (raw === "none" || raw === "normal" || raw === "shape") return raw;
+}
 const TextBoxExtension = createNodeExtension({
 	name: "textBox",
 	schemaNodeName: "textBox",
@@ -26,6 +29,7 @@ const TextBoxExtension = createNodeExtension({
 		attrs: {
 			width: { default: 200 },
 			height: { default: null },
+			autoFit: { default: null },
 			textBoxId: { default: null },
 			fillColor: { default: null },
 			outlineWidth: { default: null },
@@ -55,9 +59,11 @@ const TextBoxExtension = createNodeExtension({
 				const d = dom.dataset;
 				const position = parseTextBoxPosition(d["position"]);
 				const wrapType = parseTextBoxWrapType(d["wrapType"]);
+				const autoFit = parseTextBoxAutoFit(d["autoFit"]);
 				return {
 					...d["width"] ? { width: Number(d["width"]) } : {},
 					...d["height"] ? { height: Number(d["height"]) } : {},
+					...autoFit ? { autoFit } : {},
 					...d["textboxId"] ? { textBoxId: d["textboxId"] } : {},
 					...d["fillColor"] ? { fillColor: d["fillColor"] } : {},
 					...d["outlineWidth"] ? { outlineWidth: Number(d["outlineWidth"]) } : {},
@@ -85,6 +91,7 @@ const TextBoxExtension = createNodeExtension({
 			const domAttrs = { class: "docx-textbox" };
 			if (attrs.width) domAttrs["data-width"] = String(attrs.width);
 			if (attrs.height) domAttrs["data-height"] = String(attrs.height);
+			if (attrs.autoFit) domAttrs["data-auto-fit"] = attrs.autoFit;
 			if (attrs.textBoxId) domAttrs["data-textbox-id"] = attrs.textBoxId;
 			if (attrs.fillColor) domAttrs["data-fill-color"] = attrs.fillColor;
 			if (attrs.outlineWidth) domAttrs["data-outline-width"] = String(attrs.outlineWidth);

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

@@ -46,7 +46,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;
+  listMarkerFontSize?: number; /** 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.
    * `tab` (default) grows the marker to the next tab stop; `space` adds one
@@ -307,7 +308,8 @@ type ShapeAttrs = {
  */
 type TextBoxAttrs = {
   /** Width in pixels */width?: number; /** Height in pixels */
-  height?: number; /** Unique identifier */
+  height?: number; /** Text fitting behavior */
+  autoFit?: document_d_exports.ShapeTextBody["autoFit"]; /** Unique identifier */
   textBoxId?: string; /** Fill color as CSS color */
   fillColor?: string; /** Outline width in pixels */
   outlineWidth?: number; /** Outline color as CSS color */

package/dist/prosemirror/styles/resolvedStyleAttrs.js

@@ -86,6 +86,7 @@ function listAttrsFromResolvedStyle(resolved, numbering) {
 		listMarkerHidden: rendering?.markerHidden ?? null,
 		listMarkerFontFamily: rendering?.markerFontFamily ?? null,
 		listMarkerFontSize: rendering?.markerFontSize ?? null,
+		listMarkerAlignment: rendering?.markerAlignment ?? null,
 		listMarkerSuffix: rendering?.markerSuffix ?? null,
 		listMarkerAllCaps: rendering?.markerAllCaps ?? null,
 		listImplicitChildLevelAdvances: null,