@stll/folio-core 0.9.0 → 0.10.0

package/dist/layout-engine/measure/tableCellFloating.js

@@ -3,6 +3,36 @@ import { isFloatingImageRun } from "../types.js";
 import { clampFloatingWrapMargins } from "./clampFloatingWrapMargins.js";
 import { createTableCellFlowState, placeTableCellBlock } from "./tableCellFlow.js";
 //#region src/layout-engine/measure/tableCellFloating.ts
+const resolveCellScopedPosition = ({ run, paragraphY, contentWidth }) => {
+	const position = run.position;
+	let side = "left";
+	let x = 0;
+	if (position?.horizontal) {
+		const horizontal = position.horizontal;
+		if (horizontal.align === "right") {
+			side = "right";
+			x = contentWidth - run.width;
+		} else if (horizontal.align === "center") x = (contentWidth - run.width) / 2;
+		else if (horizontal.posOffset !== void 0) {
+			x = emuToPixels(horizontal.posOffset);
+			side = x > contentWidth / 2 ? "right" : "left";
+		}
+	} else if (run.cssFloat === "right") {
+		side = "right";
+		x = contentWidth - run.width;
+	}
+	let y = paragraphY;
+	if (position?.vertical) {
+		const vertical = position.vertical;
+		if (vertical.posOffset !== void 0) y = paragraphY + emuToPixels(vertical.posOffset);
+		else if (vertical.align === "top") y = 0;
+	}
+	return {
+		side,
+		x,
+		y
+	};
+};
 function getTableCellContentWidth(cell, cellMeasure) {
 	const padLeft = cell?.padding?.left ?? 7;
 	const padRight = cell?.padding?.right ?? 7;
@@ -19,40 +49,16 @@ function getTableCellFloatingImages(cell, cellMeasure, contentWidth, resolvePosi
 		if (block.kind !== "paragraph") continue;
 		for (const run of block.runs) {
 			if (run.kind !== "image" || !isFloatingImageRun(run)) continue;
-			const position = run.position;
 			const distTop = run.distTop ?? 0;
 			const distBottom = run.distBottom ?? 0;
 			const distLeft = run.distLeft ?? 12;
 			const distRight = run.distRight ?? 12;
-			let side;
-			let x;
-			let y;
-			if (resolvePosition) ({side, x, y} = resolvePosition(run, placement.contentTop));
-			else {
-				side = "left";
-				x = 0;
-				if (position?.horizontal) {
-					const horizontal = position.horizontal;
-					if (horizontal.align === "right") {
-						side = "right";
-						x = contentWidth - run.width;
-					} else if (horizontal.align === "center") x = (contentWidth - run.width) / 2;
-					else if (horizontal.posOffset !== void 0) {
-						x = emuToPixels(horizontal.posOffset);
-						side = x > contentWidth / 2 ? "right" : "left";
-					}
-				} else if (run.cssFloat === "right") {
-					side = "right";
-					x = contentWidth - run.width;
-				}
-				y = placement.contentTop;
-				if (position?.vertical) {
-					const vertical = position.vertical;
-					if (vertical.posOffset !== void 0) y = placement.contentTop + emuToPixels(vertical.posOffset);
-					else if (vertical.align === "top") y = 0;
-				}
-				x = Math.max(0, Math.min(x, contentWidth - run.width));
-			}
+			const verticalOriginY = run.position?.vertical?.relativeTo === "paragraph" ? placement.top : placement.contentTop;
+			const resolved = run.layoutInCell === false && resolvePosition ? resolvePosition(run, verticalOriginY) : resolveCellScopedPosition({
+				run,
+				paragraphY: verticalOriginY,
+				contentWidth
+			});
 			let wrapText = "bothSides";
 			if (run.cssFloat === "left") wrapText = "right";
 			else if (run.cssFloat === "right") wrapText = "left";
@@ -67,9 +73,9 @@ function getTableCellFloatingImages(cell, cellMeasure, contentWidth, resolvePosi
 				...run.cropRight != null ? { cropRight: run.cropRight } : {},
 				...run.cropBottom != null ? { cropBottom: run.cropBottom } : {},
 				...run.cropLeft != null ? { cropLeft: run.cropLeft } : {},
-				x,
-				y,
-				side,
+				x: resolved.x,
+				y: resolved.y,
+				side: resolved.side,
 				distTop,
 				distBottom,
 				distLeft,

package/dist/layout-engine/types.d.ts

@@ -162,7 +162,8 @@ type ImageRun = {
    * eigenpal #424 (opacity render pipeline).
    */
   opacity?: number; /** Position for floating/anchored images */
-  position?: ImageRunPosition; /** Wrap type from DOCX (inline, square, tight, through, topAndBottom, etc.) */
+  position?: ImageRunPosition; /** Whether a table-cell anchor uses the cell as its positioning scope. Undefined defaults true. */
+  layoutInCell?: boolean; /** Wrap type from DOCX (inline, square, tight, through, topAndBottom, etc.) */
   wrapType?: ImageWrap["type"]; /** Display mode for CSS rendering */
   displayMode?: "inline" | "block" | "float"; /** CSS float direction */
   cssFloat?: "left" | "right" | "none"; /** Wrap distances in pixels */
@@ -293,13 +294,14 @@ type ListNumPr = {
  */
 type ParagraphAttrs = {
   alignment?: "left" | "center" | "right" | "justify"; /** East Asian first/last-character restrictions (`w:kinsoku`). */
-  kinsoku?: boolean; /** Hanging punctuation (`w:overflowPunct`), retained for layout policy. */
+  kinsoku?: boolean; /** Hanging punctuation (`w:overflowPunct`); defaults to enabled when omitted. */
   overflowPunctuation?: boolean; /** Exempt this paragraph from document automatic hyphenation. */
   suppressAutoHyphens?: boolean; /** Document-wide automatic hyphenation controls retained for line layout. */
   automaticHyphenation?: {
     enabled: true;
     doNotHyphenateCaps?: boolean;
-    consecutiveLineLimit?: number;
+    consecutiveLineLimit?: number; /** Maximum tolerated line-end whitespace before hyphenation, in twips. */
+    hyphenationZoneTwips?: number;
   }; /** Document-wide custom line-edge characters and compatibility behavior. */
   lineBreakRules?: {
     noLineBreaksBefore?: {

package/dist/prosemirror/attrs/index.js

@@ -306,6 +306,7 @@ 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);

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

package/dist/prosemirror/conversion/effectiveTableCellFormatting.js

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

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -911,6 +911,7 @@ function createImageRun(node) {
 	if (attrs.opacity != null) image.opacity = attrs.opacity;
 	const imagePosition = imagePositionFromAttrs(attrs.position);
 	if (imagePosition) image.position = imagePosition;
+	if (attrs.layoutInCell !== void 0) image.layoutInCell = attrs.layoutInCell;
 	if (attrs.borderWidth && attrs.borderWidth > 0) {
 		const outline = {
 			width: pixelsToEmu(attrs.borderWidth),

package/dist/prosemirror/conversion/toProseDoc.js

@@ -7,10 +7,9 @@ import { assertValidProseMirrorDocument } from "../validation.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";
+import { resolveEffectiveTableCellFormatting } from "./effectiveTableCellFormatting.js";
 //#region src/prosemirror/conversion/toProseDoc.ts
 const TOC_STYLE_ID = /^TOC\d*$/iu;
 /**
@@ -725,88 +724,60 @@ function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths,
 		if (cellIsFirstRow && cellIsLastCol && (tableLook?.firstRow || rowCnf?.firstRow || cellCnf?.firstRow) && (tableLook?.lastColumn || rowCnf?.lastColumn || cellCnf?.lastColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.neCell);
 		if (cellIsLastRow && cellIsFirstCol && (tableLook?.lastRow || rowCnf?.lastRow || cellCnf?.lastRow) && (tableLook?.firstColumn || rowCnf?.firstColumn || cellCnf?.firstColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.swCell);
 		if (cellIsLastRow && cellIsLastCol && (tableLook?.lastRow || rowCnf?.lastRow || cellCnf?.lastRow) && (tableLook?.lastColumn || rowCnf?.lastColumn || cellCnf?.lastColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.seCell);
-		cells.push(convertTableCell(cell, styleResolver, context, isHeaderRow, gridWidth, cellConditionalStyle, tableBorders, isFirstRow, isLastRow, isFirstCol, isLastCol, calculatedRowSpan, preserveVMergeRestart, rowSpanInfo?.continuationCells, defaultCellMargins));
+		cells.push(convertTableCell({
+			cell,
+			styleResolver,
+			context,
+			isHeader: isHeaderRow,
+			gridWidthPercent: gridWidth,
+			conditionalStyle: cellConditionalStyle,
+			tableBorders,
+			position: {
+				isFirstRow,
+				isLastRow,
+				isFirstColumn: isFirstCol,
+				isLastColumn: isLastCol
+			},
+			calculatedRowSpan,
+			preserveVMergeRestart,
+			vMergeContinuationCells: rowSpanInfo?.continuationCells,
+			defaultCellMargins
+		}));
 	}
 	return schema.node("tableRow", attrs, cells);
 }
-const TABLE_BORDER_SIDES = [
-	"top",
-	"bottom",
-	"left",
-	"right",
-	"insideH",
-	"insideV",
-	"topLeftToBottomRight",
-	"topRightToBottomLeft"
-];
-function resolveThemedBorderColors(borders, theme) {
-	if (!borders || !theme?.colorScheme) return borders;
-	let resolved;
-	for (const side of TABLE_BORDER_SIDES) {
-		const border = borders[side];
-		if (!border?.color?.themeColor || border.color.auto) continue;
-		resolved ??= { ...borders };
-		resolved[side] = {
-			...border,
-			color: { rgb: resolveColor(border.color, theme).replace(/^#/u, "") }
-		};
-	}
-	return resolved ?? borders;
-}
 /**
 * Convert a TableCell to a ProseMirror table cell node
 */
-function convertTableCell(cell, styleResolver, context, isHeader, gridWidthPercent, conditionalStyle, tableBorders, isFirstRow, isLastRow, isFirstCol, isLastCol, calculatedRowSpan, preserveVMergeRestart, vMergeContinuationCells, defaultCellMargins) {
-	const { theme } = context;
+function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPercent, conditionalStyle, tableBorders, position, calculatedRowSpan, preserveVMergeRestart, vMergeContinuationCells, defaultCellMargins }) {
 	const formatting = cell.formatting;
 	const rowspan = calculatedRowSpan ?? 1;
-	let width = formatting?.width?.value;
-	let widthType = formatting?.width?.type;
-	if (width === void 0 && gridWidthPercent !== void 0) {
-		width = gridWidthPercent;
-		widthType = "pct";
-	}
-	const backgroundColor = resolveShadingFill(formatting?.shading ?? conditionalStyle?.tcPr?.shading, theme).replace(/^#/u, "");
-	const baseBorders = (() => {
-		if (tableBorders) return {
-			top: isFirstRow ? tableBorders.top : tableBorders.insideH,
-			bottom: isLastRow ? tableBorders.bottom : tableBorders.insideH,
-			left: isFirstCol ? tableBorders.left : tableBorders.insideV,
-			right: isLastCol ? tableBorders.right : tableBorders.insideV
-		};
-	})();
-	const conditionalBorders = conditionalStyle?.tcPr?.borders;
-	const cellBorders = formatting?.borders;
-	const borders = resolveThemedBorderColors(baseBorders || conditionalBorders || cellBorders ? {
-		...baseBorders,
-		...conditionalBorders,
-		...cellBorders
-	} : void 0, theme);
-	const buildMarginsAttr = (src) => {
-		const m = {};
-		if (src.top?.value !== void 0) m.top = src.top.value;
-		if (src.bottom?.value !== void 0) m.bottom = src.bottom.value;
-		if (src.left?.value !== void 0) m.left = src.left.value;
-		if (src.right?.value !== void 0) m.right = src.right.value;
-		return m;
-	};
+	const effectiveFormatting = resolveEffectiveTableCellFormatting({
+		directFormatting: formatting,
+		styleFormatting: conditionalStyle?.tcPr,
+		tableBorders,
+		position,
+		gridWidthPercent,
+		defaultMargins: defaultCellMargins,
+		theme: context.theme
+	});
 	const attrs = {
 		colspan: formatting?.gridSpan ?? 1,
 		rowspan
 	};
-	if (width !== void 0) attrs.width = width;
-	if (widthType) attrs.widthType = widthType;
+	if (effectiveFormatting.width.type === "value") {
+		attrs.width = effectiveFormatting.width.value;
+		if (effectiveFormatting.width.widthType) attrs.widthType = effectiveFormatting.width.widthType;
+	}
 	if (formatting?.verticalAlign) attrs.verticalAlign = formatting.verticalAlign;
-	if (backgroundColor) {
-		attrs.backgroundColor = backgroundColor;
-		attrs._resolvedBackgroundColor = backgroundColor;
+	if (effectiveFormatting.background.type === "color") {
+		attrs.backgroundColor = effectiveFormatting.background.rgb;
+		attrs._resolvedBackgroundColor = effectiveFormatting.background.rgb;
 	}
 	if (formatting?.textDirection) attrs.textDirection = formatting.textDirection;
 	if (formatting?.noWrap !== void 0) attrs.noWrap = formatting.noWrap;
-	if (borders) attrs.borders = borders;
-	if (formatting?.margins) attrs.margins = buildMarginsAttr(formatting.margins);
-	else if (conditionalStyle?.tcPr?.margins) attrs.margins = buildMarginsAttr(conditionalStyle.tcPr.margins);
-	else if (defaultCellMargins) attrs.margins = defaultCellMargins;
+	if (effectiveFormatting.borders) attrs.borders = effectiveFormatting.borders;
+	if (effectiveFormatting.margins) attrs.margins = effectiveFormatting.margins;
 	if (formatting) attrs._originalFormatting = formatting;
 	if (cell.propertyChanges && cell.propertyChanges.length > 0) attrs.tcPrChange = [...cell.propertyChanges];
 	if (preserveVMergeRestart) attrs._preserveVMergeRestart = true;
@@ -1072,6 +1043,7 @@ function convertImage(image, rawXml) {
 		cropBottom: image.crop?.bottom,
 		cropLeft: image.crop?.left,
 		position,
+		layoutInCell: image.layoutInCell,
 		borderWidth,
 		borderColor,
 		borderStyle,

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

@@ -1,8 +1,8 @@
 import { autospacingMatchesBase } from "../../autospacingBase.js";
 import { directionIsRtl } from "../../paragraphDirection.js";
 import { expectParagraphAttrs } from "../../attrs/index.js";
-import { paragraphToStyle } from "../../../utils/formatToStyle.js";
 import { createNodeExtension } from "../create.js";
+import { paragraphToStyle } from "../../../utils/formatToStyle.js";
 import { collectHeadings } from "../../../utils/headingCollector.js";
 import { listAttrsFromResolvedStyle, paragraphAttrsFromResolvedStyle } from "../../styles/resolvedStyleAttrs.js";
 import { Fragment } from "prosemirror-model";

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

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

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

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

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

@@ -1,6 +1,6 @@
 import { expectTextColorMarkAttrs } from "../../attrs/index.js";
-import { textToStyle } from "../../../utils/formatToStyle.js";
 import { createMarkExtension } from "../create.js";
+import { textToStyle } from "../../../utils/formatToStyle.js";
 import { removeMark, setMark } from "./markUtils.js";
 import { panic } from "better-result";
 //#region src/prosemirror/extensions/marks/TextColorExtension.ts

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

@@ -33,6 +33,7 @@ const ImageExtension = createNodeExtension({
 			cropBottom: { default: null },
 			cropLeft: { default: null },
 			position: { default: null },
+			layoutInCell: { default: null },
 			borderWidth: { default: null },
 			borderColor: { default: null },
 			borderStyle: { default: null },

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

@@ -1,7 +1,7 @@
 import { TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_WIDTH_TYPE_VALUES } from "../../../types/documentEnumValues.js";
 import { expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, mergeTableAttrs, mergeTableCellAttrs, mergeTableRowAttrs } from "../../attrs/index.js";
-import { resolveColor } from "../../../utils/colorResolver.js";
 import { createExtension, createNodeExtension } from "../create.js";
+import { resolveColor } from "../../../utils/colorResolver.js";
 import { panic } from "better-result";
 import { Plugin, PluginKey, Selection, TextSelection } from "prosemirror-state";
 import { CellSelection, TableMap, columnResizing, mergeCells, removeRow, selectedRect, splitCell, tableEditing } from "prosemirror-tables";

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

@@ -197,7 +197,8 @@ type ImageAttrs = {
   cropRight?: number;
   cropBottom?: number;
   cropLeft?: number; /** Position for floating images (horizontal and vertical alignment) */
-  position?: ImagePositionAttrs; /** Border width in pixels */
+  position?: ImagePositionAttrs; /** Use the containing table cell as the anchor's positioning scope (the OOXML default). */
+  layoutInCell?: boolean; /** Border width in pixels */
   borderWidth?: number; /** Border color as CSS color string */
   borderColor?: string; /** Border style (CSS border-style value) */
   borderStyle?: string; /** Wrap text setting from DOCX (left, right, bothSides, largest) for round-trip */

package/dist/redline.d.ts

@@ -1,20 +1,35 @@
-import { FolioAIEditApplyResult } from "./ai-edits/types.js";
+import { FolioAIEditAppliedOperation, FolioAIEditSkippedOperation } from "./ai-edits/types.js";
+import { FolioDocumentStoryHandle, FolioResolvedReviewedView } from "./ai-edits/headless.js";
+import { FolioDocumentPrivacyOptions, FolioDocumentPrivacyReport } from "./docx/metadataPrivacy.js";
 
 //#region src/redline.d.ts
 /** Options for {@link generateRedlineDocx}. */
 type GenerateRedlineDocxOptions = {
-  /** Author recorded on the generated tracked changes. (default: `"folio compare"`) */author?: string;
+  /** Author recorded on the generated tracked changes. (default: `"folio compare"`) */author?: string; /** Resolved base input state. (default: `"final"`) */
+  baseView?: FolioResolvedReviewedView; /** Resolved revised input state. (default: `"final"`) */
+  revisedView?: FolioResolvedReviewedView; /** Optional output-only package-metadata privacy transforms. */
+  privacy?: FolioDocumentPrivacyOptions;
+};
+declare const InvalidGenerateRedlineDocxOptionsError_base: import("better-result").TaggedErrorClass<"InvalidGenerateRedlineDocxOptionsError", {
+  message: string;
+  option: "baseView" | "revisedView";
+  receivedValue: unknown;
+}>;
+declare class InvalidGenerateRedlineDocxOptionsError extends InvalidGenerateRedlineDocxOptionsError_base {}
+type GenerateRedlineUnprocessedStory = {
+  baseStory: FolioDocumentStoryHandle | null;
+  revisedStory: FolioDocumentStoryHandle | null;
+  reason: "missing-base-story" | "missing-revised-story";
 };
 /** Result of {@link generateRedlineDocx}. */
-type GenerateRedlineDocxResult = FolioAIEditApplyResult & {
-  /** The redline `.docx`: the base document with base → revised tracked changes. */buffer: ArrayBuffer;
+type GenerateRedlineDocxResult = {
+  /** The base package with generated tracked changes. */buffer: ArrayBuffer; /** Operations applied across every matched story. */
+  applied: FolioAIEditAppliedOperation[]; /** Block operations that could not be applied. */
+  skipped: FolioAIEditSkippedOperation[]; /** Package parts that could not be represented as story-scoped text edits. */
+  unprocessedStories: GenerateRedlineUnprocessedStory[]; /** Privacy transforms applied to the generated package. */
+  privacyReport: FolioDocumentPrivacyReport;
 };
-/**
- * Compare `base` and `revised` and return the base document with every
- * difference recorded as a tracked change. See the module doc comment for
- * semantics and limitations; `skipped` reports any block the generator could
- * not redline (e.g. additions with no anchor in an empty base document).
- */
+/** Compare two buffers and return tracked changes for every matched editable story. */
 declare const generateRedlineDocx: (base: ArrayBuffer, revised: ArrayBuffer, options?: GenerateRedlineDocxOptions) => Promise<GenerateRedlineDocxResult>;
 //#endregion
-export { GenerateRedlineDocxOptions, GenerateRedlineDocxResult, generateRedlineDocx };
+export { GenerateRedlineDocxOptions, GenerateRedlineDocxResult, GenerateRedlineUnprocessedStory, InvalidGenerateRedlineDocxOptionsError, generateRedlineDocx };