@stll/folio-core 0.62.0 → 0.63.0

package/dist/layout-bridge/convert/headerFooterLayout.d.ts

@@ -6,7 +6,7 @@ import "./toFlowBlocks.js";
 import { MeasureBlocksFn } from "./footnoteLayout.js";
 import { Node } from "prosemirror-model";
 //#region src/layout-bridge/convert/headerFooterLayout.d.ts
-type HeaderFooterMetrics = {
+export type HeaderFooterMetrics = {
   section: "header" | "footer";
   pageSize: {
     w: number;
@@ -14,10 +14,10 @@ type HeaderFooterMetrics = {
   };
   margins: PageMargins;
 };
-declare function normalizeHeaderFooterMeasureBlocks(blocks: FlowBlock[], section?: HeaderFooterMetrics["section"]): FlowBlock[];
-declare function resolveHeaderFooterPositionedVisualTop(position: ImageRunPosition | undefined, elementHeight: number, sourceY: number, flowHeight: number, metrics: HeaderFooterMetrics): number;
-declare function resolveHeaderFooterVisualTop(run: ImageRun, paragraphY: number, flowHeight: number, metrics: HeaderFooterMetrics): number;
-declare function calculateHeaderFooterVisualBounds(blocks: FlowBlock[], measures: Measure[], flowHeight: number, metrics: HeaderFooterMetrics): {
+export declare function normalizeHeaderFooterMeasureBlocks(blocks: FlowBlock[], section?: HeaderFooterMetrics["section"]): FlowBlock[];
+export declare function resolveHeaderFooterPositionedVisualTop(position: ImageRunPosition | undefined, elementHeight: number, sourceY: number, flowHeight: number, metrics: HeaderFooterMetrics): number;
+export declare function resolveHeaderFooterVisualTop(run: ImageRun, paragraphY: number, flowHeight: number, metrics: HeaderFooterMetrics): number;
+export declare function calculateHeaderFooterVisualBounds(blocks: FlowBlock[], measures: Measure[], flowHeight: number, metrics: HeaderFooterMetrics): {
   visualTop: number;
   visualBottom: number;
 };
@@ -28,7 +28,7 @@ declare function calculateHeaderFooterVisualBounds(blocks: FlowBlock[], measures
  * `visualBottom` is still correct for rendering and page-hash invalidation;
  * these bounds separately describe the in-flow portion for API consumers.
  */
-declare function calculateHeaderFooterMarginPushBounds(blocks: FlowBlock[], measures: Measure[], flowHeight: number, metrics: HeaderFooterMetrics): {
+export declare function calculateHeaderFooterMarginPushBounds(blocks: FlowBlock[], measures: Measure[], flowHeight: number, metrics: HeaderFooterMetrics): {
   top: number;
   bottom: number;
 };
@@ -39,8 +39,8 @@ declare function calculateHeaderFooterMarginPushBounds(blocks: FlowBlock[], meas
  * text. Bands wholly below the body start need page-local flow support and are
  * intentionally not flattened into a top margin here.
  */
-declare function calculateHeaderFooterBodyTopClearance(blocks: FlowBlock[], flowHeight: number, metrics: HeaderFooterMetrics): number | undefined;
-type ConvertHeaderFooterOptions = {
+export declare function calculateHeaderFooterBodyTopClearance(blocks: FlowBlock[], flowHeight: number, metrics: HeaderFooterMetrics): number | undefined;
+export type ConvertHeaderFooterOptions = {
   /** Review projection applied before header/footer measurement. Defaults to All Markup. */
   markupView?: DisplayMode;
   /** Whether comment highlights are painted. Defaults to true. */
@@ -51,6 +51,7 @@ type ConvertHeaderFooterOptions = {
   defaultSize?: number;
   fontAlternates?: ToFlowBlocksOptions["fontAlternates"];
   embeddedFontFamilyMap?: ReadonlyMap<string, string>;
+  documentFontFacts?: ToFlowBlocksOptions["documentFontFacts"];
   measureBlocks: MeasureBlocksFn;
   /** Document-wide `w:defaultTabStop` in twips — forwarded to toFlowBlocks. */
   defaultTabStopTwips?: number;
@@ -79,7 +80,7 @@ type ConvertHeaderFooterOptions = {
  * edits. The HF pipeline runs at most four times per layout pass and the
  * paragraph-level measurement cache one layer down covers most of the work.
  */
-declare function convertHeaderFooterToContent(headerFooter: document_d_exports.HeaderFooter | null | undefined, contentWidth: number, metrics: HeaderFooterMetrics, options: ConvertHeaderFooterOptions): HeaderFooterContent | undefined;
+export declare function convertHeaderFooterToContent(headerFooter: document_d_exports.HeaderFooter | null | undefined, contentWidth: number, metrics: HeaderFooterMetrics, options: ConvertHeaderFooterOptions): HeaderFooterContent | undefined;
 /**
  * Same as {@link convertHeaderFooterToContent}, but sourced from a live
  * ProseMirror document instead of `HeaderFooter.content`. Used by the
@@ -91,7 +92,7 @@ declare function convertHeaderFooterToContent(headerFooter: document_d_exports.H
  * Theme and styles are threaded again because effective character-style
  * toggles cannot all be represented by the flattened ProseMirror marks.
  */
-declare function convertHeaderFooterPmDocToContent(pmDoc: Node | null | undefined, contentWidth: number, metrics: HeaderFooterMetrics, options: ConvertHeaderFooterOptions): HeaderFooterContent | undefined;
+export declare function convertHeaderFooterPmDocToContent(pmDoc: Node | null | undefined, contentWidth: number, metrics: HeaderFooterMetrics, options: ConvertHeaderFooterOptions): HeaderFooterContent | undefined;
 /**
  * A paragraph-relative wrapping image that spans the whole story width leaves
  * no side on which following content can flow. Retain the host paragraph's
@@ -103,6 +104,6 @@ type ReserveHeaderFooterFullWidthWrapBandsOptions = {
   contentWidth: number;
   metrics: HeaderFooterMetrics;
 };
-declare function reserveHeaderFooterFullWidthWrapBands({ blocks, measures, contentWidth, metrics }: ReserveHeaderFooterFullWidthWrapBandsOptions): Measure[];
+export declare function reserveHeaderFooterFullWidthWrapBands({ blocks, measures, contentWidth, metrics }: ReserveHeaderFooterFullWidthWrapBandsOptions): Measure[];
 //#endregion
-export { ConvertHeaderFooterOptions, HeaderFooterMetrics, calculateHeaderFooterBodyTopClearance, calculateHeaderFooterMarginPushBounds, calculateHeaderFooterVisualBounds, convertHeaderFooterPmDocToContent, convertHeaderFooterToContent, normalizeHeaderFooterMeasureBlocks, reserveHeaderFooterFullWidthWrapBands, resolveHeaderFooterPositionedVisualTop, resolveHeaderFooterVisualTop };
+export {};

package/dist/layout-bridge/convert/headerFooterLayout.js

@@ -8,12 +8,13 @@ import { toFlowBlocks } from "./toFlowBlocks.js";
 //#region src/layout-bridge/convert/headerFooterLayout.ts
 const DETACHED_WATERMARK_HOST = Symbol.for("stll.detachedWatermarkHost");
 const headerFooterToProseDocWithDetachedWatermarkHost = (headerFooter, options) => {
-	return headerFooterToProseDoc(headerFooter.content.map((block, blockIndex) => {
+	const markedContent = headerFooter.content.map((block, blockIndex) => {
 		if (blockIndex !== headerFooter.watermarkBlockIndex || block.type !== "paragraph") return block;
 		const marked = cloneParagraphWithPropertySource(block, {});
 		Reflect.set(marked, DETACHED_WATERMARK_HOST, true);
 		return marked;
-	}), options);
+	});
+	return headerFooterToProseDoc(markedContent, options);
 };
 function isAnchoredImageRun(run) {
 	if (run.kind !== "image") return false;
@@ -363,19 +364,22 @@ function convertHeaderFooterPmDocToContent(pmDoc, contentWidth, metrics, options
 	if (options.styles) flowOptions.styles = options.styles;
 	if (options.theme !== void 0) flowOptions.theme = options.theme;
 	if (options.embeddedFontFamilyMap !== void 0) flowOptions.embeddedFontFamilyMap = options.embeddedFontFamilyMap;
+	if (options.documentFontFacts !== void 0) flowOptions.documentFontFacts = options.documentFontFacts;
 	if (options.fontAlternates !== void 0) flowOptions.fontAlternates = options.fontAlternates;
 	if (options.defaultTabStopTwips !== void 0) flowOptions.defaultTabStopTwips = options.defaultTabStopTwips;
 	if (options.lineBreakRules) flowOptions.lineBreakRules = options.lineBreakRules;
 	if (options.justificationCompatibility) flowOptions.justificationCompatibility = options.justificationCompatibility;
 	if (options.tableIndentCompatibility) flowOptions.tableIndentCompatibility = options.tableIndentCompatibility;
 	if (options.automaticHyphenation) flowOptions.automaticHyphenation = options.automaticHyphenation;
+	const markupView = options.markupView ?? "all-markup";
 	const projection = projectStoryMarkupView({
 		doc: pmDoc,
-		markupView: options.markupView ?? "all-markup",
+		markupView,
 		styles: options.styles,
 		numbering: options.numbering
 	});
-	const flowBlocks = toFlowBlocks(projection.type === "resolved" ? projection.doc : pmDoc, flowOptions);
+	const viewDoc = projection.type === "resolved" ? projection.doc : pmDoc;
+	const flowBlocks = toFlowBlocks(viewDoc, flowOptions);
 	return finalizeHeaderFooterContent(projection.type === "resolved" ? remapMarkupViewBlocks(flowBlocks, projection) : flowBlocks, contentWidth, metrics, options);
 }
 function horizontalImageLeft({ run, contentWidth, metrics }) {
@@ -557,6 +561,8 @@ function serializeRunFmt(run) {
 		"fontSize",
 		"fontFamily",
 		"alternateFontFamily",
+		"hAnsiFontFamily",
+		"hAnsiAlternateFontFamily",
 		"eastAsiaFontFamily",
 		"eastAsiaAlternateFontFamily",
 		"eastAsiaHint",

package/dist/layout-bridge/convert/imageConversion.d.ts

@@ -6,7 +6,7 @@ import { Node } from "prosemirror-model";
  * Constrain image dimensions to fit within the page content area.
  * Scales proportionally if height exceeds pageContentHeight.
  */
-declare function constrainImageToPage(width: number, height: number, pageContentHeight: number | undefined): {
+export declare function constrainImageToPage(width: number, height: number, pageContentHeight: number | undefined): {
   width: number;
   height: number;
 };
@@ -14,20 +14,19 @@ declare function constrainImageToPage(width: number, height: number, pageContent
  * Build an ImageRun from ProseMirror node attrs, applying conditional property assignment
  * to satisfy exactOptionalPropertyTypes.
  */
-declare function buildImageRun(attrs: ImageAttrs, constrained: {
+export declare function buildImageRun(attrs: ImageAttrs, constrained: {
   width: number;
   height: number;
 }, pmStart: number, pmEnd: number, trackedChange?: Pick<RunFormatting, "isInsertion" | "isDeletion" | "changeAuthor" | "changeDate" | "changeRevisionId">, forceLayoutInCell?: boolean): ImageRun;
 /** A package image whose bytes cannot paint still owns its authored line box. */
-declare const hasRelationshipBackedImageBox: (attrs: ImageAttrs) => boolean;
+export declare const hasRelationshipBackedImageBox: (attrs: ImageAttrs) => boolean;
 /**
  * A preview counts as a source: the bytes are not in the attrs, but the
  * display list can produce them without I/O when it interns the descriptor.
  */
-declare const hasPaintableImageSource: (attrs: Pick<ImageAttrs, "src" | "preview">) => boolean;
+export declare const hasPaintableImageSource: (attrs: Pick<ImageAttrs, "src" | "preview">) => boolean;
 /**
  * Convert an image node to an ImageBlock.
  */
-declare function convertImage(node: Node, startPos: number, pageContentHeight?: number): ImageBlock | undefined;
-//#endregion
-export { buildImageRun, constrainImageToPage, convertImage, hasPaintableImageSource, hasRelationshipBackedImageBox };
+export declare function convertImage(node: Node, startPos: number, pageContentHeight?: number): ImageBlock | undefined;
+//#endregion

package/dist/layout-bridge/convert/listMarkers.d.ts

@@ -3,25 +3,25 @@ import { ParagraphAttrs, ParagraphPropertyChangeAttrs } from "../../prosemirror/
 import { ParagraphAttrs as ParagraphAttrs$1 } from "../../layout-engine/types.js";
 import { FontAlternates } from "../../fonts/fontAlternates.js";
 //#region src/layout-bridge/convert/listMarkers.d.ts
-declare function applyMarkerAllCaps(marker: string | null, allCaps: boolean | undefined): string | null;
+export declare function applyMarkerAllCaps(marker: string | null, allCaps: boolean | undefined): string | null;
 /**
  * Convert PM paragraph attrs to layout engine paragraph attrs.
  */
 type ListMarkerRevision = NonNullable<ParagraphAttrs$1["listMarkerRevision"]>;
-type ListPropertyChange = ParagraphPropertyChangeAttrs;
-type ListPropertyFormatting = NonNullable<ListPropertyChange["previousFormatting"]>;
-declare function toListMarkerRevision(kind: ListMarkerRevision["kind"], info: ListPropertyChange["info"]): ListMarkerRevision;
-declare function isAddedNumberingChange(change: ListPropertyChange): change is ListPropertyChange & {
+export type ListPropertyChange = ParagraphPropertyChangeAttrs;
+export type ListPropertyFormatting = NonNullable<ListPropertyChange["previousFormatting"]>;
+export declare function toListMarkerRevision(kind: ListMarkerRevision["kind"], info: ListPropertyChange["info"]): ListMarkerRevision;
+export declare function isAddedNumberingChange(change: ListPropertyChange): change is ListPropertyChange & {
   previousFormatting: ListPropertyFormatting;
 };
-declare function isRemovedNumberingChange(change: ListPropertyChange): change is ListPropertyChange & {
+export declare function isRemovedNumberingChange(change: ListPropertyChange): change is ListPropertyChange & {
   previousFormatting: ListPropertyFormatting;
 };
-declare function isChangedNumberingChange(currentNumPr: NonNullable<ParagraphAttrs["numPr"]>, change: ListPropertyChange): change is ListPropertyChange & {
+export declare function isChangedNumberingChange(currentNumPr: NonNullable<ParagraphAttrs["numPr"]>, change: ListPropertyChange): change is ListPropertyChange & {
   previousFormatting: ListPropertyFormatting;
 };
-declare function applyDeletedListMarkerAttrs(attrs: ParagraphAttrs$1, change: ListPropertyChange & {
+export declare function applyDeletedListMarkerAttrs(attrs: ParagraphAttrs$1, change: ListPropertyChange & {
   previousFormatting: ListPropertyFormatting;
 }, theme: document_d_exports.Theme | null | undefined, fontAlternates: FontAlternates | undefined, paragraphMarkFormatting: () => document_d_exports.TextFormatting | undefined): void;
 //#endregion
-export { ListPropertyChange, ListPropertyFormatting, applyDeletedListMarkerAttrs, applyMarkerAllCaps, isAddedNumberingChange, isChangedNumberingChange, isRemovedNumberingChange, toListMarkerRevision };
+export {};

package/dist/layout-bridge/convert/markupViewFlow.d.ts

@@ -5,7 +5,7 @@ type PositionRange = {
   from: number;
   to: number;
 };
-type MarkupViewFlowOptions = {
+export type MarkupViewFlowOptions = {
   /** Authored (editor) positions to the positions the blocks were built with. */
   positionMap: StepMap;
   /** Ranges, in the blocks' positions, whose paragraphs show a change bar. */
@@ -15,6 +15,6 @@ type MarkupViewFlowOptions = {
  * Re-address blocks built from a view projection in editor positions, and mark
  * the paragraphs the view flags with a change bar.
  */
-declare function remapMarkupViewBlocks(blocks: readonly FlowBlock[], { positionMap, changeBarRanges }: MarkupViewFlowOptions): FlowBlock[];
+export declare function remapMarkupViewBlocks(blocks: readonly FlowBlock[], { positionMap, changeBarRanges }: MarkupViewFlowOptions): FlowBlock[];
 //#endregion
-export { MarkupViewFlowOptions, remapMarkupViewBlocks };
+export {};

package/dist/layout-bridge/convert/noteReferences.d.ts

@@ -4,9 +4,8 @@ import { FlowBlock } from "../../layout-engine/types.js";
  * Runs with `idKey` set, in document order: the note references a block list
  * makes, through table cells (and tables within cells) and text boxes.
  */
-declare function collectNoteRefs(blocks: readonly FlowBlock[], idKey: "footnoteRefId" | "endnoteRefId"): {
+export declare function collectNoteRefs(blocks: readonly FlowBlock[], idKey: "footnoteRefId" | "endnoteRefId"): {
   noteId: number;
   pmPos: number;
 }[];
-//#endregion
-export { collectNoteRefs };
+//#endregion

package/dist/layout-bridge/convert/pageBreakSplitting.d.ts

@@ -8,9 +8,9 @@ type SplitParagraphAtPageBreaksOptions = {
   splitPageBreakAndParagraphMark: boolean;
 };
 /** Every page-break run under a node, nested tables and text boxes included. */
-declare const countPageBreakRuns: (node: Node) => number;
+export declare const countPageBreakRuns: (node: Node) => number;
 /** Decide leading-break eligibility from the exact projected runs consumed by layout. */
-declare const hasSingleLeadingProjectedPageBreak: (runs: readonly Run[], pageBreaks: readonly PageBreakRunProjection[]) => boolean;
-declare function splitParagraphAtPageBreaks({ pageBreaks, paragraph, splitPageBreakAndParagraphMark }: SplitParagraphAtPageBreaksOptions): (ParagraphBlock | PageBreakBlock)[];
+export declare const hasSingleLeadingProjectedPageBreak: (runs: readonly Run[], pageBreaks: readonly PageBreakRunProjection[]) => boolean;
+export declare function splitParagraphAtPageBreaks({ pageBreaks, paragraph, splitPageBreakAndParagraphMark }: SplitParagraphAtPageBreaksOptions): (ParagraphBlock | PageBreakBlock)[];
 //#endregion
-export { countPageBreakRuns, hasSingleLeadingProjectedPageBreak, splitParagraphAtPageBreaks };
+export {};

package/dist/layout-bridge/convert/pageBreakSplitting.js

@@ -3,6 +3,10 @@ import { nextBlockId } from "./flowConversionShared.js";
 import { hasVisibleParagraphPayload } from "./paragraphConversion.js";
 import { panic } from "better-result";
 //#region src/layout-bridge/convert/pageBreakSplitting.ts
+/**
+* Splits a paragraph at its page-break runs into paragraph fragments and
+* page-break blocks.
+*/
 function paragraphFragmentAttrs(source, index, count) {
 	if (!source) return;
 	const attrs = {

package/dist/layout-bridge/convert/paragraphAttrs.d.ts

@@ -15,6 +15,6 @@ type ConvertParagraphAttrsOptions = {
    */
   paragraphMarkFormatting: () => document_d_exports.TextFormatting | undefined;
 };
-declare function convertParagraphAttrs(pmAttrs: ParagraphAttrs, { theme, fontAlternates, listCounterStreams, defaultTabStopTwips, paragraphMarkFormatting }: ConvertParagraphAttrsOptions): ParagraphAttrs$1;
+export declare function convertParagraphAttrs(pmAttrs: ParagraphAttrs, { theme, fontAlternates, listCounterStreams, defaultTabStopTwips, paragraphMarkFormatting }: ConvertParagraphAttrsOptions): ParagraphAttrs$1;
 //#endregion
-export { convertParagraphAttrs };
+export {};

package/dist/layout-bridge/convert/paragraphAttrs.js

@@ -75,14 +75,16 @@ function convertParagraphAttrs(pmAttrs, { theme, fontAlternates, listCounterStre
 		if (autoBefore || pmSpacingExplicit?.before || spacingFromDocDefaults?.before || spacingFromImplicitDefaultStyle?.before) explicit.before = true;
 		if (autoAfter || pmSpacingExplicit?.after || spacingFromDocDefaults?.after || spacingFromImplicitDefaultStyle?.after) explicit.after = true;
 		if (explicit.before !== void 0 || explicit.after !== void 0) attrs.spacingExplicit = explicit;
-		if (typeof lineSpacing === "number") if (pmAttrs.lineSpacingRule === "exact" || pmAttrs.lineSpacingRule === "atLeast") {
-			attrs.spacing.line = twipsToPixels(lineSpacing);
-			attrs.spacing.lineUnit = "px";
-			attrs.spacing.lineRule = pmAttrs.lineSpacingRule;
-		} else {
-			attrs.spacing.line = lineSpacing / 240;
-			attrs.spacing.lineUnit = "multiplier";
-			attrs.spacing.lineRule = "auto";
+		if (typeof lineSpacing === "number") {
+			if (pmAttrs.lineSpacingRule === "exact" || pmAttrs.lineSpacingRule === "atLeast") {
+				attrs.spacing.line = twipsToPixels(lineSpacing);
+				attrs.spacing.lineUnit = "px";
+				attrs.spacing.lineRule = pmAttrs.lineSpacingRule;
+			} else {
+				attrs.spacing.line = lineSpacing / 240;
+				attrs.spacing.lineUnit = "multiplier";
+				attrs.spacing.lineRule = "auto";
+			}
 		}
 	}
 	let indentLeft = typeof pmAttrs.indentLeft === "number" ? pmAttrs.indentLeft : void 0;
@@ -103,8 +105,10 @@ function convertParagraphAttrs(pmAttrs, { theme, fontAlternates, listCounterStre
 		attrs.indent = {};
 		if (indentLeft !== void 0) attrs.indent.left = twipsToPixels(indentLeft);
 		if (typeof pmAttrs.indentRight === "number") attrs.indent.right = twipsToPixels(pmAttrs.indentRight);
-		if (indentFirstLine !== void 0) if (hangingIndent) attrs.indent.hanging = Math.abs(twipsToPixels(indentFirstLine));
-		else attrs.indent.firstLine = twipsToPixels(indentFirstLine);
+		if (indentFirstLine !== void 0) {
+			if (hangingIndent) attrs.indent.hanging = Math.abs(twipsToPixels(indentFirstLine));
+			else attrs.indent.firstLine = twipsToPixels(indentFirstLine);
+		}
 	}
 	if (pmAttrs.styleId) attrs.styleId = pmAttrs.styleId;
 	if (pmAttrs.borders) {
@@ -141,6 +145,8 @@ function convertParagraphAttrs(pmAttrs, { theme, fontAlternates, listCounterStre
 	}
 	if (pmAttrs.pageBreakBefore) attrs.pageBreakBefore = true;
 	if (pmAttrs.kinsoku !== void 0 && pmAttrs.kinsoku !== null) attrs.kinsoku = pmAttrs.kinsoku;
+	if (pmAttrs.autoSpaceDE !== void 0 && pmAttrs.autoSpaceDE !== null) attrs.autoSpaceDE = pmAttrs.autoSpaceDE;
+	if (pmAttrs.autoSpaceDN !== void 0 && pmAttrs.autoSpaceDN !== null) attrs.autoSpaceDN = pmAttrs.autoSpaceDN;
 	if (pmAttrs.overflowPunctuation !== void 0 && pmAttrs.overflowPunctuation !== null) attrs.overflowPunctuation = pmAttrs.overflowPunctuation;
 	if (pmAttrs.suppressAutoHyphens !== void 0 && pmAttrs.suppressAutoHyphens !== null) attrs.suppressAutoHyphens = pmAttrs.suppressAutoHyphens;
 	if (pmAttrs.renderedPageBreakBefore) attrs.renderedPageBreakBefore = true;
@@ -166,7 +172,8 @@ function convertParagraphAttrs(pmAttrs, { theme, fontAlternates, listCounterStre
 			if (numberingInsertionChange) attrs.listMarkerRevision = toListMarkerRevision("ins", numberingInsertionChange.info);
 		}
 	}
-	const resolvedMarker = applyMarkerAllCaps(advanceVisibleListMarker(pmAttrs, listCounterStreams).marker, pmAttrs.listMarkerAllCaps);
+	const visibleMarker = advanceVisibleListMarker(pmAttrs, listCounterStreams);
+	const resolvedMarker = applyMarkerAllCaps(visibleMarker.marker, pmAttrs.listMarkerAllCaps);
 	if (resolvedMarker !== null) attrs.listMarker = resolvedMarker;
 	else if (pmAttrs.listMarker) attrs.listMarker = pmAttrs.listIsBullet ? convertBulletToUnicode(pmAttrs.listMarker, bulletMarkerFontName(pmAttrs.listMarkerFormatting)) : pmAttrs.listMarker;
 	if (pmAttrs.listIsBullet !== void 0) attrs.listIsBullet = pmAttrs.listIsBullet;

package/dist/layout-bridge/convert/paragraphConversion.d.ts

@@ -4,9 +4,8 @@ import { FlowConversionOptions } from "./flowConversionShared.js";
 import { PageBreakRunProjection } from "./paragraphRuns.js";
 import { Node } from "prosemirror-model";
 //#region src/layout-bridge/convert/paragraphConversion.d.ts
-declare function hasVisibleParagraphPayload(attrs: ParagraphAttrs$1): boolean;
+export declare function hasVisibleParagraphPayload(attrs: ParagraphAttrs$1): boolean;
 /** Whether any `w:pBdr` side draws a rule (`none`/`nil` sides draw nothing). */
-declare function drawsParagraphBorder(borders: ParagraphAttrs["borders"]): boolean;
-declare function convertParagraph(node: Node, startPos: number, options: FlowConversionOptions, pageBreaks?: PageBreakRunProjection[]): ParagraphBlock;
-//#endregion
-export { convertParagraph, drawsParagraphBorder, hasVisibleParagraphPayload };
+export declare function drawsParagraphBorder(borders: ParagraphAttrs["borders"]): boolean;
+export declare function convertParagraph(node: Node, startPos: number, options: FlowConversionOptions, pageBreaks?: PageBreakRunProjection[]): ParagraphBlock;
+//#endregion

package/dist/layout-bridge/convert/paragraphConversion.js

@@ -1,16 +1,20 @@
 import { getFontAlternate } from "../../fonts/fontAlternates.js";
-import { setParagraphFrame } from "../../layout-engine/paragraphFrame.js";
 import { expectParagraphAttrs } from "../../prosemirror/attrs/index.js";
 import { expectBookmarkBoundaryAttrs } from "../../prosemirror/bookmarkBoundaryAttrs.js";
 import { expectTextBoxAnchorAttrs } from "../../prosemirror/textBoxAnchorAttrs.js";
+import { setParagraphFrame } from "../../utils/paragraphFrame.js";
 import { nextBlockId, twipsToPixels } from "./flowConversionShared.js";
 import { convertParagraphAttrs } from "./paragraphAttrs.js";
 import { resolveParagraphMarkFormatting, resolveParagraphMarkOwnFormatting } from "./paragraphMarkFormatting.js";
 import { paragraphToRuns } from "./paragraphRuns.js";
-import { resolveWesternThemeFont } from "./textFormattingConversion.js";
+import { resolveEastAsiaThemeFont, resolveWesternThemeFont } from "./textFormattingConversion.js";
 import { panic } from "better-result";
 import { statesNoBorder } from "@stll/docx-core/model";
 //#region src/layout-bridge/convert/paragraphConversion.ts
+/**
+* Converts a ProseMirror paragraph node to a ParagraphBlock, including
+* paragraph visibility and payload predicates.
+*/
 const DETACHED_WATERMARK_HOST_ATTR = "_detachedWatermarkHost";
 const expectDetachedWatermarkHostAttr = (attrs) => {
 	const value = Reflect.get(attrs, DETACHED_WATERMARK_HOST_ATTR);
@@ -54,6 +58,9 @@ function convertParagraph(node, startPos, options, pageBreaks) {
 	});
 	if (options.numberingTabIgnoresIndent && attrs.listMarker !== void 0) attrs.listNumberingTabIgnoresIndent = true;
 	if (options.defaultFont !== void 0) attrs.defaultFontFamily ??= options.defaultFont;
+	const defaultFonts = options.styles?.docDefaults?.rPr?.fontFamily;
+	const defaultEastAsiaFont = defaultFonts ? resolveEastAsiaThemeFont(defaultFonts, options.theme) : void 0;
+	if (defaultEastAsiaFont !== void 0) attrs.defaultEastAsiaFontFamily = defaultEastAsiaFont;
 	if (options.defaultSize !== void 0) attrs.defaultFontSize ??= options.defaultSize;
 	if (options.lineBreakRules) attrs.lineBreakRules = options.lineBreakRules;
 	if (options.justificationCompatibility) attrs.justificationCompatibility = options.justificationCompatibility;

package/dist/layout-bridge/convert/paragraphFrames.d.ts

@@ -1,6 +1,6 @@
 import { BlockId, FlowBlock } from "../../layout-engine/types.js";
 //#region src/layout-bridge/convert/paragraphFrames.d.ts
 type BlockIdFactory = () => BlockId;
-declare function groupParagraphFrames(blocks: FlowBlock[], nextBlockId: BlockIdFactory): FlowBlock[];
+export declare function groupParagraphFrames(blocks: FlowBlock[], nextBlockId: BlockIdFactory): FlowBlock[];
 //#endregion
-export { groupParagraphFrames };
+export {};

package/dist/layout-bridge/convert/paragraphFrames.js

@@ -1,5 +1,5 @@
-import { getParagraphFrame, markParagraphFrameTextBox } from "../../layout-engine/paragraphFrame.js";
 import { setTextBoxGroupId } from "../../layout-engine/textBoxGroup.js";
+import { getParagraphFrame, markParagraphFrameTextBox } from "../../utils/paragraphFrame.js";
 import { pixelsToEmu } from "../../utils/units.js";
 //#region src/layout-bridge/convert/paragraphFrames.ts
 const FRAME_PROPERTIES = [

package/dist/layout-bridge/convert/paragraphMarkFormatting.d.ts

@@ -3,8 +3,7 @@ import { ParagraphAttrs } from "../../prosemirror/schema/nodes.js";
 import { RunStyleResolver } from "../../prosemirror/runStyleFormatting.js";
 //#region src/layout-bridge/convert/paragraphMarkFormatting.d.ts
 /** The mark's own properties: its `w:rStyle` character style under its direct `w:rPr`. */
-declare const resolveParagraphMarkOwnFormatting: (mark: document_d_exports.TextFormatting | undefined, styleResolver: RunStyleResolver) => document_d_exports.TextFormatting | undefined;
+export declare const resolveParagraphMarkOwnFormatting: (mark: document_d_exports.TextFormatting | undefined, styleResolver: RunStyleResolver) => document_d_exports.TextFormatting | undefined;
 /** The paragraph mark's fully resolved run properties. */
-declare const resolveParagraphMarkFormatting: (pmAttrs: ParagraphAttrs, styleResolver: RunStyleResolver) => document_d_exports.TextFormatting | undefined;
-//#endregion
-export { resolveParagraphMarkFormatting, resolveParagraphMarkOwnFormatting };
+export declare const resolveParagraphMarkFormatting: (pmAttrs: ParagraphAttrs, styleResolver: RunStyleResolver) => document_d_exports.TextFormatting | undefined;
+//#endregion

package/dist/layout-bridge/convert/paragraphRuns.d.ts

@@ -5,11 +5,10 @@ import { Node } from "prosemirror-model";
 /**
  * Convert a paragraph node to runs.
  */
-type PageBreakRunProjection = {
+export type PageBreakRunProjection = {
   pmStart: number;
   pmEnd: number;
   trackedChange?: Pick<RunFormatting, "isInsertion" | "changeAuthor" | "changeDate" | "changeRevisionId" | "isSuggestion" | "suggestionId">;
 };
-declare function paragraphToRuns(node: Node, startPos: number, _options: FlowConversionOptions, pageBreaks?: PageBreakRunProjection[]): Run[];
-//#endregion
-export { PageBreakRunProjection, paragraphToRuns };
+export declare function paragraphToRuns(node: Node, startPos: number, _options: FlowConversionOptions, pageBreaks?: PageBreakRunProjection[]): Run[];
+//#endregion

package/dist/layout-bridge/convert/paragraphRuns.js

@@ -1,6 +1,9 @@
+import { sharedMathRunFontSize } from "../../docx/mathToMathml.js";
 import { getFontAlternate } from "../../fonts/fontAlternates.js";
+import { hasAutomaticTextSpacingCandidates } from "../../layout-engine/measure/automaticTextSpacing.js";
 import { expectFieldAttrs, expectImageAttrs, expectMathAttrs, expectParagraphAttrs, expectPreservedXmlAttrs, expectSymbolAttrs } from "../../prosemirror/attrs/index.js";
-import { decodeOoxmlSymbolCharacter } from "../../utils/ooxmlSymbol.js";
+import { directionIsRtl } from "../../prosemirror/paragraphDirection.js";
+import { displayOoxmlSymbolCharacter } from "../../utils/ooxmlSymbol.js";
 import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
 import { buildImageRun, constrainImageToPage, hasPaintableImageSource, hasRelationshipBackedImageBox } from "./imageConversion.js";
 import { applyCharacterStyleToggleFormatting, markDefaultBlackTextColorSource, mergeRunFormatting } from "./runFormattingMerge.js";
@@ -40,11 +43,12 @@ function paragraphToRuns(node, startPos, _options, pageBreaks) {
 	const theme = _options.theme;
 	const fontAlternates = _options.fontAlternates;
 	const pmAttrs = expectParagraphAttrs(node);
+	const hasAutomaticSpacingCandidates = hasAutomaticTextSpacingCandidates(node.textContent);
 	const paraDefaults = paragraphRunDefaults(pmAttrs, theme, fontAlternates);
 	const paragraphStyleId = pmAttrs.styleId;
 	const inTocParagraph = pmAttrs._tableOfContentsLevel !== void 0 || tableOfContentsStyleLevel({ styleId: paragraphStyleId }) !== void 0;
 	let leadingRenderedPageBreakPending = pmAttrs.renderedPageBreakBefore === true;
-	function pushRunsForChild(child, childPos, inheritedMarks = []) {
+	function pushRunsForChild({ child, childPos, inheritedMarks = [], source }) {
 		if (child.type.name === "bookmarkBoundary") return;
 		if (child.type.name === "renderedPageBreak") {
 			if (leadingRenderedPageBreakPending) {
@@ -105,6 +109,10 @@ function paragraphToRuns(node, startPos, _options, pageBreaks) {
 				kind: "text",
 				text: child.text,
 				...mergeRunFormatting(paraDefaults, formatting),
+				...source === "literal" && !directionIsRtl(pmAttrs.direction) && hasAutomaticSpacingCandidates ? { automaticTextSpacing: {
+					latin: pmAttrs.autoSpaceDE !== false,
+					numbers: pmAttrs.autoSpaceDN !== false
+				} } : {},
 				pmStart: childPos,
 				pmEnd: childPos + child.nodeSize
 			};
@@ -113,7 +121,7 @@ function paragraphToRuns(node, startPos, _options, pageBreaks) {
 		}
 		if (child.type.name === "symbol") {
 			const attrs = expectSymbolAttrs(child);
-			const text = decodeOoxmlSymbolCharacter(attrs.char);
+			const text = displayOoxmlSymbolCharacter(attrs.font, attrs.char);
 			if (text === null) return;
 			const formatting = extractRunFormatting(effectiveMarks, theme, fontAlternates);
 			applyCharacterStyleToggleFormatting({
@@ -189,18 +197,23 @@ function paragraphToRuns(node, startPos, _options, pageBreaks) {
 			return;
 		}
 		if (child.type.name === "structuredField") {
-			let containsPageBreak = false;
+			let containsLayoutBreak = false;
 			child.descendants((descendant) => {
-				if (descendant.type.name === "pageBreakRun") {
-					containsPageBreak = true;
+				if (descendant.type.name === "pageBreakRun" || descendant.type.name === "hardBreak") {
+					containsLayoutBreak = true;
 					return false;
 				}
 				return true;
 			});
-			if (containsPageBreak) {
+			if (containsLayoutBreak) {
 				const fieldContentStart = childPos + 1;
 				child.forEach((fieldChild, fieldChildOffset) => {
-					pushRunsForChild(fieldChild, fieldContentStart + fieldChildOffset, effectiveMarks);
+					pushRunsForChild({
+						child: fieldChild,
+						childPos: fieldContentStart + fieldChildOffset,
+						inheritedMarks: effectiveMarks,
+						source: "field-result"
+					});
 				});
 				return;
 			}
@@ -238,6 +251,8 @@ function paragraphToRuns(node, startPos, _options, pageBreaks) {
 		if (child.type.name === "math") {
 			const attrs = expectMathAttrs(child);
 			const plainText = attrs.plainText || "[equation]";
+			const mathFormatting = extractRunFormatting(effectiveMarks, theme, fontAlternates);
+			const fontSize = sharedMathRunFontSize(attrs.ommlXml) ?? mathFormatting.fontSize ?? paraDefaults.fontSize;
 			runs.push({
 				kind: "math",
 				display: attrs.display ?? "inline",
@@ -245,6 +260,7 @@ function paragraphToRuns(node, startPos, _options, pageBreaks) {
 				plainText,
 				italic: true,
 				fontFamily: "Cambria Math",
+				...fontSize === void 0 ? {} : { fontSize },
 				pmStart: childPos,
 				pmEnd: childPos + child.nodeSize
 			});
@@ -253,12 +269,21 @@ function paragraphToRuns(node, startPos, _options, pageBreaks) {
 		if (child.type.name === "sdt") {
 			const sdtInnerOffset = childPos + 1;
 			child.forEach((sdtChild, sdtChildOffset) => {
-				pushRunsForChild(sdtChild, sdtInnerOffset + sdtChildOffset, effectiveMarks);
+				pushRunsForChild({
+					child: sdtChild,
+					childPos: sdtInnerOffset + sdtChildOffset,
+					inheritedMarks: effectiveMarks,
+					source
+				});
 			});
 		}
 	}
 	node.forEach((child, childOffset) => {
-		pushRunsForChild(child, offset + childOffset);
+		pushRunsForChild({
+			child,
+			childPos: offset + childOffset,
+			source: "literal"
+		});
 	});
 	const { defaultFont, defaultSize } = _options;
 	if (defaultFont !== void 0 || defaultSize !== void 0) for (const run of runs) switch (run.kind) {
@@ -269,10 +294,6 @@ function paragraphToRuns(node, startPos, _options, pageBreaks) {
 		case "math":
 			if (defaultFont !== void 0) run.fontFamily ??= defaultFont;
 			if (defaultSize !== void 0) run.fontSize ??= defaultSize;
-			break;
-		case "image":
-		case "lineBreak": break;
-		default:
 	}
 	return runs;
 }

package/dist/layout-bridge/convert/runFormattingMerge.d.ts

@@ -4,8 +4,8 @@ import { RunStyleResolver } from "../../prosemirror/runStyleFormatting.js";
 import { RunFormatting } from "../../layout-engine/types.js";
 import { Mark } from "prosemirror-model";
 //#region src/layout-bridge/convert/runFormattingMerge.d.ts
-declare function markDefaultBlackTextColorSource(formatting: RunFormatting, paraDefaults: RunFormatting): RunFormatting;
-declare function mergeRunFormatting(paraDefaults: RunFormatting, formatting: RunFormatting): RunFormatting;
+export declare function markDefaultBlackTextColorSource(formatting: RunFormatting, paraDefaults: RunFormatting): RunFormatting;
+export declare function mergeRunFormatting(paraDefaults: RunFormatting, formatting: RunFormatting): RunFormatting;
 type ApplyCharacterStyleToggleFormattingOptions = {
   formatting: RunFormatting;
   marks: readonly Mark[];
@@ -13,7 +13,7 @@ type ApplyCharacterStyleToggleFormattingOptions = {
   styleResolver: RunStyleResolver;
 };
 /** Restore character-style toggle values that plain visual marks cannot represent. */
-declare function applyCharacterStyleToggleFormatting({ formatting, marks, paragraphFormatting, styleResolver }: ApplyCharacterStyleToggleFormattingOptions): void;
-declare function applyRunFormattingOverrides(formatting: RunFormatting, attrs: RunFormattingOverrideAttrs): void;
+export declare function applyCharacterStyleToggleFormatting({ formatting, marks, paragraphFormatting, styleResolver }: ApplyCharacterStyleToggleFormattingOptions): void;
+export declare function applyRunFormattingOverrides(formatting: RunFormatting, attrs: RunFormattingOverrideAttrs): void;
 //#endregion
-export { applyCharacterStyleToggleFormatting, applyRunFormattingOverrides, markDefaultBlackTextColorSource, mergeRunFormatting };
+export {};

package/dist/layout-bridge/convert/runFormattingMerge.js

@@ -27,6 +27,7 @@ function mergeRunFormatting(paraDefaults, formatting) {
 	};
 	if (formatting.fontFamily !== void 0 && formatting.alternateFontFamily === void 0) delete merged.alternateFontFamily;
 	if (formatting.eastAsiaFontFamily !== void 0 && formatting.eastAsiaAlternateFontFamily === void 0) delete merged.eastAsiaAlternateFontFamily;
+	if (formatting.hAnsiFontFamily !== void 0 && formatting.hAnsiAlternateFontFamily === void 0) delete merged.hAnsiAlternateFontFamily;
 	if (formatting.complexScriptFontFamily !== void 0 && formatting.complexScriptAlternateFontFamily === void 0) delete merged.complexScriptAlternateFontFamily;
 	if (merged.letterSpacing === 0) delete merged.letterSpacing;
 	if (formatting.horizontalScale === 100 && paraDefaults.horizontalScale === void 0) delete merged.horizontalScale;

package/dist/layout-bridge/convert/runMarkFormatting.d.ts

@@ -6,6 +6,5 @@ import { Mark } from "prosemirror-model";
 /**
  * Extract run formatting from ProseMirror marks.
  */
-declare function extractRunFormatting(marks: readonly Mark[], theme?: document_d_exports.Theme | null, fontAlternates?: FontAlternates): RunFormatting;
-//#endregion
-export { extractRunFormatting };
+export declare function extractRunFormatting(marks: readonly Mark[], theme?: document_d_exports.Theme | null, fontAlternates?: FontAlternates): RunFormatting;
+//#endregion