@stll/folio-core 0.44.0 → 0.45.0

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -10,7 +10,7 @@ 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 { bookmarkBoundaryDisplacement, expectBookmarkBoundaryAttrs } from "../bookmarkBoundaryAttrs.js";
@@ -79,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) => {
@@ -906,6 +927,9 @@ 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");
@@ -931,10 +955,13 @@ function paragraphAttrsToFormatting(attrs) {
 	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 || kinsoku != null || overflowPunctuation != null || suppressAutoHyphens != null)) return;
+	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;
@@ -959,6 +986,9 @@ function paragraphAttrsToFormatting(attrs) {
 	if (bidi != null) f.bidi = bidi;
 	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;
@@ -1896,18 +1926,16 @@ const carriedRunFormatting = (formatting) => formatting && Object.keys(formattin
 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
 	};
@@ -1920,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",
@@ -2003,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);
@@ -2050,11 +2082,15 @@ 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("#", "") };
@@ -3015,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) => {
@@ -3026,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,
@@ -3037,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 = {
@@ -3054,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.js

@@ -10,7 +10,7 @@ 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 { textFormattingToMarks } from "../extensions/marks/markUtils.js";
 import { listRenderingAttrPatch } from "../listRenderingAttrs.js";
@@ -784,6 +784,7 @@ function calculateRowSpans(table) {
 			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,
@@ -814,7 +815,7 @@ function calculateRowSpans(table) {
 					skip: true
 				});
 			} else {
-				activeMerges.delete(cellColIndex);
+				closeVerticalMerge(activeMerges, result, cellColIndex);
 				result.set(key, {
 					rowSpan: 1,
 					skip: false
@@ -822,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);
@@ -1758,6 +1773,18 @@ function withRunBoundaryMarks(node, marks) {
 	if (!marks.some(({ type }) => type.name === "hyperlink" || type.name === "pageBreakRunOwner")) return node;
 	return node.mark(marks);
 }
+/**
+* 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;
@@ -1813,7 +1840,7 @@ function convertImage({ image, rawXml, rawXmlMode, rawImageFingerprint, runForma
 	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",
@@ -1856,8 +1883,17 @@ function convertImage({ image, rawXml, rawXmlMode, rawImageFingerprint, runForma
 		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,
@@ -1946,16 +1982,18 @@ function convertShape(shape, runFormatting) {
 	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;
@@ -1990,8 +2028,17 @@ function convertShape(shape, 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,
@@ -2003,6 +2050,7 @@ function convertShape(shape, runFormatting) {
 		outlineColorValue,
 		outlineStyle,
 		outlineCap,
+		outlineJoin,
 		outlineHeadEnd,
 		outlineTailEnd,
 		transform,
@@ -2158,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;
@@ -2184,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";
 	}
@@ -2196,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") {
@@ -2243,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,

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

@@ -1,4 +1,4 @@
-import { normalizeUserUrl, sanitizeExternalUrl } from "../../../utils/urlSecurity.js";
+import { anchorTargetAttrs, normalizeUserUrl, sanitizeExternalUrl } from "../../../utils/urlSecurity.js";
 import { expectHyperlinkMarkAttrs } from "../../attrs/index.js";
 import { createMarkExtension } from "../create.js";
 import { isMarkActive } from "./markUtils.js";
@@ -96,8 +96,7 @@ const HyperlinkExtension = createMarkExtension({
 			const { href, tooltip } = expectHyperlinkMarkAttrs(mark);
 			const domAttrs = {
 				href: sanitizeStoredHref(href),
-				target: "_blank",
-				rel: "noopener noreferrer"
+				...anchorTargetAttrs(void 0)
 			};
 			if (tooltip) domAttrs["title"] = tooltip;
 			return [

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

@@ -39,8 +39,12 @@ const ImageExtension = createNodeExtension({
 			paddingLeft: { default: null },
 			position: { default: null },
 			layoutInCell: { default: null },
+			decorative: { default: null },
+			hidden: { default: null },
+			docPrExtensions: { default: null },
 			frameLocks: { default: null },
 			borderWidth: { default: null },
+			_docxAuthoredEmu: { default: null },
 			borderColor: { default: null },
 			borderStyle: { default: null },
 			wrapText: { default: null },

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

@@ -371,19 +371,24 @@ const ShapeExtension = createNodeExtension({
 			geometryAdjustments: { default: null },
 			_docxRunFormatting: { default: null },
 			shapeId: { default: null },
+			shapeName: { default: null },
+			alt: { default: null },
+			title: { default: null },
 			width: { default: 100 },
 			height: { default: 80 },
+			_docxAuthoredEmu: { default: null },
 			fillColor: { default: null },
 			fillColorValue: { default: null },
 			fillType: { default: "solid" },
 			gradientType: { default: null },
 			gradientAngle: { default: null },
 			gradientStops: { default: null },
-			outlineWidth: { default: 1 },
+			outlineWidth: { default: null },
 			outlineColor: { default: "var(--doc-shape-outline, #000000)" },
 			outlineColorValue: { default: null },
-			outlineStyle: { default: "solid" },
+			outlineStyle: { default: null },
 			outlineCap: { default: null },
+			outlineJoin: { default: null },
 			outlineHeadEnd: { default: null },
 			outlineTailEnd: { default: null },
 			transform: { default: null },

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

@@ -77,19 +77,23 @@ const TextBoxExtension = createNodeExtension({
 		attrs: {
 			width: { default: 200 },
 			height: { default: null },
+			_docxAuthoredEmu: { default: null },
 			autoFit: { default: null },
 			wordArt: { default: null },
 			textWrap: { default: null },
 			textBoxId: { default: null },
+			textBoxName: { default: null },
+			alt: { default: null },
+			title: { default: null },
 			fillColor: { default: null },
 			outlineWidth: { default: null },
 			outlineColor: { default: null },
 			outlineStyle: { default: null },
 			transform: { default: null },
-			marginTop: { default: 4 },
-			marginBottom: { default: 4 },
-			marginLeft: { default: 7 },
-			marginRight: { default: 7 },
+			marginTop: { default: null },
+			marginBottom: { default: null },
+			marginLeft: { default: null },
+			marginRight: { default: null },
 			verticalAlign: { default: null },
 			displayMode: { default: "inline" },
 			cssFloat: { default: null },

package/dist/prosemirror/paragraphFormattingProvenance.d.ts

@@ -95,10 +95,12 @@ declare const PARAGRAPH_FORMATTING_WRITE_BACK: {
     readonly attr: "tabs";
   };
   readonly keepNext: {
-    readonly kind: "original-only";
+    readonly kind: "style-resolved-attr";
+    readonly attr: "keepNext";
   };
   readonly keepLines: {
-    readonly kind: "original-only";
+    readonly kind: "style-resolved-attr";
+    readonly attr: "keepLines";
   };
   readonly widowControl: {
     readonly kind: "style-resolved-attr";
@@ -142,7 +144,8 @@ declare const PARAGRAPH_FORMATTING_WRITE_BACK: {
     readonly kind: "original-only";
   };
   readonly runInWithNext: {
-    readonly kind: "original-only";
+    readonly kind: "style-resolved-attr";
+    readonly attr: "runInWithNext";
   };
 };
 type StyleResolvedParagraphField = { [Field in keyof typeof PARAGRAPH_FORMATTING_WRITE_BACK]: (typeof PARAGRAPH_FORMATTING_WRITE_BACK)[Field] extends {

package/dist/prosemirror/paragraphFormattingProvenance.js

@@ -53,8 +53,14 @@ const PARAGRAPH_FORMATTING_WRITE_BACK = {
 		kind: "style-resolved-attr",
 		attr: "tabs"
 	},
-	keepNext: { kind: "original-only" },
-	keepLines: { kind: "original-only" },
+	keepNext: {
+		kind: "style-resolved-attr",
+		attr: "keepNext"
+	},
+	keepLines: {
+		kind: "style-resolved-attr",
+		attr: "keepLines"
+	},
 	widowControl: {
 		kind: "style-resolved-attr",
 		attr: "widowControl"
@@ -82,7 +88,10 @@ const PARAGRAPH_FORMATTING_WRITE_BACK = {
 		attr: "suppressAutoHyphens"
 	},
 	runProperties: { kind: "original-only" },
-	runInWithNext: { kind: "original-only" }
+	runInWithNext: {
+		kind: "style-resolved-attr",
+		attr: "runInWithNext"
+	}
 };
 const STYLE_RESOLVED_PARAGRAPH_FIELDS = Object.keys(PARAGRAPH_FORMATTING_WRITE_BACK).filter((field) => PARAGRAPH_FORMATTING_WRITE_BACK[field].kind === "style-resolved-attr");
 /**