@stll/folio-core 0.47.7 → 0.48.0

package/dist/controller/fontReadiness.js

@@ -1,4 +1,5 @@
 import { buildFontAlternates, getFontAlternate } from "../fonts/fontAlternates.js";
+import { DEFAULT_FONT_FAMILY } from "../layout-engine/measure/measureHelpers.js";
 import { expectFontFamilyMarkAttrs, expectParagraphAttrs } from "../prosemirror/attrs/index.js";
 import { parseFontFamilyList, resolveFontFamily } from "../utils/fontResolver.js";
 //#region src/controller/fontReadiness.ts
@@ -11,7 +12,6 @@ function documentFontsAreLoaded() {
 	return !fontSet || fontSet.status === "loaded";
 }
 const INITIAL_LAYOUT_FONT_TIMEOUT_MS = 2e3;
-const DEFAULT_LAYOUT_FONT_FAMILY = "Calibri";
 const CSS_GENERIC_FONT_FAMILIES = /* @__PURE__ */ new Set([
 	"serif",
 	"sans-serif",
@@ -54,7 +54,7 @@ function collectInitialLayoutFontFamilies(documentModel, pmDoc) {
 function collectInitialLayoutFontFaces(documentModel, pmDoc) {
 	const faces = /* @__PURE__ */ new Map();
 	const fontAlternates = buildFontAlternates(documentModel?.package.fontTable);
-	addLayoutFontFamilyFace(faces, DEFAULT_LAYOUT_FONT_FAMILY, REGULAR_LAYOUT_FONT_DESCRIPTOR, fontAlternates);
+	addLayoutFontFamilyFace(faces, DEFAULT_FONT_FAMILY, REGULAR_LAYOUT_FONT_DESCRIPTOR, fontAlternates);
 	for (const family of documentModel?.requiredFonts ?? []) addLayoutFontFamilyFace(faces, family, REGULAR_LAYOUT_FONT_DESCRIPTOR, fontAlternates);
 	addLayoutFontFamilyFace(faces, documentModel?.package.theme?.fontScheme?.majorFont?.latin, REGULAR_LAYOUT_FONT_DESCRIPTOR, fontAlternates);
 	addLayoutFontFamilyFace(faces, documentModel?.package.theme?.fontScheme?.minorFont?.latin, REGULAR_LAYOUT_FONT_DESCRIPTOR, fontAlternates);
@@ -75,7 +75,7 @@ function collectProseMirrorFontFaces(faces, node, inheritedTextFormatting, fontA
 	if (node.type.name === "paragraph") addTextFormattingFontFaces(faces, expectParagraphAttrs(node).listMarkerFormatting, fontAlternates);
 	if (node.isText) {
 		const descriptor = layoutDescriptorFromFormattingAndMarks(textFormatting, node.marks);
-		addLayoutFontFamilyFace(faces, readFontFamilyMarkAttrs(node.marks) ?? textFormatting?.fontFamily ?? DEFAULT_LAYOUT_FONT_FAMILY, descriptor, fontAlternates);
+		addLayoutFontFamilyFace(faces, readFontFamilyMarkAttrs(node.marks) ?? textFormatting?.fontFamily ?? "Times New Roman", descriptor, fontAlternates);
 	}
 	node.forEach((child) => {
 		collectProseMirrorFontFaces(faces, child, textFormatting, fontAlternates);

package/dist/controller/hyphenationReadiness.d.ts

@@ -0,0 +1,19 @@
+import { HyphenationDictionaryError, HyphenationDictionaryId } from "../layout-engine/measure/hyphenationDictionaries.js";
+//#region src/controller/hyphenationReadiness.d.ts
+type HyphenationReadiness = {
+  /** Follow up on the dictionaries one layout run lacked. */
+  track: (missing: ReadonlySet<HyphenationDictionaryId>) => void;
+  /**
+   * Ignore loads still pending, as on unmount. A later `track` follows up
+   * afresh, so an adapter whose lifecycle re-attaches (React Strict Mode
+   * effects) keeps working.
+   */
+  cancel: () => void;
+};
+type HyphenationReadinessOptions = {
+  relayout: () => void;
+  onError: (error: HyphenationDictionaryError) => void;
+};
+declare const createHyphenationReadiness: ({ relayout, onError }: HyphenationReadinessOptions) => HyphenationReadiness;
+//#endregion
+export { HyphenationReadiness, HyphenationReadinessOptions, createHyphenationReadiness };

package/dist/controller/hyphenationReadiness.js

@@ -0,0 +1,47 @@
+import { requestHyphenationDictionary } from "../layout-engine/measure/hyphenationDictionaries.js";
+//#region src/controller/hyphenationReadiness.ts
+/**
+* Per-editor follow-up for hyphenation dictionaries a layout run lacked.
+*
+* Framework-neutral so both adapters share one implementation. The layout
+* pipeline hands {@link HyphenationReadiness.track} the dictionaries its run
+* requested but could not use; this editor then re-runs layout when one loads
+* (the load has already invalidated measured paragraphs) and reports a failed
+* one once. Editors that never asked for a dictionary hear nothing about it,
+* and an editor mounted after a failure still learns of it on its first run.
+*/
+const createHyphenationReadiness = ({ relayout, onError }) => {
+	let epoch = 0;
+	const pending = /* @__PURE__ */ new Set();
+	const reported = /* @__PURE__ */ new Set();
+	const follow = async (dictionary) => {
+		const startedIn = epoch;
+		pending.add(dictionary);
+		const settled = await requestHyphenationDictionary(dictionary);
+		if (startedIn !== epoch) return;
+		pending.delete(dictionary);
+		switch (settled.status) {
+			case "loaded":
+				relayout();
+				return;
+			case "failed":
+				if (!reported.has(dictionary)) {
+					reported.add(dictionary);
+					onError(settled.error);
+				}
+				return;
+			default:
+		}
+	};
+	return {
+		track: (missing) => {
+			for (const dictionary of missing) if (!pending.has(dictionary)) follow(dictionary);
+		},
+		cancel: () => {
+			epoch += 1;
+			pending.clear();
+		}
+	};
+};
+//#endregion
+export { createHyphenationReadiness };

package/dist/controller/layoutPipeline.d.ts

@@ -3,6 +3,7 @@ import { TemplatePreviewEntry, TemplatePreviewHiddenRange } from "../prosemirror
 import { ColumnLayout, FlowBlock, FootnoteContent, HeaderFooterContent, Layout, Measure, PageHeaderFooterRefs, PageMargins } from "../layout-engine/types.js";
 import { LayoutRunReason } from "../layout-engine/layoutInstrumentation.js";
 import { DirtyRange } from "../paged-layout/incrementalMeasure.js";
+import { HyphenationReadiness } from "./hyphenationReadiness.js";
 import { ConvertHeaderFooterOptions, HeaderFooterMetrics } from "../layout-bridge/convert/headerFooterLayout.js";
 import "../layout-engine/index.js";
 import { FootnoteRenderItem } from "../layout-painter/renderPage.js";
@@ -74,6 +75,8 @@ type LayoutPipelineDeps<THfPMs> = {
   pageRenderer?: PageRendererName;
   emptyTemplatePreviewEntries: readonly TemplatePreviewEntry[];
   emptyTemplatePreviewHidden: readonly TemplatePreviewHiddenRange[];
+  /** Follows up on the hyphenation dictionaries a run lacked (relayout or error). */
+  hyphenationReadiness: HyphenationReadiness;
 };
 declare function runLayoutPipeline<THfPMs>(deps: LayoutPipelineDeps<THfPMs>, state: EditorState, options?: LayoutRunOptions): LayoutOutcome;
 //#endregion

package/dist/controller/layoutPipeline.js

@@ -9,13 +9,16 @@ import { buildHeaderFooterFieldValues, fieldValuesEqual, resolveFieldValues } fr
 import { buildSectionPageCounts } from "../fields/sectionPageCounts.js";
 import { buildSeqValues } from "../fields/seqValues.js";
 import { buildFontAlternates } from "../fonts/fontAlternates.js";
+import { prepareEndnoteAreas, resolveEndnotePosition, spliceEndnoteAreas, trailingEndnoteIds } from "../layout-bridge/convert/endnoteLayout.js";
 import { buildFootnoteContentMap, collectEndnoteRefs, collectFootnoteRefs, computeNoteDisplayNumbers, remapNoteMarkerText } from "../layout-bridge/convert/footnoteLayout.js";
 import { applyTemplatePreviewToBlocks } from "../layout-bridge/convert/templatePreviewFlow.js";
 import { toFlowBlocks } from "../layout-bridge/convert/toFlowBlocks.js";
 import { getColumns } from "../layout-bridge/sectionColumns.js";
+import { resolveAnchorLayoutInCellCompatibility } from "../layout-engine/anchorLayoutInCellCompatibility.js";
 import { layoutDocument } from "../layout-engine/index.js";
 import { resolveJustificationCompatibility } from "../layout-engine/justificationCompatibility.js";
 import { recordLayoutComplete, recordLayoutError, recordLayoutPhase, recordLayoutStart } from "../layout-engine/layoutInstrumentation.js";
+import { collectRequestedHyphenationDictionaries } from "../layout-engine/measure/hyphenationDictionaries.js";
 import { measureBlocks, measureSingleBlockWithoutFloatingZones } from "../layout-engine/measure/measureBlocks.js";
 import { installCanvasMeasureProvider } from "../layout-engine/measure/measureContainer.js";
 import { resolveEffectiveParagraphSpacingTree } from "../layout-engine/paragraphSpacing.js";
@@ -100,6 +103,11 @@ function attachAuthoredMarginsToLayoutPages(layout, options) {
 	} : layout;
 }
 function runLayoutPipeline(deps, state, options = {}) {
+	const { result, missing } = collectRequestedHyphenationDictionaries(() => runLayoutPipelineMeasured(deps, state, options));
+	deps.hyphenationReadiness.track(missing);
+	return result;
+}
+function runLayoutPipelineMeasured(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, pageRenderer = PAGE_RENDERER.legacy, emptyTemplatePreviewEntries: EMPTY_TEMPLATE_PREVIEW_ENTRIES, emptyTemplatePreviewHidden: EMPTY_TEMPLATE_PREVIEW_HIDDEN } = deps;
 	let outcome = {};
 	let pendingArtifacts;
@@ -131,6 +139,7 @@ function runLayoutPipeline(deps, state, options = {}) {
 		if (justificationCompatibility) flowOpts.justificationCompatibility = justificationCompatibility;
 		const tableIndentCompatibility = resolveTableIndentCompatibility(documentSettings?.compatibilityMode);
 		if (tableIndentCompatibility) flowOpts.tableIndentCompatibility = tableIndentCompatibility;
+		if (resolveAnchorLayoutInCellCompatibility(documentSettings?.compatibilityMode)) flowOpts.forceAnchorLayoutInCell = true;
 		if (documentSettings?.autoHyphenation === true) flowOpts.automaticHyphenation = {
 			enabled: true,
 			...documentSettings.doNotHyphenateCaps !== void 0 ? { doNotHyphenateCaps: documentSettings.doNotHyphenateCaps } : {},
@@ -139,6 +148,9 @@ function runLayoutPipeline(deps, state, options = {}) {
 		};
 		const finalSectionDocumentGridLinePitchTwips = resolveDocumentGridLinePitch(document?.package.document.sections?.at(-1)?.properties.docGrid);
 		if (finalSectionDocumentGridLinePitchTwips !== void 0) flowOpts.finalSectionDocumentGridLinePitchTwips = finalSectionDocumentGridLinePitchTwips;
+		const endnotePosition = resolveEndnotePosition(document?.package.settings?.endnotePr?.position, document?.package.document.sections?.at(-1)?.properties);
+		const bodyTrailingEndnoteIds = trailingEndnoteIds(document?.package.endnotes, endnotePosition);
+		if (bodyTrailingEndnoteIds.size > 0) flowOpts.trailingEndnoteIds = bodyTrailingEndnoteIds;
 		let newBlocks = toFlowBlocks(document === null ? state.doc.type.create({
 			...state.doc.attrs,
 			_finalSectionStart: sectionProperties?.sectionStart ?? null
@@ -166,7 +178,7 @@ function runLayoutPipeline(deps, state, options = {}) {
 		const footnoteDisplayNumbers = documentFootnotes ? computeNoteDisplayNumbers(documentFootnotes, footnoteRefs.map((ref) => ref.footnoteId)) : void 0;
 		const documentEndnotes = document?.package.endnotes;
 		const endnoteDisplayNumbers = documentEndnotes ? computeNoteDisplayNumbers(documentEndnotes, collectEndnoteRefs(newBlocks).map((ref) => ref.endnoteId)) : void 0;
-		const endnoteNumberFormat = document?.package.document.sections?.at(-1)?.properties.endnotePr?.numFmt ?? "lowerRoman";
+		const endnoteNumberFormat = document?.package.document.sections?.at(-1)?.properties.endnotePr?.numFmt ?? document?.package.settings?.endnotePr?.numFmt ?? "lowerRoman";
 		const endnoteTexts = endnoteDisplayNumbers ? formatEndnoteTexts(endnoteDisplayNumbers, (displayNumber) => formatOoxmlCounter(displayNumber, endnoteNumberFormat)) : void 0;
 		newBlocks = remapNoteMarkerText(newBlocks, {
 			...footnoteDisplayNumbers ? { footnoteNumbers: footnoteDisplayNumbers } : {},
@@ -302,6 +314,36 @@ function runLayoutPipeline(deps, state, options = {}) {
 		};
 		outcome.measures = newMeasures;
 		recordPhaseDuration("measure-blocks", phaseStartedAt);
+		const buildNoteOptions = () => {
+			const noteOptions = { measureBlocks };
+			if (flowOpts.styles) noteOptions.styles = flowOpts.styles;
+			if (flowOpts.defaultSize !== void 0) noteOptions.defaultSize = flowOpts.defaultSize;
+			if (_theme !== void 0) noteOptions.theme = _theme;
+			noteOptions.fontAlternates = fontAlternates;
+			if (defaultTabStop !== void 0) noteOptions.defaultTabStopTwips = defaultTabStop;
+			if (flowOpts.lineBreakRules) noteOptions.lineBreakRules = flowOpts.lineBreakRules;
+			if (flowOpts.justificationCompatibility) noteOptions.justificationCompatibility = flowOpts.justificationCompatibility;
+			if (flowOpts.tableIndentCompatibility) noteOptions.tableIndentCompatibility = flowOpts.tableIndentCompatibility;
+			if (flowOpts.automaticHyphenation) noteOptions.automaticHyphenation = flowOpts.automaticHyphenation;
+			return noteOptions;
+		};
+		const endnoteAreas = documentEndnotes && endnoteDisplayNumbers && endnoteTexts ? prepareEndnoteAreas({
+			blocks: newBlocks,
+			endnotes: documentEndnotes,
+			displayNumbers: endnoteDisplayNumbers,
+			displayTexts: endnoteTexts,
+			position: endnotePosition,
+			sections: sectionPropertiesForMargins,
+			options: buildNoteOptions()
+		}) : void 0;
+		const layoutWithNoteAreas = (measures, nextLayoutOpts) => {
+			if (endnoteAreas === void 0) return layoutDocument(newBlocks, measures, nextLayoutOpts);
+			const flow = spliceEndnoteAreas(newBlocks, measures, endnoteAreas);
+			return layoutDocument(flow.blocks, flow.measures, {
+				...nextLayoutOpts,
+				noteAreas: endnoteAreas.noteAreas
+			});
+		};
 		phaseStartedAt = performance.now();
 		let newLayout;
 		let pageFootnoteMap = /* @__PURE__ */ new Map();
@@ -338,29 +380,17 @@ function runLayoutPipeline(deps, state, options = {}) {
 		const layoutOpts = buildLayoutOpts();
 		let layoutOptsUsed = layoutOpts;
 		if (hasFootnotes) {
-			footnoteContentMap = buildFootnoteContentMap(documentFootnotes, footnoteRefs, contentWidth, (() => {
-				const footnoteOptions = { measureBlocks };
-				if (flowOpts.styles) footnoteOptions.styles = flowOpts.styles;
-				if (flowOpts.defaultSize !== void 0) footnoteOptions.defaultSize = flowOpts.defaultSize;
-				if (_theme !== void 0) footnoteOptions.theme = _theme;
-				footnoteOptions.fontAlternates = fontAlternates;
-				if (defaultTabStop !== void 0) footnoteOptions.defaultTabStopTwips = defaultTabStop;
-				if (flowOpts.lineBreakRules) footnoteOptions.lineBreakRules = flowOpts.lineBreakRules;
-				if (flowOpts.justificationCompatibility) footnoteOptions.justificationCompatibility = flowOpts.justificationCompatibility;
-				if (flowOpts.tableIndentCompatibility) footnoteOptions.tableIndentCompatibility = flowOpts.tableIndentCompatibility;
-				if (flowOpts.automaticHyphenation) footnoteOptions.automaticHyphenation = flowOpts.automaticHyphenation;
-				return footnoteOptions;
-			})());
+			footnoteContentMap = buildFootnoteContentMap(documentFootnotes, footnoteRefs, contentWidth, buildNoteOptions());
 			const footnoteHeightById = /* @__PURE__ */ new Map();
 			for (const [id, content] of footnoteContentMap) footnoteHeightById.set(id, content.height + 0);
 			layoutOptsUsed = {
 				...layoutOpts,
 				footnoteHeightById
 			};
-			newLayout = layoutDocument(newBlocks, newMeasures, layoutOptsUsed);
+			newLayout = layoutWithNoteAreas(newMeasures, layoutOptsUsed);
 			pageFootnoteMap = /* @__PURE__ */ new Map();
 			for (const page of newLayout.pages) if (page.footnoteIds && page.footnoteIds.length > 0) pageFootnoteMap.set(page.number, page.footnoteIds);
-		} else newLayout = layoutDocument(newBlocks, newMeasures, layoutOpts);
+		} else newLayout = layoutWithNoteAreas(newMeasures, layoutOpts);
 		const rebuildFootnotePageMap = () => {
 			pageFootnoteMap = /* @__PURE__ */ new Map();
 			for (const page of newLayout.pages) if (page.footnoteIds && page.footnoteIds.length > 0) pageFootnoteMap.set(page.number, page.footnoteIds);
@@ -376,7 +406,7 @@ function runLayoutPipeline(deps, state, options = {}) {
 		};
 		const relayoutWithCurrentMeasures = (nextLayoutOpts) => {
 			layoutOptsUsed = withFootnoteHeights(nextLayoutOpts);
-			newLayout = layoutDocument(newBlocks, newMeasures, layoutOptsUsed);
+			newLayout = layoutWithNoteAreas(newMeasures, layoutOptsUsed);
 			if (hasFootnotes) rebuildFootnotePageMap();
 		};
 		const stabilizeFieldWidths = () => {
@@ -473,6 +503,18 @@ function runLayoutPipeline(deps, state, options = {}) {
 					measure
 				});
 			}
+			for (const area of endnoteAreas?.areas ?? []) for (const [index, block] of area.blocks.entries()) {
+				const measure = area.measures[index];
+				if (!measure) continue;
+				const noteStory = endnoteAreas?.noteStoryByBlockId.get(String(block.id));
+				blockLookup.set(String(block.id), {
+					block,
+					measure,
+					...noteStory === void 0 ? {} : { noteStory }
+				});
+			}
+			const continuationSeparator = endnoteAreas?.noteAreas.continuationSeparator;
+			if (continuationSeparator) blockLookup.set(String(continuationSeparator.block.id), continuationSeparator);
 			outcome.blockLookup = blockLookup;
 			const footnotesByPage = hasFootnotes ? buildFootnoteRenderItems(pageFootnoteMap, footnoteContentMap, document) : void 0;
 			const renderOpts = {

package/dist/display-list/build/buildDisplayList.js

@@ -5,7 +5,7 @@ import { collectFloatingImages, pageGeometryOf } from "./floatingImages.js";
 import { FontTable } from "./fontTable.js";
 import { paintPageFurniture } from "./furniture.js";
 import { ImageTable, paintImageFragment } from "./imagePrimitives.js";
-import { paintColumnSeparators, paintPageBackground } from "./pageFurniture.js";
+import { paintColumnSeparators, paintFlowedNoteSeparators, paintPageBackground } from "./pageFurniture.js";
 import { paintParagraphFragment } from "./paragraphPrimitives.js";
 import { blockRegion, createPageComposer } from "./regions.js";
 import { paintTableFragment } from "./tablePrimitives.js";
@@ -231,24 +231,51 @@ const buildPage = ({ page, pageIndex, totalPages, blockLookup, pageBackground, b
 				unsupported.report(UNSUPPORTED_CONSTRUCT.missingBlock, pageIndex, `no block lookup entry for ${fragment.kind} fragment ${String(fragment.blockId)}`);
 				continue;
 			}
-			composer.region(blockRegion({
-				fragment,
-				kind: FRAGMENT_REGION_KIND[fragment.kind],
-				context
-			}), () => {
-				paintFragment({
+			const paint = (fragmentContext) => {
+				composer.region(blockRegion({
 					fragment,
-					entry,
-					context,
-					composer,
-					prevEntry: entries[index - 1],
-					nextEntry: entries[index + 1]
+					kind: FRAGMENT_REGION_KIND[fragment.kind],
+					context: fragmentContext
+				}), () => {
+					paintFragment({
+						fragment,
+						entry,
+						context: fragmentContext,
+						composer,
+						prevEntry: entries[index - 1],
+						nextEntry: entries[index + 1]
+					});
+				});
+			};
+			const noteStory = entry.noteStory;
+			if (noteStory === void 0) {
+				paint(context);
+				continue;
+			}
+			const story = {
+				kind: noteStory.kind,
+				id: noteStory.noteId
+			};
+			composer.region({
+				kind: HIT_REGION_KINDS.note,
+				rect: {
+					xPx: fragment.x,
+					yPx: fragment.y,
+					widthPx: fragment.width,
+					heightPx: fragment.height
+				},
+				model: { story }
+			}, () => {
+				paint({
+					...context,
+					story
 				});
 			});
 		}
 	});
 	composer.push(frontFloats);
 	composer.push(paintColumnSeparators(page));
+	composer.push(paintFlowedNoteSeparators(page));
 	above(composer);
 	return {
 		pageNumber: page.number,

package/dist/display-list/build/pageFurniture.d.ts

@@ -11,6 +11,12 @@ declare const paintPageBackground: (page: Page, fill: DisplayColor) => DisplayPr
  * never drew them.
  */
 declare const paintColumnSeparators: (page: Page) => readonly DisplayPrimitive[];
+/**
+ * The separator rules of a note area laid out in the body flow (endnotes): the
+ * paginator records where each `w:separator` / `w:continuationSeparator` mark
+ * landed, so like the column rules they are derivable from the `Layout` alone.
+ */
+declare const paintFlowedNoteSeparators: (page: Page) => readonly DisplayPrimitive[];
 type FootnoteAreaPaintOptions = {
   readonly composer: PageComposer;
   readonly page: Page;
@@ -32,4 +38,4 @@ type FootnoteAreaPaintOptions = {
  */
 declare const paintFootnoteArea: ({ composer, page, context, contentById }: FootnoteAreaPaintOptions) => void;
 //#endregion
-export { FootnoteAreaPaintOptions, paintColumnSeparators, paintFootnoteArea, paintPageBackground };
+export { FootnoteAreaPaintOptions, paintColumnSeparators, paintFlowedNoteSeparators, paintFootnoteArea, paintPageBackground };

package/dist/display-list/build/pageFurniture.js

@@ -1,4 +1,4 @@
-import "../../layout-engine/types.js";
+import { NOTE_SEPARATOR_RULE_THICKNESS, NOTE_SEPARATOR_WIDTH_FRACTION } from "../../layout-engine/types.js";
 import { calculateFootnoteAreaRenderHeight } from "../../layout-painter/renderPage.js";
 import { HIT_REGION_KINDS } from "../primitives.js";
 import { DOC_CANVAS_TEXT } from "./colors.js";
@@ -20,10 +20,8 @@ import { UNSUPPORTED_CONSTRUCT } from "./unsupported.js";
 */
 /** `renderPage.ts:2049`: a hairline in the canvas ink colour. */
 const COLUMN_SEPARATOR_WIDTH_PX = .5;
-/** `renderPage.ts:1354-1360`: a 0.5px rule across a third of the column, centred in its 12px slot. */
-const FOOTNOTE_RULE_THICKNESS_PX = .5;
-const FOOTNOTE_RULE_WIDTH_FRACTION = .33;
-const FOOTNOTE_RULE_MARGIN_PX = (12 - FOOTNOTE_RULE_THICKNESS_PX) / 2;
+/** `renderFootnoteArea`: a hairline across a third of the column, centred in its 12px slot. */
+const FOOTNOTE_RULE_MARGIN_PX = (12 - NOTE_SEPARATOR_RULE_THICKNESS) / 2;
 const paintPageBackground = (page, fill) => ({
 	kind: "rect",
 	rect: {
@@ -63,6 +61,21 @@ const paintColumnSeparators = (page) => {
 	return primitives;
 };
 /**
+* The separator rules of a note area laid out in the body flow (endnotes): the
+* paginator records where each `w:separator` / `w:continuationSeparator` mark
+* landed, so like the column rules they are derivable from the `Layout` alone.
+*/
+const paintFlowedNoteSeparators = (page) => (page.noteSeparators ?? []).map((rule) => ({
+	kind: "rect",
+	rect: {
+		xPx: rule.x,
+		yPx: rule.y,
+		widthPx: rule.width,
+		heightPx: NOTE_SEPARATOR_RULE_THICKNESS
+	},
+	fill: DOC_CANVAS_TEXT
+}));
+/**
 * The footnote band at the foot of the body column: the separator rule, then
 * one body per note the paginator put on this page.
 *
@@ -98,8 +111,8 @@ const paintFootnoteArea = ({ composer, page, context, contentById }) => {
 		rect: {
 			xPx: page.margins.left,
 			yPx: areaTopPx + FOOTNOTE_RULE_MARGIN_PX,
-			widthPx: contentWidthPx * FOOTNOTE_RULE_WIDTH_FRACTION,
-			heightPx: FOOTNOTE_RULE_THICKNESS_PX
+			widthPx: contentWidthPx * NOTE_SEPARATOR_WIDTH_FRACTION,
+			heightPx: NOTE_SEPARATOR_RULE_THICKNESS
 		},
 		fill: DOC_CANVAS_TEXT
 	}];
@@ -138,4 +151,4 @@ const paintFootnoteArea = ({ composer, page, context, contentById }) => {
 	}
 };
 //#endregion
-export { paintColumnSeparators, paintFootnoteArea, paintPageBackground };
+export { paintColumnSeparators, paintFlowedNoteSeparators, paintFootnoteArea, paintPageBackground };

package/dist/display-list/build/paragraphPrimitives.js

@@ -6,7 +6,7 @@ import { countCompressibleSpaces, toPaintedText } from "../../layout-engine/meas
 import { isFloatingImageRun } from "../../layout-engine/types.js";
 import { resolveParagraphBorderHorizontalOutsets } from "../../layout-painter/borderStroke.js";
 import { getAutomaticTextColorForBackground } from "../../layout-painter/documentColors.js";
-import { UNICODE_BIDI_BY_WRAPPER_CONTROL, getLeaderChar, getRenderableTextColor, paragraphHasTrackedChanges, sliceRunsForLine, splitCollapsibleLineEdgeSpaces, splitTextRunsByEastAsia, startsAfterSoftWrap } from "../../layout-painter/renderParagraph.js";
+import { UNICODE_BIDI_BY_WRAPPER_CONTROL, getLeaderChar, getRenderableListMarkerColor, getRenderableTextColor, paragraphHasTrackedChanges, sliceRunsForLine, splitCollapsibleLineEdgeSpaces, splitTextRunsByEastAsia, startsAfterSoftWrap } from "../../layout-painter/renderParagraph.js";
 import { getHorizontalScaleFactor } from "../../utils/horizontalScale.js";
 import { resolvePhysicalParagraphInlineLayout } from "../../utils/paragraphInlineLayout.js";
 import { inlineImageBoundingBox } from "../../utils/rotationBoundingBox.js";
@@ -368,7 +368,7 @@ const emitGlyphRun = ({ sink, context, run, glyphs, style, paintXPx, baselineYPx
 		} else context.unsupported.report(UNSUPPORTED_CONSTRUCT.unresolvedColor, context.pageIndex, `run background ${background}`);
 	}
 	const font = context.fonts.intern({
-		fontFamily: style.fontFamily ?? "Calibri",
+		fontFamily: style.fontFamily ?? "Times New Roman",
 		...style.alternateFontFamily === void 0 ? {} : { alternateFontFamily: style.alternateFontFamily },
 		...style.bold === void 0 ? {} : { bold: style.bold },
 		...style.italic === void 0 ? {} : { italic: style.italic },
@@ -729,6 +729,7 @@ const paintLine = ({ block, line, geometry, context, alignment, isRtl, isFirstLi
 		tabRegions
 	};
 };
+const parseMarkerColor = (color) => color === void 0 ? void 0 : parseDisplayColor(color);
 const paintListMarker = ({ sink, block, context, paintXPx, baselineYPx, isRtl }) => {
 	const marker = block.attrs?.listMarker;
 	if (marker === void 0 || marker.length === 0) return;
@@ -742,7 +743,7 @@ const paintListMarker = ({ sink, block, context, paintXPx, baselineYPx, isRtl })
 		collapsed: false
 	});
 	const revision = block.attrs?.listMarkerRevision;
-	const color = revision ? trackedChangeColor(context.authorColors, revision.author, void 0) : DOC_CANVAS_TEXT;
+	const color = revision ? trackedChangeColor(context.authorColors, revision.author, void 0) : parseMarkerColor(getRenderableListMarkerColor(formatting.color)) ?? DOC_CANVAS_TEXT;
 	const font = context.fonts.intern({
 		fontFamily: formatting.fontFamily,
 		...formatting.alternateFontFamily === void 0 ? {} : { alternateFontFamily: formatting.alternateFontFamily },
@@ -813,7 +814,7 @@ const paintTab = ({ sink, context, runs, index, run, tabContext, layoutXPx, pain
 					collapsed: false
 				});
 				const font = context.fonts.intern({
-					fontFamily: style.fontFamily ?? "Calibri",
+					fontFamily: style.fontFamily ?? "Times New Roman",
 					...style.bold === void 0 ? {} : { bold: style.bold },
 					...style.italic === void 0 ? {} : { italic: style.italic },
 					measureStyle: style

package/dist/display-list/build/tablePrimitives.js

@@ -1,5 +1,5 @@
 import { createTableCellFlowState, placeTableCellBlock } from "../../layout-engine/measure/tableCellFlow.js";
-import { buildTableCellGrid, buildTableCellPlacements, getSourceCellAt } from "../../layout-engine/measure/tableCellGrid.js";
+import { buildTableCellGrid, buildTableCellPlacements, getSourceCellAt, getTableCellSpacingInsetsY } from "../../layout-engine/measure/tableCellGrid.js";
 import { tableFragmentBottomBorders } from "../../layout-engine/measure/tableFragmentBorderGeometry.js";
 import { resolveTableCellPadding } from "../../layout-engine/types.js";
 import { cellTextRotationDegrees } from "../../layout-painter/renderTable.js";
@@ -253,8 +253,10 @@ const paintTableBody = ({ composer, block, measure, xPx, yPx, fromRow, toRow, he
 	const placements = buildTableCellPlacements({
 		grid,
 		columnWidths: measure.columnWidths,
-		bidi: block.bidi === true
+		bidi: block.bidi === true,
+		cellSpacing: block.cellSpacing
 	});
+	const bordersSeparated = (block.cellSpacing ?? 0) > 0;
 	const rowTops = [0];
 	for (const rowMeasure of measure.rows) rowTops.push((rowTops.at(-1) ?? 0) + rowMeasure.height);
 	const paintRow = (rowIndex, rowYPx) => {
@@ -283,7 +285,9 @@ const paintTableBody = ({ composer, block, measure, xPx, yPx, fromRow, toRow, he
 			if (!placement) continue;
 			const rowSpan = Math.max(1, Math.trunc(cell.rowSpan ?? 1));
 			const spanEnd = Math.min(rowTops.length - 1, rowIndex + rowSpan);
-			const heightPx = spanEnd > rowIndex ? rowTops[spanEnd] - rowTops[rowIndex] : rowMeasure.height;
+			const slotHeightPx = spanEnd > rowIndex ? rowTops[spanEnd] - rowTops[rowIndex] : rowMeasure.height;
+			const spacing = getTableCellSpacingInsetsY(block.cellSpacing, rowIndex, rowSpan, block.rows.length);
+			const heightPx = Math.max(0, slotHeightPx - spacing.top - spacing.bottom);
 			const atLogicalStart = placement.sourceColumn === 0;
 			const atLogicalEnd = placement.sourceColumn + placement.columnSpan >= measure.columnWidths.length;
 			const isFirstColumn = block.bidi === true ? atLogicalEnd : atLogicalStart;
@@ -292,7 +296,7 @@ const paintTableBody = ({ composer, block, measure, xPx, yPx, fromRow, toRow, he
 			const leftCell = getSourceCellAt(grid, rowIndex, leftNeighborColumn);
 			const box = {
 				xPx: xPx + placement.left,
-				yPx: rowYPx,
+				yPx: rowYPx + spacing.top,
 				widthPx: placement.width,
 				heightPx
 			};
@@ -312,9 +316,9 @@ const paintTableBody = ({ composer, block, measure, xPx, yPx, fromRow, toRow, he
 					context,
 					paintTextBox,
 					sides: {
-						top: rowIndex === fromRow || !hasVisibleBorder(aboveCell?.borders?.bottom),
+						top: bordersSeparated || rowIndex === fromRow || !hasVisibleBorder(aboveCell?.borders?.bottom),
 						bottom: true,
-						left: isFirstColumn || !hasVisibleBorder(leftCell?.borders?.right),
+						left: bordersSeparated || isFirstColumn || !hasVisibleBorder(leftCell?.borders?.right),
 						right: true
 					}
 				});

package/dist/docx/attributeRemainder.js

@@ -1,11 +1,19 @@
 import { modelledAttributeNames } from "./propertyElementAttributes.js";
 import { OOXML_NAMESPACES } from "./serializer/partNamespaces.js";
+import { XML_NAMESPACE_URI } from "./xmlNamespaceContext.js";
 import { getLocalName, resolveAttributeNamespaceUri } from "./xmlParser.js";
 import { TaggedError } from "better-result";
 import { escapeXmlAttribute } from "@stll/docx-core";
 //#region src/docx/attributeRemainder.ts
-/** Namespace URI to the prefix a rebuilt part binds for it. */
-const CANONICAL_PREFIX = new Map(Object.entries(OOXML_NAMESPACES).map(([prefix, { uri }]) => [uri, prefix]));
+/**
+* Namespace URI to the prefix a rebuilt part binds for it.
+*
+* `xml` is reserved rather than declared — {@link OOXML_NAMESPACES} excludes
+* it because a rebuilt part must never write `xmlns:xml` — so it is added
+* here on its own: the remainder still has to spell `xml:space`, `xml:lang`
+* and `xml:id` back, or the attribute is written unprefixed instead of dropped.
+*/
+const CANONICAL_PREFIX = new Map([...Object.entries(OOXML_NAMESPACES).map(([prefix, { uri }]) => [uri, prefix]), [XML_NAMESPACE_URI, "xml"]]);
 const XML_LOCAL_NAME = /^[\p{L}_][\p{L}\p{M}\p{N}._\-\u{00B7}\u{203F}-\u{2040}]*$/u;
 var InvalidPreservedAttributeError = class extends TaggedError("InvalidPreservedAttributeError") {};
 /** Whether an attribute remainder can be emitted under a bound canonical name. */

package/dist/docx/blockContentParser.d.ts

@@ -2,12 +2,14 @@ import { document_d_exports } from "../types/document.js";
 import { NumberingMap } from "./numberingParser.js";
 import { ParseContext } from "./parseContext.js";
 import { XmlElement } from "./xmlParser.js";
+import { PreviewLedger } from "./previewBudget.js";
 import { StyleMap } from "./styleParser.js";
 //#region src/docx/blockContentParser.d.ts
 type ParseBlockContentOptions = {
   inHeaderFooter?: boolean;
   rootXmlns?: Record<string, string>;
   context?: ParseContext | undefined;
+  previews?: PreviewLedger;
 };
 declare const parseBlockContent: (parent: XmlElement, styles: StyleMap | null, theme: document_d_exports.Theme | null, numbering: NumberingMap | null, rels: document_d_exports.RelationshipMap | null, media: Map<string, document_d_exports.MediaFile> | null, options?: ParseBlockContentOptions) => document_d_exports.BlockContent[];
 //#endregion