@stll/folio-core 0.22.2 → 0.22.3

package/dist/controller/layoutPipeline.js

@@ -58,6 +58,29 @@ function bodyBlocksClearSectionHeaderFooter(blocks, { authoredMargins, sectionHe
 	});
 	return changed ? nextBlocks : blocks;
 }
+const arePageMarginsEqual = (left, right) => left.top === right.top && left.right === right.right && left.bottom === right.bottom && left.left === right.left && left.header === right.header && left.footer === right.footer;
+const mirrorPageMarginsIfNeeded = (authoredMargins, pageNumber, mirrorMargins) => mirrorMargins && pageNumber % 2 === 0 ? {
+	...authoredMargins,
+	left: authoredMargins.right,
+	right: authoredMargins.left
+} : authoredMargins;
+function attachAuthoredMarginsToLayoutPages(layout, options) {
+	let changed = false;
+	const pages = layout.pages.map((page) => {
+		const sectionProperties = options.sectionPropertiesForMargins[page.sectionIndex ?? 0];
+		const authoredMargins = mirrorPageMarginsIfNeeded(sectionProperties ? getMargins(sectionProperties) : options.authoredMargins, page.number, options.mirrorMargins);
+		if (page.authoredMargins && arePageMarginsEqual(page.authoredMargins, authoredMargins)) return page;
+		changed = true;
+		return {
+			...page,
+			authoredMargins
+		};
+	});
+	return changed ? {
+		...layout,
+		pages
+	} : layout;
+}
 function runLayoutPipeline(deps, state, options = {}) {
 	const { contentWidth, columns, pageSize, margins, pageGap, showMarginGuides, marginGuideColor, syncCoordinator, headerContent, footerContent, firstPageHeaderContent, firstPageFooterContent, headerContentRId, footerContentRId, firstPageHeaderContentRId, firstPageFooterContentRId, sectionHeaderFooterRefs, theme: _theme, sectionProperties, document, defaultTabStop, mirrorMargins, styles, layout, hfPMs, painter, pagesContainer, session, renderHfFromContentOrPm, renderHeaderFooterContentByRId, documentFontsAreLoaded, buildFootnoteRenderItems, describeInvalidHighlightMarks, emptyTemplatePreviewEntries: EMPTY_TEMPLATE_PREVIEW_ENTRIES } = deps;
 	let outcome = {};
@@ -341,6 +364,11 @@ function runLayoutPipeline(deps, state, options = {}) {
 		};
 		let stabilizedFieldValues;
 		stabilizeFieldWidths();
+		newLayout = attachAuthoredMarginsToLayoutPages(newLayout, {
+			authoredMargins: margins,
+			mirrorMargins,
+			sectionPropertiesForMargins
+		});
 		const rebuildHeaderFooterForLayout = () => {
 			const seqValues = buildSeqValues(newBlocks);
 			const bookmarkTextInputs = stabilizedFieldValues === void 0 ? { seqValues } : {

package/dist/docx/imageParser.js

@@ -4,7 +4,7 @@ import { sanitizeExternalUrl } from "../utils/urlSecurity.js";
 import { WRAP_ELEMENT_NAMES, parsePositionH, parsePositionV, parseWrapElement } from "./drawingUtils.js";
 import { resolveTarget } from "./relsParser.js";
 import { isTextBoxDrawing } from "./textBoxParser.js";
-import { findByFullName, findChild, getAttribute, getChildElements, parseNumericAttribute } from "./xmlParser.js";
+import { findByFullName, findChild, getAttribute, getChildElements, parseNumericAttribute, parseOnOffValue } from "./xmlParser.js";
 //#region src/docx/imageParser.ts
 /**
 * Convert rotation value (1/60000 of a degree) to degrees
@@ -74,7 +74,7 @@ function parseDocProps(docPr) {
 	const name = getAttribute(docPr, null, "name");
 	const descr = getAttribute(docPr, null, "descr");
 	const title = getAttribute(docPr, null, "title");
-	const decorative = getAttribute(docPr, null, "decorative") === "1";
+	const decorative = parseOnOffValue(getAttribute(docPr, null, "decorative")) === true;
 	const hlinkClickEl = findChild(docPr, "a", "hlinkClick");
 	const hlinkRId = hlinkClickEl ? getAttribute(hlinkClickEl, "r", "id") : null;
 	return {
@@ -92,8 +92,8 @@ function parseDocProps(docPr) {
 function parseTransform(xfrm) {
 	if (!xfrm) return;
 	const rot = getAttribute(xfrm, null, "rot");
-	const flipH = getAttribute(xfrm, null, "flipH") === "1";
-	const flipV = getAttribute(xfrm, null, "flipV") === "1";
+	const flipH = parseOnOffValue(getAttribute(xfrm, null, "flipH")) === true;
+	const flipV = parseOnOffValue(getAttribute(xfrm, null, "flipV")) === true;
 	const rotation = rotToDegrees(rot);
 	if (rotation === void 0 && !flipH && !flipV) return;
 	const transform = {};
@@ -155,10 +155,7 @@ function parseImageCrop(blipFill) {
 * spec-defined default.
 */
 function parseOnOffAttr(element, name) {
-	const raw = getAttribute(element, null, name);
-	if (raw === null) return;
-	if (raw === "1" || raw === "true" || raw === "on") return true;
-	if (raw === "0" || raw === "false" || raw === "off") return false;
+	return parseOnOffValue(getAttribute(element, null, name));
 }
 /**
 * Parse `<a:alphaModFix amt="..."/>` inside the `a:blip` element. The
@@ -358,7 +355,7 @@ function parseAnchor(anchorEl, rels, media) {
 	const size = parseExtent(findByFullName(anchorEl, "wp:extent"));
 	const padding = parseEffectExtent(findByFullName(anchorEl, "wp:effectExtent"));
 	const props = parseDocProps(findByFullName(anchorEl, "wp:docPr"));
-	const behindDoc = getAttribute(anchorEl, null, "behindDoc") === "1";
+	const behindDoc = parseOnOffValue(getAttribute(anchorEl, null, "behindDoc")) === true;
 	const layoutInCell = parseOnOffAttr(anchorEl, "layoutInCell");
 	const allowOverlap = parseOnOffAttr(anchorEl, "allowOverlap");
 	const anchorDistT = parseNumericAttribute(anchorEl, null, "distT");

package/dist/docx/server/inspectDocxPackage.js

@@ -1,6 +1,6 @@
 import { getAttributeAnyPrefix, getLocalName, parseXmlDocument } from "../xmlParser.js";
 import { DocxArchiveError, loadDocxArchive } from "./boundedArchive.js";
-import { TaggedError } from "better-result";
+import { Result, TaggedError } from "better-result";
 import { createHash } from "node:crypto";
 //#region src/docx/server/inspectDocxPackage.ts
 const FOLIO_DOCX_PACKAGE_INSPECTION_VERSION = 1;
@@ -32,16 +32,17 @@ const decodeXml = (bytes, part) => {
 	let encoding = "utf-8";
 	if (bytes.length >= 2 && (bytes[0] === 255 && bytes[1] === 254 || bytes[0] === 60 && bytes[1] === 0)) encoding = "utf-16le";
 	else if (bytes.length >= 2 && (bytes[0] === 254 && bytes[1] === 255 || bytes[0] === 0 && bytes[1] === 60)) encoding = "utf-16be";
-	try {
-		return new TextDecoder(encoding, { fatal: true }).decode(bytes);
-	} catch (cause) {
-		throw new FolioDocxPackageInspectionError({
+	const decoded = Result.try({
+		try: () => new TextDecoder(encoding, { fatal: true }).decode(bytes),
+		catch: (cause) => new FolioDocxPackageInspectionError({
 			message: `Failed to decode XML package part "${part}"`,
 			code: "xml-decode-failed",
 			part,
 			cause
-		});
-	}
+		})
+	});
+	if (decoded.isOk()) return decoded.value;
+	throw decoded.error;
 };
 const parseContentTypes = (xml) => {
 	const declarations = {

package/dist/docx/styleParser.js

@@ -2,7 +2,7 @@ import { mergeParagraphFormatting } from "../utils/paragraphFormattingMerge.js";
 import { mergeTextFormatting } from "../utils/textFormattingMerge.js";
 import { BorderStyleSchema, ConditionalStyleTypeSchema, EmphasisMarkSchema, FontHintSchema, FontThemeSchema, HighlightColorSchema, LineSpacingRuleSchema, ParagraphAlignmentSchema, ShadingPatternSchema, StyleTypeSchema, TabLeaderSchema, TabStopAlignmentSchema, TableCellTextDirectionSchema, TableRowHeightRuleSchema, TableWidthTypeSchema, TextEffectSchema, ThemeColorSlotSchema, UnderlineStyleSchema, narrowEnum } from "./parserEnums.js";
 import { resolveThemeFontRef } from "./themeParser.js";
-import { findChild, findChildren, getAttribute, getLocalName, parseBooleanElement, parseNumberingLevelAttribute, parseNumericAttribute, parseTableMeasurementValue, parseXmlDocument } from "./xmlParser.js";
+import { findChild, findChildren, getAttribute, getLocalName, parseBooleanElement, parseNumberingLevelAttribute, parseNumericAttribute, parseOnOffValue, parseTableMeasurementValue, parseXmlDocument } from "./xmlParser.js";
 //#region src/docx/styleParser.ts
 /**
 * Parse text formatting properties (w:rPr)
@@ -224,9 +224,9 @@ function parseBorderSpec(border) {
 	const space = parseNumericAttribute(border, "w", "space");
 	if (space !== void 0) spec.space = space;
 	const shadowAttr = getAttribute(border, "w", "shadow");
-	if (shadowAttr) spec.shadow = shadowAttr === "1" || shadowAttr === "true";
+	if (shadowAttr) spec.shadow = parseOnOffValue(shadowAttr) ?? false;
 	const frame = getAttribute(border, "w", "frame");
-	if (frame) spec.frame = frame === "1" || frame === "true";
+	if (frame) spec.frame = parseOnOffValue(frame) ?? false;
 	return spec;
 }
 /**
@@ -278,9 +278,9 @@ function parseParagraphProperties(pPr, theme) {
 		const lineRule = narrowEnum(getAttribute(spacing, "w", "lineRule"), LineSpacingRuleSchema);
 		if (lineRule) formatting.lineSpacingRule = lineRule;
 		const beforeAuto = getAttribute(spacing, "w", "beforeAutospacing");
-		if (beforeAuto) formatting.beforeAutospacing = beforeAuto === "1" || beforeAuto === "true";
+		if (beforeAuto) formatting.beforeAutospacing = parseOnOffValue(beforeAuto) ?? false;
 		const afterAuto = getAttribute(spacing, "w", "afterAutospacing");
-		if (afterAuto) formatting.afterAutospacing = afterAuto === "1" || afterAuto === "true";
+		if (afterAuto) formatting.afterAutospacing = parseOnOffValue(afterAuto) ?? false;
 	}
 	const ind = findChild(pPr, "w", "ind");
 	if (ind) {
@@ -452,17 +452,17 @@ function parseTableLook(tblLook) {
 		}
 	}
 	const firstColumn = getAttribute(tblLook, "w", "firstColumn");
-	if (firstColumn) look.firstColumn = firstColumn === "1";
+	if (firstColumn) look.firstColumn = parseOnOffValue(firstColumn) ?? false;
 	const firstRow = getAttribute(tblLook, "w", "firstRow");
-	if (firstRow) look.firstRow = firstRow === "1";
+	if (firstRow) look.firstRow = parseOnOffValue(firstRow) ?? false;
 	const lastColumn = getAttribute(tblLook, "w", "lastColumn");
-	if (lastColumn) look.lastColumn = lastColumn === "1";
+	if (lastColumn) look.lastColumn = parseOnOffValue(lastColumn) ?? false;
 	const lastRow = getAttribute(tblLook, "w", "lastRow");
-	if (lastRow) look.lastRow = lastRow === "1";
+	if (lastRow) look.lastRow = parseOnOffValue(lastRow) ?? false;
 	const noHBand = getAttribute(tblLook, "w", "noHBand");
-	if (noHBand) look.noHBand = noHBand === "1";
+	if (noHBand) look.noHBand = parseOnOffValue(noHBand) ?? false;
 	const noVBand = getAttribute(tblLook, "w", "noVBand");
-	if (noVBand) look.noVBand = noVBand === "1";
+	if (noVBand) look.noVBand = parseOnOffValue(noVBand) ?? false;
 	return Object.keys(look).length > 0 ? look : void 0;
 }
 /**
@@ -669,7 +669,7 @@ function parseStyle(styleEl, theme) {
 		type: narrowEnum(rawType, StyleTypeSchema) ?? "paragraph"
 	};
 	const defaultAttr = getAttribute(styleEl, "w", "default");
-	if (defaultAttr) style.default = defaultAttr === "1" || defaultAttr === "true";
+	if (defaultAttr) style.default = parseOnOffValue(defaultAttr) ?? false;
 	const children = collectStyleChildren(styleEl);
 	const nameEl = children.name;
 	if (nameEl) {
@@ -871,10 +871,10 @@ function parseStyleDefinitionsFromDocument(doc, theme, resolvedStyles) {
 		const latentStylesEl = findChild(doc, "w", "latentStyles");
 		if (latentStylesEl) {
 			const latentStyles = {
-				defLockedState: getAttribute(latentStylesEl, "w", "defLockedState") === "1",
-				defSemiHidden: getAttribute(latentStylesEl, "w", "defSemiHidden") === "1",
-				defUnhideWhenUsed: getAttribute(latentStylesEl, "w", "defUnhideWhenUsed") === "1",
-				defQFormat: getAttribute(latentStylesEl, "w", "defQFormat") === "1"
+				defLockedState: parseOnOffValue(getAttribute(latentStylesEl, "w", "defLockedState")) ?? false,
+				defSemiHidden: parseOnOffValue(getAttribute(latentStylesEl, "w", "defSemiHidden")) ?? false,
+				defUnhideWhenUsed: parseOnOffValue(getAttribute(latentStylesEl, "w", "defUnhideWhenUsed")) ?? false,
+				defQFormat: parseOnOffValue(getAttribute(latentStylesEl, "w", "defQFormat")) ?? false
 			};
 			const defUIPriority = parseNumericAttribute(latentStylesEl, "w", "defUIPriority");
 			if (defUIPriority !== void 0) latentStyles.defUIPriority = defUIPriority;

package/dist/docx/xmlParser.d.ts

@@ -272,13 +272,17 @@ declare function parseNumberingLevelAttribute(element: XmlElement | null | undef
  * (`5000`); normalize those to the ECMA-376 unit the layout engine expects.
  */
 declare function parseTableMeasurementValue(element: XmlElement | null | undefined, widthType: string): number | undefined;
+/**
+ * Parse an OOXML `ST_OnOff` lexical value.
+ */
+declare function parseOnOffValue(value: string | null | undefined): boolean | undefined;
 /**
  * Parse a boolean value from an attribute or element presence
  *
  * OOXML boolean conventions:
  * - Element presence with no val attribute = true
- * - w:val="true" or w:val="1" = true
- * - w:val="false" or w:val="0" = false
+ * - w:val="true", w:val="1", or w:val="on" = true
+ * - w:val="false", w:val="0", or w:val="off" = false
  *
  * @param element - Element to check
  * @param namespace - Namespace for val attribute
@@ -334,4 +338,4 @@ declare function mergeXmlnsDeclarations(inherited: Record<string, string>, eleme
  */
 declare function cloneWithXmlnsDeclarations(element: XmlElement, xmlnsDecls: Record<string, string>): XmlElement;
 //#endregion
-export { NAMESPACES, WORDPROCESSINGML_NAMESPACE_URIS, XmlElement, XmlNamespaceScope, cloneWithXmlnsDeclarations, collectXmlnsDeclarations, elementToXml, findAllDeep, findByFullName, findChild, findChildByLocalName, findChildByNamespaceUri, findChildren, findChildrenByLocalName, findDeep, getAttribute, getAttributeAny, getAttributeAnyPrefix, getAttributeByNamespaceUri, getAttributes, getChildElements, getLocalName, getNamespacePrefix, getNamespaceUri, getTextContent, hasChild, hasFlag, matchesName, mergeXmlnsDeclarations, parseBooleanElement, parseColorElement, parseNumberingLevelAttribute, parseNumericAttribute, parseTableMeasurementValue, parseXml, parseXmlDocument };
+export { NAMESPACES, WORDPROCESSINGML_NAMESPACE_URIS, XmlElement, XmlNamespaceScope, cloneWithXmlnsDeclarations, collectXmlnsDeclarations, elementToXml, findAllDeep, findByFullName, findChild, findChildByLocalName, findChildByNamespaceUri, findChildren, findChildrenByLocalName, findDeep, getAttribute, getAttributeAny, getAttributeAnyPrefix, getAttributeByNamespaceUri, getAttributes, getChildElements, getLocalName, getNamespacePrefix, getNamespaceUri, getTextContent, hasChild, hasFlag, matchesName, mergeXmlnsDeclarations, parseBooleanElement, parseColorElement, parseNumberingLevelAttribute, parseNumericAttribute, parseOnOffValue, parseTableMeasurementValue, parseXml, parseXmlDocument };

package/dist/docx/xmlParser.js

@@ -438,8 +438,7 @@ function getTextContent(element) {
 function hasFlag(element, namespace, name) {
 	const value = getAttribute(element, namespace, name);
 	if (value === null) return false;
-	if (value === "0" || value === "false" || value === "off") return false;
-	return true;
+	return parseOnOffValue(value) ?? true;
 }
 /**
 * Check if a child element exists (used for boolean flags in OOXML)
@@ -515,12 +514,27 @@ function parseTableMeasurementValue(element, widthType) {
 	return Number.isNaN(num) ? void 0 : num;
 }
 /**
+* Parse an OOXML `ST_OnOff` lexical value.
+*/
+function parseOnOffValue(value) {
+	if (value === null || value === void 0) return;
+	switch (value) {
+		case "1":
+		case "true":
+		case "on": return true;
+		case "0":
+		case "false":
+		case "off": return false;
+		default: return;
+	}
+}
+/**
 * Parse a boolean value from an attribute or element presence
 *
 * OOXML boolean conventions:
 * - Element presence with no val attribute = true
-* - w:val="true" or w:val="1" = true
-* - w:val="false" or w:val="0" = false
+* - w:val="true", w:val="1", or w:val="on" = true
+* - w:val="false", w:val="0", or w:val="off" = false
 *
 * @param element - Element to check
 * @param namespace - Namespace for val attribute
@@ -541,8 +555,7 @@ function parseBooleanElement(element, namespace = "w") {
 		}
 	}
 	if (val === null) return true;
-	if (val === "0" || val === "false" || val === "off") return false;
-	return true;
+	return parseOnOffValue(val) ?? true;
 }
 /**
 * Deep find - search recursively for an element
@@ -699,4 +712,4 @@ function cloneWithXmlnsDeclarations(element, xmlnsDecls) {
 	return element;
 }
 //#endregion
-export { NAMESPACES, WORDPROCESSINGML_NAMESPACE_URIS, cloneWithXmlnsDeclarations, collectXmlnsDeclarations, elementToXml, findAllDeep, findByFullName, findChild, findChildByLocalName, findChildByNamespaceUri, findChildren, findChildrenByLocalName, findDeep, getAttribute, getAttributeAny, getAttributeAnyPrefix, getAttributeByNamespaceUri, getAttributes, getChildElements, getLocalName, getNamespacePrefix, getNamespaceUri, getTextContent, hasChild, hasFlag, matchesName, mergeXmlnsDeclarations, parseBooleanElement, parseColorElement, parseNumberingLevelAttribute, parseNumericAttribute, parseTableMeasurementValue, parseXml, parseXmlDocument };
+export { NAMESPACES, WORDPROCESSINGML_NAMESPACE_URIS, cloneWithXmlnsDeclarations, collectXmlnsDeclarations, elementToXml, findAllDeep, findByFullName, findChild, findChildByLocalName, findChildByNamespaceUri, findChildren, findChildrenByLocalName, findDeep, getAttribute, getAttributeAny, getAttributeAnyPrefix, getAttributeByNamespaceUri, getAttributes, getChildElements, getLocalName, getNamespacePrefix, getNamespaceUri, getTextContent, hasChild, hasFlag, matchesName, mergeXmlnsDeclarations, parseBooleanElement, parseColorElement, parseNumberingLevelAttribute, parseNumericAttribute, parseOnOffValue, parseTableMeasurementValue, parseXml, parseXmlDocument };

package/dist/layout-engine/measure/measureHelpers.d.ts

@@ -3,6 +3,7 @@ import { FontStyle } from "./measureTypes.js";
 //#region src/layout-engine/measure/measureHelpers.d.ts
 declare const DEFAULT_FONT_SIZE = 11;
 declare const DEFAULT_FONT_FAMILY = "Calibri";
+declare const DOCX_SCRIPT_FONT_SCALE = 0.75;
 /**
  * Build a measurement `FontStyle` from a run's formatting. Single source of
  * truth for run → FontStyle so every measurement path (layout line-breaking,
@@ -87,4 +88,4 @@ declare function halfPtToPx(halfPt: number): number;
  */
 declare function pxToHalfPt(px: number): number;
 //#endregion
-export { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, buildFontString, buildRunFontStyle, clearFontResolvedCache, findCharacterAtX, getResolvedData, getXForCharacter, halfPtToPx, ptToPx, pxToHalfPt, pxToPt, pxToTwips, twipsToPx };
+export { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, DOCX_SCRIPT_FONT_SCALE, buildFontString, buildRunFontStyle, clearFontResolvedCache, findCharacterAtX, getResolvedData, getXForCharacter, halfPtToPx, ptToPx, pxToHalfPt, pxToPt, pxToTwips, twipsToPx };

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

@@ -9,12 +9,14 @@ import { FONT_KERNING_MODE, getRunFontKerningMode } from "./textMeasurementPolic
 * char-offset geometry. The layout engine imports these directly so it never
 * transitively pulls the canvas measurement backend; the canvas implementation
 * (`measureContainer.ts`) consumes them too.
+* Script sizing: eigenpal/docx-editor@585413d0 (Apache-2.0), modified for Folio.
 */
 const TWIPS_PER_INCH = 1440;
 const PX_PER_INCH = 96;
 const TWIPS_PER_PX = TWIPS_PER_INCH / PX_PER_INCH;
 const DEFAULT_FONT_SIZE = 11;
 const DEFAULT_FONT_FAMILY = "Calibri";
+const DOCX_SCRIPT_FONT_SCALE = .75;
 /**
 * Build a measurement `FontStyle` from a run's formatting. Single source of
 * truth for run → FontStyle so every measurement path (layout line-breaking,
@@ -24,7 +26,8 @@ const DEFAULT_FONT_FAMILY = "Calibri";
 * and size fallbacks for runs that declare neither.
 */
 function buildRunFontStyle(run, fallbackFontFamily, fallbackFontSize) {
-	const fontSize = run.fontSize ?? fallbackFontSize;
+	const baseFontSize = run.fontSize ?? fallbackFontSize;
+	const fontSize = run.superscript || run.subscript ? baseFontSize * DOCX_SCRIPT_FONT_SCALE : baseFontSize;
 	return {
 		fontFamily: run.fontFamily ?? fallbackFontFamily,
 		...run.eastAsiaFontFamily !== void 0 ? { eastAsiaFontFamily: run.eastAsiaFontFamily } : {},
@@ -168,4 +171,4 @@ function pxToHalfPt(px) {
 	return pxToPt(px) * 2;
 }
 //#endregion
-export { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, buildFontString, buildRunFontStyle, clearFontResolvedCache, findCharacterAtX, getResolvedData, getXForCharacter, halfPtToPx, ptToPx, pxToHalfPt, pxToPt, pxToTwips, twipsToPx };
+export { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, DOCX_SCRIPT_FONT_SCALE, buildFontString, buildRunFontStyle, clearFontResolvedCache, findCharacterAtX, getResolvedData, getXForCharacter, halfPtToPx, ptToPx, pxToHalfPt, pxToPt, pxToTwips, twipsToPx };

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

@@ -1063,6 +1063,12 @@ type Page = {
   fragments: Fragment[];
   /** Page margins. */
   margins: PageMargins;
+  /**
+   * Authored section margins before header/footer clearance expands the body
+   * content box insets. Page-margin-relative anchors use these page-setup
+   * landmarks instead of furniture-expanded content insets.
+   */
+  authoredMargins?: PageMargins;
   /** Page size (width, height). */
   size: {
     w: number;

package/dist/layout-painter/anchoredImagePosition.d.ts

@@ -1,4 +1,4 @@
-import { ImageRun } from "../layout-engine/types.js";
+import { ImageRun, PageMargins } from "../layout-engine/types.js";
 //#region src/layout-painter/anchoredImagePosition.d.ts
 type PageGeometry = {
   pageWidth: number;
@@ -7,6 +7,7 @@ type PageGeometry = {
   marginTop: number;
   marginRight: number;
   marginBottom: number;
+  authoredMargins?: PageMargins;
   contentWidth: number;
   contentHeight: number;
 };

package/dist/layout-painter/anchoredImagePosition.js

@@ -1,6 +1,13 @@
 import { emuToPixels } from "./renderUtils.js";
 //#region src/layout-painter/anchoredImagePosition.ts
+const authoredMargins = (geometry) => geometry.authoredMargins ?? {
+	top: geometry.marginTop,
+	right: geometry.marginRight,
+	bottom: geometry.marginBottom,
+	left: geometry.marginLeft
+};
 function resolveHorizontalBand(relativeTo, geometry) {
+	const margins = authoredMargins(geometry);
 	switch (relativeTo) {
 		case "page": return {
 			baseX: -geometry.marginLeft,
@@ -9,12 +16,12 @@ function resolveHorizontalBand(relativeTo, geometry) {
 		case "leftMargin":
 		case "insideMargin": return {
 			baseX: -geometry.marginLeft,
-			bandWidth: geometry.marginLeft
+			bandWidth: margins.left
 		};
 		case "rightMargin":
 		case "outsideMargin": return {
-			baseX: geometry.contentWidth,
-			bandWidth: geometry.marginRight
+			baseX: geometry.pageWidth - geometry.marginLeft - margins.right,
+			bandWidth: margins.right
 		};
 		case "character": return {
 			baseX: 0,
@@ -27,6 +34,7 @@ function resolveHorizontalBand(relativeTo, geometry) {
 	}
 }
 function resolveVerticalBand(relativeTo, fragmentY, geometry) {
+	const margins = authoredMargins(geometry);
 	switch (relativeTo) {
 		case "page": return {
 			baseY: -geometry.marginTop,
@@ -34,11 +42,11 @@ function resolveVerticalBand(relativeTo, fragmentY, geometry) {
 		};
 		case "topMargin": return {
 			baseY: -geometry.marginTop,
-			bandHeight: geometry.marginTop
+			bandHeight: margins.top
 		};
 		case "bottomMargin": return {
-			baseY: geometry.contentHeight,
-			bandHeight: geometry.marginBottom
+			baseY: geometry.pageHeight - geometry.marginTop - margins.bottom,
+			bandHeight: margins.bottom
 		};
 		case "paragraph":
 		case "line": return {

package/dist/layout-painter/renderPage.js

@@ -797,6 +797,7 @@ function renderPage(page, context, options = {}) {
 		marginTop: page.margins.top,
 		marginRight: page.margins.right,
 		marginBottom: page.margins.bottom,
+		...page.authoredMargins ? { authoredMargins: page.authoredMargins } : {},
 		contentWidth,
 		contentHeight: page.size.h - page.margins.top - page.margins.bottom
 	};
@@ -1209,10 +1210,19 @@ function computePageFingerprint(page, blockLookup) {
 function computePageRenderFingerprint(page, blockLookup) {
 	return computePageFingerprintInternal(page, blockLookup, { includePmPositions: false });
 }
+const pageMarginsFingerprint = (margins) => [
+	margins.top,
+	margins.right,
+	margins.bottom,
+	margins.left,
+	margins.header ?? "",
+	margins.footer ?? ""
+].join(",");
 function computePageFingerprintInternal(page, blockLookup, options) {
 	const parts = [];
 	parts.push(`s:${page.size.w},${page.size.h}`);
-	parts.push(`m:${page.margins.top},${page.margins.right},${page.margins.bottom},${page.margins.left}`);
+	parts.push(`m:${pageMarginsFingerprint(page.margins)}`);
+	if (page.authoredMargins) parts.push(`am:${pageMarginsFingerprint(page.authoredMargins)}`);
 	parts.push(`n:${page.number}`);
 	if (page.sectionIndex !== void 0) parts.push(`si:${page.sectionIndex}`);
 	if (page.sectionPageNumber !== void 0) parts.push(`sp:${page.sectionPageNumber}`);

package/dist/layout-painter/renderParagraph.js

@@ -2,7 +2,7 @@ import { ommlToMathml } from "../docx/mathToMathml.js";
 import { parseXmlDocument } from "../docx/xmlParser.js";
 import { evaluateFieldInstruction } from "../fields/evaluateField.js";
 import { getListMarkerInlineWidth, getListMarkerVisualOffset } from "../layout-engine/measure/listMarkerWidth.js";
-import "../layout-engine/measure/measureHelpers.js";
+import { DOCX_SCRIPT_FONT_SCALE } from "../layout-engine/measure/measureHelpers.js";
 import { FONT_KERNING_MODE, countCompressibleSpaces, getFontKerningMode, getRunFontKerningMode, toPaintedText } from "../layout-engine/measure/textMeasurementPolicy.js";
 import { isFloatingImageRun } from "../layout-engine/types.js";
 import { calculateTabWidth } from "../prosemirror/utils/tabCalculator.js";
@@ -76,7 +76,6 @@ function isMathRun(run) {
 }
 const AUTOMATIC_TEXT_COLOR_VALUES = /* @__PURE__ */ new Set(["auto", "windowtext"]);
 const DEFAULT_BLACK_TEXT_COLOR_VALUES = /* @__PURE__ */ new Set(["000000", "000"]);
-const DOCX_SUPERSCRIPT_SCALE = .75;
 const SUGGESTION_COLOR_CSS = "var(--suggestion-color, #6d3bd6)";
 const SUGGESTION_TINT_CSS = "var(--suggestion-bg, color-mix(in oklch, #6d3bd6 12%, transparent))";
 const SUGGESTION_TINT_LAYER_CSS = `linear-gradient(${SUGGESTION_TINT_CSS}, ${SUGGESTION_TINT_CSS})`;
@@ -109,8 +108,8 @@ function fontSizePtToPx(fontSizePt) {
 	return fontSizePt * 96 / 72;
 }
 function getRaisedRunFontSize(run) {
-	if (run.fontSize) return `${fontSizePtToPx(run.fontSize) * DOCX_SUPERSCRIPT_SCALE}px`;
-	return `${DOCX_SUPERSCRIPT_SCALE}em`;
+	if (run.fontSize) return `${fontSizePtToPx(run.fontSize) * DOCX_SCRIPT_FONT_SCALE}px`;
+	return `${DOCX_SCRIPT_FONT_SCALE}em`;
 }
 /**
 * Apply text run styles to an element

package/dist/prosemirror/attrs/index.js

@@ -1,4 +1,4 @@
-import { FIELD_TYPE_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LINE_SPACING_RULE_VALUES, OUTLINE_STYLE_ATTR_VALUES, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES } from "../../types/documentEnumValues.js";
+import { FIELD_TYPE_VALUES, FONT_THEME_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LINE_SPACING_RULE_VALUES, OUTLINE_STYLE_ATTR_VALUES, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES } from "../../types/documentEnumValues.js";
 import { isParagraphDirection } from "../paragraphDirection.js";
 import { TRACKED_CHANGE_PROVENANCE_VALUES } from "../schema/marks.js";
 import { panic } from "better-result";
@@ -163,6 +163,7 @@ const readParagraphAttrs = (node) => {
 	optionalNumber(attrs, "spaceBefore", "paragraph.attrs.spaceBefore", issues);
 	optionalNumber(attrs, "spaceAfter", "paragraph.attrs.spaceAfter", issues);
 	optionalNumber(attrs, "lineSpacing", "paragraph.attrs.lineSpacing", issues);
+	optionalBoolean(attrs, "lineSpacingExplicit", "paragraph.attrs.lineSpacingExplicit", issues);
 	optionalBoolean(attrs, "snapToGrid", "paragraph.attrs.snapToGrid", issues);
 	optionalOneOf(attrs, "lineSpacingRule", "paragraph.attrs.lineSpacingRule", issues, LINE_SPACING_RULE_VALUES);
 	optionalNumber(attrs, "indentLeft", "paragraph.attrs.indentLeft", issues);
@@ -571,10 +572,10 @@ const readFontFamilyMarkAttrs = (mark) => {
 	optionalString(attrs, "eastAsia", "fontFamily.attrs.eastAsia", issues);
 	optionalString(attrs, "cs", "fontFamily.attrs.cs", issues);
 	optionalString(attrs, "hint", "fontFamily.attrs.hint", issues);
-	optionalString(attrs, "asciiTheme", "fontFamily.attrs.asciiTheme", issues);
-	optionalString(attrs, "hAnsiTheme", "fontFamily.attrs.hAnsiTheme", issues);
-	optionalString(attrs, "eastAsiaTheme", "fontFamily.attrs.eastAsiaTheme", issues);
-	optionalString(attrs, "csTheme", "fontFamily.attrs.csTheme", issues);
+	optionalOneOf(attrs, "asciiTheme", "fontFamily.attrs.asciiTheme", issues, FONT_THEME_VALUES);
+	optionalOneOf(attrs, "hAnsiTheme", "fontFamily.attrs.hAnsiTheme", issues, FONT_THEME_VALUES);
+	optionalOneOf(attrs, "eastAsiaTheme", "fontFamily.attrs.eastAsiaTheme", issues, FONT_THEME_VALUES);
+	optionalOneOf(attrs, "csTheme", "fontFamily.attrs.csTheme", issues, FONT_THEME_VALUES);
 	return attrsResult(attrs, issues);
 };
 const expectFontFamilyMarkAttrs = (mark) => expectCachedMarkAttrs(mark, fontFamilyAttrsCache, readFontFamilyMarkAttrs, "font family attrs");

package/dist/prosemirror/commands/propertyChangeScope.d.ts

@@ -19,7 +19,7 @@ type AttrPatch = Record<string, unknown>;
  *   without a style resolver: `numPrFromStyle`, the `list*` rendering attrs,
  *   `spacingFromDocDefaults`, `spacingFromImplicitDefaultStyle`
  */
-declare const PPR_CHANGE_SCOPED_ATTR_KEYS: readonly ["styleId", "numPr", "alignment", "spaceBefore", "spaceAfter", "lineSpacing", "lineSpacingRule", "snapToGrid", "spacingExplicit", "indentLeft", "indentRight", "indentFirstLine", "hangingIndent", "borders", "shading", "tabs", "pageBreakBefore", "keepNext", "keepLines", "widowControl", "contextualSpacing", "outlineLevel", "direction", "_autospacingBase"];
+declare const PPR_CHANGE_SCOPED_ATTR_KEYS: readonly ["styleId", "numPr", "alignment", "spaceBefore", "spaceAfter", "lineSpacing", "lineSpacingRule", "lineSpacingExplicit", "snapToGrid", "spacingExplicit", "indentLeft", "indentRight", "indentFirstLine", "hangingIndent", "borders", "shading", "tabs", "pageBreakBefore", "keepNext", "keepLines", "widowControl", "contextualSpacing", "outlineLevel", "direction", "_autospacingBase"];
 /**
  * Build the attr patch that rejecting one pPrChange applies to a paragraph:
  * every in-scope key set to the stored previous value, or reset to `null`

package/dist/prosemirror/commands/propertyChangeScope.js

@@ -27,6 +27,7 @@ const PPR_CHANGE_SCOPED_ATTR_KEYS = [
 	"spaceAfter",
 	"lineSpacing",
 	"lineSpacingRule",
+	"lineSpacingExplicit",
 	"snapToGrid",
 	"spacingExplicit",
 	"indentLeft",

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -543,6 +543,7 @@ function paragraphAttrsToFormatting(attrs) {
 	const afterAutospacingEdited = afterHasAutospacingBase ? !autospacingMatchesBase(attrs._autospacingBase, "after", spaceAfter) : afterOriginalAutospacing && attrs._autospacingBase == null;
 	const shouldSerializeSpaceBefore = typeof spaceBefore === "number" && (!beforeHasAutospacingBase || beforeAutospacingEdited);
 	const shouldSerializeSpaceAfter = typeof spaceAfter === "number" && (!afterHasAutospacingBase || afterAutospacingEdited);
+	const hasDirectLineSpacing = attrs.lineSpacingExplicit === true;
 	if (attrs._originalFormatting) {
 		const orig = attrs._originalFormatting;
 		const result = { ...orig };
@@ -556,6 +557,15 @@ function paragraphAttrsToFormatting(attrs) {
 			if (typeof spaceAfter === "number") result.spaceAfter = spaceAfter;
 			else delete result.spaceAfter;
 		}
+		if (attrs.spacingExplicit?.before && typeof spaceBefore === "number") result.spaceBefore = spaceBefore;
+		if (attrs.spacingExplicit?.after && typeof spaceAfter === "number") result.spaceAfter = spaceAfter;
+		const originalHasDirectLineSpacing = orig.lineSpacing !== void 0 || orig.lineSpacingRule !== void 0;
+		if (hasDirectLineSpacing || originalHasDirectLineSpacing) {
+			if (typeof attrs.lineSpacing === "number") result.lineSpacing = attrs.lineSpacing;
+			else Reflect.deleteProperty(result, "lineSpacing");
+			if (attrs.lineSpacingRule) result.lineSpacingRule = attrs.lineSpacingRule;
+			else Reflect.deleteProperty(result, "lineSpacingRule");
+		}
 		if (attrs.alignment !== (orig.alignment ?? void 0)) if (attrs.alignment) result.alignment = attrs.alignment;
 		else delete result.alignment;
 		if (isStyleSourcedNumPr(attrs)) {
@@ -583,15 +593,15 @@ function paragraphAttrsToFormatting(attrs) {
 	}
 	const outlineLevel = Reflect.get(attrs, "outlineLevel");
 	const bidi = directionToBidi(attrs.direction);
-	if (!(attrs.alignment || shouldSerializeSpaceBefore || shouldSerializeSpaceAfter || beforeAutospacingEdited || afterAutospacingEdited || attrs.lineSpacing || 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;
+	if (!(attrs.alignment || shouldSerializeSpaceBefore || shouldSerializeSpaceAfter || beforeAutospacingEdited || afterAutospacingEdited || hasDirectLineSpacing || 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 f = {};
 	if (attrs.alignment) f.alignment = attrs.alignment;
 	if (shouldSerializeSpaceBefore) f.spaceBefore = spaceBefore;
 	if (beforeAutospacingEdited) f.beforeAutospacing = false;
 	if (shouldSerializeSpaceAfter) f.spaceAfter = spaceAfter;
 	if (afterAutospacingEdited) f.afterAutospacing = false;
-	if (attrs.lineSpacing) f.lineSpacing = attrs.lineSpacing;
-	if (attrs.lineSpacingRule) f.lineSpacingRule = attrs.lineSpacingRule;
+	if (hasDirectLineSpacing && typeof attrs.lineSpacing === "number") f.lineSpacing = attrs.lineSpacing;
+	if (hasDirectLineSpacing && attrs.lineSpacingRule) f.lineSpacingRule = attrs.lineSpacingRule;
 	if (attrs.snapToGrid != null) f.snapToGrid = attrs.snapToGrid;
 	if (attrs.spacingExplicit) f.spacingExplicit = attrs.spacingExplicit;
 	if (attrs.indentLeft) f.indentLeft = attrs.indentLeft;

package/dist/prosemirror/conversion/toProseDoc.js

@@ -319,6 +319,7 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 		set("spaceAfter", formatting?.spaceAfter ?? stylePpr?.spaceAfter);
 		set("lineSpacing", formatting?.lineSpacing ?? stylePpr?.lineSpacing);
 		set("lineSpacingRule", formatting?.lineSpacingRule ?? stylePpr?.lineSpacingRule);
+		set("lineSpacingExplicit", formatting?.lineSpacing !== void 0 || formatting?.lineSpacingRule !== void 0 ? true : void 0);
 		set("snapToGrid", formatting?.snapToGrid ?? stylePpr?.snapToGrid);
 		set("spacingExplicit", formatting?.spacingExplicit);
 		const paragraphStyle = styleId ? styleResolver.getStyle(styleId) ?? styleResolver.getDefaultParagraphStyle() : styleResolver.getDefaultParagraphStyle();

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

@@ -161,6 +161,7 @@ function extractParagraphAttrsFromStyle(element) {
 		if (spacing) {
 			attrs.lineSpacing = spacing.lineSpacing;
 			attrs.lineSpacingRule = spacing.lineSpacingRule;
+			attrs.lineSpacingExplicit = true;
 		}
 	}
 	if (style.marginTop) {
@@ -187,6 +188,7 @@ const paragraphNodeSpec = {
 		spaceAfter: { default: null },
 		lineSpacing: { default: null },
 		lineSpacingRule: { default: null },
+		lineSpacingExplicit: { default: null },
 		snapToGrid: { default: null },
 		spacingExplicit: { default: null },
 		spacingFromDocDefaults: { default: null },
@@ -323,6 +325,30 @@ function setParagraphAttr(attr, value) {
 		return true;
 	};
 }
+function setParagraphSpacingAttr(side, twips) {
+	return (state, dispatch) => {
+		const { $from, $to } = state.selection;
+		if (!dispatch) return true;
+		let tr = state.tr;
+		const seen = /* @__PURE__ */ new Set();
+		state.doc.nodesBetween($from.pos, $to.pos, (node, pos) => {
+			if (node.type.name === "paragraph" && !seen.has(pos)) {
+				seen.add(pos);
+				const spacingExplicit = {
+					...node.attrs["spacingExplicit"],
+					[side]: true
+				};
+				tr = tr.setNodeMarkup(pos, void 0, {
+					...node.attrs,
+					[side === "before" ? "spaceBefore" : "spaceAfter"]: twips,
+					spacingExplicit
+				});
+			}
+		});
+		dispatch(tr.scrollIntoView());
+		return true;
+	};
+}
 function setParagraphAttrsCmd(attrs) {
 	return (state, dispatch) => {
 		const { $from, $to } = state.selection;
@@ -348,7 +374,8 @@ function makeSetAlignment(alignment) {
 function makeSetLineSpacing(value, rule = "auto") {
 	return (state, dispatch) => setParagraphAttrsCmd({
 		lineSpacing: value,
-		lineSpacingRule: rule
+		lineSpacingRule: rule,
+		lineSpacingExplicit: true
 	})(state, dispatch);
 }
 function makeIncreaseIndent(amount = 720) {
@@ -498,8 +525,8 @@ const ParagraphExtension = createNodeExtension({
 			singleSpacing: () => makeSetLineSpacing(240),
 			oneAndHalfSpacing: () => makeSetLineSpacing(360),
 			doubleSpacing: () => makeSetLineSpacing(480),
-			setSpaceBefore: (twips) => setParagraphAttr("spaceBefore", twips),
-			setSpaceAfter: (twips) => setParagraphAttr("spaceAfter", twips),
+			setSpaceBefore: (twips) => setParagraphSpacingAttr("before", twips),
+			setSpaceAfter: (twips) => setParagraphSpacingAttr("after", twips),
 			increaseIndent: (amount) => makeIncreaseIndent(amount),
 			decreaseIndent: (amount) => makeDecreaseIndent(amount),
 			setIndentLeft: (twips) => setParagraphAttr("indentLeft", twips > 0 ? twips : null),

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

@@ -1,8 +1,7 @@
 import { expectUnderlineMarkAttrs } from "../../attrs/index.js";
 import { createMarkExtension } from "../create.js";
-import { setMark } from "./markUtils.js";
+import { setMark, toggleUnderlineMark } from "./markUtils.js";
 import { panic } from "better-result";
-import { toggleMark } from "prosemirror-commands";
 //#region src/prosemirror/extensions/marks/UnderlineExtension.ts
 /**
 * Underline Mark Extension
@@ -17,14 +16,17 @@ const UnderlineExtension = createMarkExtension({
 		},
 		parseDOM: [{ tag: "u" }, {
 			style: "text-decoration",
-			getAttrs: (value) => value.includes("underline") ? {} : false
+			getAttrs: (value) => {
+				if (value.includes("underline")) return {};
+				return value.includes("none") ? { style: "none" } : false;
+			}
 		}],
 		toDOM(mark) {
 			const attrs = expectUnderlineMarkAttrs(mark);
 			const style = attrs.style;
 			const colorRgb = attrs.color?.rgb;
-			const cssStyle = ["text-decoration: underline"];
-			if (style && style !== "single") {
+			const cssStyle = [`text-decoration: ${style === "none" ? "none" : "underline"}`];
+			if (style && style !== "single" && style !== "none") {
 				const cssDecorationStyle = {
 					double: "double",
 					dotted: "dotted",
@@ -46,13 +48,13 @@ const UnderlineExtension = createMarkExtension({
 		if (!underlineType) panic("Missing mark type: underline");
 		return {
 			commands: {
-				toggleUnderline: () => toggleMark(underlineType),
+				toggleUnderline: () => toggleUnderlineMark(underlineType),
 				setUnderlineStyle: (style, color) => setMark(underlineType, {
 					style,
 					color
 				})
 			},
-			keyboardShortcuts: { "Mod-u": toggleMark(underlineType) }
+			keyboardShortcuts: { "Mod-u": toggleUnderlineMark(underlineType) }
 		};
 	}
 });

package/dist/prosemirror/extensions/marks/markUtils.d.ts

@@ -4,6 +4,7 @@ import { Mark, MarkType, Schema } from "prosemirror-model";
 //#region src/prosemirror/extensions/marks/markUtils.d.ts
 type MarkAttrs = Record<string, unknown>;
 declare function setMark(markType: MarkType, attrs: MarkAttrs): Command;
+declare function toggleUnderlineMark(markType: MarkType): Command;
 declare function removeMark(markType: MarkType): Command;
 /**
  * Check if a mark is active in the current selection
@@ -30,4 +31,4 @@ declare function createSetMarkCommand(markType: MarkType, attrs?: Record<string,
  */
 declare function createRemoveMarkCommand(markType: MarkType): Command;
 //#endregion
-export { clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, removeMark, setMark, textFormattingToMarks };
+export { clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, removeMark, setMark, textFormattingToMarks, toggleUnderlineMark };

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

@@ -1,5 +1,20 @@
+import { FONT_THEME_VALUES } from "../../../types/documentEnumValues.js";
+import { mergeFontFamily } from "../../../utils/fontFamilyMerge.js";
+import { expectFontFamilyMarkAttrs } from "../../attrs/index.js";
 import { applyRunFormattingOverrideMark, buildRunFormattingOverrideAttrs } from "./RunFormattingOverrideExtension.js";
 //#region src/prosemirror/extensions/marks/markUtils.ts
+const isFontTheme = (value) => value !== void 0 && FONT_THEME_VALUES.some((theme) => theme === value);
+const fontFamilyAttrsToFormatting = ({ ascii, hAnsi, eastAsia, cs, hint, asciiTheme, hAnsiTheme, eastAsiaTheme, csTheme }) => ({
+	...ascii !== void 0 ? { ascii } : {},
+	...hAnsi !== void 0 ? { hAnsi } : {},
+	...eastAsia !== void 0 ? { eastAsia } : {},
+	...cs !== void 0 ? { cs } : {},
+	...hint !== void 0 ? { hint } : {},
+	...isFontTheme(asciiTheme) ? { asciiTheme } : {},
+	...hAnsiTheme !== void 0 ? { hAnsiTheme } : {},
+	...eastAsiaTheme !== void 0 ? { eastAsiaTheme } : {},
+	...csTheme !== void 0 ? { csTheme } : {}
+});
 function marksToTextFormatting(marks) {
 	const formatting = {};
 	for (const mark of marks) switch (mark.type.name) {
@@ -10,7 +25,10 @@ function marksToTextFormatting(marks) {
 			formatting.italic = true;
 			break;
 		case "underline":
-			formatting.underline = { style: typeof mark.attrs["style"] === "string" ? mark.attrs["style"] : "single" };
+			formatting.underline = {
+				style: typeof mark.attrs["style"] === "string" ? mark.attrs["style"] : "single",
+				...mark.attrs["color"] !== null && mark.attrs["color"] !== void 0 ? { color: mark.attrs["color"] } : {}
+			};
 			break;
 		case "strike":
 			formatting.strike = true;
@@ -34,17 +52,9 @@ function marksToTextFormatting(marks) {
 		case "fontSize":
 			formatting.fontSize = Number(mark.attrs["size"]);
 			break;
-		case "fontFamily": {
-			const ascii = mark.attrs["ascii"] !== null && mark.attrs["ascii"] !== void 0 ? String(mark.attrs["ascii"]) : void 0;
-			const hAnsi = mark.attrs["hAnsi"] !== null && mark.attrs["hAnsi"] !== void 0 ? String(mark.attrs["hAnsi"]) : void 0;
-			const hint = mark.attrs["hint"];
-			formatting.fontFamily = {
-				...ascii !== void 0 ? { ascii } : {},
-				...hAnsi !== void 0 ? { hAnsi } : {},
-				...hint === "default" || hint === "eastAsia" || hint === "cs" ? { hint } : {}
-			};
+		case "fontFamily":
+			formatting.fontFamily = fontFamilyAttrsToFormatting(expectFontFamilyMarkAttrs(mark));
 			break;
-		}
 		case "language": {
 			const val = mark.attrs["val"];
 			const eastAsia = mark.attrs["eastAsia"];
@@ -93,21 +103,82 @@ function dispatchStoredMarks(state, dispatch, marks) {
 	tr.setStoredMarks(marks);
 	dispatch(tr);
 }
+function compactAttrs(attrs) {
+	if (!attrs) return {};
+	const result = {};
+	for (const [key, value] of Object.entries(attrs)) if (value !== null && value !== void 0) result[key] = value;
+	return result;
+}
+function mergeMarkAttrs(markType, currentMark, nextAttrs) {
+	const next = compactAttrs(nextAttrs);
+	switch (markType.name) {
+		case "fontFamily": return mergeFontFamily(currentMark ? fontFamilyAttrsToFormatting(expectFontFamilyMarkAttrs(currentMark)) : void 0, fontFamilyAttrsToFormatting(expectFontFamilyMarkAttrs(markType.create(next))));
+		case "underline": return {
+			...compactAttrs(currentMark?.attrs),
+			...next
+		};
+		default: return nextAttrs;
+	}
+}
+function markRequiresAttrMerge(markType) {
+	return markType.name === "fontFamily" || markType.name === "underline";
+}
+function createMarkWithMergedAttrs(markType, currentMark, nextAttrs) {
+	if (!markRequiresAttrMerge(markType)) return markType.create(nextAttrs);
+	return markType.create(mergeMarkAttrs(markType, currentMark, nextAttrs));
+}
 function setMark(markType, attrs) {
 	return (state, dispatch) => {
 		const { from, to, empty } = state.selection;
-		const mark = markType.create(attrs);
 		if (empty) {
 			if (dispatch) {
 				const current = state.storedMarks ?? state.selection.$from.marks();
-				dispatchStoredMarks(state, dispatch, [...markType.isInSet(current) ? current.filter((m) => m.type !== markType) : current, mark]);
+				const currentMark = markType.isInSet(current);
+				const marks = markType.isInSet(current) ? current.filter((m) => m.type !== markType) : current;
+				const mark = createMarkWithMergedAttrs(markType, currentMark, attrs);
+				dispatchStoredMarks(state, dispatch, [...marks, mark]);
 			}
 			return true;
 		}
-		if (dispatch) dispatch(state.tr.addMark(from, to, mark).scrollIntoView());
+		if (dispatch) {
+			if (!markRequiresAttrMerge(markType)) {
+				dispatch(state.tr.addMark(from, to, markType.create(attrs)).scrollIntoView());
+				return true;
+			}
+			let tr = state.tr;
+			state.doc.nodesBetween(from, to, (node, pos) => {
+				if (!node.isText) return;
+				const start = Math.max(from, pos);
+				const end = Math.min(to, pos + node.nodeSize);
+				const mark = createMarkWithMergedAttrs(markType, markType.isInSet(node.marks), attrs);
+				tr = tr.addMark(start, end, mark);
+			});
+			dispatch(tr.scrollIntoView());
+		}
 		return true;
 	};
 }
+function selectionHasVisibleUnderline(state, markType) {
+	const { from, to, empty, $from } = state.selection;
+	if (empty) {
+		const mark = markType.isInSet(state.storedMarks ?? $from.marks());
+		return mark !== void 0 && mark.attrs["style"] !== "none";
+	}
+	let hasVisibleUnderline = false;
+	state.doc.nodesBetween(from, to, (node) => {
+		if (!node.isText) return true;
+		const mark = markType.isInSet(node.marks);
+		if (mark && mark.attrs["style"] !== "none") {
+			hasVisibleUnderline = true;
+			return false;
+		}
+		return true;
+	});
+	return hasVisibleUnderline;
+}
+function toggleUnderlineMark(markType) {
+	return (state, dispatch) => setMark(markType, { style: selectionHasVisibleUnderline(state, markType) ? "none" : "single" })(state, dispatch);
+}
 function removeMark(markType) {
 	return (state, dispatch) => {
 		const { from, to, empty } = state.selection;
@@ -197,8 +268,13 @@ function textFormattingToMarks(formatting, schema) {
 	if (formatting.fontFamily && schema.marks["fontFamily"]) marks.push(schema.marks["fontFamily"].create({
 		ascii: formatting.fontFamily.ascii,
 		hAnsi: formatting.fontFamily.hAnsi,
+		eastAsia: formatting.fontFamily.eastAsia,
+		cs: formatting.fontFamily.cs,
 		hint: formatting.fontFamily.hint,
-		asciiTheme: formatting.fontFamily.asciiTheme
+		asciiTheme: formatting.fontFamily.asciiTheme,
+		hAnsiTheme: formatting.fontFamily.hAnsiTheme,
+		eastAsiaTheme: formatting.fontFamily.eastAsiaTheme,
+		csTheme: formatting.fontFamily.csTheme
 	}));
 	if (formatting.language && schema.marks["language"]) marks.push(schema.marks["language"].create(formatting.language));
 	if (formatting.vertAlign === "superscript" && schema.marks["superscript"]) marks.push(schema.marks["superscript"].create());
@@ -245,4 +321,4 @@ function createRemoveMarkCommand(markType) {
 	return removeMark(markType);
 }
 //#endregion
-export { clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, removeMark, setMark, textFormattingToMarks };
+export { clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, removeMark, setMark, textFormattingToMarks, toggleUnderlineMark };

package/dist/prosemirror/plugins/selectionTracker.js

@@ -1,3 +1,4 @@
+import { collectMarksInRange } from "../selectionMarks.js";
 import { Plugin, PluginKey } from "prosemirror-state";
 //#region src/prosemirror/plugins/selectionTracker.ts
 /**
@@ -32,7 +33,7 @@ function extractSelectionContext(state) {
 	const paragraphFormatting = {};
 	if (paragraph.type.name === "paragraph") {
 		if (paragraph.attrs["alignment"]) paragraphFormatting.alignment = paragraph.attrs["alignment"];
-		if (paragraph.attrs["lineSpacing"]) {
+		if (typeof paragraph.attrs["lineSpacing"] === "number") {
 			paragraphFormatting.lineSpacing = paragraph.attrs["lineSpacing"];
 			paragraphFormatting.lineSpacingRule = paragraph.attrs["lineSpacingRule"];
 		}
@@ -79,9 +80,13 @@ function extractSelectionContext(state) {
 * Extract text formatting from current selection/cursor marks
 */
 function extractTextFormatting(state) {
-	const { selection } = state;
-	const { empty, $from } = selection;
-	const marks = state.storedMarks || (empty ? $from.marks() : []);
+	const { selection, doc } = state;
+	const { from, to, empty, $from } = selection;
+	const marks = empty ? state.storedMarks || $from.marks() : collectMarksInRange({
+		doc,
+		from,
+		to
+	});
 	const formatting = {};
 	for (const mark of marks) switch (mark.type.name) {
 		case "bold":
@@ -91,7 +96,7 @@ function extractTextFormatting(state) {
 			formatting.italic = true;
 			break;
 		case "underline":
-			formatting.underline = {
+			if (mark.attrs["style"] !== "none") formatting.underline = {
 				style: mark.attrs["style"] || "single",
 				color: mark.attrs["color"]
 			};

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

@@ -32,6 +32,7 @@ type ParagraphAttrs = {
   spaceAfter?: number;
   lineSpacing?: number;
   lineSpacingRule?: document_d_exports.LineSpacingRule;
+  lineSpacingExplicit?: boolean;
   snapToGrid?: boolean;
   spacingExplicit?: SpacingExplicit;
   /** Layout provenance: document defaults survive on empty paragraphs. */

package/dist/prosemirror/selectionMarks.d.ts

@@ -0,0 +1,11 @@
+import { Mark, Node } from "prosemirror-model";
+//#region src/prosemirror/selectionMarks.d.ts
+type CollectMarksInRangeOptions = {
+  doc: Node;
+  from: number;
+  to: number;
+};
+/** Collect one representative per mark type, preferring visible underline state. */
+declare const collectMarksInRange: ({ doc, from, to }: CollectMarksInRangeOptions) => Mark[];
+//#endregion
+export { collectMarksInRange };

package/dist/prosemirror/selectionMarks.js

@@ -0,0 +1,19 @@
+//#region src/prosemirror/selectionMarks.ts
+const UNDERLINE_MARK = "underline";
+const HIDDEN_UNDERLINE_STYLE = "none";
+const shouldReplaceMark = (current, incoming) => current.type.name === UNDERLINE_MARK && current.attrs["style"] === HIDDEN_UNDERLINE_STYLE && incoming.attrs["style"] !== HIDDEN_UNDERLINE_STYLE;
+/** Collect one representative per mark type, preferring visible underline state. */
+const collectMarksInRange = ({ doc, from, to }) => {
+	const seen = /* @__PURE__ */ new Map();
+	doc.nodesBetween(from, to, (node) => {
+		if (!node.isText) return;
+		for (const mark of node.marks) {
+			const name = mark.type.name;
+			const current = seen.get(name);
+			if (!current || shouldReplaceMark(current, mark)) seen.set(name, mark);
+		}
+	});
+	return Array.from(seen.values());
+};
+//#endregion
+export { collectMarksInRange };

package/dist/prosemirror/selectionState.js

@@ -1,4 +1,5 @@
 import { directionIsRtl } from "./paragraphDirection.js";
+import { collectMarksInRange } from "./selectionMarks.js";
 //#region src/prosemirror/selectionState.ts
 /**
 * Extract selection state from editor state.
@@ -18,7 +19,11 @@ function extractSelectionState(state) {
 	const paragraph = $from.parent;
 	const isEmptyParagraph = paragraph.type.name === "paragraph" && paragraph.textContent.length === 0;
 	const paragraphDefaultFormatting = paragraph.attrs["defaultTextFormatting"];
-	const marks = empty ? state.storedMarks || selection.$from.marks() : collectMarksInRange(doc, from, to);
+	const marks = empty ? state.storedMarks || selection.$from.marks() : collectMarksInRange({
+		doc,
+		from,
+		to
+	});
 	if (isEmptyParagraph && marks.length === 0 && paragraphDefaultFormatting) textFormatting = { ...paragraphDefaultFormatting };
 	for (const mark of marks) switch (mark.type.name) {
 		case "bold":
@@ -28,7 +33,7 @@ function extractSelectionState(state) {
 			textFormatting.italic = true;
 			break;
 		case "underline":
-			textFormatting.underline = {
+			if (mark.attrs["style"] !== "none") textFormatting.underline = {
 				style: mark.attrs["style"] || "single",
 				color: mark.attrs["color"]
 			};
@@ -67,7 +72,7 @@ function extractSelectionState(state) {
 	let styleId = null;
 	if (paragraph.type.name === "paragraph") {
 		if (paragraph.attrs["alignment"]) paragraphFormatting.alignment = paragraph.attrs["alignment"];
-		if (paragraph.attrs["lineSpacing"]) {
+		if (typeof paragraph.attrs["lineSpacing"] === "number") {
 			paragraphFormatting.lineSpacing = paragraph.attrs["lineSpacing"];
 			paragraphFormatting.lineSpacingRule = paragraph.attrs["lineSpacingRule"];
 		}
@@ -91,22 +96,5 @@ function extractSelectionState(state) {
 		endParagraphIndex
 	};
 }
-/**
-* Collect the first occurrence of each mark type found on any text node within
-* the range. Mirrors the "any inline child has this mark" semantics that
-* prosemirror-commands' toggleMark uses to decide add-vs-remove, so the
-* toolbar's active state stays consistent with what a toggle click will do.
-*/
-function collectMarksInRange(doc, from, to) {
-	const seen = /* @__PURE__ */ new Map();
-	doc.nodesBetween(from, to, (node) => {
-		if (!node.isText) return;
-		for (const mark of node.marks) {
-			const name = mark.type.name;
-			if (!seen.has(name)) seen.set(name, mark);
-		}
-	});
-	return Array.from(seen.values());
-}
 //#endregion
 export { extractSelectionState };

package/dist/prosemirror/styles/resolvedStyleAttrs.js

@@ -27,6 +27,7 @@ function paragraphAttrsFromResolvedStyle(resolved) {
 		spaceAfter: ppr?.spaceAfter ?? null,
 		lineSpacing: ppr?.lineSpacing ?? null,
 		lineSpacingRule: ppr?.lineSpacingRule ?? null,
+		lineSpacingExplicit: null,
 		snapToGrid: ppr?.snapToGrid ?? null,
 		indentLeft: ppr?.indentLeft ?? null,
 		indentRight: ppr?.indentRight ?? null,

package/dist/utils/formatToStyle.js

@@ -108,7 +108,7 @@ function paragraphToStyle(formatting, theme) {
 	}
 	if (formatting.indentLeft !== void 0) style.marginLeft = formatPx(twipsToPixels(formatting.indentLeft));
 	if (formatting.indentRight !== void 0) style.marginRight = formatPx(twipsToPixels(formatting.indentRight));
-	if (formatting.indentFirstLine !== void 0) style.textIndent = formatPx(twipsToPixels(formatting.indentFirstLine));
+	if (formatting.indentFirstLine !== void 0) style.textIndent = formatPx(twipsToPixels(formatting.hangingIndent ? -Math.abs(formatting.indentFirstLine) : formatting.indentFirstLine));
 	if (formatting.borders) {
 		if (formatting.borders.top) Object.assign(style, borderToStyle(formatting.borders.top, "Top", theme));
 		if (formatting.borders.bottom) Object.assign(style, borderToStyle(formatting.borders.bottom, "Bottom", theme));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.22.2",
+  "version": "0.22.3",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",