postext 1.4.2 → 1.5.1

package/dist/pipeline/raggedLines.js

@@ -1,7 +1,9 @@
+import { trackSegments } from '../knuthPlass/tracking';
+import { RAGGED_SPACE_RATIO } from '../knuthPlass/constants';
 /** Word-space ratio (justified over natural) past which a justified line
  *  is set ragged instead of stretched. Matches the sandbox's loose-line
  *  threshold, so such a line is fixed rather than flagged. */
-export const LINE_MAX_SPACE_RATIO = 3;
+export const LINE_MAX_SPACE_RATIO = RAGGED_SPACE_RATIO;
 /**
  * A justified line the breaker could not fill — a long link that breaks
  * only at its own joints, a list item whose last word cannot come up and
@@ -10,6 +12,11 @@ export const LINE_MAX_SPACE_RATIO = 3;
  * set such lines ragged (like a paragraph's last line): the text keeps its
  * natural spacing and the right edge gives instead. Lines within the
  * threshold are left as measured.
+ *
+ * A line set ragged also drops the justification tracking the breaker gave
+ * it (`VDTLine.letterSpacing`, `bodyText.maxJustifyTracking`): its letters
+ * go back to their natural widths too, rather than stay letter-spaced on a
+ * ragged edge.
  */
 export function raggedLooseLines(lines, textAlign) {
     if (textAlign !== 'justify')
@@ -19,10 +26,24 @@ export function raggedLooseLines(lines, textAlign) {
         if (line.isLastLine || line.justifiedSpaceRatio === undefined || line.justifiedSpaceRatio <= LINE_MAX_SPACE_RATIO)
             return line;
         changed = true;
-        const { justifiedSpaceRatio: _loose, ...rest } = line;
+        const { justifiedSpaceRatio: _loose, letterSpacing, ...rest } = line;
         void _loose;
-        return { ...rest, ragged: true };
+        if (!letterSpacing)
+            return { ...rest, ragged: true };
+        return { ...rest, ...untracked(line, letterSpacing), ragged: true };
     });
     return changed ? out : lines;
 }
+/** The segments and box of `line` without the `tracking` px a character
+ *  the reconstruction added to its text segments: `trackSegments` run again
+ *  with the opposite sign, so a stacked script pair (whose first run stays
+ *  at width 0 and whose second took the longer run's tracking) comes back
+ *  to its natural widths too. */
+function untracked(line, tracking) {
+    if (!line.segments)
+        return { bbox: line.bbox };
+    const segments = line.segments.map((seg) => (seg.kind === 'text' ? { ...seg } : seg));
+    const removed = -trackSegments(segments, -tracking);
+    return { segments, bbox: { ...line.bbox, width: line.bbox.width - removed } };
+}
 //# sourceMappingURL=raggedLines.js.map

package/dist/pipeline/raggedLines.js.map

@@ -1 +1 @@
-{"version":3,"file":"raggedLines.js","sourceRoot":"","sources":["../../src/pipeline/raggedLines.ts"],"names":[],"mappings":"AAEA;;8DAE8D;AAC9D,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAEtC;;;;;;;;GAQG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAgB,EAAE,SAA6B;IAC9E,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC1C,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC7B,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,mBAAmB,KAAK,SAAS,IAAI,IAAI,CAAC,mBAAmB,IAAI,oBAAoB;YAAE,OAAO,IAAI,CAAC;QAC/H,OAAO,GAAG,IAAI,CAAC;QACf,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;QACtD,KAAK,MAAM,CAAC;QACZ,OAAO,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACnC,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;AAC/B,CAAC"}
+{"version":3,"file":"raggedLines.js","sourceRoot":"","sources":["../../src/pipeline/raggedLines.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D;;8DAE8D;AAC9D,MAAM,CAAC,MAAM,oBAAoB,GAAG,kBAAkB,CAAC;AAEvD;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAgB,EAAE,SAA6B;IAC9E,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC1C,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC7B,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,mBAAmB,KAAK,SAAS,IAAI,IAAI,CAAC,mBAAmB,IAAI,oBAAoB;YAAE,OAAO,IAAI,CAAC;QAC/H,OAAO,GAAG,IAAI,CAAC;QACf,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;QACrE,KAAK,MAAM,CAAC;QACZ,IAAI,CAAC,aAAa;YAAE,OAAO,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACrD,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,SAAS,CAAC,IAAI,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACtE,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;AAC/B,CAAC;AAED;;;;iCAIiC;AACjC,SAAS,SAAS,CAAC,IAAa,EAAE,QAAgB;IAChD,IAAI,CAAC,IAAI,CAAC,QAAQ;QAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;IAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACtF,MAAM,OAAO,GAAG,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC;IACpD,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,OAAO,EAAE,EAAE,CAAC;AAChF,CAAC"}

package/dist/pipeline/resourceLayout.d.ts

@@ -98,10 +98,12 @@ export interface TableRowMetrics {
      *  or all header cells): a slice never ends on one when it can help it. */
     groupHeaderRow: boolean[];
 }
-/** Resolve the colour of every inline `:swatch{…}` span: a `#rgb` / `#rrggbb`
- *  hex is normalised to six digits; any other value is looked up as a
- *  document palette entry id. An unresolved colour is left as written (the
- *  measurer then draws an empty outline). Spans without a swatch pass through. */
+/** Resolve the colour of every inline `:swatch{…}` span: a `#rgb` / `#rgba`
+ *  hex is normalised to six / eight digits, a `#rrggbb` / `#rrggbbaa` one
+ *  lower-cased, an `rgb()` / `rgba()` colour kept as written; any other
+ *  value is looked up as a document palette entry id. An unresolved colour
+ *  is left as written (the measurer then draws an empty outline). Spans
+ *  without a swatch pass through. */
 export declare function resolveSwatchSpans(spans: InlineSpan[], palette: ColorPaletteEntry[] | undefined): InlineSpan[];
 /** Build a label for an inline `:ref` to a resource, honouring its `style` and
  *  optional override `text`. Mirrors the caption-prefix conventions. */

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

@@ -1 +1 @@
-{"version":3,"file":"resourceLayout.d.ts","sourceRoot":"","sources":["../../src/pipeline/resourceLayout.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resourceLayout.d.ts","sourceRoot":"","sources":["../../src/pipeline/resourceLayout.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAW,MAAM,UAAU,CAAC;AACpD,OAAO,KAAK,EACV,iBAAiB,EAEjB,QAAQ,EACR,gBAAgB,EAChB,YAAY,EAEZ,UAAU,EAIX,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EACV,cAAc,EACd,qBAAqB,EAOtB,MAAM,QAAQ,CAAC;AAoBhB,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;+EAC2E;IAC3E,WAAW,EAAE,MAAM,CAAC;IACpB;;;;oEAIgE;IAChE,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,+EAA+E;IAC/E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,2EAA2E;IAC3E,iBAAiB,EAAE,oBAAoB,CAAC;IACxC,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB;uCACmC;IACnC,KAAK,CAAC,EAAE,cAAc,CAAC;IACvB;;;;kEAI8D;IAC9D,YAAY,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACrF;8DAC0D;IAC1D,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;sBAGsB;AACtB,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;;yDAGyD;AACzD,MAAM,WAAW,eAAe;IAC9B,6EAA6E;IAC7E,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,sEAAsE;IACtE,cAAc,EAAE,MAAM,CAAC;IACvB;mCAC+B;IAC/B,cAAc,EAAE,OAAO,EAAE,CAAC;IAC1B;+EAC2E;IAC3E,cAAc,EAAE,OAAO,EAAE,CAAC;CAC3B;AAED;;;;;qCAKqC;AACrC,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,iBAAiB,EAAE,GAAG,SAAS,GAAG,UAAU,EAAE,CAW9G;AAOD;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,CAYR;AAyCD;;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;AAgUD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,CAsBnF;AAED;;;6BAG6B;AAC7B,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAe7D;AAMD;sDACsD;AACtD,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,cAAc,GAAG,MAAM,EAAE,CAajF;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAuBrG;AAwPD;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,mBAAmB,GAAG;IAC/D,KAAK,EAAE,qBAAqB,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB;8CAC0C;IAC1C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;kCAC8B;IAC9B,SAAS,CAAC,EAAE,eAAe,CAAC;CAC7B,CAiYA;AAGD;qEACqE;AACrE,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,qBAAqB,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,CAY/E"}

package/dist/pipeline/resourceLayout.js

@@ -32,33 +32,43 @@
  */
 import { createBoundingBox } from '../vdt';
 import { measureRichBlock, measureTextWidth, buildFontString } from '../measure';
+import { isSwatchFill, measureRichSnippet } from '../measure/rich';
+import { isBlankText } from '../measure/spaces';
+import { linkSegments } from '../measure/links';
 import { dimensionToPx } from '../units';
 // Caption / table-cell / note content is parsed with the shared snippet
 // parser so measurement and the sandbox's glyph→snippet mapping agree on
 // one span list (`:ref{…}` becomes a one-char placeholder span).
 import { parseInlineSnippetSpans as parseRefAwareSpans } from '../parse/inlineSnippet';
+import { sliceSpan } from '../parse/links';
 import { chipContextOf, fontSizePxOf, resolveChipSpans } from './chips';
 import { mergeCaptionStyle } from '../defaults/captionStyle';
 import { pickTableStyle } from '../defaults/tableStyle';
 import { resolveColorValue } from '../defaults/shared';
 import { resolveBodyStyle } from './styles';
+import { uppercasePreservingLength } from './buildBlockKind';
+import { lineTrailingTracking } from '../lineInk';
 /** 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. */
 const NBSP = ' ';
-/** Resolve the colour of every inline `:swatch{…}` span: a `#rgb` / `#rrggbb`
- *  hex is normalised to six digits; any other value is looked up as a
- *  document palette entry id. An unresolved colour is left as written (the
- *  measurer then draws an empty outline). Spans without a swatch pass through. */
+/** Resolve the colour of every inline `:swatch{…}` span: a `#rgb` / `#rgba`
+ *  hex is normalised to six / eight digits, a `#rrggbb` / `#rrggbbaa` one
+ *  lower-cased, an `rgb()` / `rgba()` colour kept as written; any other
+ *  value is looked up as a document palette entry id. An unresolved colour
+ *  is left as written (the measurer then draws an empty outline). Spans
+ *  without a swatch pass through. */
 export function resolveSwatchSpans(spans, palette) {
     return spans.map((span) => {
         if (!span.swatch)
             return span;
         const raw = span.swatch.color.trim();
-        const short = /^#([0-9a-f])([0-9a-f])([0-9a-f])$/i.exec(raw);
+        const short = /^#([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])?$/i.exec(raw);
         if (short)
-            return { ...span, swatch: { color: `#${short[1]}${short[1]}${short[2]}${short[2]}${short[3]}${short[3]}`.toLowerCase() } };
-        if (/^#[0-9a-f]{6}$/i.test(raw))
+            return { ...span, swatch: { color: `#${short.slice(1).filter(Boolean).map((d) => d + d).join('')}`.toLowerCase() } };
+        if (/^#(?:[0-9a-f]{6}|[0-9a-f]{8})$/i.test(raw))
             return { ...span, swatch: { color: raw.toLowerCase() } };
+        if (isSwatchFill(raw))
+            return { ...span, swatch: { color: raw } };
         const entry = palette?.find((e) => e.id === raw);
         return entry ? { ...span, swatch: { color: entry.value.hex } } : span;
     });
@@ -79,12 +89,34 @@ 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 = applyRefCase(type?.name ?? type?.shortLabel ?? '', ref.case);
-        return name ? `${name}${NBSP}${number}` : number;
+        return labelWithNumber(applyRefCase(type?.name ?? type?.shortLabel ?? '', ref.case), number);
     }
     // default: short label + number (e.g. "Fig. 1.7")
-    const short = applyRefCase(type?.shortLabel ?? type?.name ?? '', ref.case);
-    return short ? `${short}${NBSP}${number}` : number;
+    return labelWithNumber(applyRefCase(type?.shortLabel ?? type?.name ?? '', ref.case), number);
+}
+/** "Fig. 1.7": a type's label and a number, glued by a no-break space. A
+ *  type whose `numberingTemplate` is empty has no number, and its label
+ *  stands alone (EF-149). */
+function labelWithNumber(label, number) {
+    if (!label)
+        return number;
+    return number ? `${label}${NBSP}${number}` : label;
+}
+/** The label that opens a caption: "Figure 1.7. " — or, for a type
+ *  numbered with an empty template, "Figure. ". Without a number, spaces at
+ *  the prefix's end are dropped, and a prefix that already ends in a stop
+ *  (`.`, `:`, `!`, `?`, `…` or a full-width form, as in "Pl.") takes no
+ *  second one. Empty without a prefix. */
+const CAPTION_STOP_RE = /[.:!?…。．：！？]$/;
+function captionLabelText(captionPrefix, number) {
+    if (captionPrefix.length === 0)
+        return '';
+    if (number)
+        return `${captionPrefix}${NBSP}${number}. `;
+    const label = captionPrefix.trimEnd();
+    if (label.length === 0)
+        return '';
+    return CAPTION_STOP_RE.test(label) ? `${label} ` : `${label}. `;
 }
 /** Apply a `:ref{case=…}` transform to the label part of a computed
  *  reference (`Fig.` / `Figure`). The number is never touched — the caller
@@ -142,31 +174,43 @@ function fitWidth(intrinsicW, intrinsicH, columnWidth) {
     const height = (intrinsicH / intrinsicW) * width;
     return { width, height };
 }
+/** Share of the free room set left of a body aligned per `placement.align`. */
+function alignFactor(align) {
+    return align === 'center' ? 0.5 : align === 'right' ? 1 : 0;
+}
 /** Markers a cell paragraph may open with: bullets, dashes, a number with
  *  its dot or bracket — followed by whitespace and some text. */
 const CELL_ITEM_MARKER = /^(\s*)([•·◦○▪‣\-*–—]|\d{1,3}[.)])(\s+)(?=\S)/;
-/** Split a cell's spans into paragraphs at hard line breaks (`\n`). The
- *  break characters are dropped; an empty paragraph (a blank line) is kept
- *  out — the measurer would skip it as whitespace anyway. */
-function splitCellParagraphs(spans) {
+/** A cell breaks its lines at a newline and at a forced break (`\\`, see
+ *  `SNIPPET_BREAK_RE`); a caption or a note only at a forced break. */
+const CELL_BREAK_RE = /[\n\u2028]/;
+const FORCED_BREAK_RE = /\u2028/;
+/** Split a cell's spans into paragraphs at hard line breaks (`\n`, and
+ *  the forced breaks). The break characters are dropped; an empty paragraph
+ *  (a blank line) is kept out — the measurer would skip it as whitespace
+ *  anyway. A line holding a no-break space is no blank line: it sets a
+ *  line of the cell, as in CommonMark (EF-154). */
+function splitCellParagraphs(spans, breakRe = CELL_BREAK_RE) {
     const out = [];
     let current = [];
     const flush = () => {
-        if (current.some((sp) => sp.text.trim().length > 0))
+        if (current.some((sp) => !isBlankText(sp.text)))
             out.push(current);
         current = [];
     };
     for (const span of spans) {
-        if (span.ref || span.math || !span.text.includes('\n')) {
+        if (span.ref || span.math || !breakRe.test(span.text)) {
             current.push(span);
             continue;
         }
-        const pieces = span.text.split('\n');
+        const pieces = span.text.split(breakRe);
+        let at = 0;
         pieces.forEach((piece, i) => {
             if (i > 0)
                 flush();
             if (piece.length > 0)
-                current.push({ ...span, text: piece });
+                current.push(span.links ? sliceSpan(span, at, at + piece.length) : { ...span, text: piece });
+            at += piece.length + 1;
         });
     }
     flush();
@@ -183,9 +227,38 @@ function takeCellItemMarker(spans) {
         return null;
     const [whole, indent, text, ws] = m;
     const rest = first.text.slice(whole.length);
-    const stripped = rest.length > 0 ? [{ ...first, text: rest }, ...spans.slice(1)] : spans.slice(1);
+    const stripped = rest.length > 0 ? [first.links ? sliceSpan(first, whole.length) : { ...first, text: rest }, ...spans.slice(1)] : spans.slice(1);
     return { marker: { text, ws, level: Math.min(5, 1 + Math.floor(indent.length / 2)) }, spans: stripped };
 }
+/**
+ * Measure a caption or a note. Without a forced break it is one rich block,
+ * exactly as before; with forced breaks (`\\`, or a backslash ending a line
+ * — see `SNIPPET_BREAK_RE`) each piece is measured on its own and the
+ * pieces are stacked, one line pitch apart. An empty piece (two breaks in a
+ * row) adds no line. Lines are block-relative (y = 0 at the first line).
+ */
+function measureSnippetLines(spans, fonts, maxWidthPx, lineHeightPx, options) {
+    const [normal, bold, italic, boldItalic] = fonts;
+    // The measurer sets every line flush left at its natural width unless it
+    // justifies: a centred or right-aligned caption or note is pushed over by
+    // each line's slack (EF-166), as table cells are.
+    const align = options.textAlign;
+    const aligned = (lines) => align === 'center' || align === 'right'
+        ? lines.map((line) => {
+            const slack = Math.max(0, maxWidthPx - line.bbox.width);
+            return shiftLines([line], align === 'center' ? slack / 2 : slack, 0)[0];
+        })
+        : lines;
+    const measure = (ps) => aligned(linkSegments(measureRichSnippet(ps, normal, bold, italic, boldItalic, maxWidthPx, lineHeightPx, options).lines, ps));
+    if (!spans.some((s) => !s.ref && !s.math && FORCED_BREAK_RE.test(s.text)))
+        return measure(spans);
+    const lines = [];
+    for (const piece of splitCellParagraphs(spans, FORCED_BREAK_RE)) {
+        const measured = measure(piece);
+        lines.push(...shiftLines(measured, 0, lines.length * lineHeightPx));
+    }
+    return lines;
+}
 /**
  * Measure a cell's content: paragraphs separated by hard line breaks, each
  * either plain text or a list item. An item hangs its text off its marker —
@@ -199,14 +272,23 @@ function measureCellContent(spans, set, width, textAlign, listGapPx) {
     const paragraphs = splitCellParagraphs(spans);
     const lines = [];
     let y = 0;
-    const measure = (ps, w) => measureRichBlock(ps, set.fontString, set.boldFontString, set.italicFontString, set.boldItalicFontString, Math.max(1, w), set.lineHeightPx, { textAlign: 'left' });
+    const tracking = set.letterSpacingPx ?? 0;
+    const measure = (ps, w) => {
+        const m = measureRichSnippet(ps, set.fontString, set.boldFontString, set.italicFontString, set.boldItalicFontString, Math.max(1, w), set.lineHeightPx, tracking !== 0 ? { textAlign: 'left', letterSpacingPx: tracking } : { textAlign: 'left' });
+        const linked = linkSegments(m.lines, ps);
+        return { ...m, lines: tracking !== 0 ? linked.map((line) => ({ ...line, letterSpacing: tracking })) : linked };
+    };
     // Plain paragraphs follow the cell's horizontal alignment: the measurer
     // sets every line flush left at its natural width, so a centred or
     // right-aligned line is pushed over by the slack. List items stay flush
-    // left (their markers align).
-    const slack = (line) => textAlign === 'center' ? Math.max(0, (width - line.bbox.width) / 2)
-        : textAlign === 'right' ? Math.max(0, width - line.bbox.width)
-            : 0;
+    // left (their markers align). The tracking after a tracked line's last
+    // letter is advance, not ink, and is left out (EF-153).
+    const slack = (line) => {
+        const ink = line.bbox.width - lineTrailingTracking(line, tracking);
+        return textAlign === 'center' ? Math.max(0, (width - ink) / 2)
+            : textAlign === 'right' ? Math.max(0, width - ink)
+                : 0;
+    };
     for (const paragraph of paragraphs) {
         const item = takeCellItemMarker(paragraph);
         if (!item) {
@@ -215,7 +297,7 @@ function measureCellContent(spans, set, width, textAlign, listGapPx) {
             y += m.lines.length * set.lineHeightPx;
             continue;
         }
-        const markerWidth = measureTextWidth(item.marker.text, set.fontString);
+        const markerWidth = measureTextWidth(item.marker.text, set.fontString) + tracking * item.marker.text.length;
         const indentPx = markerWidth + listGapPx;
         const levelOffset = (item.marker.level - 1) * indentPx;
         const textX = levelOffset + indentPx;
@@ -266,6 +348,7 @@ function fitCellImage(image, align, innerWidth, resources) {
     const target = Math.max(1, innerWidth * fraction);
     let fileId;
     let format;
+    let pdfFileId;
     let kind;
     let width;
     let height;
@@ -280,6 +363,7 @@ function fitCellImage(image, align, innerWidth, resources) {
     else if (resource.kind === 'svg' && resource.svg) {
         kind = 'svg';
         fileId = resource.svg.fileId;
+        pdfFileId = resource.svg.pdfFileId;
         const iw = resource.svg.width ?? 0;
         const ih = resource.svg.height ?? 0;
         width = target;
@@ -292,7 +376,7 @@ function fitCellImage(image, align, innerWidth, resources) {
         return null;
     const x = align === 'center' ? (innerWidth - width) / 2 : align === 'right' ? innerWidth - width : 0;
     const altText = resource.altText ?? resource.caption;
-    return { resourceId: resource.id, kind, fileId, format, altText, x: Math.max(0, x), width, height };
+    return { resourceId: resource.id, kind, fileId, format, pdfFileId, altText, x: Math.max(0, x), width, height };
 }
 /** Smallest border thickness (px) we let through: thinner rules would vanish
  *  on screen, but 0.5pt (≈0.67px at 96dpi) hairlines must survive intact —
@@ -467,7 +551,8 @@ function layoutTable(model, columnWidth, style, resourceNumbering, resourceTypes
             const isHeader = cellIsHeader(cell, r, model);
             const set = isHeader ? header : body;
             const cellWidth = spanWidth(c, colSpan) - cellPaddingPx * 2;
-            const spans = resolveCellChips(resolveSwatchSpans(resolveRefSpans(parseRefAwareSpans(cell.content), resourceNumbering, resourceTypes, resources, refStyle), style.palette), style.chips, set);
+            const parsed = parseRefAwareSpans(cell.content);
+            const spans = resolveCellChips(resolveSwatchSpans(resolveRefSpans(set.uppercase ? parsed.map((s) => (s.ref || s.math ? s : { ...s, text: uppercasePreservingLength(s.text) })) : parsed, resourceNumbering, resourceTypes, resources, refStyle), style.palette), style.chips, set);
             const m = measureCellContent(spans, set, Math.max(1, cellWidth), cell.align ?? 'left', style.listGapPx);
             // An embedded image sits at the top of the cell; the text (when
             // there is any) runs under it, a padding's worth below.
@@ -546,6 +631,11 @@ function layoutTable(model, columnWidth, style, resourceNumbering, resourceTypes
         }
         metrics = { rowHeights: [...rowMinHeight], headerRowCount, breakableAfter, groupHeaderRow };
     }
+    // Zebra rows count the body rows from the first one after the header, by
+    // model row: a continuation slice keeps every row's stripe, and a merged
+    // cell takes the stripe of its first row.
+    const zebra = style.bodyAlternateBackground !== undefined;
+    const zebraFrom = zebra ? tableHeaderRowCount(model) : 0;
     const cells = measured.map((m) => {
         const x0 = columnEdges[m.col] ?? 0;
         const x1 = columnEdges[Math.min(m.col + m.colSpan, colCount)] ?? columnWidth;
@@ -566,6 +656,7 @@ function layoutTable(model, columnWidth, style, resourceNumbering, resourceTypes
                 fileId: m.image.fileId,
                 ...(m.image.format !== undefined ? { format: m.image.format } : {}),
                 ...(m.image.altText !== undefined ? { altText: m.image.altText } : {}),
+                ...(m.image.pdfFileId ? { pdfFileId: m.image.pdfFileId } : {}),
                 rect: createBoundingBox(x0 + cellPaddingPx + m.image.x, top, m.image.width, m.image.height),
             }
             : undefined;
@@ -581,6 +672,7 @@ function layoutTable(model, columnWidth, style, resourceNumbering, resourceTypes
             lines: placed,
             ...(image ? { image } : {}),
             ...(m.background !== undefined ? { background: m.background } : {}),
+            ...(zebra && !m.isHeader && m.row >= zebraFrom && (m.row - zebraFrom) % 2 === 1 ? { alternate: true } : {}),
         };
     });
     const layout = {
@@ -598,6 +690,7 @@ function layoutTable(model, columnWidth, style, resourceNumbering, resourceTypes
         borderWidthPx,
         headerBackground: style.headerBackground,
         bodyBackground: style.bodyBackground,
+        ...(zebra ? { bodyAlternateBackground: style.bodyAlternateBackground } : {}),
         cells,
         columnEdges,
         rowEdges,
@@ -676,6 +769,7 @@ export function layoutResourceBlock(input) {
         const hWeight = ts.headerBold ? boldWeight : normalWeight;
         const hBase = ts.headerItalic ? 'italic' : 'normal';
         const hFlip = ts.headerItalic ? 'normal' : 'italic';
+        const headerTrackingPx = dimensionToPx(ts.headerLetterSpacing, dpi, headerFontPx);
         const style = {
             body: {
                 fontString: buildFontString(ts.bodyFontFamily, bodyFontPx, normalWeight),
@@ -692,6 +786,8 @@ export function layoutResourceBlock(input) {
                 boldItalicFontString: buildFontString(ts.headerFontFamily, headerFontPx, boldWeight, hFlip),
                 color: ts.headerColor.hex,
                 lineHeightPx: headerFontPx * lineHeightRatio,
+                ...(headerTrackingPx !== 0 ? { letterSpacingPx: headerTrackingPx } : {}),
+                ...(ts.headerTextTransform === 'uppercase' ? { uppercase: true } : {}),
             },
             borderColor: ts.borderColor.hex,
             borderWidthPx: ts.borders && ts.rules !== 'none'
@@ -700,6 +796,7 @@ export function layoutResourceBlock(input) {
             cellPaddingPx: dimensionToPx(ts.cellPadding, dpi, bodyFontPx),
             headerBackground: ts.headerBackgroundEnabled ? ts.headerBackground.hex : undefined,
             bodyBackground: ts.bodyBackgroundEnabled ? ts.bodyBackground.hex : undefined,
+            bodyAlternateBackground: ts.bodyAlternateBackgroundEnabled ? ts.bodyAlternateBackground.hex : undefined,
             rules: ts.rules,
             listGapPx: dimensionToPx(resolved.unorderedLists.gap, dpi, bodyFontPx),
             palette,
@@ -741,9 +838,7 @@ export function layoutResourceBlock(input) {
     const hasCaption = captionText.trim().length > 0 || captionPrefix.length > 0;
     if (hasCaption) {
         // Prefix span: "<captionPrefix> <number>. " (non-breaking inside the label).
-        const prefixText = captionPrefix.length > 0
-            ? `${captionPrefix}${NBSP}${number}.${number ? ' ' : ''}`
-            : '';
+        const prefixText = captionLabelText(captionPrefix, number);
         const resolvedSpans = resolveChipSpans(resolveSwatchSpans(resolveRefSpans(parseRefAwareSpans(captionText), resourceNumbering, resourceTypes, resources, refStyle), palette), chipContextOf(resolved), captionFontPx);
         // Description spans pick up the configured slant on top of their own markup.
         const descSpans = cs.descriptionItalic
@@ -758,8 +853,7 @@ export function layoutResourceBlock(input) {
         const allSpans = prefixText.length > 0
             ? [{ text: prefixText, bold: cs.labelBold, italic: cs.labelItalic, captionLabel: true }, ...descSpans, ...suffixSpans]
             : [...descSpans, ...suffixSpans];
-        const measured = measureRichBlock(allSpans, captionFontString, captionBoldFontString, captionItalicFontString, captionBoldItalicFontString, Math.max(1, (input.captionAside?.width ?? columnWidth) - captionPaddingPx * 2), captionLineHeightPx, { textAlign: cs.align });
-        measuredCaption = measured.lines;
+        measuredCaption = measureSnippetLines(allSpans, [captionFontString, captionBoldFontString, captionItalicFontString, captionBoldItalicFontString], Math.max(1, (input.captionAside?.width ?? columnWidth) - captionPaddingPx * 2), captionLineHeightPx, { textAlign: cs.align });
     }
     const captionTextHeight = measuredCaption.length * captionLineHeightPx;
     // Height of the caption band: the text plus the bar padding on both sides.
@@ -784,8 +878,7 @@ export function layoutResourceBlock(input) {
         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, input.captionAside?.width ?? columnWidth), noteLineHeightPx, { textAlign: cs.note.align });
-        measuredNote = measured.lines;
+        measuredNote = measureSnippetLines(slanted, [noteFontString, noteBoldFontString, noteItalicFontString, noteBoldItalicFontString], Math.max(1, input.captionAside?.width ?? columnWidth), noteLineHeightPx, { textAlign: cs.note.align });
     }
     const noteHeight = measuredNote.length > 0
         ? measuredNote.length * noteLineHeightPx + noteGapPx
@@ -845,7 +938,15 @@ export function layoutResourceBlock(input) {
         : captionAbove ? 0 : bodyHeight + (captionBandHeight > 0 ? captionGapPx : 0);
     const bodyY = captionAbove ? captionHeight : 0;
     const asideDx = aside ? aside.dx : 0;
-    const bodyRect = createBoundingBox(0, bodyY, bodyWidth, bodyHeight);
+    // A picture narrower than its slot — shrunk to fit the page or the room
+    // left (`layout.fitFiguresToPage`), or a bitmap smaller than the column —
+    // sits in the slot per `placement.align`, as a float narrowed by
+    // `placement.width` does; the caption and note keep the slot's measure.
+    // A turned figure and one with its caption beside it stay flush left.
+    const bodyX = !rotate && !aside && (resource.kind === 'bitmap' || resource.kind === 'svg') && bodyWidth < columnWidth
+        ? (columnWidth - bodyWidth) * alignFactor(resource.placement?.align ?? resourceType?.defaultPlacement?.align)
+        : 0;
+    const bodyRect = createBoundingBox(bodyX, 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) {