postext 0.3.19 → 0.3.21

package/dist/pipeline/headerFooter.js

@@ -1,7 +1,11 @@
+import { TITLE_BREAK_RE, applyTitleBreaks } from '../parse/inlineFormatting';
 import { createBoundingBox, } from '../vdt';
-import { computeChapterTitles, computeChapterNumbers } from './placeholders';
+import { computeChapterTitles, computeChapterNumbers, computeChapterAttrs, computePartValues } from './placeholders';
+import { parsePartNumber } from './parts';
 import { computePageMetrics } from './buildHelpers';
 import { buildHeadingLevelMap } from './config';
+import { classifyPages } from './pageRoles';
+import { dimensionToPx } from '../units';
 import { layoutDesignSlot, } from '../design/layout';
 /** Slots live in the page margin area between the body edge and the page
  *  edge. Header slot container: from `top-margin` edge down to body top.
@@ -15,7 +19,7 @@ import { layoutDesignSlot, } from '../design/layout';
  *  This matches the legacy semantics: `marginFromBody` was "distance from
  *  body edge" — the migration translates that to an offset of the same
  *  magnitude from the body-facing edge. */
-function headerContainerBbox(contentArea, _pageHeight) {
+function headerContainerBbox(contentArea) {
     // Header: spans from top of page to body top.
     return { x: contentArea.x, y: 0, width: contentArea.width, height: contentArea.y };
 }
@@ -99,11 +103,23 @@ function boxPrimitiveToBlock(prim) {
  *  rather than below the natural text bottom. Applies to both in-column
  *  headings (overlay in block bbox) and page-spanning openers (width is the
  *  full content area; passed in by the caller). */
-export function measureHeadingAdvancedDesignHeight(level, heading, width, dpi, metadata, pageIndex) {
+export function measureHeadingAdvancedDesignHeight(level, heading, width, dpi, metadata, pageIndex, 
+/** Page/bleed frames in absolute page px, for `anchor.to: 'page' |
+ *  'bleed'` elements. Translated into the stub coordinate system (the
+ *  heading container's top-left at `origin`) so a band anchored above the
+ *  heading does not grow the reserved height, while anything extending
+ *  below the heading's top does. */
+frames, 
+/** Absolute page position of the heading container's top-left. Defaults
+ *  to the frames' page origin when omitted. */
+origin) {
     if (!level.advancedDesign.enabled)
         return 0;
+    const minHeightPx = level.advancedDesign.minHeight
+        ? dimensionToPx(level.advancedDesign.minHeight, dpi)
+        : 0;
     if (level.advancedDesign.slot.elements.length === 0)
-        return 0;
+        return minHeightPx;
     const stubPage = { index: pageIndex, pageLabel: '1' };
     const placeholders = {
         kind: 'heading',
@@ -113,23 +129,90 @@ export function measureHeadingAdvancedDesignHeight(level, heading, width, dpi, m
         chapterTitleByPageIndex: [],
         heading,
     };
-    const result = layoutDesignSlot(level.advancedDesign.slot, { container: { x: 0, y: 0, width, height: 1e6 }, dpi, placeholders }, pageIndex);
+    let stubFrames;
+    if (frames) {
+        const ox = origin?.x ?? frames.page.x;
+        const oy = origin?.y ?? frames.page.y;
+        const shift = (f) => ({ x: f.x - ox, y: f.y - oy, width: f.width, height: f.height });
+        stubFrames = { page: shift(frames.page), bleed: shift(frames.bleed) };
+    }
+    const result = layoutDesignSlot(level.advancedDesign.slot, { container: { x: 0, y: 0, width, height: 1e6 }, dpi, placeholders, frames: stubFrames }, pageIndex);
     let bottom = 0;
     for (const prim of result.primitives) {
         bottom = Math.max(bottom, prim.y + prim.height);
     }
-    return bottom;
+    return Math.max(bottom, minHeightPx);
 }
-export function layoutSlotToVdt(slot, container, pageIndex, placeholders, dpi) {
-    const result = layoutDesignSlot(slot, { container, dpi, placeholders }, pageIndex);
+export function layoutSlotToVdt(slot, container, pageIndex, placeholders, dpi, extras) {
+    const result = layoutDesignSlot(slot, { container, dpi, placeholders, frames: extras?.frames, pageRole: extras?.pageRole }, pageIndex);
     if (result.primitives.length === 0)
         return undefined;
-    const blocks = result.primitives.map(primitiveToBlock);
+    const titleElementIds = extras?.titleSource
+        ? new Set(slot.elements.filter((el) => el.kind === 'text' && el.content.includes('{titleText}')).map((el) => el.id))
+        : undefined;
+    const attrElementKeys = new Map();
+    if (extras?.attrSources) {
+        for (const el of slot.elements) {
+            if (el.kind !== 'text')
+                continue;
+            const m = /^\s*\{attr\.([A-Za-z_][A-Za-z0-9_-]*)\}\s*$/.exec(el.content);
+            if (m && extras.attrSources[m[1]])
+                attrElementKeys.set(el.id, m[1]);
+        }
+    }
+    const blocks = result.primitives.map((prim) => {
+        const block = primitiveToBlock(prim);
+        const attrKey = attrElementKeys.get(prim.id);
+        if (block.kind === 'text' && attrKey !== undefined && extras?.attrSources?.[attrKey]) {
+            const range = extras.attrSources[attrKey];
+            const value = extras.attrs?.[attrKey] ?? '';
+            block.sourceStart = range.start;
+            block.sourceEnd = range.end;
+            if (value.length === range.end - range.start) {
+                block.sourceText = value;
+                block.sourceMap = Array.from({ length: value.length }, (_, i) => range.start + i);
+            }
+            return block;
+        }
+        if (block.kind === 'text' && titleElementIds?.has(prim.id) && extras?.titleSource) {
+            block.sourceStart = extras.titleSource.start;
+            block.sourceEnd = extras.titleSource.end;
+            if (extras.titleSource.text !== undefined && extras.titleSource.sourceMap
+                && extras.titleSource.sourceMap.length === extras.titleSource.text.length) {
+                block.sourceText = extras.titleSource.text;
+                block.sourceMap = extras.titleSource.sourceMap;
+            }
+        }
+        return block;
+    });
     return {
         bbox: createBoundingBox(container.x, container.y, container.width, container.height),
         blocks,
     };
 }
+/** Plain title text of a part (`\\` rendered as a line break) and the
+ *  source offset of every character of it, for editor cursor mapping. */
+function partTitleSourceMap(rawTitle, sourceStart) {
+    let text = '';
+    const sourceMap = [];
+    const re = /[ \t]*\\\\[ \t]*/g;
+    let last = 0;
+    let m;
+    while ((m = re.exec(rawTitle)) !== null) {
+        for (let i = last; i < m.index; i++) {
+            text += rawTitle[i];
+            sourceMap.push(sourceStart + i);
+        }
+        text += '\n';
+        sourceMap.push(sourceStart + m.index);
+        last = m.index + m[0].length;
+    }
+    for (let i = last; i < rawTitle.length; i++) {
+        text += rawTitle[i];
+        sourceMap.push(sourceStart + i);
+    }
+    return { text, sourceMap };
+}
 /** Container bbox for a page-spanning heading opener band: occupies the
  *  vertical band the heading block reserved in its column, extended
  *  horizontally across the full content area (both columns) — but NOT beyond
@@ -156,7 +239,7 @@ function findOpenerHeading(page, headingLevelByNumber) {
                 .map((ln) => (ln.segments ?? []).map((s) => s.text).join(''))
                 .join(' ');
             const pref = block.numberPrefix ?? '';
-            const title = pref && full.startsWith(`${pref} `) ? full.slice(pref.length + 1) : full;
+            const title = applyTitleBreaks(pref && full.startsWith(`${pref} `) ? full.slice(pref.length + 1) : full, block.titleBreaks, block.titleLength ?? -1);
             return { block, level: block.headingLevel, titleText: title, numberPrefix: pref };
         }
     }
@@ -173,6 +256,7 @@ function synthesiseDefaultOpenerSlot(level, hasNumberPrefix) {
         kind: 'text',
         id: 'defaultHeadingOpener',
         parity: 'all',
+        pages: 'all',
         placement: {
             anchor: { to: 'container', edge: 'top-left' },
             offset: { x: { value: 0, unit: 'pt' }, y: { value: 0, unit: 'pt' } },
@@ -192,17 +276,60 @@ function synthesiseDefaultOpenerSlot(level, hasNumberPrefix) {
     };
     return { elements: [textEl] };
 }
+/** Default opener design of a `:::part` page when `parts.design` is empty:
+ *  `{number} {titleText}` (or just `{titleText}` without a number) in the
+ *  H1 typography, anchored at the top-left of the part's body area — the
+ *  container is the trim box, so the offset is the part margins. Purely
+ *  decorative: raise `parts.margins.top` to keep the body clear of it. */
+function synthesiseDefaultPartSlot(resolved, page, trimBox, hasNumber) {
+    const level = resolved.headings.levels.find((l) => l.level === 1) ?? resolved.headings.levels[0];
+    const content = hasNumber ? '{number} {titleText}' : '{titleText}';
+    const textEl = {
+        kind: 'text',
+        id: 'defaultPartOpener',
+        parity: 'all',
+        pages: 'all',
+        placement: {
+            anchor: { to: 'container', edge: 'top-left' },
+            offset: {
+                x: { value: page.contentArea.x - trimBox.x, unit: 'px' },
+                y: { value: page.contentArea.y - trimBox.y, unit: 'px' },
+            },
+            size: { width: { value: page.contentArea.width, unit: 'px' }, height: 'auto' },
+        },
+        content,
+        fontFamily: level.fontFamily,
+        fontSize: level.fontSize,
+        fontWeight: level.fontWeight,
+        italic: level.italic,
+        color: level.color,
+        align: 'left',
+        verticalAlign: 'top',
+        lineHeight: level.lineHeight.unit === 'em' ? level.lineHeight.value : 1.2,
+        overflow: 'wrap',
+        hyphenate: true,
+    };
+    return { elements: [textEl] };
+}
 /**
  * After body placement finishes, attach header/footer slots to every page.
  */
 export function buildHeadersAndFooters(doc) {
     const resolved = doc.config;
     const dpi = resolved.page.dpi;
-    const { contentArea } = computePageMetrics(resolved);
+    const metrics = computePageMetrics(resolved);
+    const frames = { page: metrics.trimBox, bleed: metrics.bleedBox };
+    // Page roles drive the per-element `pages` filter of every slot below.
+    classifyPages(doc, resolved);
     const chapterTitleByPageIndex = computeChapterTitles(doc.blocks, doc.pages.length, doc.pages);
     const chapterNumberByPageIndex = computeChapterNumbers(doc.blocks, doc.pages.length, doc.pages);
+    const chapterAttrsByPageIndex = computeChapterAttrs(doc.blocks, doc.pages.length, doc.pages);
+    const { partTitleByPageIndex, partNumberByPageIndex } = computePartValues(doc.pages);
     const headingLevelByNumber = buildHeadingLevelMap(resolved);
     for (const page of doc.pages) {
+        // Per-page content area: mirrored margins swap inner/outer on even pages.
+        const contentArea = page.contentArea;
+        const extras = { frames, pageRole: page.role };
         if (resolved.header.elements.length > 0) {
             const placeholders = {
                 kind: 'header',
@@ -210,8 +337,72 @@ export function buildHeadersAndFooters(doc) {
                 allPages: doc.pages,
                 metadata: doc.metadata,
                 chapterTitleByPageIndex,
+                chapterNumberByPageIndex,
+                chapterAttrsByPageIndex,
+                partTitleByPageIndex,
+                partNumberByPageIndex,
             };
-            page.header = layoutSlotToVdt(resolved.header, headerContainerBbox(contentArea, page.height), page.index, placeholders, dpi);
+            page.header = layoutSlotToVdt(resolved.header, headerContainerBbox(contentArea), page.index, placeholders, dpi, extras);
+        }
+        // Back of a part divider: a blank page right after a part page takes the
+        // part's verso design (the model book tints the whole leaf).
+        const prevPage = page.index > 0 ? doc.pages[page.index - 1] : undefined;
+        if (!page.partInfo
+            && prevPage?.partInfo
+            && resolved.parts.versoDesign.elements.length > 0
+            && page.columns.every((c) => c.blocks.length === 0)) {
+            const { number, title } = prevPage.partInfo;
+            const placeholders = {
+                kind: 'part',
+                page,
+                allPages: doc.pages,
+                metadata: doc.metadata,
+                chapterTitleByPageIndex,
+                chapterNumberByPageIndex,
+                chapterAttrsByPageIndex,
+                partTitleByPageIndex,
+                partNumberByPageIndex,
+                heading: {
+                    titleText: title.replace(TITLE_BREAK_RE, '\n'),
+                    formattedNumber: number,
+                    numericValue: parsePartNumber(number),
+                    chapterNumber: chapterNumberByPageIndex[page.index] ?? '',
+                },
+            };
+            page.openerBand = layoutSlotToVdt(resolved.parts.versoDesign, { x: frames.page.x, y: frames.page.y, width: frames.page.width, height: frames.page.height }, page.index, placeholders, dpi, extras);
+        }
+        // Part-divider page: the opener design covers the full trim box and is
+        // purely decorative (the body column already comes from `parts.margins`).
+        if (page.partInfo) {
+            const { number, title } = page.partInfo;
+            const slot = resolved.parts.design.elements.length > 0
+                ? resolved.parts.design
+                : synthesiseDefaultPartSlot(resolved, page, frames.page, number.length > 0);
+            const placeholders = {
+                kind: 'part',
+                page,
+                allPages: doc.pages,
+                metadata: doc.metadata,
+                chapterTitleByPageIndex,
+                chapterNumberByPageIndex,
+                chapterAttrsByPageIndex,
+                partTitleByPageIndex,
+                partNumberByPageIndex,
+                heading: {
+                    titleText: title.replace(TITLE_BREAK_RE, '\n'),
+                    formattedNumber: number,
+                    numericValue: parsePartNumber(number),
+                    chapterNumber: chapterNumberByPageIndex[page.index] ?? '',
+                },
+            };
+            const partTitleSource = page.partInfo.titleSourceStart !== undefined && page.partInfo.titleSourceEnd !== undefined
+                ? {
+                    start: page.partInfo.titleSourceStart,
+                    end: page.partInfo.titleSourceEnd,
+                    ...partTitleSourceMap(title, page.partInfo.titleSourceStart),
+                }
+                : undefined;
+            page.openerBand = layoutSlotToVdt(slot, { x: frames.page.x, y: frames.page.y, width: frames.page.width, height: frames.page.height }, page.index, placeholders, dpi, { ...extras, titleSource: partTitleSource });
         }
         const opener = findOpenerHeading(page, headingLevelByNumber);
         if (opener) {
@@ -226,13 +417,29 @@ export function buildHeadersAndFooters(doc) {
                     allPages: doc.pages,
                     metadata: doc.metadata,
                     chapterTitleByPageIndex,
+                    chapterNumberByPageIndex,
+                    chapterAttrsByPageIndex,
+                    partTitleByPageIndex,
+                    partNumberByPageIndex,
                     heading: {
                         titleText: opener.titleText,
                         formattedNumber: opener.numberPrefix,
                         chapterNumber: chapterNumberByPageIndex[page.index] ?? '',
+                        attrs: opener.block.attrs,
                     },
                 };
-                page.openerBand = layoutSlotToVdt(slot, openerContainerBbox(opener.block, contentArea), page.index, placeholders, dpi);
+                const headingMap = opener.block.sourceMap;
+                const headingTitleSource = headingMap && headingMap.length > 0
+                    ? {
+                        start: headingMap[0],
+                        end: headingMap[headingMap.length - 1] + 1,
+                        text: opener.titleText,
+                        sourceMap: headingMap,
+                    }
+                    : opener.block.sourceStart !== undefined && opener.block.sourceEnd !== undefined
+                        ? { start: opener.block.sourceStart, end: opener.block.sourceEnd }
+                        : undefined;
+                page.openerBand = layoutSlotToVdt(slot, openerContainerBbox(opener.block, contentArea), page.index, placeholders, dpi, { ...extras, titleSource: headingTitleSource, attrSources: opener.block.attrSources, attrs: opener.block.attrs });
                 if (page.openerBand) {
                     opener.block.hidden = true;
                 }
@@ -269,13 +476,18 @@ export function buildHeadersAndFooters(doc) {
                     allPages: doc.pages,
                     metadata: doc.metadata,
                     chapterTitleByPageIndex,
+                    chapterNumberByPageIndex,
+                    chapterAttrsByPageIndex,
+                    partTitleByPageIndex,
+                    partNumberByPageIndex,
                     heading: {
                         titleText: title,
                         formattedNumber: pref,
                         chapterNumber: chapterNumberByPageIndex[page.index] ?? '',
+                        attrs: block.attrs,
                     },
                 };
-                const overlay = layoutSlotToVdt(lvl.advancedDesign.slot, { x: block.bbox.x, y: block.bbox.y, width: block.bbox.width, height: block.bbox.height }, page.index, placeholders, dpi);
+                const overlay = layoutSlotToVdt(lvl.advancedDesign.slot, { x: block.bbox.x, y: block.bbox.y, width: block.bbox.width, height: block.bbox.height }, page.index, placeholders, dpi, extras);
                 if (overlay)
                     block.designOverlay = overlay;
             }
@@ -287,8 +499,12 @@ export function buildHeadersAndFooters(doc) {
                 allPages: doc.pages,
                 metadata: doc.metadata,
                 chapterTitleByPageIndex,
+                chapterNumberByPageIndex,
+                chapterAttrsByPageIndex,
+                partTitleByPageIndex,
+                partNumberByPageIndex,
             };
-            page.footer = layoutSlotToVdt(resolved.footer, footerContainerBbox(contentArea, page.height), page.index, placeholders, dpi);
+            page.footer = layoutSlotToVdt(resolved.footer, footerContainerBbox(contentArea, page.height), page.index, placeholders, dpi, extras);
         }
     }
 }

package/dist/pipeline/headerFooter.js.map

@@ -1 +1 @@
-{"version":3,"file":"headerFooter.js","sourceRoot":"","sources":["../../src/pipeline/headerFooter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"headerFooter.js","sourceRoot":"","sources":["../../src/pipeline/headerFooter.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/lists.d.ts

@@ -12,6 +12,13 @@ export interface ListBulletStyle {
     itemSpacingPx: number;
     textFontSizePx: number;
     verticalOffsetPx: number;
+    /** Ordered-list separator drawn as its own run (only when its style
+     *  differs from the number's). `separatorOffsetPx` is measured from the
+     *  bullet's left edge. */
+    separatorText?: string;
+    separatorFontString?: string;
+    separatorColor?: string;
+    separatorOffsetPx?: number;
 }
 export interface ListItemResolved {
     text: BlockStyle;
@@ -21,9 +28,17 @@ export interface ListItemResolved {
     strikethroughText: boolean;
 }
 export interface OrderedRunMetric {
+    /** Formatted number; includes the separator unless a distinct separator
+     *  run exists (`separatorText` set). */
     numberText: string;
     numberWidthPx: number;
     maxNumberWidthPx: number;
+    /** Distinct separator run (style differs from the number's). */
+    separatorText?: string;
+    separatorFontString?: string;
+    separatorColor?: string;
+    separatorGapPx?: number;
+    separatorWidthPx?: number;
 }
 export interface OrderedListMetrics {
     perBlock: Map<number, OrderedRunMetric>;

package/dist/pipeline/lists.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lists.d.ts","sourceRoot":"","sources":["../../src/pipeline/lists.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAY,MAAM,UAAU,CAAC;AAEvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAE7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAG3C,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,eAAe,CAAC;IACxB,qIAAqI;IACrI,qBAAqB,EAAE,MAAM,CAAC;IAC9B,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACxC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACtC;AAyDD,wEAAwE;AACxE,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,EAAE,CAWhG;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,cAAc,EACxB,cAAc,EAAE,MAAM,EACtB,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACzC,MAAM,EAAE,CAcV;AAyCD;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,YAAY,EAAE,EAC7B,QAAQ,EAAE,cAAc,EACxB,cAAc,EAAE,MAAM,GACrB,kBAAkB,CAwFpB;AAED,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,cAAc,EACxB,cAAc,EAAE,MAAM,EAAE,EACxB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,GACd,gBAAgB,CA4DlB;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,cAAc,EACxB,cAAc,EAAE,MAAM,EAAE,EACxB,MAAM,EAAE,gBAAgB,GACvB,gBAAgB,CAoDlB"}
+{"version":3,"file":"lists.d.ts","sourceRoot":"","sources":["../../src/pipeline/lists.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAY,MAAM,UAAU,CAAC;AAEvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAE7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAG3C,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB;;8BAE0B;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,eAAe,CAAC;IACxB,qIAAqI;IACrI,qBAAqB,EAAE,MAAM,CAAC;IAC9B,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,gBAAgB;IAC/B;4CACwC;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gEAAgE;IAChE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AA4CD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACxC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACtC;AAyDD,wEAAwE;AACxE,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,EAAE,CAWhG;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,cAAc,EACxB,cAAc,EAAE,MAAM,EACtB,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACzC,MAAM,EAAE,CAkBV;AAyCD;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,YAAY,EAAE,EAC7B,QAAQ,EAAE,cAAc,EACxB,cAAc,EAAE,MAAM,GACrB,kBAAkB,CAuGpB;AAED,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,cAAc,EACxB,cAAc,EAAE,MAAM,EAAE,EACxB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,GACd,gBAAgB,CA4DlB;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,cAAc,EACxB,cAAc,EAAE,MAAM,EAAE,EACxB,MAAM,EAAE,gBAAgB,GACvB,gBAAgB,CA+DlB"}

package/dist/pipeline/lists.js

@@ -1,6 +1,26 @@
 import { dimensionToPx } from '../units';
 import { buildFontString, measureGlyphWidth } from '../measure';
 import { resolveBodyStyle } from './styles';
+function levelNumberFontString(level, dpi, bodyFontSizePx) {
+    const fontSizePx = dimensionToPx(level.fontSize, dpi, bodyFontSizePx);
+    return buildFontString(level.fontFamily, fontSizePx, level.fontWeight.toString(), level.italic ? 'italic' : 'normal');
+}
+/**
+ * The separator becomes its own run only when its resolved style differs
+ * from the number's (font, colour or a positive gap). With the defaults the
+ * marker stays a single `number + separator` text run.
+ */
+function resolveSeparatorRun(level, numberFontString, dpi, bodyFontSizePx) {
+    if (level.separator.length === 0)
+        return undefined;
+    const fontSizePx = dimensionToPx(level.fontSize, dpi, bodyFontSizePx);
+    const fontString = buildFontString(level.separatorFontFamily, fontSizePx, level.separatorFontWeight.toString(), level.separatorItalic ? 'italic' : 'normal');
+    const gapPx = dimensionToPx(level.separatorGap, dpi, bodyFontSizePx);
+    const color = level.separatorColor.hex;
+    if (fontString === numberFontString && color === level.color.hex && gapPx === 0)
+        return undefined;
+    return { fontString, color, gapPx };
+}
 /**
  * Compute the effective indent in px for each list level. User-overridden
  * `indent` is honored directly. Otherwise level 1 falls back to the general
@@ -46,8 +66,15 @@ export function computeOrderedLevelIndentsPx(resolved, bodyFontSizePx, maxNumber
     const lists = resolved.orderedLists;
     return computeIndentCascade(lists.levels, dimensionToPx(lists.indent, dpi, bodyFontSizePx), dimensionToPx(lists.gap, dpi, bodyFontSizePx), dpi, bodyFontSizePx, 
     // 1-based depth of the previous level = prevIndex + 1.
-    (prev, prevFontString, prevIndex) => maxNumberWidthByDepth.get(prevIndex + 1)
-        ?? measureGlyphWidth('99' + prev.separator, prevFontString));
+    (prev, prevFontString, prevIndex) => {
+        const measured = maxNumberWidthByDepth.get(prevIndex + 1);
+        if (measured !== undefined)
+            return measured;
+        const sep = resolveSeparatorRun(prev, prevFontString, dpi, bodyFontSizePx);
+        if (!sep)
+            return measureGlyphWidth('99' + prev.separator, prevFontString);
+        return measureGlyphWidth('99', prevFontString) + sep.gapPx + measureGlyphWidth(prev.separator, sep.fontString);
+    });
 }
 function toRoman(n) {
     if (n <= 0 || n >= 4000)
@@ -99,11 +126,10 @@ export function computeOrderedListRunMetrics(contentBlocks, resolved, bodyFontSi
     const perBlock = new Map();
     const maxWidthByDepth = new Map();
     const runsByDepth = new Map();
-    // Pre-compute per-level font strings (used to measure number widths).
-    const levelFontStrings = lists.levels.map((lvl) => {
-        const fontSizePx = dimensionToPx(lvl.fontSize, dpi, bodyFontSizePx);
-        return buildFontString(lvl.fontFamily, fontSizePx, lvl.fontWeight.toString(), lvl.italic ? 'italic' : 'normal');
-    });
+    // Pre-compute per-level font strings (used to measure number widths) and
+    // the separator run style when it differs from the number's.
+    const levelFontStrings = lists.levels.map((lvl) => levelNumberFontString(lvl, dpi, bodyFontSizePx));
+    const levelSeparatorRuns = lists.levels.map((lvl, i) => resolveSeparatorRun(lvl, levelFontStrings[i], dpi, bodyFontSizePx));
     const closeRun = (depth) => {
         const run = runsByDepth.get(depth);
         if (!run || run.kind !== 'ordered' || run.itemIdxs.length === 0) {
@@ -112,6 +138,10 @@ export function computeOrderedListRunMetrics(contentBlocks, resolved, bodyFontSi
         }
         const levelIdx = Math.max(0, Math.min(levelFontStrings.length - 1, depth - 1));
         const fontString = levelFontStrings[levelIdx];
+        const sepRun = levelSeparatorRuns[levelIdx];
+        const separator = lists.levels[levelIdx].separator;
+        // The separator is the same string in the same font for the whole run.
+        const separatorWidthPx = sepRun ? measureGlyphWidth(separator, sepRun.fontString) : 0;
         let maxWidth = 0;
         const widths = new Map();
         for (const idx of run.itemIdxs) {
@@ -129,10 +159,14 @@ export function computeOrderedListRunMetrics(contentBlocks, resolved, bodyFontSi
                 continue;
             entry.numberWidthPx = widths.get(idx) ?? 0;
             entry.maxNumberWidthPx = maxWidth;
+            if (sepRun)
+                entry.separatorWidthPx = separatorWidthPx;
         }
+        // Marker column = right-aligned numbers (+ gap + separator when split).
+        const markerWidth = sepRun ? maxWidth + sepRun.gapPx + separatorWidthPx : maxWidth;
         const prevDepthMax = maxWidthByDepth.get(depth) ?? 0;
-        if (maxWidth > prevDepthMax)
-            maxWidthByDepth.set(depth, maxWidth);
+        if (markerWidth > prevDepthMax)
+            maxWidthByDepth.set(depth, markerWidth);
         runsByDepth.delete(depth);
     };
     const closeAllRuns = () => {
@@ -170,8 +204,20 @@ export function computeOrderedListRunMetrics(contentBlocks, resolved, bodyFontSi
             run.itemIdxs.push(i);
             const levelIdx = Math.max(0, Math.min(lists.levels.length - 1, depth - 1));
             const levelCfg = lists.levels[levelIdx];
-            const numberText = formatListNumber(counter, levelCfg.numberFormat) + levelCfg.separator;
-            perBlock.set(i, { numberText, numberWidthPx: 0, maxNumberWidthPx: 0 });
+            const sepRun = levelSeparatorRuns[levelIdx];
+            const number = formatListNumber(counter, levelCfg.numberFormat);
+            perBlock.set(i, sepRun
+                ? {
+                    numberText: number,
+                    numberWidthPx: 0,
+                    maxNumberWidthPx: 0,
+                    separatorText: levelCfg.separator,
+                    separatorFontString: sepRun.fontString,
+                    separatorColor: sepRun.color,
+                    separatorGapPx: sepRun.gapPx,
+                    separatorWidthPx: 0,
+                }
+                : { numberText: number + levelCfg.separator, numberWidthPx: 0, maxNumberWidthPx: 0 });
         }
     }
     closeAllRuns();
@@ -236,10 +282,7 @@ export function resolveOrderedListItemStyle(depth, resolved, levelIndentsPx, met
     const lists = resolved.orderedLists;
     const levelIdx = Math.max(0, Math.min(lists.levels.length - 1, depth - 1));
     const levelConfig = lists.levels[levelIdx];
-    const numberFontSizePx = dimensionToPx(levelConfig.fontSize, dpi, bodyStyle.fontSizePx);
-    const numberWeight = levelConfig.fontWeight.toString();
-    const numberStyle = levelConfig.italic ? 'italic' : 'normal';
-    const numberFontString = buildFontString(levelConfig.fontFamily, numberFontSizePx, numberWeight, numberStyle);
+    const numberFontString = levelNumberFontString(levelConfig, dpi, bodyStyle.fontSizePx);
     const indentPx = levelIndentsPx[levelIdx] ?? 0;
     const gapPx = dimensionToPx(lists.gap, dpi, bodyStyle.fontSizePx);
     const itemSpacingPx = dimensionToPx(lists.itemSpacing, dpi, bodyStyle.fontSizePx);
@@ -249,6 +292,14 @@ export function resolveOrderedListItemStyle(depth, resolved, levelIndentsPx, met
     // Right-align: reserve max width so text starts after `indent + maxWidth + gap`.
     // The individual number is drawn at `indent + (maxWidth - thisWidth)`.
     const rightAlignOffsetPx = Math.max(0, metric.maxNumberWidthPx - metric.numberWidthPx);
+    // A distinct separator run follows the (right-aligned) number column, so
+    // it lands in the same column for every item of the run.
+    const separatorGapPx = metric.separatorGapPx ?? 0;
+    const separatorWidthPx = metric.separatorWidthPx ?? 0;
+    const hasSeparatorRun = metric.separatorText !== undefined;
+    const markerWidthPx = hasSeparatorRun
+        ? metric.maxNumberWidthPx + separatorGapPx + separatorWidthPx
+        : metric.maxNumberWidthPx;
     const text = {
         ...bodyStyle,
         marginTopPx,
@@ -263,13 +314,19 @@ export function resolveOrderedListItemStyle(depth, resolved, levelIndentsPx, met
         bulletColor: levelConfig.color.hex,
         // Report the MAX width so the common text-shift math (`indent + bulletWidth + gap`)
         // still carves out the full numbered column for every item in the run.
-        bulletWidthPx: metric.maxNumberWidthPx,
+        bulletWidthPx: markerWidthPx,
         gapPx,
         hangingIndent: lists.hangingIndent,
         itemSpacingPx,
         textFontSizePx: bodyStyle.fontSizePx,
         verticalOffsetPx,
     };
+    if (hasSeparatorRun) {
+        bullet.separatorText = metric.separatorText;
+        bullet.separatorFontString = metric.separatorFontString;
+        bullet.separatorColor = metric.separatorColor;
+        bullet.separatorOffsetPx = metric.numberWidthPx + separatorGapPx;
+    }
     return {
         text,
         bullet,