@stll/folio-core 0.47.7 → 0.49.0

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

@@ -1,12 +1,13 @@
 import { getListMarkerInlineWidth, getListMarkerVisualOffset, resolveListMarkerFont } from "../../layout-engine/measure/listMarkerWidth.js";
 import { DEFAULT_FONT_FAMILY, buildRunFontStyle, ptToPx } from "../../layout-engine/measure/measureHelpers.js";
 import { getFontMetrics, measureTextWidth } from "../../layout-engine/measure/measureProvider.js";
+import { SMALL_CAPS_SCALE, smallCapsSegments } from "../../layout-engine/measure/smallCapsCasing.js";
 import { calculateTabWidth, pixelsToTwips } from "../../layout-engine/measure/tabCalculator.js";
 import { countCompressibleSpaces, toPaintedText } from "../../layout-engine/measure/textMeasurementPolicy.js";
 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";
@@ -315,6 +316,39 @@ const runGlyphDirection = (run, paragraphIsRtl) => run.bidiWrapper?.direction ??
 */
 const runUnicodeBidi = (run) => run.bidiWrapper === void 0 ? void 0 : UNICODE_BIDI_BY_WRAPPER_CONTROL[run.bidiWrapper.control];
 /**
+* `glyphs` split into same-size stretches for a `w:smallCaps` run, or
+* `undefined` when it has no lowercase letter (a heading typed in caps, a run
+* of digits and punctuation): that run paints as the single glyph run it
+* always did, no backend work spent on a split it does not need.
+*
+* Every backend draws one glyph size per `glyphRun` (a PDF's `Tf` sets the
+* whole text-showing operation's size; a DOM span sets one `font-size`), so a
+* mixed-size run becomes a short run of primitives instead of one primitive
+* with glyphs a backend cannot all draw at the size it is told. `advancesPx`
+* is sliced from the already-measured run — the widths line breaking decided
+* on — never re-measured, so the split cannot disagree with the width the
+* line was fitted at.
+*/
+const smallCapsGlyphRunSegments = (glyphs, fontSizePx) => {
+	const segments = smallCapsSegments(glyphs.text);
+	if (!segments.some((segment) => segment.small)) return;
+	const smallFontSizePx = fontSizePx * SMALL_CAPS_SCALE;
+	const result = [];
+	let advanceIndex = 0;
+	for (const segment of segments) {
+		const codePointCount = [...segment.text].length;
+		const advancesPx = glyphs.advancesPx.slice(advanceIndex, advanceIndex + codePointCount);
+		advanceIndex += codePointCount;
+		result.push({
+			text: segment.text,
+			fontSizePx: segment.small ? smallFontSizePx : fontSizePx,
+			advancesPx,
+			widthPx: advancesPx.reduce((sum, advance) => sum + advance, 0)
+		});
+	}
+	return result;
+};
+/**
 * One `glyphRun` plus everything painted around it: the run's background rect
 * first, then the glyphs, then the decorations whose geometry CSS would have
 * derived from the font.
@@ -368,7 +402,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 },
@@ -380,20 +414,43 @@ const emitGlyphRun = ({ sink, context, run, glyphs, style, paintXPx, baselineYPx
 		pattern: "solid"
 	} : void 0;
 	const unicodeBidi = runUnicodeBidi(run);
-	sink.glyphs.push({
-		kind: "glyphRun",
+	const direction = runGlyphDirection(run, isRtl);
+	const commonFields = {
 		font,
-		fontSizePx,
 		color,
-		xPx: paintXPx,
 		baselineYPx: runBaselineYPx,
-		...glyphRunText(glyphs),
-		direction: runGlyphDirection(run, isRtl),
+		direction,
 		...unicodeBidi === void 0 ? {} : { unicodeBidi },
 		...stroke === void 0 ? {} : { stroke },
 		...pmRange === void 0 ? {} : { pmRange },
 		...collapsedEdge === void 0 ? {} : { collapsedEdge }
+	};
+	const smallCapsRuns = style.fontVariant === "small-caps" && direction === "ltr" ? smallCapsGlyphRunSegments(glyphs, fontSizePx) : void 0;
+	if (smallCapsRuns === void 0) sink.glyphs.push({
+		kind: "glyphRun",
+		fontSizePx,
+		xPx: paintXPx,
+		...glyphRunText(glyphs),
+		...commonFields
 	});
+	else {
+		const adjustments = glyphs.adjustments === void 0 ? {} : { adjustments: glyphs.adjustments };
+		let segmentXPx = paintXPx;
+		for (const segment of smallCapsRuns) {
+			sink.glyphs.push({
+				kind: "glyphRun",
+				fontSizePx: segment.fontSizePx,
+				xPx: segmentXPx,
+				text: segment.text,
+				advancesPx: segment.advancesPx,
+				kerning: glyphs.kerning,
+				smallCaps: true,
+				...adjustments,
+				...commonFields
+			});
+			segmentXPx += segment.widthPx;
+		}
+	}
 	emitDecorations({
 		sink,
 		run,
@@ -506,7 +563,6 @@ const emitDecorations = ({ sink, run, color, context, xPx, glyphs, baselineYPx,
 */
 const reportRunEffects = (run, context) => {
 	const { unsupported, pageIndex } = context;
-	if (run.smallCaps) unsupported.report(UNSUPPORTED_CONSTRUCT.smallCaps, pageIndex, "w:smallCaps is carried on the run and painted by the DOM backend; the PDF backend paints full-size glyphs for it");
 	if (getHorizontalScaleFactor(run.horizontalScale) !== 1) unsupported.report(UNSUPPORTED_CONSTRUCT.horizontalScale, pageIndex, `w:w ${String(run.horizontalScale)}% is carried on the run and painted by the DOM backend; the PDF backend paints unnarrowed glyphs at the measured advances`);
 	if (run.textEffect) unsupported.report(UNSUPPORTED_CONSTRUCT.textEffect, pageIndex, `w:effect ${run.textEffect}`);
 	if (run.emphasisMark) unsupported.report(UNSUPPORTED_CONSTRUCT.emphasisMark, pageIndex, `w:em ${run.emphasisMark}`);
@@ -729,6 +785,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 +799,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 +870,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/display-list/build/textBoxPrimitives.js

@@ -64,7 +64,7 @@ const paintUnrotatedTextBoxFragment = ({ composer, fragment, block, measure, con
 			fill
 		});
 		else context.unsupported.report(UNSUPPORTED_CONSTRUCT.unresolvedColor, context.pageIndex, `text box fill ${block.fillColor}`);
-	}
+	} else if (block.fillGradient) context.unsupported.report(UNSUPPORTED_CONSTRUCT.textBoxGradientFill, context.pageIndex, "text box gradient fill");
 	let outlineWidthPx = 0;
 	const outlineDash = presetDashForOutlineAttr(block.outlineStyle) ?? "solid";
 	if (block.outlineWidth !== void 0 && block.outlineWidth > 0 && outlineDash !== "none") {

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

@@ -7,8 +7,6 @@ import { DisplayUnsupported } from "../types.js";
 declare const UNSUPPORTED_CONSTRUCT: {
   /** `w:effect` animations (blinkBackground, shimmer, …). */
   readonly textEffect: "textEffect";
-  /** `w:smallCaps`: advances are correct, the small-cap glyph choice is not expressible. */
-  readonly smallCaps: "smallCaps";
   /** `w:w` horizontal scale: folded into advances, but the glyphs are not narrowed. */
   readonly horizontalScale: "horizontalScale";
   /** `w:em` emphasis marks. */
@@ -39,6 +37,8 @@ declare const UNSUPPORTED_CONSTRUCT: {
   readonly headerFooterContent: "headerFooterContent";
   /** `a:bodyPr` middle/bottom anchoring inside a text box. */
   readonly textBoxVerticalAlign: "textBoxVerticalAlign";
+  /** A text box's `a:gradFill`: the primitives carry no gradient. */
+  readonly textBoxGradientFill: "textBoxGradientFill";
   /** A fragment kind with no builder. */
   readonly fragmentKind: "fragmentKind";
   /** A fragment whose block or measure is missing from the block lookup. */

package/dist/display-list/dom/renderDisplayListToDom.js

@@ -297,7 +297,6 @@ const paintGlyphRun = (run, context) => {
 	if (run.unicodeBidi !== void 0) span.style.unicodeBidi = run.unicodeBidi;
 	if (run.stroke !== void 0) span.style.webkitTextStroke = `${px(run.stroke.thicknessPx)} ${cssColor(run.stroke.color)}`;
 	span.style.fontKerning = run.kerning ? "normal" : "none";
-	if (run.smallCaps) span.style.fontVariant = "small-caps";
 	applyAdjustments(span, run.adjustments);
 	span.dataset["advanceSum"] = String(advanceSum);
 	applyModelRange(span, run.pmRange);

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

package/dist/docx/blockContentParser.js

@@ -1,10 +1,11 @@
 import { parseBookmarkEnd, parseBookmarkStart } from "./bookmarkParser.js";
-import { convertBulletToUnicode } from "./bulletMarkers.js";
-import { CAPTURE, dispatchChildren, ownedElsewhere, withPreservedChildren } from "./containerChildren.js";
+import { bulletMarkerFontName, convertBulletToUnicode } from "./bulletMarkers.js";
+import { CAPTURE, dispatchChildrenWithContext, ownedElsewhere, withPreservedChildren } from "./containerChildren.js";
 import { isNumberingReference } from "./numberingReference.js";
 import { formatOoxmlCounter } from "./ooxmlCounterFormatter.js";
 import { parseParagraph } from "./paragraphParser.js";
 import { enrichParagraphTextBoxes } from "./paragraphTextBoxEnrichment.js";
+import { standalonePreviewLedger } from "./previewBudget.js";
 import { captureSdtSiblingMarkers, parseSdtProperties } from "./sdtProperties.js";
 import { parseTable } from "./tableParser.js";
 import { findWordprocessingChild, mergeXmlnsDeclarations, selectAlternateContentBranch } from "./xmlParser.js";
@@ -61,7 +62,7 @@ const computeListMarker = (paragraph, { numbering, listCounters, abstractCounter
 	previousList.numId = numId;
 	const pattern = listRendering.marker;
 	if (listRendering.isBullet) {
-		listRendering.marker = convertBulletToUnicode(pattern || "");
+		listRendering.marker = convertBulletToUnicode(pattern || "", bulletMarkerFontName(listRendering.markerFormatting));
 		previousList.abstractNumId = null;
 		previousList.fromStyle = false;
 		previousList.numId = null;
@@ -84,7 +85,7 @@ const withContainerXmlns = (state, element) => ({
 	...state,
 	options: {
 		...state.options,
-		rootXmlns: mergeXmlnsDeclarations(state.options?.rootXmlns ?? {}, element)
+		rootXmlns: mergeXmlnsDeclarations(state.options.rootXmlns ?? {}, element)
 	}
 });
 /**
@@ -121,74 +122,88 @@ const parseBlockContent = (parent, styles, theme, numbering, rels, media, option
 	},
 	options: {
 		...options,
-		rootXmlns: mergeXmlnsDeclarations(options?.rootXmlns ?? {}, parent)
+		rootXmlns: mergeXmlnsDeclarations(options?.rootXmlns ?? {}, parent),
+		previews: options?.previews ?? standalonePreviewLedger()
 	}
 });
+const BLOCK_CONTENT_UNDECLARED = { AlternateContent: (child, { resources: { styles, theme, numbering, rels, media }, state, modelled }) => {
+	const selectedBranch = selectAlternateContentBranch(child);
+	if (!selectedBranch) return;
+	modelled.push(...parseBlockContentWithState(selectedBranch, styles, theme, numbering, rels, media, withContainerXmlns(withContainerXmlns(state, child), selectedBranch)));
+} };
+const BLOCK_CONTENT_HANDLERS = {
+	p: (child, { resources: { styles, theme, numbering, rels, media }, state, modelled }) => {
+		const paragraph = parseParagraph(child, styles, theme, numbering, rels, media, {
+			...state.options,
+			runConsolidation: "deferred"
+		});
+		enrichParagraphTextBoxes(paragraph, child, styles, theme, numbering, rels, media, parseTable, state.options.previews, state.options.context);
+		computeListMarker(paragraph, {
+			numbering,
+			listCounters: state.listCounters,
+			abstractCounters: state.abstractCounters,
+			restartedNumIds: state.restartedNumIds,
+			previousList: state.previousList
+		});
+		modelled.push(paragraph);
+	},
+	tbl: (child, { resources: { styles, theme, numbering, rels, media }, state, modelled }) => {
+		const table = parseTable(child, styles, theme, numbering, rels, media, state.options);
+		if (!table) return;
+		modelled.push(table);
+	},
+	sdt: (child, { resources: { styles, theme, numbering, rels, media }, state, modelled }) => {
+		modelled.push(parseBlockSdt(child, styles, theme, numbering, rels, media, state));
+	},
+	bookmarkStart: (child, { modelled }) => {
+		modelled.push(parseBookmarkStart(child));
+	},
+	bookmarkEnd: (child, { modelled }) => {
+		modelled.push(parseBookmarkEnd(child));
+	},
+	...BLOCK_CHILD_OWNERS,
+	altChunk: CAPTURE,
+	commentRangeEnd: CAPTURE,
+	commentRangeStart: CAPTURE,
+	customXml: CAPTURE,
+	customXmlDelRangeEnd: CAPTURE,
+	customXmlDelRangeStart: CAPTURE,
+	customXmlInsRangeEnd: CAPTURE,
+	customXmlInsRangeStart: CAPTURE,
+	customXmlMoveFromRangeEnd: CAPTURE,
+	customXmlMoveFromRangeStart: CAPTURE,
+	customXmlMoveToRangeEnd: CAPTURE,
+	customXmlMoveToRangeStart: CAPTURE,
+	del: CAPTURE,
+	ins: CAPTURE,
+	moveFrom: CAPTURE,
+	moveFromRangeEnd: CAPTURE,
+	moveFromRangeStart: CAPTURE,
+	moveTo: CAPTURE,
+	moveToRangeEnd: CAPTURE,
+	moveToRangeStart: CAPTURE,
+	permEnd: CAPTURE,
+	permStart: CAPTURE,
+	proofErr: CAPTURE
+};
 const parseBlockContentWithState = (parent, styles, theme, numbering, rels, media, state) => {
 	const modelled = [];
-	return withPreservedChildren(modelled, dispatchChildren({
+	return withPreservedChildren(modelled, dispatchChildrenWithContext({
 		element: parent,
 		container: "block-content",
 		capturePosition: () => modelled.length,
-		undeclared: { AlternateContent: (child) => {
-			const selectedBranch = selectAlternateContentBranch(child);
-			if (!selectedBranch) return;
-			modelled.push(...parseBlockContentWithState(selectedBranch, styles, theme, numbering, rels, media, withContainerXmlns(withContainerXmlns(state, child), selectedBranch)));
-		} },
-		handlers: {
-			p: (child) => {
-				const paragraph = parseParagraph(child, styles, theme, numbering, rels, media, {
-					...state.options,
-					runConsolidation: "deferred"
-				});
-				enrichParagraphTextBoxes(paragraph, child, styles, theme, numbering, rels, media, parseTable, state.options?.context);
-				computeListMarker(paragraph, {
-					numbering,
-					listCounters: state.listCounters,
-					abstractCounters: state.abstractCounters,
-					restartedNumIds: state.restartedNumIds,
-					previousList: state.previousList
-				});
-				modelled.push(paragraph);
-			},
-			tbl: (child) => {
-				const table = parseTable(child, styles, theme, numbering, rels, media, state.options);
-				if (!table) return;
-				modelled.push(table);
-			},
-			sdt: (child) => {
-				modelled.push(parseBlockSdt(child, styles, theme, numbering, rels, media, state));
-			},
-			bookmarkStart: (child) => {
-				modelled.push(parseBookmarkStart(child));
-			},
-			bookmarkEnd: (child) => {
-				modelled.push(parseBookmarkEnd(child));
+		undeclared: BLOCK_CONTENT_UNDECLARED,
+		handlers: BLOCK_CONTENT_HANDLERS,
+		context: {
+			resources: {
+				styles,
+				theme,
+				numbering,
+				rels,
+				media
 			},
-			...BLOCK_CHILD_OWNERS,
-			altChunk: CAPTURE,
-			commentRangeEnd: CAPTURE,
-			commentRangeStart: CAPTURE,
-			customXml: CAPTURE,
-			customXmlDelRangeEnd: CAPTURE,
-			customXmlDelRangeStart: CAPTURE,
-			customXmlInsRangeEnd: CAPTURE,
-			customXmlInsRangeStart: CAPTURE,
-			customXmlMoveFromRangeEnd: CAPTURE,
-			customXmlMoveFromRangeStart: CAPTURE,
-			customXmlMoveToRangeEnd: CAPTURE,
-			customXmlMoveToRangeStart: CAPTURE,
-			del: CAPTURE,
-			ins: CAPTURE,
-			moveFrom: CAPTURE,
-			moveFromRangeEnd: CAPTURE,
-			moveFromRangeStart: CAPTURE,
-			moveTo: CAPTURE,
-			moveToRangeEnd: CAPTURE,
-			moveToRangeStart: CAPTURE,
-			permEnd: CAPTURE,
-			permStart: CAPTURE,
-			proofErr: CAPTURE
+			state,
+			modelled
 		}
 	}), (xml) => ({
 		type: "preservedBlock",

package/dist/docx/bulletMarkers.d.ts

@@ -1,4 +1,20 @@
 //#region src/docx/bulletMarkers.d.ts
-declare const convertBulletToUnicode: (bulletChar: string) => string;
+type MarkerFontFamily = {
+  ascii?: string | undefined;
+  hAnsi?: string | undefined;
+};
+/** The face a bullet level's `w:rFonts` names for its (Latin-range) marker character. */
+declare const bulletMarkerFontName: (formatting: {
+  fontFamily?: MarkerFontFamily | undefined;
+} | null | undefined) => string | undefined;
+/**
+ * Map a bullet level's `w:lvlText` to the character painted for it.
+ *
+ * `fontName` is the level's own `w:rFonts` face. When it is an ordinary text
+ * font, a Latin-range character is the letter itself (the common `o` bullet
+ * in a monospace face); without a named face the character is read as a
+ * symbol-font code.
+ */
+declare const convertBulletToUnicode: (bulletChar: string, fontName?: string) => string;
 //#endregion
-export { convertBulletToUnicode };
+export { bulletMarkerFontName, convertBulletToUnicode };