@stll/folio-core 0.43.0 → 0.45.0

package/dist/prosemirror/conversion/toProseDoc.js

@@ -1,28 +1,30 @@
 import { resolveColorValueToHex } from "../../docx/drawingUtils.js";
 import { isNumberingReference } from "../../docx/numberingReference.js";
 import { PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, createProseParagraphWithPropertySource, getDocumentParagraphPropertySourceContract, recreateProseNodeWithParagraphPropertySource, transportTableCellsWithParagraphPropertySources } from "../../docx/paragraphPropertySource.js";
+import { isBaselineVertAlign } from "../../docx/runParser.js";
+import { resolveTableLook } from "../../docx/tableLook.js";
+import { isCellMergeContinuation } from "../../docx/tableParser.js";
 import { buildPageBreakRunSourceDescendantIndex } from "../../internal/pageBreakRunSourceDescendantIndex.js";
 import { createStyleEngine } from "../../style-engine/styleEngine.js";
 import { normalizeHorizontalScalePercent } from "../../utils/horizontalScale.js";
 import { mergeParagraphFormatting, mergeParagraphTabStops } from "../../utils/paragraphFormattingMerge.js";
 import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
 import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
-import { emuToPixels } from "../../utils/units.js";
+import { emuToPixels, emuToStrokePixels } from "../../utils/units.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
-import { buildRunFormattingOverrideAttrs } from "../extensions/marks/RunFormattingOverrideExtension.js";
+import { textFormattingToMarks } from "../extensions/marks/markUtils.js";
 import { listRenderingAttrPatch } from "../listRenderingAttrs.js";
 import { stampNumberedRefFieldBaselines } from "../numberedRefFields.js";
 import { pageBreakRunParagraphProjectionDispositionForFeatures } from "../pageBreakRunProjection.js";
 import { directionFromBidi } from "../paragraphDirection.js";
+import { styleResolvedParagraphFormatting } from "../paragraphFormattingProvenance.js";
 import { lineSpacingProvenanceFromSpacing } from "../paragraphSpacing.js";
 import { getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, resolveParagraphBodyRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting } from "../runStyleFormatting.js";
 import { schema } from "../schema/index.js";
-import { COMPLEX_SCRIPT_RUN_PROPERTY_KEYS } from "../schema/marks.js";
 import { cascadeStyleTextFormatting } from "../styles/styleToggleCascade.js";
 import { canCarryTrackedRunMark, trackedRunInlineAtomDisposition } from "../trackedRunInlineAtoms.js";
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { resolveEffectiveTableCellFormatting } from "./effectiveTableCellFormatting.js";
-import { shadingToRunShadingAttrs } from "./runShadingMark.js";
 import { sdtAttrsFromProperties } from "./sdtAttrs.js";
 import { TaggedError, panic } from "better-result";
 import { DRAWING_RAW_XML_MODES } from "@stll/docx-core/model";
@@ -77,25 +79,72 @@ const collectPairedBookmarkIds = (blocks) => {
 		for (const content of run.content) if (content.type === "shape" && content.shape.textBody) visitBlocks(content.shape.textBody.content);
 	};
 	const visitHyperlink = (hyperlink) => {
-		for (const child of hyperlink.children) if (child.type === "bookmarkStart") countBoundary(child.id, "start");
-		else if (child.type === "bookmarkEnd") countBoundary(child.id, "end");
-		else visitRun(child);
+		for (const child of hyperlink.children) switch (child.type) {
+			case "bookmarkStart":
+				countBoundary(child.id, "start");
+				break;
+			case "bookmarkEnd":
+				countBoundary(child.id, "end");
+				break;
+			case "run":
+				visitRun(child);
+				break;
+			default: panic(`Unsupported hyperlink child: ${JSON.stringify(child)}`);
+		}
 	};
 	const visitParagraphContent = (content) => {
-		if (content.type === "bookmarkStart") countBoundary(content.id, "start");
-		else if (content.type === "bookmarkEnd") countBoundary(content.id, "end");
-		else if (content.type === "run") visitRun(content);
-		else if (content.type === "hyperlink") visitHyperlink(content);
-		else if (content.type === "simpleField") for (const child of content.content) if (child.type === "hyperlink") visitHyperlink(child);
-		else visitRun(child);
-		else if (content.type === "complexField") for (const run of [...content.fieldCode ?? [], ...content.fieldResult]) visitRun(run);
-		else if (content.type === "inlineSdt") for (const child of content.content) visitParagraphContent(child);
-		else if (content.type === "insertion" || content.type === "deletion" || content.type === "moveFrom" || content.type === "moveTo") for (const child of content.content) visitParagraphContent(child);
+		switch (content.type) {
+			case "bookmarkStart":
+				countBoundary(content.id, "start");
+				return;
+			case "bookmarkEnd":
+				countBoundary(content.id, "end");
+				return;
+			case "run":
+				visitRun(content);
+				return;
+			case "hyperlink":
+				visitHyperlink(content);
+				return;
+			case "simpleField":
+				for (const child of content.content) if (child.type === "hyperlink") visitHyperlink(child);
+				else visitRun(child);
+				return;
+			case "complexField":
+				for (const run of [...content.fieldCode ?? [], ...content.fieldResult]) visitRun(run);
+				return;
+			case "inlineSdt":
+			case "insertion":
+			case "deletion":
+			case "moveFrom":
+			case "moveTo":
+			case "bidiWrapper":
+				for (const child of content.content) visitParagraphContent(child);
+				return;
+			case "commentRangeStart":
+			case "commentRangeEnd":
+			case "commentReference":
+			case "moveFromRangeStart":
+			case "moveFromRangeEnd":
+			case "moveToRangeStart":
+			case "moveToRangeEnd":
+			case "mathEquation": return;
+			default: panic(`Unsupported paragraph content: ${JSON.stringify(content)}`);
+		}
 	};
 	const visitBlocks = (nestedBlocks) => {
-		for (const block of nestedBlocks) if (block.type === "paragraph") for (const content of block.content) visitParagraphContent(content);
-		else if (block.type === "table") for (const row of block.rows) for (const cell of row.cells) visitBlocks(cell.content);
-		else visitBlocks(block.content);
+		for (const block of nestedBlocks) switch (block.type) {
+			case "paragraph":
+				for (const content of block.content) visitParagraphContent(content);
+				break;
+			case "table":
+				for (const row of block.rows) for (const cell of row.cells) visitBlocks(cell.content);
+				break;
+			case "blockSdt":
+				visitBlocks(block.content);
+				break;
+			default: panic(`Unsupported block content: ${JSON.stringify(block)}`);
+		}
 	};
 	visitBlocks(blocks);
 	return new Set([...counts].flatMap(([id, count]) => count.starts === 1 && count.ends === 1 && count.firstStart !== void 0 && count.firstEnd !== void 0 && count.firstStart < count.firstEnd ? [id] : []));
@@ -121,12 +170,21 @@ function toProseDoc(document, options) {
 	};
 	const convertBodyBlocks = (blocks) => {
 		const out = [];
-		for (const block of blocks) if (block.type === "paragraph") out.push(...convertParagraphWithTextBoxes(block, styleResolver, {
-			textBoxGroupId: nextTextBoxGroupId(),
-			context: conversionContext
-		}));
-		else if (block.type === "table") out.push(convertTable(block, styleResolver, conversionContext));
-		else out.push(convertBlockSdt(block, convertBodyBlocks));
+		for (const block of blocks) switch (block.type) {
+			case "paragraph":
+				out.push(...convertParagraphWithTextBoxes(block, styleResolver, {
+					textBoxGroupId: nextTextBoxGroupId(),
+					context: conversionContext
+				}));
+				break;
+			case "table":
+				out.push(convertTable(block, styleResolver, conversionContext));
+				break;
+			case "blockSdt":
+				out.push(convertBlockSdt(block, convertBodyBlocks));
+				break;
+			default: panic(`Unsupported block content: ${JSON.stringify(block)}`);
+		}
 		return out;
 	};
 	nodes.push(...convertBodyBlocks(paragraphs));
@@ -265,58 +323,95 @@ function convertParagraph(paragraph, styleResolver, context, activeCommentIds, e
 	const emitTrackedChange = (change, markType, moveKind) => {
 		emitInlineNodes(convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, nextPageBreakRunOwnerId, getInheritedRunFormatting, styleResolver, moveKind, textBoxAnchors));
 	};
-	for (const content of paragraph.content) if (content.type === "commentRangeStart") commentIds.add(content.id);
-	else if (content.type === "commentRangeEnd") commentIds.delete(content.id);
-	else if (content.type === "commentReference") anchorPointComment(inlineNodes, content.id);
-	else if (content.type === "run") emitInlineNodes(convertRun(content, getInheritedRunFormatting(content.formatting), nextPageBreakRunOwnerId, styleResolver, textBoxAnchors));
-	else if (content.type === "hyperlink") {
-		const linkNodes = convertHyperlink(content, {
-			getInheritedRunFormatting,
-			styleResolver,
-			hyperlinkIndex: nextHyperlinkInstanceIndex(),
-			textBoxAnchors,
-			nextPageBreakRunOwnerId
-		});
-		if (linkNodes.length === 0) {
-			emptyHyperlinks ??= [];
-			emptyHyperlinks.push({
-				offset: inlineOffset,
-				...content.href !== void 0 ? { href: content.href } : {},
-				...content.anchor !== void 0 ? { anchor: content.anchor } : {},
-				...content.tooltip !== void 0 ? { tooltip: content.tooltip } : {},
-				...content.rId !== void 0 ? { rId: content.rId } : {}
+	for (const content of withoutBidiWrappers(paragraph.content)) switch (content.type) {
+		case "commentRangeStart":
+			commentIds.add(content.id);
+			break;
+		case "commentRangeEnd":
+			commentIds.delete(content.id);
+			break;
+		case "commentReference":
+			anchorPointComment(inlineNodes, content.id);
+			break;
+		case "run":
+			emitInlineNodes(convertRun(content, getInheritedRunFormatting(content.formatting), nextPageBreakRunOwnerId, styleResolver, textBoxAnchors));
+			break;
+		case "hyperlink": {
+			const linkNodes = convertHyperlink(content, {
+				getInheritedRunFormatting,
+				styleResolver,
+				hyperlinkIndex: nextHyperlinkInstanceIndex(),
+				textBoxAnchors,
+				nextPageBreakRunOwnerId
 			});
-			continue;
+			if (linkNodes.length === 0) {
+				emptyHyperlinks ??= [];
+				emptyHyperlinks.push({
+					offset: inlineOffset,
+					...content.href !== void 0 ? { href: content.href } : {},
+					...content.anchor !== void 0 ? { anchor: content.anchor } : {},
+					...content.tooltip !== void 0 ? { tooltip: content.tooltip } : {},
+					...content.rId !== void 0 ? { rId: content.rId } : {}
+				});
+				break;
+			}
+			emitInlineNodes(linkNodes);
+			break;
 		}
-		emitInlineNodes(linkNodes);
-	} else if (content.type === "simpleField" || content.type === "complexField") emitInlineNode(convertField(content, {
-		getInheritedRunFormatting,
-		styleResolver,
-		nextHyperlinkInstanceIndex,
-		nextPageBreakRunOwnerId,
-		textBoxAnchors
-	}));
-	else if (content.type === "inlineSdt") emitInlineNode(convertInlineSdt(content, nextHyperlinkInstanceIndex, nextPageBreakRunOwnerId, getInheritedRunFormatting, styleResolver, textBoxAnchors));
-	else if (content.type === "insertion" || content.type === "moveTo") emitTrackedChange(content, "insertion", content.type === "moveTo" ? "moveTo" : null);
-	else if (content.type === "deletion" || content.type === "moveFrom") emitTrackedChange(content, "deletion", content.type === "moveFrom" ? "moveFrom" : null);
-	else if (content.type === "mathEquation") emitInlineNode(convertMathEquation(content));
-	else if (content.type === "bookmarkStart" && pairedBookmarkIds.has(content.id)) emitInlineNode(schema.node("bookmarkBoundary", {
-		type: "start",
-		id: content.id,
-		name: content.name,
-		colFirst: content.colFirst,
-		colLast: content.colLast
-	}));
-	else if (content.type === "bookmarkEnd" && pairedBookmarkIds.has(content.id)) emitInlineNode(schema.node("bookmarkBoundary", {
-		type: "end",
-		id: content.id
-	}));
-	else if (content.type === "bookmarkStart") {
-		if (!bookmarksArr) bookmarksArr = [];
-		bookmarksArr.push({
-			id: content.id,
-			name: content.name
-		});
+		case "simpleField":
+		case "complexField":
+			emitInlineNode(convertField(content, {
+				getInheritedRunFormatting,
+				styleResolver,
+				nextHyperlinkInstanceIndex,
+				nextPageBreakRunOwnerId,
+				textBoxAnchors
+			}));
+			break;
+		case "inlineSdt":
+			emitInlineNode(convertInlineSdt(content, nextHyperlinkInstanceIndex, nextPageBreakRunOwnerId, getInheritedRunFormatting, styleResolver, textBoxAnchors));
+			break;
+		case "insertion":
+		case "moveTo":
+			emitTrackedChange(content, "insertion", content.type === "moveTo" ? "moveTo" : null);
+			break;
+		case "deletion":
+		case "moveFrom":
+			emitTrackedChange(content, "deletion", content.type === "moveFrom" ? "moveFrom" : null);
+			break;
+		case "mathEquation":
+			emitInlineNode(convertMathEquation(content));
+			break;
+		case "bookmarkStart":
+			if (pairedBookmarkIds.has(content.id)) {
+				emitInlineNode(schema.node("bookmarkBoundary", {
+					type: "start",
+					id: content.id,
+					name: content.name,
+					colFirst: content.colFirst,
+					colLast: content.colLast,
+					displacedByCustomXml: content.displacedByCustomXml
+				}));
+				break;
+			}
+			if (!bookmarksArr) bookmarksArr = [];
+			bookmarksArr.push({
+				id: content.id,
+				name: content.name
+			});
+			break;
+		case "bookmarkEnd":
+			if (pairedBookmarkIds.has(content.id)) emitInlineNode(schema.node("bookmarkBoundary", {
+				type: "end",
+				id: content.id,
+				displacedByCustomXml: content.displacedByCustomXml
+			}));
+			break;
+		case "moveFromRangeStart":
+		case "moveFromRangeEnd":
+		case "moveToRangeStart":
+		case "moveToRangeEnd": break;
+		default: panic(`Unsupported paragraph content: ${JSON.stringify(content)}`);
 	}
 	if (bookmarksArr) attrs.bookmarks = bookmarksArr;
 	if (emptyHyperlinks) attrs._emptyHyperlinks = emptyHyperlinks;
@@ -387,11 +482,13 @@ function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, next
 		id: item.id,
 		name: item.name,
 		colFirst: item.colFirst,
-		colLast: item.colLast
+		colLast: item.colLast,
+		displacedByCustomXml: item.displacedByCustomXml
 	}));
 	else if (item.type === "bookmarkEnd") nodes.push(schema.node("bookmarkBoundary", {
 		type: "end",
-		id: item.id
+		id: item.id,
+		displacedByCustomXml: item.displacedByCustomXml
 	}));
 	else panic(`Unsupported tracked-run content: ${JSON.stringify(item)}`);
 	const mark = schema.marks[markType].create({
@@ -435,6 +532,8 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 	let stylePpr;
 	if (styleResolver) {
 		stylePpr = styleResolver.resolveParagraphStyleInTable(styleId, tableParagraphOverlay).paragraphFormatting;
+		const resolvedFormatting = styleResolvedParagraphFormatting(stylePpr);
+		if (resolvedFormatting) attrs._resolvedFormatting = resolvedFormatting;
 		set("alignment", formatting?.alignment ?? stylePpr?.alignment);
 		set("alignmentFromStyle", stylePpr?.alignment);
 		set("spaceBefore", formatting?.spaceBefore ?? stylePpr?.spaceBefore);
@@ -665,30 +764,33 @@ function calculateRowSpans(table) {
 		const rowCells = row.cells.map((cell) => {
 			const colspan = cell.formatting?.gridSpan ?? 1;
 			const vMerge = cell.formatting?.vMerge;
-			const startRow = vMerge === "continue" ? activeMerges.get(colIndex) : void 0;
+			const isMergeContinuation = isCellMergeContinuation(cell);
+			const startRow = isMergeContinuation ? activeMerges.get(colIndex) : void 0;
 			const info = {
 				cell,
 				colIndex,
 				colspan,
 				vMerge,
+				isMergeContinuation,
 				startRow,
 				hasMeaningfulContent: tableCellHasMeaningfulContent(cell),
-				shouldSkip: vMerge === "continue" && startRow !== void 0
+				shouldSkip: isMergeContinuation && startRow !== void 0
 			};
 			colIndex += colspan;
 			return info;
 		});
 		const rowWouldBeEmpty = rowCells.length > 0 && rowCells.every((cell) => cell.shouldSkip);
 		for (const cellInfo of rowCells) {
-			const { colIndex: cellColIndex, vMerge, startRow, hasMeaningfulContent } = cellInfo;
+			const { colIndex: cellColIndex, vMerge, isMergeContinuation, startRow, hasMeaningfulContent } = cellInfo;
 			const key = `${rowIndex}-${cellColIndex}`;
 			if (vMerge === "restart") {
+				closeVerticalMerge(activeMerges, result, cellColIndex);
 				activeMerges.set(cellColIndex, rowIndex);
 				result.set(key, {
 					rowSpan: 1,
 					skip: false
 				});
-			} else if (vMerge === "continue") {
+			} else if (isMergeContinuation) {
 				if (startRow === void 0 || rowWouldBeEmpty || hasMeaningfulContent) {
 					result.set(key, {
 						rowSpan: 1,
@@ -713,7 +815,7 @@ function calculateRowSpans(table) {
 					skip: true
 				});
 			} else {
-				activeMerges.delete(cellColIndex);
+				closeVerticalMerge(activeMerges, result, cellColIndex);
 				result.set(key, {
 					rowSpan: 1,
 					skip: false
@@ -721,14 +823,28 @@ function calculateRowSpans(table) {
 			}
 		}
 	}
+	clearActiveVerticalMerges(activeMerges, result);
 	return result;
 }
+/**
+* End the vertical merge active in one column.
+*
+* A `w:vMerge="restart"` is carried through the editor by its cell's rowspan,
+* which only exists once a continuation joins it. A merge that closes with a
+* rowspan of 1 — a restart with no continuation, one interrupted by a plain
+* cell, one whose continuation is in a row a revision removed — has nothing
+* but this flag to say the cell was a merge origin, and dropping it changes
+* the table's visible structure.
+*/
+function closeVerticalMerge(activeMerges, result, colIndex) {
+	const startRow = activeMerges.get(colIndex);
+	if (startRow === void 0) return;
+	const restartCell = result.get(`${startRow}-${colIndex}`);
+	if (restartCell && restartCell.rowSpan === 1) restartCell.preserveVMergeRestart = true;
+	activeMerges.delete(colIndex);
+}
 function clearActiveVerticalMerges(activeMerges, result) {
-	for (const [colIndex, startRow] of activeMerges) {
-		const restartCell = result.get(`${startRow}-${colIndex}`);
-		if (restartCell) restartCell.preserveVMergeRestart = true;
-	}
-	activeMerges.clear();
+	for (const colIndex of [...activeMerges.keys()]) closeVerticalMerge(activeMerges, result, colIndex);
 }
 function tableCellHasMeaningfulContent(cell) {
 	return cell.content.some(blockHasMeaningfulContent);
@@ -745,7 +861,7 @@ function paragraphContentHasMeaningfulContent(content) {
 }
 function convertTable(table, styleResolver, context) {
 	for (const row of table.rows) for (const cell of row.cells) {
-		if (cell.formatting?.vMerge === "continue" && context.pageBreakRunSourceDescendants.containsPageBreakRun(cell.content)) throw new UnsupportedDocxToProseMirrorConversionError({
+		if (isCellMergeContinuation(cell) && context.pageBreakRunSourceDescendants.containsPageBreakRun(cell.content)) throw new UnsupportedDocxToProseMirrorConversionError({
 			message: `${PAGE_BREAK_CONTAINER_DESCRIPTIONS["table-cell"]} cannot be represented in the editor model`,
 			owner: "table-cell",
 			contentType: "break"
@@ -756,7 +872,7 @@ function convertTable(table, styleResolver, context) {
 	const columnWidths = table.columnWidths;
 	const totalWidth = columnWidths?.reduce((sum, w) => sum + w, 0) ?? 0;
 	const tableStyleId = table.formatting?.styleId;
-	const look = table.formatting?.look;
+	const look = resolveTableLook(table.formatting?.look);
 	const tableStyle = tableStyleId ? styleResolver?.getStyle(tableStyleId) : void 0;
 	const defaultTableStyle = styleResolver?.getDefaultTableStyle();
 	const fallbackTableStyle = tableStyleId ? void 0 : defaultTableStyle;
@@ -792,7 +908,7 @@ function convertTable(table, styleResolver, context) {
 	if (resolvedTableIndent) attrs._resolvedIndent = resolvedTableIndent;
 	if (resolvedTableJustification) attrs._resolvedJustification = resolvedTableJustification;
 	if (resolvedTableBidi !== void 0) attrs._resolvedBidi = resolvedTableBidi;
-	if (table.formatting) attrs._originalFormatting = table.formatting;
+	attrs._originalFormatting = table.formatting ?? {};
 	if (table.propertyChanges && table.propertyChanges.length > 0) attrs.tblPrChange = [...table.propertyChanges];
 	const conditionalStyles = {};
 	const setCS = (key, type) => {
@@ -814,15 +930,15 @@ function convertTable(table, styleResolver, context) {
 	setCS("neCell", "neCell");
 	setCS("swCell", "swCell");
 	setCS("seCell", "seCell");
-	const bandingEnabledH = look?.noHBand !== true;
-	const bandingEnabledV = look?.noVBand !== true;
+	const bandingEnabledH = !look.noHBand;
+	const bandingEnabledV = !look.noVBand;
 	let dataRowIndex = 0;
 	const totalRows = table.rows.length;
 	const gridColumnCount = columnWidths?.length ?? 0;
 	const totalColumns = gridColumnCount > 0 ? gridColumnCount : countTableColumns(table.rows);
 	const rows = table.rows.map((row, rowIndex) => {
-		const isFirstRowStyled = rowIndex === 0 && !!look?.firstRow;
-		const isLastRow = rowIndex === totalRows - 1 && !!look?.lastRow;
+		const isFirstRowStyled = rowIndex === 0 && look.firstRow;
+		const isLastRow = rowIndex === totalRows - 1 && look.lastRow;
 		const rowBandStyle = (() => {
 			if (bandingEnabledH && !isFirstRowStyled && !isLastRow) return (() => {
 				if (dataRowIndex % 2 === 0) return conditionalStyles.band1Horz;
@@ -857,26 +973,34 @@ function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths,
 	if (row.formatting) attrsWithoutStructuralChange._originalFormatting = row.formatting;
 	if (row.propertyChanges && row.propertyChanges.length > 0) attrsWithoutStructuralChange.trPrChange = [...row.propertyChanges];
 	let attrs = attrsWithoutStructuralChange;
-	if (row.structuralChange?.type === "tableRowInsertion") attrs = {
-		...attrsWithoutStructuralChange,
-		trIns: {
-			revisionId: row.structuralChange.info.id,
-			author: row.structuralChange.info.author,
-			date: row.structuralChange.info.date ?? null,
-			...row.structuralChange.info.utcDate ? { utcDate: row.structuralChange.info.utcDate.value } : {},
-			...row.structuralChange.info.initials ? { initials: row.structuralChange.info.initials } : {}
-		}
-	};
-	else if (row.structuralChange?.type === "tableRowDeletion") attrs = {
-		...attrsWithoutStructuralChange,
-		trDel: {
-			revisionId: row.structuralChange.info.id,
-			author: row.structuralChange.info.author,
-			date: row.structuralChange.info.date ?? null,
-			...row.structuralChange.info.utcDate ? { utcDate: row.structuralChange.info.utcDate.value } : {},
-			...row.structuralChange.info.initials ? { initials: row.structuralChange.info.initials } : {}
+	const rowStructuralChange = row.structuralChange;
+	if (rowStructuralChange) {
+		const revision = {
+			revisionId: rowStructuralChange.info.id,
+			author: rowStructuralChange.info.author,
+			date: rowStructuralChange.info.date ?? null,
+			...rowStructuralChange.info.utcDate ? { utcDate: rowStructuralChange.info.utcDate.value } : {},
+			...rowStructuralChange.info.initials ? { initials: rowStructuralChange.info.initials } : {}
+		};
+		switch (rowStructuralChange.type) {
+			case "tableRowInsertion":
+				attrs = {
+					...attrsWithoutStructuralChange,
+					trIns: revision
+				};
+				break;
+			case "tableRowDeletion":
+				attrs = {
+					...attrsWithoutStructuralChange,
+					trDel: revision
+				};
+				break;
+			case "tableCellInsertion":
+			case "tableCellDeletion":
+			case "tableCellMerge": break;
+			default: panic(`Unsupported table row structural change: ${JSON.stringify(rowStructuralChange)}`);
 		}
-	};
+	}
 	const numCells = row.cells.length;
 	const isFirstRow = rowIndex === 0;
 	const isLastRow = rowIndex === (totalRows ?? 1) - 1;
@@ -1006,38 +1130,41 @@ function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPer
 	}
 	if (formatting) attrs._originalFormatting = formatting;
 	if (cell.propertyChanges && cell.propertyChanges.length > 0) attrs.tcPrChange = [...cell.propertyChanges];
-	if (cell.structuralChange?.type === "tableCellInsertion") attrs.cellMarker = {
-		kind: "ins",
-		info: {
-			revisionId: cell.structuralChange.info.id,
-			author: cell.structuralChange.info.author,
-			date: cell.structuralChange.info.date ?? null,
-			...cell.structuralChange.info.utcDate ? { utcDate: cell.structuralChange.info.utcDate.value } : {},
-			...cell.structuralChange.info.initials ? { initials: cell.structuralChange.info.initials } : {}
-		}
-	};
-	else if (cell.structuralChange?.type === "tableCellDeletion") attrs.cellMarker = {
-		kind: "del",
-		info: {
-			revisionId: cell.structuralChange.info.id,
-			author: cell.structuralChange.info.author,
-			date: cell.structuralChange.info.date ?? null,
-			...cell.structuralChange.info.utcDate ? { utcDate: cell.structuralChange.info.utcDate.value } : {},
-			...cell.structuralChange.info.initials ? { initials: cell.structuralChange.info.initials } : {}
+	const cellStructuralChange = cell.structuralChange;
+	if (cellStructuralChange) {
+		const info = {
+			revisionId: cellStructuralChange.info.id,
+			author: cellStructuralChange.info.author,
+			date: cellStructuralChange.info.date ?? null,
+			...cellStructuralChange.info.utcDate ? { utcDate: cellStructuralChange.info.utcDate.value } : {},
+			...cellStructuralChange.info.initials ? { initials: cellStructuralChange.info.initials } : {}
+		};
+		switch (cellStructuralChange.type) {
+			case "tableCellInsertion":
+				attrs.cellMarker = {
+					kind: "ins",
+					info
+				};
+				break;
+			case "tableCellDeletion":
+				attrs.cellMarker = {
+					kind: "del",
+					info
+				};
+				break;
+			case "tableCellMerge":
+				attrs.cellMarker = {
+					kind: "merge",
+					info,
+					...cellStructuralChange.verticalMerge !== void 0 ? { verticalMerge: cellStructuralChange.verticalMerge } : {},
+					...cellStructuralChange.verticalMergeOriginal !== void 0 ? { verticalMergeOriginal: cellStructuralChange.verticalMergeOriginal } : {}
+				};
+				break;
+			case "tableRowInsertion":
+			case "tableRowDeletion": break;
+			default: panic(`Unsupported table cell structural change: ${JSON.stringify(cellStructuralChange)}`);
 		}
-	};
-	else if (cell.structuralChange?.type === "tableCellMerge") attrs.cellMarker = {
-		kind: "merge",
-		info: {
-			revisionId: cell.structuralChange.info.id,
-			author: cell.structuralChange.info.author,
-			date: cell.structuralChange.info.date ?? null,
-			...cell.structuralChange.info.utcDate ? { utcDate: cell.structuralChange.info.utcDate.value } : {},
-			...cell.structuralChange.info.initials ? { initials: cell.structuralChange.info.initials } : {}
-		},
-		...cell.structuralChange.verticalMerge !== void 0 ? { verticalMerge: cell.structuralChange.verticalMerge } : {},
-		...cell.structuralChange.verticalMergeOriginal !== void 0 ? { verticalMergeOriginal: cell.structuralChange.verticalMergeOriginal } : {}
-	};
+	}
 	if (preserveVMergeRestart) attrs._preserveVMergeRestart = true;
 	if (vMergeContinuationCells && vMergeContinuationCells.length > 0) attrs._docxVMergeContinuationCells = transportTableCellsWithParagraphPropertySources(vMergeContinuationCells);
 	const contentNodes = [];
@@ -1136,6 +1263,22 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 /**
 * Convert a MathEquation to a ProseMirror math node.
 */
+/**
+* Flatten `w:bdo`/`w:dir` out of an inline content list.
+*
+* The editor has no projection for a bidirectional wrapper yet, and the
+* alternative to flattening it is worse than losing the direction: every
+* inline loop below narrows by a chain of `else if` rather than by
+* exhaustion, so an unhandled member reaches whichever branch happens to be
+* last and is read as that. Flattening keeps the wrapper's content and loses
+* only its direction, which the survival census records as an
+* editor-projection loss until the mark that carries it exists.
+*
+* The save path is unaffected: a document opened and saved without being
+* edited replays its markup, and one that is edited keeps the wrapper because
+* `fromProseDoc` rebuilds from the source paragraph.
+*/
+const withoutBidiWrappers = (content) => content.flatMap((item) => item.type === "bidiWrapper" ? withoutBidiWrappers(item.content) : [item]);
 function convertMathEquation(math) {
 	return schema.node("math", {
 		display: math.display,
@@ -1149,37 +1292,50 @@ function convertMathEquation(math) {
 function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, nextPageBreakRunOwnerId, getInheritedRunFormatting, styleResolver, textBoxAnchors) {
 	const props = sdt.properties;
 	const inlineNodes = [];
-	for (const content of sdt.content) if (content.type === "run") {
-		const runNodes = convertRun(content, getInheritedRunFormatting(content.formatting), nextPageBreakRunOwnerId, styleResolver, textBoxAnchors);
-		inlineNodes.push(...runNodes);
-	} else if (content.type === "hyperlink") {
-		const linkNodes = convertHyperlink(content, {
-			getInheritedRunFormatting,
-			styleResolver,
-			hyperlinkIndex: nextHyperlinkInstanceIndex(),
-			textBoxAnchors,
-			nextPageBreakRunOwnerId
-		});
-		inlineNodes.push(...linkNodes);
-	} else if (content.type === "simpleField" || content.type === "complexField") {
-		const fieldNode = convertField(content, {
-			getInheritedRunFormatting,
-			styleResolver,
-			nextHyperlinkInstanceIndex,
-			nextPageBreakRunOwnerId,
-			textBoxAnchors
-		});
-		if (fieldNode) inlineNodes.push(fieldNode);
-	} else if (content.type === "inlineSdt") {
-		const nestedSdt = convertInlineSdt(content, nextHyperlinkInstanceIndex, nextPageBreakRunOwnerId, getInheritedRunFormatting, styleResolver, textBoxAnchors);
-		if (nestedSdt) inlineNodes.push(nestedSdt);
-	} else if (content.type === "insertion") inlineNodes.push(...convertTrackedChange(content, "insertion", nextHyperlinkInstanceIndex, nextPageBreakRunOwnerId, getInheritedRunFormatting, styleResolver, null, textBoxAnchors));
-	else if (content.type === "deletion") inlineNodes.push(...convertTrackedChange(content, "deletion", nextHyperlinkInstanceIndex, nextPageBreakRunOwnerId, getInheritedRunFormatting, styleResolver, null, textBoxAnchors));
-	else if (content.type === "moveTo") inlineNodes.push(...convertTrackedChange(content, "insertion", nextHyperlinkInstanceIndex, nextPageBreakRunOwnerId, getInheritedRunFormatting, styleResolver, "moveTo", textBoxAnchors));
-	else if (content.type === "moveFrom") inlineNodes.push(...convertTrackedChange(content, "deletion", nextHyperlinkInstanceIndex, nextPageBreakRunOwnerId, getInheritedRunFormatting, styleResolver, "moveFrom", textBoxAnchors));
-	else {
-		const mathNode = convertMathEquation(content);
-		if (mathNode) inlineNodes.push(mathNode);
+	for (const content of sdt.content) switch (content.type) {
+		case "run":
+			inlineNodes.push(...convertRun(content, getInheritedRunFormatting(content.formatting), nextPageBreakRunOwnerId, styleResolver, textBoxAnchors));
+			break;
+		case "hyperlink": {
+			const currentHyperlinkIndex = nextHyperlinkInstanceIndex();
+			inlineNodes.push(...convertHyperlink(content, {
+				getInheritedRunFormatting,
+				styleResolver,
+				hyperlinkIndex: currentHyperlinkIndex,
+				textBoxAnchors,
+				nextPageBreakRunOwnerId
+			}));
+			break;
+		}
+		case "simpleField":
+		case "complexField": {
+			const fieldNode = convertField(content, {
+				getInheritedRunFormatting,
+				styleResolver,
+				nextHyperlinkInstanceIndex,
+				nextPageBreakRunOwnerId,
+				textBoxAnchors
+			});
+			if (fieldNode) inlineNodes.push(fieldNode);
+			break;
+		}
+		case "inlineSdt": {
+			const nestedSdt = convertInlineSdt(content, nextHyperlinkInstanceIndex, nextPageBreakRunOwnerId, getInheritedRunFormatting, styleResolver, textBoxAnchors);
+			if (nestedSdt) inlineNodes.push(nestedSdt);
+			break;
+		}
+		case "insertion":
+		case "deletion":
+		case "moveTo":
+		case "moveFrom":
+			inlineNodes.push(...convertTrackedChange(content, content.type === "insertion" || content.type === "moveTo" ? "insertion" : "deletion", nextHyperlinkInstanceIndex, nextPageBreakRunOwnerId, getInheritedRunFormatting, styleResolver, content.type === "moveTo" || content.type === "moveFrom" ? content.type : null, textBoxAnchors));
+			break;
+		case "mathEquation": {
+			const mathNode = convertMathEquation(content);
+			if (mathNode) inlineNodes.push(mathNode);
+			break;
+		}
+		default: panic(`Unsupported inline SDT content: ${JSON.stringify(content)}`);
 	}
 	return schema.node("sdt", sdtAttrsFromProperties(props), inlineNodes.length > 0 ? inlineNodes : void 0);
 }
@@ -1196,7 +1352,7 @@ function convertRun(run, resolvedStyleFormatting, nextPageBreakRunOwnerId, style
 	if (run.propertyChanges && run.propertyChanges.length > 0) marks.push(schema.mark("runPropertyChange", { changes: [...run.propertyChanges] }));
 	if (run.content.some((content) => content.type === "break" && content.breakType === "page")) marks.push(schema.mark("pageBreakRunOwner", { id: nextPageBreakRunOwnerId() }));
 	for (const content of run.content) {
-		const contentNodes = convertRunContent(content, marks, mergedFormatting, textBoxAnchors);
+		const contentNodes = convertRunContent(content, marks, mergedFormatting, textBoxAnchors, run.formatting);
 		nodes.push(...contentNodes);
 	}
 	return nodes;
@@ -1263,6 +1419,7 @@ const scanLeadingPageBreakContent = (content, scan) => {
 		case "moveFrom":
 		case "moveTo":
 		case "inlineSdt":
+		case "bidiWrapper":
 			for (const child of content.content) scanLeadingPageBreakContent(child, scan);
 			return;
 		case "simpleField":
@@ -1458,7 +1615,7 @@ const canReconstructAuthoredRunFormatting = ({ directFormatting, effectiveFormat
 };
 function buildRunMarks(runFormatting, inherited, styleResolver) {
 	if (runFormatting === void 0 && inherited.implicitCharacterStyleApplied === true && inherited.paragraphMarkOverrides === void 0) return {
-		marks: textFormattingToMarks(inherited.formatting, {
+		marks: textFormattingToMarks(inherited.formatting, schema, {
 			overrideFormatting: void 0,
 			directFormatting: void 0,
 			authoredCarrier: "reconstruct"
@@ -1502,7 +1659,7 @@ function buildRunMarks(runFormatting, inherited, styleResolver) {
 		if (overrideFormatting?.bold === true) delete overrideFormatting.bold;
 		if (overrideFormatting?.italic === true) delete overrideFormatting.italic;
 	}
-	const marks = textFormattingToMarks(mergedFormatting, {
+	const marks = textFormattingToMarks(mergedFormatting, schema, {
 		overrideFormatting,
 		directFormatting: runFormatting,
 		authoredCarrier
@@ -1513,55 +1670,6 @@ function buildRunMarks(runFormatting, inherited, styleResolver) {
 		mergedFormatting
 	};
 }
-const addDirectFontProvenance = (marks, directFormatting) => {
-	const directFontProperties = [];
-	if (directFormatting?.fontFamily !== void 0) directFontProperties.push("fontFamily");
-	if (directFormatting?.fontSize !== void 0) directFontProperties.push("fontSize");
-	if (directFormatting?.color !== void 0) directFontProperties.push("color");
-	if (directFontProperties.length === 0) return;
-	const index = marks.findIndex(({ type }) => type.name === "runFormattingOverride");
-	const existing = index >= 0 ? marks.at(index) : void 0;
-	const override = schema.mark("runFormattingOverride", {
-		...existing?.attrs,
-		directFontProperties
-	});
-	if (index >= 0) {
-		marks[index] = override;
-		return;
-	}
-	marks.push(override);
-};
-const COMPLEX_SCRIPT_MIRRORS = [
-	{
-		ordinary: "bold",
-		complex: "boldCs"
-	},
-	{
-		ordinary: "italic",
-		complex: "italicCs"
-	},
-	{
-		ordinary: "fontSize",
-		complex: "fontSizeCs"
-	}
-];
-const addComplexScriptAbsenceProvenance = (marks, directFormatting) => {
-	const absent = COMPLEX_SCRIPT_MIRRORS.filter(({ ordinary, complex }) => directFormatting?.[ordinary] !== void 0 && directFormatting[complex] === void 0).map(({ complex }) => complex);
-	if (absent.length === 0) return;
-	const index = marks.findIndex(({ type }) => type.name === "runFormattingOverride");
-	const existing = index >= 0 ? marks.at(index) : void 0;
-	const existingAbsences = new Set(existing?.attrs["complexScriptPropertyAbsences"] ?? []);
-	for (const property of absent) existingAbsences.add(property);
-	const override = schema.mark("runFormattingOverride", {
-		...existing?.attrs,
-		complexScriptPropertyAbsences: COMPLEX_SCRIPT_RUN_PROPERTY_KEYS.filter((property) => existingAbsences.has(property))
-	});
-	if (index >= 0) {
-		marks[index] = override;
-		return;
-	}
-	marks.push(override);
-};
 const ORDINARY_STYLE_TOGGLE_KEYS = [
 	"strike",
 	"allCaps",
@@ -1579,9 +1687,28 @@ function getRunFormattingOverrides({ directFormatting, effectiveStyleFormatting,
 	return overrides;
 }
 /**
+* The vertical alignment a note reference mark carries.
+*
+* The mark models the two alignments a reference can sit at; `subscript` is not
+* one of them and drops to `null`. `baseline` is read through its owner, since
+* it is the reserved "no offset" value rather than an offset of its own.
+*/
+const noteReferenceVertAlign = (vertAlign) => {
+	if (isBaselineVertAlign(vertAlign)) return "baseline";
+	return vertAlign === "superscript" ? "superscript" : null;
+};
+/**
+* The run properties an inline atom has to carry itself.
+*
+* `withRunBoundaryMarks` keeps the run's formatting marks off an image or
+* shape node, so the node is the only place left to record the `w:rPr` the
+* run was authored with.
+*/
+const carriedRunFormatting = (formatting) => formatting && Object.keys(formatting).length > 0 ? formatting : void 0;
+/**
 * Convert RunContent to ProseMirror nodes
 */
-function convertRunContent(content, marks, formatting, textBoxAnchors) {
+function convertRunContent(content, marks, formatting, textBoxAnchors, authoredFormatting) {
 	switch (content.type) {
 		case "text":
 			if (content.text) return [schema.text(content.text, marks)];
@@ -1605,7 +1732,8 @@ function convertRunContent(content, marks, formatting, textBoxAnchors) {
 			image: content.image,
 			rawXml: content.rawXml,
 			rawXmlMode: content.rawXmlMode,
-			rawImageFingerprint: content.rawXmlMode === DRAWING_RAW_XML_MODES.PRESERVE_ONLY ? void 0 : content.rawImageFingerprint
+			rawImageFingerprint: content.rawXmlMode === DRAWING_RAW_XML_MODES.PRESERVE_ONLY ? void 0 : content.rawImageFingerprint,
+			runFormatting: carriedRunFormatting(authoredFormatting)
 		}), marks)];
 		case "shape": {
 			const shp = content.shape;
@@ -1613,13 +1741,13 @@ function convertRunContent(content, marks, formatting, textBoxAnchors) {
 				const anchorId = textBoxAnchors?.get(shp);
 				return anchorId ? [schema.node("textBoxAnchor", { anchorId }).mark(marks)] : [];
 			}
-			return [withRunBoundaryMarks(convertShape(shp), marks)];
+			return [withRunBoundaryMarks(convertShape(shp, carriedRunFormatting(authoredFormatting)), marks)];
 		}
 		case "footnoteRef": {
 			const footnoteMark = schema.mark("footnoteRef", {
 				id: content.id.toString(),
 				noteType: "footnote",
-				vertAlign: formatting?.vertAlign === "baseline" || formatting?.vertAlign === "superscript" ? formatting.vertAlign : null
+				vertAlign: noteReferenceVertAlign(formatting?.vertAlign)
 			});
 			return [schema.text(content.id.toString(), [...marks, footnoteMark])];
 		}
@@ -1627,7 +1755,7 @@ function convertRunContent(content, marks, formatting, textBoxAnchors) {
 			const endnoteMark = schema.mark("footnoteRef", {
 				id: content.id.toString(),
 				noteType: "endnote",
-				vertAlign: formatting?.vertAlign === "baseline" || formatting?.vertAlign === "superscript" ? formatting.vertAlign : null
+				vertAlign: noteReferenceVertAlign(formatting?.vertAlign)
 			});
 			return [schema.text(content.id.toString(), [...marks, endnoteMark])];
 		}
@@ -1645,7 +1773,19 @@ function withRunBoundaryMarks(node, marks) {
 	if (!marks.some(({ type }) => type.name === "hyperlink" || type.name === "pageBreakRunOwner")) return node;
 	return node.mark(marks);
 }
-function convertImage({ image, rawXml, rawXmlMode, rawImageFingerprint }) {
+/**
+* The authored-EMU carrier for a drawing, or nothing when the source authored
+* none of these values and there is accordingly nothing to carry.
+*/
+const authoredEmuAttrs = (values) => Object.values(values).some((value) => value !== void 0) ? values : void 0;
+/** The wrap insets of a drawing, keyed by the pixel attribute each becomes. */
+const wrapDistanceEmu = (wrap) => ({
+	distTop: wrap?.distT,
+	distBottom: wrap?.distB,
+	distLeft: wrap?.distL,
+	distRight: wrap?.distR
+});
+function convertImage({ image, rawXml, rawXmlMode, rawImageFingerprint, runFormatting }) {
 	const imageSize = image.size;
 	const widthPx = imageSize?.width ? emuToPixels(imageSize.width) : void 0;
 	const heightPx = imageSize?.height ? emuToPixels(imageSize.height) : void 0;
@@ -1700,7 +1840,7 @@ function convertImage({ image, rawXml, rawXmlMode, rawImageFingerprint }) {
 	let borderColor;
 	let borderStyle;
 	if (image.outline && image.outline.width) {
-		borderWidth = Math.round(image.outline.width / 914400 * 96 * 100) / 100;
+		borderWidth = emuToStrokePixels(image.outline.width);
 		if (image.outline.color?.rgb) borderColor = `#${image.outline.color.rgb}`;
 		borderStyle = image.outline.style ? {
 			solid: "solid",
@@ -1743,8 +1883,17 @@ function convertImage({ image, rawXml, rawXmlMode, rawImageFingerprint }) {
 		paddingLeft: image.padding?.left,
 		position,
 		layoutInCell: image.layoutInCell,
+		decorative: image.decorative,
+		hidden: image.hidden,
+		docPrExtensions: image.docPrExtensions ? [...image.docPrExtensions] : void 0,
 		frameLocks: image.frameLocks ? { ...image.frameLocks } : void 0,
 		borderWidth,
+		_docxAuthoredEmu: authoredEmuAttrs({
+			width: imageSize?.width,
+			height: imageSize?.height,
+			borderWidth: image.outline?.width,
+			...wrapDistanceEmu(image.wrap)
+		}),
 		borderColor,
 		borderStyle,
 		wrapText,
@@ -1753,7 +1902,8 @@ function convertImage({ image, rawXml, rawXmlMode, rawImageFingerprint }) {
 		_docxRawXml: rawXml,
 		_docxRawXmlMode: rawXmlMode,
 		_docxRawImageFingerprint: rawImageFingerprint,
-		_docxObjectPreview: rawXml !== void 0 && /<(?:[A-Za-z_][\w.-]*:)?object(?:\s|>)/u.test(rawXml)
+		_docxObjectPreview: rawXml !== void 0 && /<(?:[A-Za-z_][\w.-]*:)?object(?:\s|>)/u.test(rawXml),
+		_docxRunFormatting: runFormatting
 	});
 }
 function convertHyperlink(hyperlink, { getInheritedRunFormatting, styleResolver, hyperlinkIndex, textBoxAnchors, nextPageBreakRunOwnerId }) {
@@ -1772,14 +1922,16 @@ function convertHyperlink(hyperlink, { getInheritedRunFormatting, styleResolver,
 				id: child.id,
 				name: child.name,
 				colFirst: child.colFirst,
-				colLast: child.colLast
+				colLast: child.colLast,
+				displacedByCustomXml: child.displacedByCustomXml
 			}, void 0, [linkMark]));
 			continue;
 		}
 		if (child.type === "bookmarkEnd") {
 			nodes.push(schema.node("bookmarkBoundary", {
 				type: "end",
-				id: child.id
+				id: child.id,
+				displacedByCustomXml: child.displacedByCustomXml
 			}, void 0, [linkMark]));
 			continue;
 		}
@@ -1790,82 +1942,15 @@ function convertHyperlink(hyperlink, { getInheritedRunFormatting, styleResolver,
 			if (child.propertyChanges && child.propertyChanges.length > 0) runMarks.push(schema.mark("runPropertyChange", { changes: [...child.propertyChanges] }));
 			if (child.content.some((content) => content.type === "break" && content.breakType === "page")) runMarks.push(schema.mark("pageBreakRunOwner", { id: nextPageBreakRunOwnerId() }));
 			const allMarks = [...runMarks, linkMark];
-			for (const content of child.content) nodes.push(...convertRunContent(content, allMarks, mergedFormatting, textBoxAnchors));
+			for (const content of child.content) nodes.push(...convertRunContent(content, allMarks, mergedFormatting, textBoxAnchors, child.formatting));
 		}
 	}
 	return nodes;
 }
-function textFormattingToMarks(formatting, options) {
-	if (!formatting) return [];
-	const marks = [];
-	const overrideFormatting = options ? options.overrideFormatting : formatting;
-	let overrideAttrs;
-	if (options?.authoredCarrier === "reconstruct") overrideAttrs = buildRunFormattingOverrideAttrs(overrideFormatting, { type: "structural-only" });
-	else if (options) overrideAttrs = buildRunFormattingOverrideAttrs(overrideFormatting, {
-		type: "authored-baseline",
-		formatting: options.directFormatting
-	});
-	else overrideAttrs = buildRunFormattingOverrideAttrs(overrideFormatting);
-	if (overrideAttrs) marks.push(schema.mark("runFormattingOverride", overrideAttrs));
-	if (formatting.bold) marks.push(schema.mark("bold"));
-	if (formatting.italic) marks.push(schema.mark("italic"));
-	if (formatting.underline && formatting.underline.style !== "none") marks.push(schema.mark("underline", {
-		style: formatting.underline.style,
-		color: formatting.underline.color
-	}));
-	if (formatting.strike || formatting.doubleStrike) marks.push(schema.mark("strike", { double: formatting.doubleStrike || false }));
-	if (formatting.color && !formatting.color.auto) marks.push(schema.mark("textColor", {
-		rgb: formatting.color.rgb,
-		themeColor: formatting.color.themeColor,
-		themeTint: formatting.color.themeTint,
-		themeShade: formatting.color.themeShade
-	}));
-	if (formatting.highlight && formatting.highlight !== "none") marks.push(schema.mark("highlight", { color: formatting.highlight }));
-	const runShadingMarkAttrs = shadingToRunShadingAttrs(formatting.shading);
-	if (runShadingMarkAttrs) marks.push(schema.mark("runShading", runShadingMarkAttrs));
-	if (formatting.fontSize) marks.push(schema.mark("fontSize", { size: formatting.fontSize }));
-	if (formatting.fontFamily) marks.push(schema.mark("fontFamily", {
-		ascii: formatting.fontFamily.ascii,
-		hAnsi: formatting.fontFamily.hAnsi,
-		eastAsia: formatting.fontFamily.eastAsia,
-		cs: formatting.fontFamily.cs,
-		hint: formatting.fontFamily.hint,
-		asciiTheme: formatting.fontFamily.asciiTheme,
-		hAnsiTheme: formatting.fontFamily.hAnsiTheme,
-		eastAsiaTheme: formatting.fontFamily.eastAsiaTheme,
-		csTheme: formatting.fontFamily.csTheme
-	}));
-	if (formatting.language) marks.push(schema.mark("language", formatting.language));
-	if (formatting.vertAlign === "superscript") marks.push(schema.mark("superscript"));
-	else if (formatting.vertAlign === "subscript") marks.push(schema.mark("subscript"));
-	if (formatting.allCaps) marks.push(schema.mark("allCaps"));
-	if (formatting.smallCaps) marks.push(schema.mark("smallCaps"));
-	const spacing = typeof formatting.spacing === "number" ? formatting.spacing : null;
-	const position = typeof formatting.position === "number" ? formatting.position : null;
-	const scale = normalizeHorizontalScalePercent(formatting.scale) ?? null;
-	const kerning = typeof formatting.kerning === "number" ? formatting.kerning : null;
-	if (spacing !== null || position !== null || scale !== null || kerning !== null) marks.push(schema.mark("characterSpacing", {
-		spacing,
-		position,
-		scale,
-		kerning
-	}));
-	if (formatting.hidden === true) marks.push(schema.mark("hidden"));
-	if (formatting.emboss) marks.push(schema.mark("emboss"));
-	if (formatting.imprint) marks.push(schema.mark("imprint"));
-	if (formatting.shadow) marks.push(schema.mark("textShadow"));
-	if (formatting.emphasisMark && formatting.emphasisMark !== "none") marks.push(schema.mark("emphasisMark", { type: formatting.emphasisMark }));
-	if (formatting.outline) marks.push(schema.mark("textOutline"));
-	if (formatting.rtl) marks.push(schema.mark("rtl"));
-	if (formatting.effect && formatting.effect !== "none") marks.push(schema.mark("textEffect", { effect: formatting.effect }));
-	addDirectFontProvenance(marks, options?.directFormatting);
-	if (options?.authoredCarrier === "preserve") addComplexScriptAbsenceProvenance(marks, options.directFormatting);
-	return marks;
-}
 /**
 * Convert a Shape to a ProseMirror shape node (inline SVG)
 */
-function convertShape(shape) {
+function convertShape(shape, runFormatting) {
 	const shapeSize = shape.size;
 	const widthPx = shapeSize?.width ? emuToPixels(shapeSize.width) : 100;
 	const heightPx = shapeSize?.height ? emuToPixels(shapeSize.height) : 80;
@@ -1897,16 +1982,18 @@ function convertShape(shape) {
 	let outlineColorValue;
 	let outlineStyle = "none";
 	let outlineCap;
+	let outlineJoin;
 	let outlineHeadEnd;
 	let outlineTailEnd;
 	if (shape.outline) {
-		if (shape.outline.width) outlineWidth = Math.round(shape.outline.width / 914400 * 96 * 100) / 100;
+		if (shape.outline.width) outlineWidth = emuToStrokePixels(shape.outline.width);
 		if (shape.outline.color) {
 			outlineColorValue = shape.outline.color;
 			outlineColor = resolveColorValueToHex(shape.outline.color);
 		}
-		outlineStyle = shape.outline.style || "solid";
+		outlineStyle = shape.outline.style;
 		outlineCap = shape.outline.cap;
+		outlineJoin = shape.outline.join;
 		outlineHeadEnd = shape.outline.headEnd;
 		outlineTailEnd = shape.outline.tailEnd;
 	} else outlineWidth = 0;
@@ -1937,11 +2024,21 @@ function convertShape(shape) {
 		}
 	};
 	return schema.node("shape", {
+		_docxRunFormatting: runFormatting,
 		shapeType: shapeAttrs.shapeType ?? "rect",
 		geometryAdjustments: shape.geometryAdjustments === void 0 ? void 0 : JSON.stringify(shape.geometryAdjustments),
 		shapeId: shape.id,
+		shapeName: shape.name,
+		alt: shape.alt,
+		title: shape.title,
 		width: widthPx,
 		height: heightPx,
+		_docxAuthoredEmu: authoredEmuAttrs({
+			width: shapeSize?.width,
+			height: shapeSize?.height,
+			outlineWidth: shape.outline?.width,
+			...wrapDistanceEmu(shape.wrap)
+		}),
 		fillColor,
 		fillColorValue,
 		fillType,
@@ -1953,6 +2050,7 @@ function convertShape(shape) {
 		outlineColorValue,
 		outlineStyle,
 		outlineCap,
+		outlineJoin,
 		outlineHeadEnd,
 		outlineTailEnd,
 		transform,
@@ -2108,6 +2206,9 @@ function textBoxFromShape(shape, textBody) {
 		content: textBody.content
 	};
 	if (shape.id) textBox.id = shape.id;
+	if (shape.name !== void 0) textBox.name = shape.name;
+	if (shape.alt !== void 0) textBox.alt = shape.alt;
+	if (shape.title !== void 0) textBox.title = shape.title;
 	if (shape.position) textBox.position = shape.position;
 	if (shape.wrap) textBox.wrap = shape.wrap;
 	if (shape.fill) textBox.fill = shape.fill;
@@ -2134,7 +2235,7 @@ function convertTextBox(textBox, styleResolver, options) {
 	let outlineColor;
 	let outlineStyle;
 	if (textBox.outline && textBox.outline.width) {
-		outlineWidth = Math.round(textBox.outline.width / 914400 * 96 * 100) / 100;
+		outlineWidth = emuToStrokePixels(textBox.outline.width);
 		if (textBox.outline.color?.rgb) outlineColor = `#${textBox.outline.color.rgb}`;
 		outlineStyle = textBox.outline.style || "solid";
 	}
@@ -2146,10 +2247,10 @@ function convertTextBox(textBox, styleResolver, options) {
 		if (textBox.transform.flipV) transforms.push("scaleY(-1)");
 		if (transforms.length > 0) transform = transforms.join(" ");
 	}
-	const marginTop = textBox.margins?.top !== void 0 ? emuToPixels(textBox.margins.top) : 4;
-	const marginBottom = textBox.margins?.bottom !== void 0 ? emuToPixels(textBox.margins.bottom) : 4;
-	const marginLeft = textBox.margins?.left !== void 0 ? emuToPixels(textBox.margins.left) : 7;
-	const marginRight = textBox.margins?.right !== void 0 ? emuToPixels(textBox.margins.right) : 7;
+	const marginTop = textBox.margins?.top !== void 0 ? emuToPixels(textBox.margins.top) : void 0;
+	const marginBottom = textBox.margins?.bottom !== void 0 ? emuToPixels(textBox.margins.bottom) : void 0;
+	const marginLeft = textBox.margins?.left !== void 0 ? emuToPixels(textBox.margins.left) : void 0;
+	const marginRight = textBox.margins?.right !== void 0 ? emuToPixels(textBox.margins.right) : void 0;
 	const contentNodes = [];
 	for (const block of textBox.content) {
 		if (block.type === "paragraph") {
@@ -2193,18 +2294,31 @@ function convertTextBox(textBox, styleResolver, options) {
 	else if (wrapType === "behind" || wrapType === "inFront") displayMode = "float";
 	else if (cssFloat !== "none") displayMode = "float";
 	else displayMode = "block";
-	const distTop = textBox.wrap?.distT ? emuToPixels(textBox.wrap.distT) : void 0;
-	const distBottom = textBox.wrap?.distB ? emuToPixels(textBox.wrap.distB) : void 0;
-	const distLeft = textBox.wrap?.distL ? emuToPixels(textBox.wrap.distL) : void 0;
-	const distRight = textBox.wrap?.distR ? emuToPixels(textBox.wrap.distR) : void 0;
+	const distTop = textBox.wrap?.distT !== void 0 ? emuToPixels(textBox.wrap.distT) : void 0;
+	const distBottom = textBox.wrap?.distB !== void 0 ? emuToPixels(textBox.wrap.distB) : void 0;
+	const distLeft = textBox.wrap?.distL !== void 0 ? emuToPixels(textBox.wrap.distL) : void 0;
+	const distRight = textBox.wrap?.distR !== void 0 ? emuToPixels(textBox.wrap.distR) : void 0;
 	return schema.node("textBox", {
 		width: widthPx,
 		height: heightPx,
+		_docxAuthoredEmu: authoredEmuAttrs({
+			width: textBoxSize?.width,
+			height: textBoxSize?.height,
+			outlineWidth: textBox.outline?.width,
+			marginTop: textBox.margins?.top,
+			marginBottom: textBox.margins?.bottom,
+			marginLeft: textBox.margins?.left,
+			marginRight: textBox.margins?.right,
+			...wrapDistanceEmu(textBox.wrap)
+		}),
 		autoFit: textBox.autoFit,
 		wordArt: textBox.wordArt,
 		textWrap: textBox.textWrap,
 		verticalAlign: textBox.verticalAlign,
 		textBoxId: textBox.id,
+		textBoxName: textBox.name,
+		alt: textBox.alt,
+		title: textBox.title,
 		fillColor,
 		outlineWidth,
 		outlineColor,
@@ -2253,24 +2367,33 @@ function headerFooterToProseDoc(content, options) {
 	};
 	const convertBlocks = (blocks) => {
 		const out = [];
-		for (const block of blocks) if (block.type === "paragraph") {
-			const isDetachedWatermarkHost = Reflect.get(block, DETACHED_WATERMARK_HOST) === true;
-			const paragraphNodes = convertParagraphWithTextBoxes(block, styleResolver, {
-				textBoxGroupId: nextTextBoxGroupId(),
-				context: conversionContext,
-				preserveEmptyWrapper: isDetachedWatermarkHost
-			});
-			if (isDetachedWatermarkHost) {
-				const paragraphNodeIndex = paragraphNodes.findIndex(({ type }) => type.name === "paragraph");
-				const paragraphNode = paragraphNodes[paragraphNodeIndex];
-				if (paragraphNode) paragraphNodes[paragraphNodeIndex] = recreateProseNodeWithParagraphPropertySource(paragraphNode, { attrs: {
-					...paragraphNode.attrs,
-					_detachedWatermarkHost: true
-				} });
+		for (const block of blocks) switch (block.type) {
+			case "paragraph": {
+				const isDetachedWatermarkHost = Reflect.get(block, DETACHED_WATERMARK_HOST) === true;
+				const paragraphNodes = convertParagraphWithTextBoxes(block, styleResolver, {
+					textBoxGroupId: nextTextBoxGroupId(),
+					context: conversionContext,
+					preserveEmptyWrapper: isDetachedWatermarkHost
+				});
+				if (isDetachedWatermarkHost) {
+					const paragraphNodeIndex = paragraphNodes.findIndex(({ type }) => type.name === "paragraph");
+					const paragraphNode = paragraphNodes[paragraphNodeIndex];
+					if (paragraphNode) paragraphNodes[paragraphNodeIndex] = recreateProseNodeWithParagraphPropertySource(paragraphNode, { attrs: {
+						...paragraphNode.attrs,
+						_detachedWatermarkHost: true
+					} });
+				}
+				out.push(...paragraphNodes);
+				break;
 			}
-			out.push(...paragraphNodes);
-		} else if (block.type === "table") out.push(convertTable(block, styleResolver, conversionContext));
-		else out.push(convertBlockSdt(block, convertBlocks));
+			case "table":
+				out.push(convertTable(block, styleResolver, conversionContext));
+				break;
+			case "blockSdt":
+				out.push(convertBlockSdt(block, convertBlocks));
+				break;
+			default: panic(`Unsupported block content: ${JSON.stringify(block)}`);
+		}
 		return out;
 	};
 	nodes.push(...convertBlocks(content));
@@ -2289,4 +2412,4 @@ function createEmptyDoc() {
 	return schema.node("doc", null, [schema.node("paragraph", {}, [])]);
 }
 //#endregion
-export { UnsupportedDocxToProseMirrorConversionError, createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, resolveParagraphDefaultTextFormatting, standaloneTableCellToProseMirror, textFormattingToMarks, toProseDoc };
+export { UnsupportedDocxToProseMirrorConversionError, createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, resolveParagraphDefaultTextFormatting, standaloneTableCellToProseMirror, toProseDoc };