postext 0.3.19 → 0.3.21

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

@@ -1 +1 @@
-{"version":3,"file":"placement.d.ts","sourceRoot":"","sources":["../../src/pipeline/placement.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,WAAW,EAChB,KAAK,QAAQ,EACb,KAAK,OAAO,EACZ,KAAK,OAAO,EACZ,KAAK,SAAS,EACf,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAGnD,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,OAAO,EAAE,EAChB,YAAY,EAAE,MAAM,GACnB,OAAO,EAAE,CAMX;AAED,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,cAAc,EACxB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,GACnB,OAAO,CAOT;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,eAAe,GAAG,SAAS,CAElF;AAED,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,cAAc,EACxB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,GAClC,IAAI,CAsBN;AAED;;;0BAG0B;AAC1B,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,cAAc,EACxB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,GAClC,IAAI,CAQN;AAED;;;;;;;;;;0EAU0E;AAC1E,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,cAAc,EACxB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,kBAAkB,GACzB,IAAI,CAqCN;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,QAAQ,EACf,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,eAAe,EACvB,GAAG,EAAE,WAAW,EAChB,QAAQ,EAAE,cAAc,EACxB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,GACnB,MAAM,CAkBR;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,QAAQ,EACf,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,SAAS,EACd,MAAM,EAAE,eAAe,GACtB,IAAI,CAeN"}
+{"version":3,"file":"placement.d.ts","sourceRoot":"","sources":["../../src/pipeline/placement.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/placement.js

@@ -1,5 +1,7 @@
 import { createBoundingBox, createVDTPage, createVDTColumn, } from '../vdt';
 import { computeColumnBboxes } from './config';
+import { contentAreaForPage, mirrorContentArea } from './buildHelpers';
+import { dimensionToPx } from '../units';
 export function resetLinePositions(lines, lineHeightPx) {
     return lines.map((line, i) => ({
         ...line,
@@ -8,16 +10,150 @@ export function resetLinePositions(lines, lineHeightPx) {
     }));
 }
 export function createPageWithColumns(pageIndex, resolved, contentArea, pageWidthPx, pageHeightPx) {
-    const page = createVDTPage(pageIndex, pageWidthPx, pageHeightPx);
-    const colBboxes = computeColumnBboxes(contentArea, resolved);
+    // `contentArea` is the recto (odd-page) area; mirrored margins swap the
+    // inner/outer margins on even pages. `pageIndex` is the page's position in
+    // `doc.pages`, so page number = index + 1.
+    const pageArea = contentAreaForPage({ contentArea, pageWidthPx }, resolved, pageIndex);
+    const page = createVDTPage(pageIndex, pageWidthPx, pageHeightPx, pageArea);
+    const colBboxes = computeColumnBboxes(pageArea, resolved);
     for (let i = 0; i < colBboxes.length; i++) {
         page.columns.push(createVDTColumn(i, colBboxes[i]));
     }
     return page;
 }
+/** Turn a freshly opened (empty) page into a part-divider page: a single
+ *  body column inset from the trim box by `parts.margins` (mirrored on even
+ *  pages when `parts.margins.mirror` is on), `page.contentArea` set to that
+ *  area, `partInfo` stamped and the role fixed to `'part'`. The opener
+ *  design is laid out later by `buildHeadersAndFooters` against the full
+ *  trim box and never reserves body space. */
+export function createPartPage(page, metrics, resolved, info) {
+    const dpi = resolved.page.dpi;
+    const m = resolved.parts.margins;
+    const trim = metrics.trimBox;
+    const top = dimensionToPx(m.top, dpi);
+    const bottom = dimensionToPx(m.bottom, dpi);
+    const left = dimensionToPx(m.left, dpi);
+    const right = dimensionToPx(m.right, dpi);
+    let area = createBoundingBox(trim.x + left, trim.y + top, Math.max(0, trim.width - left - right), Math.max(0, trim.height - top - bottom));
+    const isEvenPage = (page.index + 1) % 2 === 0;
+    if (m.mirror && isEvenPage)
+        area = mirrorContentArea(area, metrics.pageWidthPx);
+    page.contentArea = area;
+    page.columns = [createVDTColumn(0, area)];
+    page.partInfo = {
+        number: info.number,
+        title: info.title,
+        titleSourceStart: info.titleSourceStart,
+        titleSourceEnd: info.titleSourceEnd,
+    };
+    page.role = 'part';
+    return page;
+}
 export function currentColumn(doc, cursor) {
     return doc.pages[cursor.pageIndex].columns[cursor.columnIndex];
 }
+/** Whether any column of the page — text or span — holds a placed block.
+ *  Floats live outside the columns and do not count. */
+export function pageHasContent(page) {
+    return page.columns.some((c) => c.blocks.length > 0);
+}
+// ---------------------------------------------------------------------------
+// Column bands (page-span blocks, stage 1)
+//
+// `page.columns` stays a flat array in reading order. A page-span inline
+// block occupies its own full-width column (`kind: 'span'`); the text
+// columns of the band it interrupts are closed at the cut line and a fresh
+// band of text columns (`band + 1`) is appended below it with the same
+// x / width and the same bottom as the closed band. Column indices are
+// monotonic — columns are only ever appended — so `block.columnIndex` keeps
+// addressing `page.columns[i]` and renderers need no drawing changes: each
+// column clips to its own bbox.
+// ---------------------------------------------------------------------------
+/** Text columns of `band` in reading order (span columns excluded). */
+export function bandColumns(page, band) {
+    return page.columns.filter((c) => c.kind !== 'span' && (c.band ?? 0) === band);
+}
+/** Band the cursor's column belongs to (`0` for the plain single-band page). */
+export function currentBand(page, cursor) {
+    return page.columns[cursor.columnIndex]?.band ?? 0;
+}
+/** True when every column of the band has consumed the same height (within
+ *  0.5px) — the page top, right after an opener heading (which reserves its
+ *  band in every column), right after another span block, or right after a
+ *  top float band. Used height = `bbox.height − availableHeight`. */
+export function isBandLevel(cols) {
+    if (cols.length === 0)
+        return false;
+    const used0 = cols[0].bbox.height - cols[0].availableHeight;
+    return cols.every((c) => Math.abs((c.bbox.height - c.availableHeight) - used0) <= 0.5);
+}
+/** Lowest used bottom (absolute y) across the band's columns — where a
+ *  full-width block can start without covering placed content. */
+export function bandUsedBottom(cols) {
+    let bottom = -Infinity;
+    for (const c of cols) {
+        bottom = Math.max(bottom, c.bbox.y + (c.bbox.height - c.availableHeight));
+    }
+    return bottom;
+}
+/**
+ * Close the band formed by `cols` at `cutY`, insert a full-width span column
+ * holding `block` right below the cut, and open a fresh band of text columns
+ * under it. The band's columns are clamped to `cutY` — a column whose top
+ * already sits at the cut becomes zero-height — and keep only the slack
+ * between their used bottom and the cut in `availableHeight` (zero when the
+ * band is level on the grid; whole lines when a band cap cut the band with
+ * its last column short, so column balancing can still fill them). The span
+ * column is `{ kind: 'span', band }` at `contentArea.x / width`, `needPx`
+ * tall (the block plus its spacing, already rounded to the grid by the
+ * caller); `block` is placed inside it at `spacingBefore` below the cut with
+ * height `blockHeight` (default: the rest of the band), so `block.pageIndex`
+ * / `columnIndex` address the span column.
+ *
+ * The new text columns (`band + 1`) copy each closed column's x / width and
+ * keep its original bottom (so a bottom float band reserved on one column
+ * still constrains its successor). A column with no room left (bottom
+ * within 0.5px of the new band's top) is not created; when none is, the
+ * cursor stays on the span column — which is full — so the next placement
+ * advances to a new page. Otherwise the cursor moves to the first new
+ * column. Returns the span column.
+ */
+export function closeBandAndInsertSpan(page, cols, cutY, block, needPx, cursor, spacingBefore = 0, blockHeight = needPx - spacingBefore) {
+    const band = cols[0]?.band ?? 0;
+    const bottoms = cols.map((c) => c.bbox.y + c.bbox.height);
+    for (const c of cols) {
+        const used = c.bbox.height - c.availableHeight;
+        c.band = band;
+        c.bbox.height = Math.max(0, cutY - c.bbox.y);
+        c.availableHeight = Math.max(0, c.bbox.height - used);
+    }
+    const spanCol = createVDTColumn(page.columns.length, createBoundingBox(page.contentArea.x, cutY, page.contentArea.width, needPx));
+    spanCol.kind = 'span';
+    spanCol.band = band;
+    page.columns.push(spanCol);
+    cursor.pageIndex = page.index;
+    cursor.columnIndex = spanCol.index;
+    if (spacingBefore > 0)
+        spanCol.availableHeight -= spacingBefore;
+    placeBlockInColumn(block, blockHeight, spanCol, cursor);
+    spanCol.availableHeight = 0;
+    const newTop = cutY + needPx;
+    let firstNew;
+    cols.forEach((c, i) => {
+        const height = bottoms[i] - newTop;
+        if (height < 0.5)
+            return;
+        const next = createVDTColumn(page.columns.length, createBoundingBox(c.bbox.x, newTop, c.bbox.width, height));
+        next.band = band + 1;
+        page.columns.push(next);
+        if (!firstNew)
+            firstNew = next;
+    });
+    if (firstNew)
+        cursor.columnIndex = firstNew.index;
+    return spanCol;
+}
 export function advanceToNextColumn(doc, cursor, resolved, contentArea, pageWidthPx, pageHeightPx, onNewPage) {
     const page = doc.pages[cursor.pageIndex];
     if (cursor.columnIndex < page.columns.length - 1) {
@@ -41,9 +177,9 @@ export function advanceToNextColumn(doc, cursor, resolved, contentArea, pageWidt
  *  emitting a blank leading page when a `:::pagebreak` directive lands
  *  before any content. */
 export function advanceToNextPageBoundary(doc, cursor, resolved, contentArea, pageWidthPx, pageHeightPx, onNewPage) {
-    const curPage = doc.pages[cursor.pageIndex];
-    const curPageEmpty = curPage.columns.every((c) => c.blocks.length === 0);
-    if (curPageEmpty)
+    // Span columns hold their block like any other column, so a page whose
+    // only content is a page-span block counts as non-empty here.
+    if (!pageHasContent(doc.pages[cursor.pageIndex]))
         return;
     const startPageIndex = cursor.pageIndex;
     do {
@@ -101,18 +237,19 @@ export function enforcePageParity(doc, cursor, resolved, contentArea, pageWidthP
     }
 }
 /**
- * Place a resource block (image / svg / table + caption) keeping it together as
- * one atomic unit (issue #49 §7 — Placement). Resources never split mid-content
- * for v1: if the group's combined height fits the remaining column space it is
- * placed there; otherwise the cursor advances to the next column/page (without
- * emitting a leading blank page when the current column is empty), and the
- * resource is force-placed there even when it exceeds a single column's height.
+ * Place an atomic block — a resource group (image / svg / table + caption,
+ * issue #49 §7) or a callout frame — keeping it together as one unit. Atomic
+ * blocks never split mid-content for v1: if the group's combined height fits
+ * the remaining column space it is placed there; otherwise the cursor advances
+ * to the next column/page (without emitting a leading blank page when the
+ * current column is empty), and the block is force-placed there even when it
+ * exceeds a single column's height.
  *
  * `spacingBefore` is consumed from the target column's available height before
  * placement (collapsed against the previous block's bottom margin by the
  * caller). Returns the height actually reserved for the block.
  */
-export function placeResourceBlock(block, groupHeight, spacingBefore, cursor, doc, resolved, contentArea, pageWidthPx, pageHeightPx) {
+export function placeAtomicBlock(block, groupHeight, spacingBefore, cursor, doc, resolved, contentArea, pageWidthPx, pageHeightPx) {
     let col = currentColumn(doc, cursor);
     const isFirstInColumn = col.blocks.length === 0;
     const effectiveSpacing = isFirstInColumn ? 0 : spacingBefore;
@@ -130,6 +267,8 @@ export function placeResourceBlock(block, groupHeight, spacingBefore, cursor, do
     placeBlockInColumn(block, groupHeight, col, cursor);
     return groupHeight;
 }
+/** @deprecated Use {@link placeAtomicBlock}. */
+export const placeResourceBlock = placeAtomicBlock;
 export function placeBlockInColumn(block, blockHeight, col, cursor) {
     const y = col.bbox.y + (col.bbox.height - col.availableHeight);
     block.bbox = createBoundingBox(col.bbox.x, y, col.bbox.width, blockHeight);

package/dist/pipeline/placement.js.map

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

package/dist/pipeline/resourceLayout.d.ts

@@ -10,17 +10,23 @@
  *  - bitmap / svg: scale to the column width, preserving aspect ratio. The
  *    height follows from the intrinsic dimensions; svgs without intrinsic
  *    dimensions fall back to a 4:3 box at column width.
- *  - table: equal column split; each cell measured via the shared rich-text
- *    measurer; row height = max cell height (rowspans distribute across rows).
+ *  - table: columns split by `TableModel.columnWidths` weights (equal split
+ *    when unset); each cell measured via the shared rich-text measurer; row
+ *    height = max cell height (rowspans distribute across rows).
  *  - caption: measured via the rich-text measurer with the caption font, with
  *    the type's caption prefix + number prepended. Inline `:ref` spans resolve
  *    to their computed label and are tagged so renderers can colour / link them.
+ *    Sits below the body by default or above it (`captionStyle.position`),
+ *    optionally on a background bar spanning the block width. A resource type
+ *    may override the caption style partially (`ResourceType.captionStyle`).
+ *  - note: an optional smaller run (`Resource.note`) placed under the body when
+ *    the caption is above, otherwise under the caption.
  *
- * Resource + caption are measured as one group; `totalHeight` is what goes to
- * placement (resources paginate atomically — no mid-split for v1).
+ * Resource + caption + note are measured as one group; `totalHeight` is what
+ * goes to placement (resources paginate atomically — no mid-split for v1).
  */
 import type { InlineSpan } from '../parse';
-import type { Resource, ResourceType } from '../types';
+import type { Resource, ResourceType, TableModel } from '../types';
 import type { ResolvedConfig, ResolvedResourceBlock } from '../vdt';
 import type { ResourceNumberingMap } from './resourceNumbering';
 export interface ResourceLayoutInput {
@@ -45,6 +51,13 @@ export declare function resolveRefSpans(spans: InlineSpan[], resourceNumbering:
     bold: boolean;
     italic: boolean;
 }): InlineSpan[];
+/**
+ * Column x-edges (length = columnCount + 1) for a table model laid out at
+ * `columnWidth`. `TableModel.columnWidths` are relative weights, normalised so
+ * they always fill the width exactly; a missing array, a wrong length, or any
+ * non-positive / non-finite weight falls back to an equal split.
+ */
+export declare function computeColumnEdges(model: TableModel, columnWidth: number): number[];
 /**
  * Measure a resource block (image / svg / table) plus its caption into a
  * placement-ready {@link ResolvedResourceBlock}. Returns the block and its

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

@@ -1 +1 @@
-{"version":3,"file":"resourceLayout.d.ts","sourceRoot":"","sources":["../../src/pipeline/resourceLayout.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EACV,QAAQ,EACR,YAAY,EAIb,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EACV,cAAc,EACd,qBAAqB,EAItB,MAAM,QAAQ,CAAC;AAMhB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAMhE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,QAAQ,CAAC;IACnB,YAAY,EAAE,YAAY,GAAG,SAAS,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,cAAc,CAAC;IACzB,oCAAoC;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,2EAA2E;IAC3E,iBAAiB,EAAE,oBAAoB,CAAC;IACxC,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,SAAS,EAAE,QAAQ,EAAE,CAAC;CACvB;AAED;wEACwE;AACxE,wBAAgB,eAAe,CAC7B,GAAG,EAAE,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EACnC,iBAAiB,EAAE,oBAAoB,EACvC,aAAa,EAAE,YAAY,EAAE,EAC7B,SAAS,EAAE,QAAQ,EAAE,GACpB,MAAM,CAcR;AAWD;;6EAE6E;AAC7E,wBAAgB,eAAe,CAC7B,KAAK,EAAE,UAAU,EAAE,EACnB,iBAAiB,EAAE,oBAAoB,EACvC,aAAa,EAAE,YAAY,EAAE,EAC7B,SAAS,EAAE,QAAQ,EAAE,EACrB,QAAQ,CAAC,EAAE;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,GAC5C,UAAU,EAAE,CAcd;AA+LD;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,mBAAmB,GAAG;IAC/D,KAAK,EAAE,qBAAqB,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;CACrB,CA2KA"}
+{"version":3,"file":"resourceLayout.d.ts","sourceRoot":"","sources":["../../src/pipeline/resourceLayout.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAW,MAAM,UAAU,CAAC;AACpD,OAAO,KAAK,EAEV,QAAQ,EACR,YAAY,EACZ,UAAU,EAIX,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EACV,cAAc,EACd,qBAAqB,EAItB,MAAM,QAAQ,CAAC;AAOhB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAMhE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,QAAQ,CAAC;IACnB,YAAY,EAAE,YAAY,GAAG,SAAS,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,cAAc,CAAC;IACzB,oCAAoC;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,2EAA2E;IAC3E,iBAAiB,EAAE,oBAAoB,CAAC;IACxC,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,SAAS,EAAE,QAAQ,EAAE,CAAC;CACvB;AAED;wEACwE;AACxE,wBAAgB,eAAe,CAC7B,GAAG,EAAE,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EACnC,iBAAiB,EAAE,oBAAoB,EACvC,aAAa,EAAE,YAAY,EAAE,EAC7B,SAAS,EAAE,QAAQ,EAAE,GACpB,MAAM,CAcR;AA4BD;;6EAE6E;AAC7E,wBAAgB,eAAe,CAC7B,KAAK,EAAE,UAAU,EAAE,EACnB,iBAAiB,EAAE,oBAAoB,EACvC,aAAa,EAAE,YAAY,EAAE,EAC7B,SAAS,EAAE,QAAQ,EAAE,EACrB,QAAQ,CAAC,EAAE;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,GAC5C,UAAU,EAAE,CAcd;AAuDD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,CAsBnF;AAkJD;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,mBAAmB,GAAG;IAC/D,KAAK,EAAE,qBAAqB,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;CACrB,CA6PA"}

package/dist/pipeline/resourceLayout.js

@@ -10,19 +10,26 @@
  *  - bitmap / svg: scale to the column width, preserving aspect ratio. The
  *    height follows from the intrinsic dimensions; svgs without intrinsic
  *    dimensions fall back to a 4:3 box at column width.
- *  - table: equal column split; each cell measured via the shared rich-text
- *    measurer; row height = max cell height (rowspans distribute across rows).
+ *  - table: columns split by `TableModel.columnWidths` weights (equal split
+ *    when unset); each cell measured via the shared rich-text measurer; row
+ *    height = max cell height (rowspans distribute across rows).
  *  - caption: measured via the rich-text measurer with the caption font, with
  *    the type's caption prefix + number prepended. Inline `:ref` spans resolve
  *    to their computed label and are tagged so renderers can colour / link them.
+ *    Sits below the body by default or above it (`captionStyle.position`),
+ *    optionally on a background bar spanning the block width. A resource type
+ *    may override the caption style partially (`ResourceType.captionStyle`).
+ *  - note: an optional smaller run (`Resource.note`) placed under the body when
+ *    the caption is above, otherwise under the caption.
  *
- * Resource + caption are measured as one group; `totalHeight` is what goes to
- * placement (resources paginate atomically — no mid-split for v1).
+ * Resource + caption + note are measured as one group; `totalHeight` is what
+ * goes to placement (resources paginate atomically — no mid-split for v1).
  */
 import { createBoundingBox } from '../vdt';
 import { measureRichBlock, buildFontString } from '../measure';
 import { dimensionToPx } from '../units';
 import { extractInlineRefs, injectRefSpans, parseInlineFormatting } from '../parse/inlineFormatting';
+import { mergeCaptionStyle } from '../defaults/captionStyle';
 import { resolveBodyStyle } from './styles';
 /** Non-breaking space used to glue a resolved `:ref` label into a single
  *  atomic text token, so a post-measurement pass can tag it reliably. */
@@ -39,13 +46,30 @@ export function resolveRefLabel(ref, resourceNumbering, resourceTypes, resources
     const resource = resources.find((r) => r.id === ref.resourceId);
     const type = resource ? resourceTypes.find((t) => t.id === resource.typeId) : undefined;
     if (ref.style === 'full') {
-        const name = type?.name ?? type?.shortLabel ?? '';
+        const name = applyRefCase(type?.name ?? type?.shortLabel ?? '', ref.case);
         return name ? `${name}${NBSP}${number}` : number;
     }
     // default: short label + number (e.g. "Fig. 1.7")
-    const short = type?.shortLabel ?? type?.name ?? '';
+    const short = applyRefCase(type?.shortLabel ?? type?.name ?? '', ref.case);
     return short ? `${short}${NBSP}${number}` : number;
 }
+/** Apply a `:ref{case=…}` transform to the label part of a computed
+ *  reference (`Fig.` / `Figure`). The number is never touched — the caller
+ *  joins it afterwards — and `text=` overrides bypass this entirely. */
+function applyRefCase(label, refCase) {
+    if (refCase === undefined || label.length === 0)
+        return label;
+    switch (refCase) {
+        case 'lower':
+            return label.toLocaleLowerCase();
+        case 'upper':
+            return label.toLocaleUpperCase();
+        case 'capitalize': {
+            const first = [...label][0];
+            return first.toLocaleUpperCase() + label.slice(first.length);
+        }
+    }
+}
 /** Parse caption / table-cell content into inline spans, recognising the same
  *  inline `:ref{…}` microformat as body text so references inside captions and
  *  cells resolve to their computed labels (the cell/caption is self-contained,
@@ -93,17 +117,51 @@ function fitWidth(intrinsicW, intrinsicH, columnWidth) {
     const height = (intrinsicH / intrinsicW) * width;
     return { width, height };
 }
-/** Lay out an HTML-table resource: equal column split, per-cell rich-text
- *  measurement, row height = max measured cell height. Rowspans reserve their
- *  primary cell's full vertical extent. */
+/** Smallest border thickness (px) we let through: thinner rules would vanish
+ *  on screen, but 0.5pt (≈0.67px at 96dpi) hairlines must survive intact —
+ *  the previous `max(1, round(px))` rounded them up to a full pixel. */
+const MIN_BORDER_PX = 0.25;
+/**
+ * Column x-edges (length = columnCount + 1) for a table model laid out at
+ * `columnWidth`. `TableModel.columnWidths` are relative weights, normalised so
+ * they always fill the width exactly; a missing array, a wrong length, or any
+ * non-positive / non-finite weight falls back to an equal split.
+ */
+export function computeColumnEdges(model, columnWidth) {
+    const colCount = model.rows.length > 0 ? Math.max(...model.rows.map((r) => r.length)) : 0;
+    const weights = model.columnWidths;
+    const valid = weights !== undefined
+        && weights.length === colCount
+        && weights.every((w) => Number.isFinite(w) && w > 0);
+    const edges = [0];
+    if (colCount === 0)
+        return edges;
+    if (!valid) {
+        const colWidth = columnWidth / colCount;
+        for (let c = 1; c <= colCount; c++)
+            edges.push(c * colWidth);
+        return edges;
+    }
+    const total = weights.reduce((sum, w) => sum + w, 0);
+    let acc = 0;
+    for (let c = 0; c < colCount; c++) {
+        acc += (weights[c] / total) * columnWidth;
+        edges.push(acc);
+    }
+    // Snap the last edge so floating-point drift never leaves a sliver.
+    edges[colCount] = columnWidth;
+    return edges;
+}
+/** Lay out an HTML-table resource: weighted column split (see
+ *  {@link computeColumnEdges}), per-cell rich-text measurement, row height =
+ *  max measured cell height. Rowspans reserve their primary cell's full
+ *  vertical extent. */
 function layoutTable(model, columnWidth, style, resourceNumbering, resourceTypes, resources, refStyle) {
     const { body, header, borderColor, borderWidthPx, cellPaddingPx } = style;
     const rowCount = model.rows.length;
     const colCount = rowCount > 0 ? Math.max(...model.rows.map((r) => r.length)) : 0;
-    const colWidth = colCount > 0 ? columnWidth / colCount : columnWidth;
-    const columnEdges = [];
-    for (let c = 0; c <= colCount; c++)
-        columnEdges.push(c * colWidth);
+    const columnEdges = computeColumnEdges(model, columnWidth);
+    const spanWidth = (col, colSpan) => (columnEdges[Math.min(col + colSpan, colCount)] ?? columnWidth) - (columnEdges[col] ?? 0);
     const measured = [];
     const rowMinHeight = new Array(rowCount).fill(body.lineHeightPx);
     for (let r = 0; r < rowCount; r++) {
@@ -116,7 +174,7 @@ function layoutTable(model, columnWidth, style, resourceNumbering, resourceTypes
             const rowSpan = Math.max(1, cell.rowSpan ?? 1);
             const isHeader = cell.isHeader ?? r < (model.headerRowCount ?? 0);
             const set = isHeader ? header : body;
-            const cellWidth = colSpan * colWidth - cellPaddingPx * 2;
+            const cellWidth = spanWidth(c, colSpan) - cellPaddingPx * 2;
             const spans = resolveRefSpans(parseRefAwareSpans(cell.content), resourceNumbering, resourceTypes, resources, refStyle);
             const m = measureRichBlock(spans, set.fontString, set.boldFontString, set.italicFontString, set.boldItalicFontString, Math.max(1, cellWidth), set.lineHeightPx, { textAlign: cell.align === 'center' ? 'center' : cell.align === 'right' ? 'left' : 'left' });
             const contentHeight = Math.max(set.lineHeightPx, m.totalHeight) + cellPaddingPx * 2;
@@ -193,6 +251,7 @@ function layoutTable(model, columnWidth, style, resourceNumbering, resourceTypes
         cells,
         columnEdges,
         rowEdges,
+        rules: style.rules,
     };
     return { layout, height: tableHeight };
 }
@@ -266,22 +325,25 @@ export function layoutResourceBlock(input) {
                 lineHeightPx: headerFontPx * lineHeightRatio,
             },
             borderColor: ts.borderColor.hex,
-            borderWidthPx: ts.borders ? Math.max(1, Math.round(dimensionToPx(ts.borderWidth, dpi))) : 0,
+            borderWidthPx: ts.borders && ts.rules !== 'none'
+                ? Math.max(MIN_BORDER_PX, dimensionToPx(ts.borderWidth, dpi))
+                : 0,
             cellPaddingPx: dimensionToPx(ts.cellPadding, dpi, bodyFontPx),
             headerBackground: ts.headerBackgroundEnabled ? ts.headerBackground.hex : undefined,
             bodyBackground: ts.bodyBackgroundEnabled ? ts.bodyBackground.hex : undefined,
+            rules: ts.rules,
         };
         const { layout, height } = layoutTable(resource.table.model, columnWidth, style, resourceNumbering, resourceTypes, resources, refStyle);
         table = layout;
         bodyWidth = columnWidth;
         bodyHeight = height;
     }
-    const bodyRect = createBoundingBox(0, 0, bodyWidth, bodyHeight);
     // --- Caption -----------------------------------------------------------
-    const cs = resolved.captionStyle;
+    const cs = mergeCaptionStyle(resolved.captionStyle, resourceType?.captionStyle, resolved.colorPalette);
     const captionFontPx = dimensionToPx(cs.fontSize, dpi);
     const captionLineHeightPx = captionFontPx * lineHeightRatio;
     const captionGapPx = dimensionToPx(cs.gap, dpi, captionFontPx);
+    const captionPaddingPx = cs.backgroundEnabled ? dimensionToPx(cs.padding, dpi, captionFontPx) : 0;
     // Caption font set (label + description share one typeface/size; weight and
     // slant vary per span).
     const captionFontString = buildFontString(cs.fontFamily, captionFontPx, normalWeight);
@@ -292,7 +354,8 @@ export function layoutResourceBlock(input) {
     // Inline `:ref` labels render in the configured reference colour (defaults to
     // the emphasis/bold colour).
     const linkColor = resolved.bodyText.referenceColor.hex;
-    let captionLines = [];
+    // Caption lines measured at the block origin (y = 0); positioned below.
+    let measuredCaption = [];
     const captionText = resource.caption ?? '';
     const hasCaption = captionText.trim().length > 0 || captionPrefix.length > 0;
     if (hasCaption) {
@@ -308,13 +371,65 @@ export function layoutResourceBlock(input) {
         const allSpans = prefixText.length > 0
             ? [{ text: prefixText, bold: cs.labelBold, italic: cs.labelItalic, captionLabel: true }, ...descSpans]
             : descSpans;
-        const measured = measureRichBlock(allSpans, captionFontString, captionBoldFontString, captionItalicFontString, captionBoldItalicFontString, Math.max(1, columnWidth), captionLineHeightPx, { textAlign: cs.align });
-        captionLines = shiftLines(measured.lines, 0, bodyHeight + captionGapPx);
+        const measured = measureRichBlock(allSpans, captionFontString, captionBoldFontString, captionItalicFontString, captionBoldItalicFontString, Math.max(1, columnWidth - captionPaddingPx * 2), captionLineHeightPx, { textAlign: cs.align });
+        measuredCaption = measured.lines;
+    }
+    const captionTextHeight = measuredCaption.length * captionLineHeightPx;
+    // Height of the caption band: the text plus the bar padding on both sides.
+    const captionBandHeight = measuredCaption.length > 0
+        ? captionTextHeight + captionPaddingPx * 2
+        : 0;
+    const captionHeight = captionBandHeight > 0 ? captionBandHeight + captionGapPx : 0;
+    // --- Note --------------------------------------------------------------
+    const noteFontPx = dimensionToPx(cs.note.fontSize, dpi);
+    const noteLineHeightPx = noteFontPx * lineHeightRatio;
+    const noteGapPx = dimensionToPx(cs.note.gap, dpi, noteFontPx);
+    const noteFontString = buildFontString(cs.fontFamily, noteFontPx, normalWeight);
+    const noteBoldFontString = buildFontString(cs.fontFamily, noteFontPx, boldWeight);
+    const noteItalicFontString = buildFontString(cs.fontFamily, noteFontPx, normalWeight, 'italic');
+    const noteBoldItalicFontString = buildFontString(cs.fontFamily, noteFontPx, boldWeight, 'italic');
+    let measuredNote = [];
+    const noteText = resource.note ?? '';
+    if (noteText.trim().length > 0) {
+        const noteSpans = resolveRefSpans(parseRefAwareSpans(noteText), resourceNumbering, resourceTypes, resources, refStyle);
+        const slanted = cs.note.italic
+            ? noteSpans.map((s) => ({ ...s, italic: s.italic || true }))
+            : noteSpans;
+        const measured = measureRichBlock(slanted, noteFontString, noteBoldFontString, noteItalicFontString, noteBoldItalicFontString, Math.max(1, columnWidth), noteLineHeightPx, { textAlign: cs.note.align });
+        measuredNote = measured.lines;
     }
-    const captionHeight = captionLines.length > 0
-        ? captionLines.length * captionLineHeightPx + captionGapPx
+    const noteHeight = measuredNote.length > 0
+        ? measuredNote.length * noteLineHeightPx + noteGapPx
         : 0;
-    const totalHeight = bodyHeight + captionHeight;
+    // --- Vertical stacking -------------------------------------------------
+    // above: [caption band] gap [body] noteGap [note]
+    // below: [body] gap [caption band] noteGap [note]
+    const captionAbove = cs.position === 'above' && captionBandHeight > 0;
+    const captionBandY = captionAbove ? 0 : bodyHeight + (captionBandHeight > 0 ? captionGapPx : 0);
+    const bodyY = captionAbove ? captionHeight : 0;
+    const bodyRect = createBoundingBox(0, bodyY, bodyWidth, bodyHeight);
+    // Table cells were laid out with the table's top at y = 0; when the caption
+    // sits above, move them down with the body (block-relative, like captions).
+    if (table && bodyY > 0) {
+        table = {
+            ...table,
+            cells: table.cells.map((cell) => ({
+                ...cell,
+                rect: createBoundingBox(cell.rect.x, cell.rect.y + bodyY, cell.rect.width, cell.rect.height),
+                lines: shiftLines(cell.lines, 0, bodyY),
+            })),
+        };
+    }
+    const captionLines = shiftLines(measuredCaption, captionPaddingPx, captionBandY + captionPaddingPx);
+    const captionBar = cs.backgroundEnabled && captionBandHeight > 0
+        ? {
+            rect: createBoundingBox(0, captionBandY, columnWidth, captionBandHeight),
+            background: cs.background.hex,
+        }
+        : undefined;
+    const noteY = (captionAbove ? bodyY + bodyHeight : bodyHeight + captionHeight) + noteGapPx;
+    const noteLines = shiftLines(measuredNote, 0, noteY);
+    const totalHeight = bodyHeight + captionHeight + noteHeight;
     const block = {
         resource,
         kind: resource.kind,
@@ -332,6 +447,13 @@ export function layoutResourceBlock(input) {
         captionLabelColor: cs.labelColor.hex,
         linkColor,
         table,
+        captionBar,
+        noteLines,
+        noteFontString,
+        noteBoldFontString,
+        noteItalicFontString,
+        noteBoldItalicFontString,
+        noteColor: cs.note.color.hex,
     };
     return { block, totalHeight };
 }