@stll/folio-core 0.43.0 → 0.45.0

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -10,12 +10,13 @@ import { OUTLINE_STYLE_CSS_ALIASES, normalizeShapeTextAnchor } from "../../types
 import { canonicalJson } from "../../utils/canonicalJson.js";
 import { normalizeHorizontalScalePercent } from "../../utils/horizontalScale.js";
 import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
-import { pixelsToEmu } from "../../utils/units.js";
+import { emuToPixels, emuToStrokePixels, pixelsToEmu } from "../../utils/units.js";
 import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectPageBreakRunAttrs, expectPageBreakRunOwnerMarkAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectSymbolAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../attrs/index.js";
 import { autospacingMatchesBase, hasAutospacingBaseSide } from "../autospacingBase.js";
-import { expectBookmarkBoundaryAttrs } from "../bookmarkBoundaryAttrs.js";
+import { bookmarkBoundaryDisplacement, expectBookmarkBoundaryAttrs } from "../bookmarkBoundaryAttrs.js";
 import { paragraphRejectAttrPatch, paragraphRejectOriginalFormatting, removeParagraphPropertyChanges } from "../commands/propertyChangeScope.js";
 import { applyRunFormattingOverrideAttrs, buildRunFormattingOverrideAttrs } from "../extensions/marks/RunFormattingOverrideExtension.js";
+import { textFormattingToMarks } from "../extensions/marks/markUtils.js";
 import { listRenderingFromAttrs as listRenderingFromAttrs$1 } from "../listRenderingAttrs.js";
 import { resolveNumberedRefFields } from "../numberedRefFields.js";
 import { directParagraphAlignment } from "../paragraphAlignment.js";
@@ -24,12 +25,12 @@ import { directParagraphSpacing } from "../paragraphSpacing.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../runFormattingMarkNames.js";
 import { authoredRunFormattingFromAttrs, hasAuthoredRunFormattingProvenance } from "../runFormattingProvenance.js";
 import { paragraphFormattingForRun, paragraphRunStyleContext, resolveEffectiveRunStyleFormatting, suppressParagraphMarkFormatting } from "../runStyleFormatting.js";
+import { schema } from "../schema/index.js";
 import { parseShapeGeometryAdjustments } from "../shapeGeometryAdjustments.js";
 import { expectTextBoxAnchorAttrs } from "../textBoxAnchorAttrs.js";
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { runShadingAttrsToShading, shadingToRunShadingAttrs } from "./runShadingMark.js";
 import { decodeSdtListItems, sdtPropertiesFromAttrs, sdtPropertiesMatchAttrs } from "./sdtAttrs.js";
-import { textFormattingToMarks } from "./toProseDoc.js";
 import { panic } from "better-result";
 import { Fragment } from "prosemirror-model";
 import { DRAWING_RAW_XML_MODES } from "@stll/docx-core/model";
@@ -78,14 +79,35 @@ function imagePositionFromAttrs(attrs) {
 		vertical
 	};
 }
+/**
+* The EMUs behind one pixel attribute of a drawing.
+*
+* `toProseDoc` carries the authored EMU beside every pixel value it derived,
+* because EMU → px → EMU does not land back on the same number. While the
+* pixel attribute still projects from the authored EMU nothing has moved it,
+* so the document gets its own value back; once an editor command has, the
+* pixel attribute is the truth and converts.
+*/
+const emuFromPixels = (px, key, authored, project) => {
+	const emu = authored?.[key];
+	return emu !== void 0 && project(emu) === px ? emu : pixelsToEmu(px);
+};
+/**
+* Copy the wrap insets onto a wrap. Shared by the image, shape and text-box
+* paths so one rule decides when an inset keeps its authored EMU.
+*/
+const assignWrapDistances = (wrap, attrs) => {
+	const authored = attrs._docxAuthoredEmu;
+	if (attrs.distTop !== void 0) wrap.distT = emuFromPixels(attrs.distTop, "distTop", authored, emuToPixels);
+	if (attrs.distBottom !== void 0) wrap.distB = emuFromPixels(attrs.distBottom, "distBottom", authored, emuToPixels);
+	if (attrs.distLeft !== void 0) wrap.distL = emuFromPixels(attrs.distLeft, "distLeft", authored, emuToPixels);
+	if (attrs.distRight !== void 0) wrap.distR = emuFromPixels(attrs.distRight, "distRight", authored, emuToPixels);
+};
 function textBoxWrapFromAttrs(attrs) {
 	if (!(attrs.wrapType !== void 0 && attrs.wrapType !== "inline" || attrs.wrapText !== void 0 || attrs.distTop !== void 0 || attrs.distBottom !== void 0 || attrs.distLeft !== void 0 || attrs.distRight !== void 0)) return;
 	const wrap = { type: attrs.wrapType ?? "inline" };
 	if (attrs.wrapText !== void 0) wrap.wrapText = attrs.wrapText;
-	if (attrs.distTop !== void 0) wrap.distT = pixelsToEmu(attrs.distTop);
-	if (attrs.distBottom !== void 0) wrap.distB = pixelsToEmu(attrs.distBottom);
-	if (attrs.distLeft !== void 0) wrap.distL = pixelsToEmu(attrs.distLeft);
-	if (attrs.distRight !== void 0) wrap.distR = pixelsToEmu(attrs.distRight);
+	assignWrapDistances(wrap, attrs);
 	return wrap;
 }
 const assignUniqueParagraph = (paragraphs, paraId, paragraph) => {
@@ -271,7 +293,7 @@ function stripSuggestedInlineMarks(marks, { baseParagraphFormatting, inheritedFo
 			styleResolver
 		}) : paragraphFormatting, previousFormatting);
 		next = next.filter((mark) => !RUN_FORMATTING_MARK_NAMES.has(mark.type.name));
-		for (const restored of textFormattingToMarks(effectivePreviousFormatting, {
+		for (const restored of textFormattingToMarks(effectivePreviousFormatting, schema, {
 			overrideFormatting: previousFormatting,
 			directFormatting: previousFormatting
 		})) next = restored.addToSet(next);
@@ -645,17 +667,47 @@ function replaceTextBoxAnchorInBlocks(blocks, marker, textBoxRun) {
 	}
 	return false;
 }
+/**
+* The inline list a text-box anchor run can be spliced out of, or nothing when
+* the item holds no such list.
+*
+* A complex field keeps its runs in `fieldCode`/`fieldResult`, two arrays
+* rather than one, and an anchor has never been placed in either; splicing one
+* would have to pick a side. The marker stays where it is and
+* `removeUnresolvedTextBoxAnchors` leaves it, as before.
+*/
+const textBoxAnchorHost = (item) => {
+	switch (item.type) {
+		case "hyperlink": return item.children;
+		case "simpleField": return item.content;
+		case "inlineSdt":
+		case "insertion":
+		case "deletion":
+		case "moveFrom":
+		case "moveTo":
+		case "bidiWrapper": return item.content;
+		case "run":
+		case "complexField":
+		case "bookmarkStart":
+		case "bookmarkEnd":
+		case "commentRangeStart":
+		case "commentRangeEnd":
+		case "commentReference":
+		case "moveFromRangeStart":
+		case "moveFromRangeEnd":
+		case "moveToRangeStart":
+		case "moveToRangeEnd":
+		case "mathEquation": return;
+		default: panic(`Unsupported paragraph content: ${JSON.stringify(item)}`);
+	}
+};
 function editTextBoxAnchorInContent(content, marker, replacement) {
-	for (let index = 0; index < content.length; index += 1) {
-		const item = content[index];
+	for (const [index, item] of content.entries()) {
 		if (item === marker) {
 			content.splice(index, 1, ...replacement ? [replacement] : []);
 			return true;
 		}
-		let nestedContent;
-		if (item?.type === "hyperlink") nestedContent = item.children;
-		else if (item?.type === "simpleField") nestedContent = item.content;
-		else if (item?.type === "inlineSdt" || item?.type === "insertion" || item?.type === "deletion" || item?.type === "moveFrom" || item?.type === "moveTo") nestedContent = item.content;
+		const nestedContent = textBoxAnchorHost(item);
 		if (!nestedContent) continue;
 		const hadContent = nestedContent.length > 0;
 		if (editTextBoxAnchorInContent(nestedContent, marker, replacement)) {
@@ -800,8 +852,23 @@ const propertyChangeFromAttrs = (change) => {
 		...currentFormatting !== void 0 && { currentFormatting }
 	};
 };
+/**
+* What the paragraph states itself for one `w:pPr` field, as opposed to what
+* the style cascade resolved into the same attr.
+*
+* `undefined` means the paragraph states nothing and the field must stay
+* absent: a materialised value is a direct override that outranks the style it
+* was read from, and a later edit to that style no longer reaches the
+* paragraph. A value the source stated directly is always authored, even when
+* it happens to equal the style's.
+*/
+const authoredParagraphValue = (field, value, orig, resolved) => {
+	if (value === void 0) return;
+	if (orig?.[field] !== void 0) return value;
+	return sameResolvedValue(value, resolved?.[field]) ? void 0 : value;
+};
 function assignBooleanToggle(result, attrs, orig, key) {
-	const value = attrs[key] ?? void 0;
+	const value = authoredParagraphValue(key, attrs[key] ?? void 0, orig, attrs._resolvedFormatting);
 	if (value === (orig[key] ?? void 0)) return;
 	if (value === void 0) Reflect.deleteProperty(result, key);
 	else result[key] = value;
@@ -860,20 +927,41 @@ function paragraphAttrsToFormatting(attrs) {
 		else delete result.styleId;
 		assignBooleanToggle(result, attrs, orig, "pageBreakBefore");
 		assignBooleanToggle(result, attrs, orig, "widowControl");
+		assignBooleanToggle(result, attrs, orig, "keepNext");
+		assignBooleanToggle(result, attrs, orig, "keepLines");
+		assignBooleanToggle(result, attrs, orig, "runInWithNext");
 		assignBooleanToggle(result, attrs, orig, "snapToGrid");
 		assignBooleanToggle(result, attrs, orig, "kinsoku");
 		assignBooleanToggle(result, attrs, orig, "overflowPunctuation");
 		assignBooleanToggle(result, attrs, orig, "suppressAutoHyphens");
 		if (attrs.spacingExplicit !== orig.spacingExplicit) if (attrs.spacingExplicit) result.spacingExplicit = attrs.spacingExplicit;
 		else delete result.spacingExplicit;
-		const bidi = directionToBidi(attrs.direction);
+		const bidi = authoredParagraphValue("bidi", directionToBidi(attrs.direction), orig, attrs._resolvedFormatting);
 		if (bidi !== (orig.bidi ?? void 0)) if (bidi === void 0) delete result.bidi;
 		else result.bidi = bidi;
 		return result;
 	}
-	const outlineLevel = Reflect.get(attrs, "outlineLevel");
-	const bidi = directionToBidi(attrs.direction);
-	if (!(directAlignment !== void 0 || shouldSerializeSpaceBefore || shouldSerializeSpaceAfter || beforeAutospacingEdited || afterAutospacingEdited || hasDirectLineSpacing || hasDirectLineSpacingRule || attrs.snapToGrid != null || attrs.indentLeft || attrs.indentRight || attrs.indentFirstLine || attrs.numPr || attrs.styleId || attrs.borders || attrs.shading || attrs.tabs || typeof outlineLevel === "number" || attrs.contextualSpacing || attrs.spacingExplicit || bidi != null || attrs.pageBreakBefore != null || attrs.widowControl != null || attrs.kinsoku != null || attrs.overflowPunctuation != null || attrs.suppressAutoHyphens != null)) return;
+	const resolved = attrs._resolvedFormatting;
+	const authored = (field, value) => authoredParagraphValue(field, value ?? void 0, void 0, resolved);
+	const outlineLevel = authored("outlineLevel", Reflect.get(attrs, "outlineLevel"));
+	const bidi = authored("bidi", directionToBidi(attrs.direction));
+	const snapToGrid = authored("snapToGrid", attrs.snapToGrid);
+	const indentLeft = authored("indentLeft", attrs.indentLeft);
+	const indentRight = authored("indentRight", attrs.indentRight);
+	const indentFirstLine = authored("indentFirstLine", attrs.indentFirstLine);
+	const borders = authored("borders", attrs.borders);
+	const shading = authored("shading", attrs.shading);
+	const tabs = authored("tabs", attrs.tabs);
+	const contextualSpacing = authored("contextualSpacing", attrs.contextualSpacing);
+	const pageBreakBefore = authored("pageBreakBefore", attrs.pageBreakBefore);
+	const widowControl = authored("widowControl", attrs.widowControl);
+	const keepNext = authored("keepNext", attrs.keepNext);
+	const keepLines = authored("keepLines", attrs.keepLines);
+	const runInWithNext = authored("runInWithNext", attrs.runInWithNext);
+	const kinsoku = authored("kinsoku", attrs.kinsoku);
+	const overflowPunctuation = authored("overflowPunctuation", attrs.overflowPunctuation);
+	const suppressAutoHyphens = authored("suppressAutoHyphens", attrs.suppressAutoHyphens);
+	if (!(directAlignment !== void 0 || shouldSerializeSpaceBefore || shouldSerializeSpaceAfter || beforeAutospacingEdited || afterAutospacingEdited || hasDirectLineSpacing || hasDirectLineSpacingRule || snapToGrid != null || indentLeft || indentRight || indentFirstLine || attrs.numPr || attrs.styleId || borders || shading || tabs || typeof outlineLevel === "number" || contextualSpacing || attrs.spacingExplicit || bidi != null || pageBreakBefore != null || widowControl != null || keepNext != null || keepLines != null || runInWithNext != null || kinsoku != null || overflowPunctuation != null || suppressAutoHyphens != null)) return;
 	const f = {};
 	if (directAlignment !== void 0) f.alignment = directAlignment;
 	if (shouldSerializeSpaceBefore) f.spaceBefore = spaceBefore;
@@ -882,25 +970,28 @@ function paragraphAttrsToFormatting(attrs) {
 	if (afterAutospacingEdited) f.afterAutospacing = false;
 	if (hasDirectLineSpacing && typeof attrs.lineSpacing === "number") f.lineSpacing = attrs.lineSpacing;
 	if (hasDirectLineSpacingRule && attrs.lineSpacingRule) f.lineSpacingRule = attrs.lineSpacingRule;
-	if (attrs.snapToGrid != null) f.snapToGrid = attrs.snapToGrid;
+	if (snapToGrid != null) f.snapToGrid = snapToGrid;
 	if (attrs.spacingExplicit) f.spacingExplicit = attrs.spacingExplicit;
-	if (attrs.indentLeft) f.indentLeft = attrs.indentLeft;
-	if (attrs.indentRight) f.indentRight = attrs.indentRight;
-	if (attrs.indentFirstLine) f.indentFirstLine = attrs.indentFirstLine;
-	if (attrs.hangingIndent) f.hangingIndent = attrs.hangingIndent;
+	if (indentLeft) f.indentLeft = indentLeft;
+	if (indentRight) f.indentRight = indentRight;
+	if (indentFirstLine) f.indentFirstLine = indentFirstLine;
+	if (attrs.hangingIndent && indentFirstLine) f.hangingIndent = attrs.hangingIndent;
 	if (attrs.numPr && !isStyleSourcedParagraphNumbering(attrs.numPr, attrs.numPrFromStyle)) f.numPr = attrs.numPr;
 	if (attrs.styleId) f.styleId = attrs.styleId;
-	if (attrs.borders) f.borders = attrs.borders;
-	if (attrs.shading) f.shading = attrs.shading;
-	if (attrs.tabs) f.tabs = attrs.tabs;
+	if (borders) f.borders = borders;
+	if (shading) f.shading = shading;
+	if (tabs) f.tabs = tabs;
 	if (typeof outlineLevel === "number") f.outlineLevel = outlineLevel;
-	if (attrs.contextualSpacing) f.contextualSpacing = attrs.contextualSpacing;
+	if (contextualSpacing) f.contextualSpacing = contextualSpacing;
 	if (bidi != null) f.bidi = bidi;
-	if (attrs.pageBreakBefore != null) f.pageBreakBefore = attrs.pageBreakBefore;
-	if (attrs.widowControl != null) f.widowControl = attrs.widowControl;
-	if (attrs.kinsoku != null) f.kinsoku = attrs.kinsoku;
-	if (attrs.overflowPunctuation != null) f.overflowPunctuation = attrs.overflowPunctuation;
-	if (attrs.suppressAutoHyphens != null) f.suppressAutoHyphens = attrs.suppressAutoHyphens;
+	if (pageBreakBefore != null) f.pageBreakBefore = pageBreakBefore;
+	if (widowControl != null) f.widowControl = widowControl;
+	if (keepNext != null) f.keepNext = keepNext;
+	if (keepLines != null) f.keepLines = keepLines;
+	if (runInWithNext != null) f.runInWithNext = runInWithNext;
+	if (kinsoku != null) f.kinsoku = kinsoku;
+	if (overflowPunctuation != null) f.overflowPunctuation = overflowPunctuation;
+	if (suppressAutoHyphens != null) f.suppressAutoHyphens = suppressAutoHyphens;
 	return f;
 }
 function createTrackedRunWrapper(type, info, child) {
@@ -1143,10 +1234,12 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 					id: attrs.id,
 					name: attrs.name,
 					...attrs.colFirst !== void 0 ? { colFirst: attrs.colFirst } : {},
-					...attrs.colLast !== void 0 ? { colLast: attrs.colLast } : {}
+					...attrs.colLast !== void 0 ? { colLast: attrs.colLast } : {},
+					...bookmarkBoundaryDisplacement(attrs)
 				} : {
 					type: "bookmarkEnd",
-					id: attrs.id
+					id: attrs.id,
+					...bookmarkBoundaryDisplacement(attrs)
 				};
 				currentTrackedChange.wrapper.content.push(boundary);
 				return;
@@ -1209,11 +1302,13 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 				id: attrs.id,
 				name: attrs.name,
 				...attrs.colFirst !== void 0 ? { colFirst: attrs.colFirst } : {},
-				...attrs.colLast !== void 0 ? { colLast: attrs.colLast } : {}
+				...attrs.colLast !== void 0 ? { colLast: attrs.colLast } : {},
+				...bookmarkBoundaryDisplacement(attrs)
 			});
 			else content.push({
 				type: "bookmarkEnd",
-				id: attrs.id
+				id: attrs.id,
+				...bookmarkBoundaryDisplacement(attrs)
 			});
 		} else if (node.isText) appendDirectRun(node, createRunFromText({
 			...formattingContext,
@@ -1426,11 +1521,13 @@ function addNodeToHyperlink({ baseParagraphFormatting, hyperlink, inheritedForma
 			id: attrs.id,
 			name: attrs.name,
 			...attrs.colFirst !== void 0 ? { colFirst: attrs.colFirst } : {},
-			...attrs.colLast !== void 0 ? { colLast: attrs.colLast } : {}
+			...attrs.colLast !== void 0 ? { colLast: attrs.colLast } : {},
+			...bookmarkBoundaryDisplacement(attrs)
 		});
 		else hyperlink.children.push({
 			type: "bookmarkEnd",
-			id: attrs.id
+			id: attrs.id,
+			...bookmarkBoundaryDisplacement(attrs)
 		});
 		return;
 	}
@@ -1818,21 +1915,27 @@ function createInlineSdtFromNode(node, textBoxAnchorMarkers, formattingContext)
 /**
 * Create a Run containing an image
 */
+/**
+* Restore the `w:rPr` an inline atom carried from its source run.
+*
+* Image and shape nodes do not hold the run's formatting marks
+* (`withRunBoundaryMarks` in toProseDoc keeps them off), so the run rebuilt
+* around one has no other record of the properties it was authored with.
+*/
+const carriedRunFormatting = (formatting) => formatting && Object.keys(formatting).length > 0 ? { formatting } : {};
 function createImageRun(node) {
 	const attrs = expectImageAttrs(node);
 	const wrap = { type: attrs.wrapType || "inline" };
-	if (attrs.distTop !== void 0) wrap.distT = pixelsToEmu(attrs.distTop);
-	if (attrs.distBottom !== void 0) wrap.distB = pixelsToEmu(attrs.distBottom);
-	if (attrs.distLeft !== void 0) wrap.distL = pixelsToEmu(attrs.distLeft);
-	if (attrs.distRight !== void 0) wrap.distR = pixelsToEmu(attrs.distRight);
+	assignWrapDistances(wrap, attrs);
 	if (attrs.wrapText) wrap.wrapText = attrs.wrapText;
+	const authoredEmu = attrs._docxAuthoredEmu;
 	const image = {
 		type: "image",
 		rId: attrs.rId || "",
 		src: attrs.src,
 		size: {
-			width: pixelsToEmu(attrs.width || 0),
-			height: pixelsToEmu(attrs.height || 0)
+			width: emuFromPixels(attrs.width || 0, "width", authoredEmu, emuToPixels),
+			height: emuFromPixels(attrs.height || 0, "height", authoredEmu, emuToPixels)
 		},
 		wrap
 	};
@@ -1845,10 +1948,13 @@ function createImageRun(node) {
 	const imagePosition = imagePositionFromAttrs(attrs.position);
 	if (imagePosition) image.position = imagePosition;
 	if (attrs.layoutInCell !== void 0) image.layoutInCell = attrs.layoutInCell;
+	if (attrs.decorative !== void 0) image.decorative = attrs.decorative;
+	if (attrs.hidden !== void 0) image.hidden = attrs.hidden;
+	if (attrs.docPrExtensions !== void 0) image.docPrExtensions = [...attrs.docPrExtensions];
 	if (attrs.frameLocks !== void 0) image.frameLocks = { ...attrs.frameLocks };
 	if (attrs.borderWidth && attrs.borderWidth > 0) {
 		const outline = {
-			width: pixelsToEmu(attrs.borderWidth),
+			width: emuFromPixels(attrs.borderWidth, "borderWidth", authoredEmu, emuToStrokePixels),
 			style: attrs.borderStyle ? {
 				solid: "solid",
 				dotted: "dot",
@@ -1888,6 +1994,7 @@ function createImageRun(node) {
 	}
 	return {
 		type: "run",
+		...carriedRunFormatting(attrs._docxRunFormatting),
 		content: [drawingFromImageAttrs(image, attrs)]
 	};
 }
@@ -1927,24 +2034,25 @@ const drawingFromImageAttrs = (image, attrs) => {
 */
 function createShapeRun(node) {
 	const attrs = expectShapeAttrs(node);
+	const authoredEmu = attrs._docxAuthoredEmu;
 	const shape = {
 		type: "shape",
 		shapeType: attrs.shapeType || "rect",
 		size: {
-			width: attrs.width ? pixelsToEmu(attrs.width) : 0,
-			height: attrs.height ? pixelsToEmu(attrs.height) : 0
+			width: attrs.width ? emuFromPixels(attrs.width, "width", authoredEmu, emuToPixels) : 0,
+			height: attrs.height ? emuFromPixels(attrs.height, "height", authoredEmu, emuToPixels) : 0
 		}
 	};
 	if (attrs.shapeId) shape.id = attrs.shapeId;
+	if (attrs.shapeName !== void 0) shape.name = attrs.shapeName;
+	if (attrs.alt !== void 0) shape.alt = attrs.alt;
+	if (attrs.title !== void 0) shape.title = attrs.title;
 	const geometryAdjustments = parseShapeGeometryAdjustments(attrs.geometryAdjustments);
 	if (geometryAdjustments !== void 0) shape.geometryAdjustments = geometryAdjustments;
 	const shapeTransform = parseTransformAttr(attrs.transform);
 	if (shapeTransform) shape.transform = shapeTransform;
 	const wrap = { type: attrs.wrapType || "inline" };
-	if (attrs.distTop !== void 0) wrap.distT = pixelsToEmu(attrs.distTop);
-	if (attrs.distBottom !== void 0) wrap.distB = pixelsToEmu(attrs.distBottom);
-	if (attrs.distLeft !== void 0) wrap.distL = pixelsToEmu(attrs.distLeft);
-	if (attrs.distRight !== void 0) wrap.distR = pixelsToEmu(attrs.distRight);
+	assignWrapDistances(wrap, attrs);
 	if (attrs.wrapText) wrap.wrapText = attrs.wrapText;
 	shape.wrap = wrap;
 	const shapePosition = imagePositionFromAttrs(attrs.position);
@@ -1974,22 +2082,28 @@ function createShapeRun(node) {
 		color: attrs.fillColorValue ?? { rgb: attrs.fillColor.replace("#", "") }
 	};
 	else if (attrs.fillType === "none") shape.fill = { type: "none" };
-	if (attrs.outlineStyle !== "none" && (attrs.outlineWidth !== void 0 && attrs.outlineWidth > 0 || attrs.outlineColor || attrs.outlineStyle || attrs.outlineCap || attrs.outlineHeadEnd || attrs.outlineTailEnd)) {
+	if (attrs.outlineStyle !== "none" && (attrs.outlineWidth !== void 0 && attrs.outlineWidth > 0 || attrs.outlineColor || attrs.outlineStyle || attrs.outlineCap || attrs.outlineJoin || attrs.outlineHeadEnd || attrs.outlineTailEnd)) {
 		const shapeOutline = {};
-		if (attrs.outlineWidth !== void 0 && attrs.outlineWidth > 0) shapeOutline.width = pixelsToEmu(attrs.outlineWidth);
-		if (attrs.outlineStyle) shapeOutline.style = normalizeShapeOutlineStyle(attrs.outlineStyle) ?? "solid";
+		if (attrs.outlineWidth !== void 0 && attrs.outlineWidth > 0) shapeOutline.width = emuFromPixels(attrs.outlineWidth, "outlineWidth", authoredEmu, emuToStrokePixels);
+		if (attrs.outlineStyle) {
+			const style = normalizeShapeOutlineStyle(attrs.outlineStyle);
+			if (style !== void 0) shapeOutline.style = style;
+		}
 		if (attrs.outlineCap) shapeOutline.cap = attrs.outlineCap;
+		if (attrs.outlineJoin) shapeOutline.join = attrs.outlineJoin;
 		if (attrs.outlineHeadEnd) shapeOutline.headEnd = attrs.outlineHeadEnd;
 		if (attrs.outlineTailEnd) shapeOutline.tailEnd = attrs.outlineTailEnd;
 		if (attrs.outlineColor) shapeOutline.color = attrs.outlineColorValue ?? { rgb: attrs.outlineColor.replace("#", "") };
 		shape.outline = shapeOutline;
 	}
+	const shapeContent = {
+		type: "shape",
+		shape
+	};
 	return {
 		type: "run",
-		content: [{
-			type: "shape",
-			shape
-		}]
+		...carriedRunFormatting(attrs._docxRunFormatting),
+		content: [shapeContent]
 	};
 }
 const RUN_FORMATTING_VISUAL_GROUPS = {
@@ -2550,6 +2664,17 @@ function marksToTextFormatting(marks, options) {
 /**
 * Convert a ProseMirror table node to our Table type
 */
+/**
+* A table the editor created carries no `w:tblPr`, so the borders its cells
+* were built with are the only record of what the table looks like. Lift the
+* first bordered cell's set to the table.
+*
+* Only for such a table: a table read from a package states its own
+* `w:tblBorders` or deliberately states none, and its cells' borders may be
+* the table style's rather than their own. Inferring there invents a
+* `w:tblBorders` the source never had, and it outranks the table style on
+* reload (`formatting.borders: absent became object` in the corpus census).
+*/
 function inferTableBorders(rows) {
 	for (const row of rows) for (const cell of row.cells) {
 		const borders = cell.formatting?.borders;
@@ -2571,7 +2696,7 @@ function convertPMTable(node, documentCounts, styleResolver = null) {
 	const attrs = expectTableAttrs(node);
 	const rows = convertPMTableRows(node, documentCounts, styleResolver);
 	const formatting = tableAttrsToFormatting(attrs) || void 0;
-	if (!formatting?.borders) {
+	if (!formatting?.borders && !attrs._originalFormatting) {
 		const inferredBorders = inferTableBorders(rows);
 		if (inferredBorders) if (formatting) formatting.borders = inferredBorders;
 		else {
@@ -2590,7 +2715,7 @@ function convertPMTable(node, documentCounts, styleResolver = null) {
 		rows
 	};
 	if (attrs.columnWidths) table.columnWidths = attrs.columnWidths;
-	if (formatting) table.formatting = formatting;
+	if (formatting && Object.keys(formatting).length > 0) table.formatting = formatting;
 	restoreTablePropertyChanges(table, attrs);
 	return table;
 }
@@ -2926,6 +3051,7 @@ const projectTextBoxBodyContent = (state, blocks) => {
 */
 function convertPMTextBox(node, styleResolver = null) {
 	const attrs = expectTextBoxAttrs(node);
+	const authoredEmu = attrs._docxAuthoredEmu;
 	const verticalAlign = normalizeShapeTextAnchor(attrs.verticalAlign);
 	const childBlocks = [];
 	node.forEach((child) => {
@@ -2937,8 +3063,8 @@ function convertPMTextBox(node, styleResolver = null) {
 		type: "shape",
 		shapeType: "textBox",
 		size: {
-			width: attrs.width ? pixelsToEmu(attrs.width) : 0,
-			height: attrs.height ? pixelsToEmu(attrs.height) : 0
+			width: attrs.width ? emuFromPixels(attrs.width, "width", authoredEmu, emuToPixels) : 0,
+			height: attrs.height ? emuFromPixels(attrs.height, "height", authoredEmu, emuToPixels) : 0
 		},
 		textBody: {
 			content: textBodyContent.type === "source-empty" ? [] : textBodyContent.content,
@@ -2948,15 +3074,18 @@ function convertPMTextBox(node, styleResolver = null) {
 			...verticalAlign !== void 0 ? { anchor: verticalAlign } : {},
 			margins: (() => {
 				const m = {};
-				if (typeof attrs.marginTop === "number") m.top = pixelsToEmu(attrs.marginTop);
-				if (typeof attrs.marginBottom === "number") m.bottom = pixelsToEmu(attrs.marginBottom);
-				if (typeof attrs.marginLeft === "number") m.left = pixelsToEmu(attrs.marginLeft);
-				if (typeof attrs.marginRight === "number") m.right = pixelsToEmu(attrs.marginRight);
+				if (typeof attrs.marginTop === "number") m.top = emuFromPixels(attrs.marginTop, "marginTop", authoredEmu, emuToPixels);
+				if (typeof attrs.marginBottom === "number") m.bottom = emuFromPixels(attrs.marginBottom, "marginBottom", authoredEmu, emuToPixels);
+				if (typeof attrs.marginLeft === "number") m.left = emuFromPixels(attrs.marginLeft, "marginLeft", authoredEmu, emuToPixels);
+				if (typeof attrs.marginRight === "number") m.right = emuFromPixels(attrs.marginRight, "marginRight", authoredEmu, emuToPixels);
 				return m;
 			})()
 		}
 	};
 	if (attrs.textBoxId) shape.id = attrs.textBoxId;
+	if (attrs.textBoxName !== void 0) shape.name = attrs.textBoxName;
+	if (attrs.alt !== void 0) shape.alt = attrs.alt;
+	if (attrs.title !== void 0) shape.title = attrs.title;
 	const transform = parseTransformAttr(attrs.transform);
 	if (transform) shape.transform = transform;
 	if (attrs.fillColor) shape.fill = {
@@ -2965,7 +3094,7 @@ function convertPMTextBox(node, styleResolver = null) {
 	};
 	if (attrs.outlineStyle !== "none" && attrs.outlineWidth && attrs.outlineWidth > 0) {
 		const tbOutline = {
-			width: pixelsToEmu(attrs.outlineWidth),
+			width: emuFromPixels(attrs.outlineWidth, "outlineWidth", authoredEmu, emuToStrokePixels),
 			style: normalizeShapeOutlineStyle(attrs.outlineStyle) ?? "solid"
 		};
 		if (attrs.outlineColor) tbOutline.color = { rgb: attrs.outlineColor.replace("#", "") };

package/dist/prosemirror/conversion/toProseDoc.d.ts

@@ -1,7 +1,6 @@
 import { document_d_exports } from "../../types/document.js";
 import { StyleEngine } from "../../style-engine/styleEngine.js";
 import "../../style-engine/index.js";
-import { schema } from "../schema/index.js";
 import { Node } from "prosemirror-model";
 //#region src/prosemirror/conversion/toProseDoc.d.ts
 type UnsupportedDocxToProseMirrorOwner = "complex-field-instruction" | "field-result" | "page-break-bearing-run" | "paragraph-borders" | "paragraph-frame" | "paragraph-outline" | "paragraph-text-box-anchor" | "table-cell" | "text-box";
@@ -39,18 +38,6 @@ declare function resolveParagraphDefaultTextFormatting(styleId: string | undefin
   includeParagraphMarkRunProperties?: boolean;
 }): document_d_exports.TextFormatting | undefined;
 declare function standaloneTableCellToProseMirror(cell: document_d_exports.TableCell, nodeType: "tableCell" | "tableHeader"): Node;
-type AuthoredRunFormattingCarrier = "preserve" | "reconstruct";
-/**
- * Convert TextFormatting to ProseMirror marks
- */
-type TextFormattingToMarksOptions = {
-  overrideFormatting: document_d_exports.TextFormatting | undefined;
-  /** Direct standard font properties whose authored provenance must survive. */
-  directFormatting?: document_d_exports.TextFormatting | undefined;
-  /** Whether direct authorship is reconstructible from structural marks and the style context. */
-  authoredCarrier?: AuthoredRunFormattingCarrier;
-};
-declare function textFormattingToMarks(formatting: document_d_exports.TextFormatting | undefined, options?: TextFormattingToMarksOptions): ReturnType<typeof schema.mark>[];
 /**
  * Convert HeaderFooter content (array of Paragraph/Table blocks) to a ProseMirror document.
  * Used for editing headers/footers in their own ProseMirror editor and for
@@ -66,4 +53,4 @@ declare function footnoteToProseDoc(content: document_d_exports.BlockContent[],
  */
 declare function createEmptyDoc(): Node;
 //#endregion
-export { ToProseDocOptions, UnsupportedDocxToProseMirrorConversionError, createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, resolveParagraphDefaultTextFormatting, standaloneTableCellToProseMirror, textFormattingToMarks, toProseDoc };
+export { ToProseDocOptions, UnsupportedDocxToProseMirrorConversionError, createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, resolveParagraphDefaultTextFormatting, standaloneTableCellToProseMirror, toProseDoc };