postext 1.15.1 → 1.16.1

package/dist/citations/types.d.ts

@@ -103,6 +103,14 @@ export interface CitationProcessor {
     readonly kind: 'in-text' | 'note';
     /** `true` for a numbered style (IEEE, Vancouver, GB/T 7714 numeric). */
     readonly numeric: boolean;
+    /** The locale's words for a sentence that names two authors or more
+     *  (the CSL terms `and` and `et-al`: と and ほか in ja-JP). A Japanese
+     *  narrative citation the engine writes itself takes them (#426);
+     *  without them it keeps 、 and 等. */
+    readonly terms?: {
+        readonly and: string;
+        readonly etAl: string;
+    };
     /** Format every citation of the book, in reading order: disambiguation,
      *  numbering and *ibid.* see all of them. */
     cite(clusters: readonly CitationClusterInput[]): FormattedCitation[];

package/dist/citations/types.d.ts.map

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

package/dist/cjkMarks.d.ts

@@ -1,8 +1,9 @@
 /**
- * The Chinese interlinear marks of a laid-out document (#193): emphasis dots
- * (着重号), the proper-name line (专名号) and the wavy book-title line
- * (书名号甲式), as `VDTLine.marks` — primitives the renderers draw as they
- * are — and the leading checks of marks and ruby (#194).
+ * The Chinese and Japanese interlinear marks of a laid-out document (#193,
+ * #421): emphasis dots (着重号, 傍点), the proper-name line (专名号), the
+ * wavy book-title line (书名号甲式) and side lines (傍線), as
+ * `VDTLine.marks` — primitives the renderers draw as they are — and the
+ * leading checks of marks, ruby (#194) and kanbun marks (#430).
  *
  * The measurer flags the segments (`VDTLineSegment.cjkMarks`); the marks are
  * placed once the document is laid out, where the renderers paint each
@@ -10,11 +11,13 @@
  * spaces of a line included), in the flow frame of the line. Dots are
  * centred on each character, spacing after it left out, and skip
  * punctuation and spaces; a line spans its run's characters, and where two
- * runs meet each end gives up an eighth of an em (clreq §5.6.1). Marks sit
- * against the characters' em box, centred on the font's central axis:
- * under in horizontal text (left in vertical text), emphasis dots over in
- * vertical text (right); when dots and a line mark the same text on one
- * side, the line is nearer the text.
+ * runs meet each end gives up an eighth of an em (clreq §5.6.1). A side
+ * line runs on across every character of its run, punctuation and spaces
+ * included. Marks sit against the characters' em box, centred on the
+ * font's central axis, on the side they were given (`over`: above
+ * horizontal text, right of vertical text): when dots and a line mark the
+ * same text on one side, the line is nearer the text, and dots on the side
+ * of a ruby reading go outside it (as CSS Text Decoration 3 sets them).
  */
 import type { ContentWarning, VDTBlock, VDTDocument, VDTLine, VDTLineMark, VDTLineSegment } from './vdt';
 import type { CjkRegion, ResolvedCjkConfig } from './types';
@@ -45,16 +48,22 @@ export declare function lineMarks(line: VDTLine, block: BlockLike, color?: strin
 /**
  * Set `VDTLine.marks` on every line of the document that holds Chinese
  * marks, and report the paragraphs whose line gap is narrower than their
- * marks or readings need (`cjkMarksExceedLeading`, `rubyExceedsLeading`),
- * once per paragraph. `cjk` is the resolved configuration (its
- * `annotationColor`).
+ * marks, readings or kanbun marks need (`cjkMarksExceedLeading`,
+ * `rubyExceedsLeading`, `kuntenExceedsLeading`), once per paragraph. `cjk`
+ * is the resolved configuration (its `annotationColor`).
  *
  * The gap between two lines of a column is shared: what the upper line
  * sets under it and the lower one over it (dots under one line and the
  * readings over the next, in one paragraph or across two) must fit in it
  * together. Where they do not, the lower line's paragraph is reported
- * (`rubyExceedsLeading` when readings take part, else
- * `cjkMarksExceedLeading`).
+ * (`rubyExceedsLeading` when readings take part, `kuntenExceedsLeading`
+ * when kanbun marks do, else `cjkMarksExceedLeading`).
+ *
+ * The cells, captions and notes of resource blocks (#429) are texts of
+ * their own: their marks are set and their leading checked the same way,
+ * each text's lines sharing their gaps only with one another (a table's
+ * cells sit apart, a caption under its figure). A resource's text is set
+ * horizontally on every page, a vertical one turning the whole block.
  */
 export declare function annotateDocument(doc: VDTDocument, cjk: ResolvedCjkConfig | undefined): ContentWarning[];
 export {};

package/dist/cjkMarks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cjkMarks.d.ts","sourceRoot":"","sources":["../src/cjkMarks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACzG,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAU5D,uDAAuD;AACvD,KAAK,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,GAAG,eAAe,GAAG,YAAY,GAAG,gBAAgB,GAAG,kBAAkB,GAAG,sBAAsB,CAAC,CAAC;AAExJ;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,GAAG;IAAE,EAAE,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAiCpG;AAED,wCAAwC;AACxC,wBAAgB,WAAW,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,SAAS,GAAG,MAAM,CAMzE;AAiED,kEAAkE;AAClE,UAAU,aAAa;IACrB,MAAM,EAAE,SAAS,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;4CAE4C;AAC5C,wBAAgB,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,aAAa,GAAG,WAAW,EAAE,CAoGlH;AAiFD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,iBAAiB,GAAG,SAAS,GAAG,cAAc,EAAE,CAmFvG"}
+{"version":3,"file":"cjkMarks.d.ts","sourceRoot":"","sources":["../src/cjkMarks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,cAAc,EAA4B,MAAM,OAAO,CAAC;AACnI,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAU5D,uDAAuD;AACvD,KAAK,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,GAAG,eAAe,GAAG,YAAY,GAAG,gBAAgB,GAAG,kBAAkB,GAAG,sBAAsB,CAAC,CAAC;AAExJ;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,GAAG;IAAE,EAAE,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAiCpG;AAED,wCAAwC;AACxC,wBAAgB,WAAW,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,SAAS,GAAG,MAAM,CAMzE;AAsED,kEAAkE;AAClE,UAAU,aAAa;IACrB,MAAM,EAAE,SAAS,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;4CAE4C;AAC5C,wBAAgB,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,aAAa,GAAG,WAAW,EAAE,CAgIlH;AAyOD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,iBAAiB,GAAG,SAAS,GAAG,cAAc,EAAE,CA0GvG"}

package/dist/cjkMarks.js

@@ -1,8 +1,9 @@
 /**
- * The Chinese interlinear marks of a laid-out document (#193): emphasis dots
- * (着重号), the proper-name line (专名号) and the wavy book-title line
- * (书名号甲式), as `VDTLine.marks` — primitives the renderers draw as they
- * are — and the leading checks of marks and ruby (#194).
+ * The Chinese and Japanese interlinear marks of a laid-out document (#193,
+ * #421): emphasis dots (着重号, 傍点), the proper-name line (专名号), the
+ * wavy book-title line (书名号甲式) and side lines (傍線), as
+ * `VDTLine.marks` — primitives the renderers draw as they are — and the
+ * leading checks of marks, ruby (#194) and kanbun marks (#430).
  *
  * The measurer flags the segments (`VDTLineSegment.cjkMarks`); the marks are
  * placed once the document is laid out, where the renderers paint each
@@ -10,11 +11,13 @@
  * spaces of a line included), in the flow frame of the line. Dots are
  * centred on each character, spacing after it left out, and skip
  * punctuation and spaces; a line spans its run's characters, and where two
- * runs meet each end gives up an eighth of an em (clreq §5.6.1). Marks sit
- * against the characters' em box, centred on the font's central axis:
- * under in horizontal text (left in vertical text), emphasis dots over in
- * vertical text (right); when dots and a line mark the same text on one
- * side, the line is nearer the text.
+ * runs meet each end gives up an eighth of an em (clreq §5.6.1). A side
+ * line runs on across every character of its run, punctuation and spaces
+ * included. Marks sit against the characters' em box, centred on the
+ * font's central axis, on the side they were given (`over`: above
+ * horizontal text, right of vertical text): when dots and a line mark the
+ * same text on one side, the line is nearer the text, and dots on the side
+ * of a ruby reading go outside it (as CSS Text Decoration 3 sets them).
  */
 import { lineInkExtent, lineTrailingTracking } from './lineInk';
 import { measureTextWidth } from './measure/canvas';
@@ -93,6 +96,11 @@ const LINE_AT = 0.08;
 const WAVE_AT = 0.1;
 const WAVE_HEIGHT = 0.08;
 const WAVE_LENGTH = 0.25;
+/** A double side line: its two rules' centres this far apart. */
+const DOUBLE_GAP = 0.08;
+/** A dotted side line: its dots' diameter and the pitch they come near. */
+const DOTTED_SIZE = 0.08;
+const DOTTED_PITCH = 0.16;
 /** How far dots move out when a line marks the same text on their side. */
 const PAST_LINE = 0.16;
 /** Where each grapheme of a segment starts and how far it advances, px
@@ -157,21 +165,26 @@ export function lineMarks(line, block, color, vertical) {
     const paint = color !== undefined ? { color } : {};
     const runs = [];
     const lined = new Set();
-    for (const kind of ['line', 'wavy']) {
+    const linedOver = new Set();
+    const idOf = (kind, seg) => kind === 'line' ? seg?.cjkMarks?.properName : kind === 'wavy' ? seg?.cjkMarks?.bookTitle : seg?.cjkMarks?.sideline?.id;
+    for (const kind of ['line', 'wavy', 'side']) {
         let open;
         for (let i = 0; i < segments.length; i++) {
             const seg = segments[i];
-            const id = kind === 'line' ? seg.cjkMarks?.properName : seg.cjkMarks?.bookTitle;
-            if (seg.kind === 'space' && id === undefined && open) {
-                // A space inside a run: the line goes on when the run does.
+            const id = idOf(kind, seg);
+            // A space inside a run (for a side line, anything the layout added
+            // there too: a Han–Latin space, a bracket): the line goes on when
+            // the run does.
+            const bridges = (s) => s.kind === 'space' || (kind === 'side' && !!s.inserted && !s.warichu);
+            if (id === undefined && open && bridges(seg)) {
                 let j = i + 1;
-                while (j < segments.length && segments[j].kind === 'space')
+                while (j < segments.length && bridges(segments[j]))
                     j++;
-                const nextId = kind === 'line' ? segments[j]?.cjkMarks?.properName : segments[j]?.cjkMarks?.bookTitle;
+                const nextId = idOf(kind, segments[j]);
                 if (nextId !== undefined && `${kind}:${nextId}` === open.key)
                     continue;
             }
-            if (id === undefined || seg.warichu || seg.inserted) {
+            if (id === undefined || seg.warichu || (seg.inserted && kind !== 'side')) {
                 open = undefined;
                 continue;
             }
@@ -179,15 +192,26 @@ export function lineMarks(line, block, color, vertical) {
             const font = segmentFont(seg, block);
             const em = fontEm(font);
             const end = xs[i] + widths[i] - (seg.kind === 'text' ? tracking + (seg.tracking ?? 0) : 0);
+            const over = kind === 'side' && seg.cjkMarks.sideline.position === 'over';
             if (open && open.key === key) {
                 open.to = Math.max(open.to, end);
                 open.endSeg = i;
-                lined.add(i);
+                (over ? linedOver : lined).add(i);
                 continue;
             }
-            open = { kind, key, from: xs[i], to: end, em, axis: -CENTRAL * em + (seg.baselineShift ?? 0), startSeg: i, endSeg: i };
+            open = {
+                kind,
+                key,
+                from: xs[i],
+                to: end,
+                em,
+                axis: -CENTRAL * em + (seg.baselineShift ?? 0),
+                startSeg: i,
+                endSeg: i,
+                ...(kind === 'side' ? { side: seg.cjkMarks.sideline } : {}),
+            };
             runs.push(open);
-            lined.add(i);
+            (over ? linedOver : lined).add(i);
         }
     }
     // Two runs that meet each give up an eighth of an em.
@@ -195,6 +219,8 @@ export function lineMarks(line, block, color, vertical) {
         for (const b of runs) {
             if (a === b || a.kind !== b.kind || b.startSeg !== a.endSeg + 1)
                 continue;
+            if (a.side && a.side.position !== b.side?.position)
+                continue;
             a.to -= a.em / 8;
             b.from += b.em / 8;
         }
@@ -203,6 +229,10 @@ export function lineMarks(line, block, color, vertical) {
         const length = r.to - r.from;
         if (length <= 0)
             continue;
+        if (r.side) {
+            out.push(sidelineMark(r.side, r.from - x0, length, r.axis, r.em, paint));
+            continue;
+        }
         const edge = r.axis + r.em / 2;
         if (r.kind === 'line') {
             out.push({ kind: 'line', x: r.from - x0, y: edge + LINE_AT * r.em, length, thickness: Math.max(0.5, STROKE * r.em), ...paint });
@@ -230,8 +260,12 @@ export function lineMarks(line, block, color, vertical) {
         const axis = -CENTRAL * em + (seg.baselineShift ?? 0);
         const size = DOT[dots.style] * em;
         const under = dots.position === 'under';
-        const past = under && lined.has(i) ? PAST_LINE * em : 0;
-        const y = under ? axis + em / 2 + GAP * em + past + size / 2 : axis - em / 2 - GAP * em - size / 2;
+        const past = (under ? lined : linedOver).has(i) ? PAST_LINE * em : 0;
+        let y = under ? axis + em / 2 + GAP * em + past + size / 2 : axis - em / 2 - GAP * em - past - size / 2;
+        // A reading on the same side: the dots go outside it.
+        const reading = seg.ruby && seg.ruby.position === dots.position ? rubyExtent(seg.ruby) : undefined;
+        if (reading)
+            y = under ? Math.max(y, reading.foot + GAP * em + size / 2) : Math.min(y, reading.head - GAP * em - size / 2);
         const t = tracking + (seg.tracking ?? 0);
         const inset = seg.ruby ? seg.inkOffset ?? 0 : 0;
         const box = seg.ruby ? Math.max(0, widths[i] - 2 * inset) : widths[i];
@@ -251,6 +285,51 @@ export function lineMarks(line, block, color, vertical) {
     });
     return out;
 }
+/** How far a reading reaches across its line, px from the baseline: its
+ *  runs' em boxes (`head` the least, `foot` the most). */
+function rubyExtent(ruby) {
+    let head = Infinity;
+    let foot = -Infinity;
+    for (const run of ruby.runs) {
+        const runEm = fontEm(run.fontString);
+        head = Math.min(head, run.dy - (CENTRAL + 0.5) * runEm);
+        foot = Math.max(foot, run.dy + (0.5 - CENTRAL) * runEm);
+    }
+    return head <= foot ? { head, foot } : undefined;
+}
+/** The mark of a side line (傍線) `length` px long from `x`, against the
+ *  em box of text `em` px high whose central axis is `axis`: a rule, two
+ *  rules, a wave or a row of dots, on the side it was given. */
+function sidelineMark(line, x, length, axis, em, paint) {
+    const sign = line.position === 'over' ? -1 : 1;
+    const edge = axis + sign * (em / 2);
+    switch (line.style) {
+        case 'double': {
+            const gap = DOUBLE_GAP * em;
+            return { kind: 'double', x, y: edge + sign * (LINE_AT * em + gap / 2), length, gap, thickness: Math.max(0.4, OUTLINE * em), ...paint };
+        }
+        case 'wavy':
+            return {
+                kind: 'wavy',
+                x,
+                y: edge + sign * WAVE_AT * em,
+                length,
+                thickness: Math.max(0.5, STROKE * em * 0.9),
+                amplitude: WAVE_HEIGHT * em,
+                wavelength: WAVE_LENGTH * em,
+                ...paint,
+            };
+        case 'dotted': {
+            const size = DOTTED_SIZE * em;
+            // The pitch that sets the dots evenly from one end to the other.
+            const span = Math.max(0, length - size);
+            const count = Math.max(1, Math.round(span / (DOTTED_PITCH * em)));
+            return { kind: 'dotted', x, y: edge + sign * LINE_AT * em, length, size, gap: span / count, thickness: size, ...paint };
+        }
+        default:
+            return { kind: 'line', x, y: edge + sign * LINE_AT * em, length, thickness: Math.max(0.5, STROKE * em), ...paint };
+    }
+}
 /** How much line gap (em of the text) a line's marks need: half an em on
  *  one side, five eighths on both (clreq §5.6.1). 0 when it has none. */
 function marksNeed(line) {
@@ -263,6 +342,8 @@ function marksNeed(line) {
             sides.add(m.dots.position);
         if (m.properName !== undefined || m.bookTitle !== undefined)
             sides.add('under');
+        if (m.sideline)
+            sides.add(m.sideline.position);
     }
     return sides.size === 0 ? 0 : sides.size > 1 ? 0.625 : 0.5;
 }
@@ -272,6 +353,10 @@ function marksNeed(line) {
 function rubyNeed(line, em) {
     let need = 0;
     for (const seg of line.segments ?? []) {
+        // A footnote marker in the line gap (JLReq §4.2.3) needs its size, as
+        // a reading does.
+        for (const run of seg.sideMarker?.runs ?? [])
+            need = Math.max(need, fontEm(run.fontString) / em);
         const r = seg.ruby;
         if (!r || r.position === 'right')
             continue;
@@ -283,6 +368,21 @@ function rubyNeed(line, em) {
     }
     return need;
 }
+/** How far a line's kanbun marks (#430) reach out of its em box, in em
+ *  of the text: the 送り仮名 beside it, 返り点 set in the line gap. */
+function kuntenNeed(line, em) {
+    const top = -(CENTRAL + 0.5) * em;
+    const bottom = (0.5 - CENTRAL) * em;
+    let need = 0;
+    for (const seg of line.segments ?? []) {
+        for (const run of seg.kunten?.runs ?? []) {
+            const runEm = fontEm(run.fontString);
+            const centre = run.dy - CENTRAL * runEm;
+            need = Math.max(need, top - (centre - runEm / 2), centre + runEm / 2 - bottom);
+        }
+    }
+    return need / em;
+}
 /** The {@link LineReach} of a line whose text is `em` px (its em box
  *  centred on the central axis): marks by their drawn extent, readings by
  *  their em box (an upright tone mark by its advance across the line). */
@@ -305,10 +405,17 @@ function lineReach(line, em) {
             reach.footRuby = true;
     };
     for (const m of line.marks ?? []) {
-        const half = m.kind === 'line' ? m.thickness / 2 : m.kind === 'wavy' ? (m.amplitude ?? 0) / 2 + m.thickness / 2 : (m.size ?? 0) / 2;
+        const half = m.kind === 'line' ? m.thickness / 2
+            : m.kind === 'wavy' ? (m.amplitude ?? 0) / 2 + m.thickness / 2
+                : m.kind === 'double' ? (m.gap ?? 0) / 2 + m.thickness / 2
+                    : (m.size ?? 0) / 2;
         extend(m.y - half, m.y + half, false);
     }
     for (const seg of line.segments ?? []) {
+        for (const run of seg.sideMarker?.runs ?? []) {
+            const runEm = fontEm(run.fontString);
+            extend(run.dy - (CENTRAL + 0.5) * runEm, run.dy + (0.5 - CENTRAL) * runEm, true);
+        }
         const r = seg.ruby;
         if (!r || r.position === 'right')
             continue;
@@ -326,89 +433,183 @@ function lineReach(line, em) {
             }
         }
     }
+    // Kanbun marks, by their em box: the side they reach furthest out on is
+    // theirs when nothing else reaches as far.
+    for (const seg of line.segments ?? []) {
+        for (const run of seg.kunten?.runs ?? []) {
+            const runEm = fontEm(run.fontString);
+            const lo = run.dy - (CENTRAL + 0.5) * runEm;
+            const hi = run.dy + (0.5 - CENTRAL) * runEm;
+            if (top - lo > reach.head + 1e-9) {
+                reach.head = top - lo;
+                reach.headRuby = false;
+                reach.headKunten = true;
+            }
+            if (hi - bottom > reach.foot + 1e-9) {
+                reach.foot = hi - bottom;
+                reach.footRuby = false;
+                reach.footKunten = true;
+            }
+        }
+    }
     return reach;
 }
+/** A resource block's texts (#429): each table cell, the caption and the
+ *  note, painted from their own fonts. Their lines carry their alignment
+ *  (the measurer pushed a centred or right-aligned line over by its
+ *  slack), so they are read flush from their start. The "continued"
+ *  marker of a table slice holds no annotations. */
+function resourceTextGroups(block, at) {
+    const rb = block.resourceBlock;
+    if (!rb)
+        return [];
+    const groups = [];
+    const add = (lines, fonts, key) => {
+        const first = lines[0];
+        if (!first || !lines.some((l) => l.segments?.some((s) => s.cjkMarks || s.ruby)))
+            return;
+        groups.push({
+            lines,
+            like: { bbox: first.bbox, textAlign: 'left', ...fonts },
+            pageIndex: block.pageIndex,
+            where: `${block.id}:${key}`,
+            at,
+        });
+    };
+    const t = rb.table;
+    if (t) {
+        t.cells.forEach((cell, i) => add(cell.lines, cell.isHeader
+            ? { fontString: t.headerFontString, boldFontString: t.headerBoldFontString, italicFontString: t.headerItalicFontString, boldItalicFontString: t.headerBoldItalicFontString }
+            : { fontString: t.fontString, boldFontString: t.boldFontString, italicFontString: t.italicFontString, boldItalicFontString: t.boldItalicFontString }, `c${i}`));
+    }
+    add(rb.captionLines, { fontString: rb.captionFontString, boldFontString: rb.captionBoldFontString, italicFontString: rb.captionItalicFontString, boldItalicFontString: rb.captionBoldItalicFontString }, 'caption');
+    add(rb.noteLines, { fontString: rb.noteFontString, boldFontString: rb.noteBoldFontString, italicFontString: rb.noteItalicFontString, boldItalicFontString: rb.noteBoldItalicFontString }, 'note');
+    return groups;
+}
+/** The blocks of a document that hold a resource: in the flow and floated
+ *  (`VDTPage.floats`), each once. */
+function resourceBlocksOf(doc) {
+    const seen = new Set();
+    for (const block of doc.blocks)
+        if (block.resourceBlock)
+            seen.add(block);
+    for (const page of doc.pages)
+        for (const block of page.floats ?? [])
+            if (block.resourceBlock)
+                seen.add(block);
+    return [...seen];
+}
 /**
  * Set `VDTLine.marks` on every line of the document that holds Chinese
  * marks, and report the paragraphs whose line gap is narrower than their
- * marks or readings need (`cjkMarksExceedLeading`, `rubyExceedsLeading`),
- * once per paragraph. `cjk` is the resolved configuration (its
- * `annotationColor`).
+ * marks, readings or kanbun marks need (`cjkMarksExceedLeading`,
+ * `rubyExceedsLeading`, `kuntenExceedsLeading`), once per paragraph. `cjk`
+ * is the resolved configuration (its `annotationColor`).
  *
  * The gap between two lines of a column is shared: what the upper line
  * sets under it and the lower one over it (dots under one line and the
  * readings over the next, in one paragraph or across two) must fit in it
  * together. Where they do not, the lower line's paragraph is reported
- * (`rubyExceedsLeading` when readings take part, else
- * `cjkMarksExceedLeading`).
+ * (`rubyExceedsLeading` when readings take part, `kuntenExceedsLeading`
+ * when kanbun marks do, else `cjkMarksExceedLeading`).
+ *
+ * The cells, captions and notes of resource blocks (#429) are texts of
+ * their own: their marks are set and their leading checked the same way,
+ * each text's lines sharing their gaps only with one another (a table's
+ * cells sit apart, a caption under its figure). A resource's text is set
+ * horizontally on every page, a vertical one turning the whole block.
  */
 export function annotateDocument(doc, cjk) {
     const warnings = [];
     const color = cjk?.annotationColor?.hex;
     const reported = new Set();
-    const whereOf = (block) => `${block.sourceStart ?? block.lines[0]?.sourceStart ?? block.id}`;
     const atOf = (block) => ({
         ...(block.sourceStart !== undefined ? { sourceStart: block.sourceStart } : block.lines[0]?.sourceStart !== undefined ? { sourceStart: block.lines[0].sourceStart } : {}),
         ...(block.sourceEnd !== undefined ? { sourceEnd: block.sourceEnd } : {}),
         ...(block.pageIndex >= 0 ? { pageIndex: block.pageIndex } : {}),
     });
-    /** The lines of each column's annotated paragraphs, in order, with
-     *  their reach. */
-    const columns = new Map();
+    const groups = [];
     for (const block of doc.blocks) {
         if (block.type === 'resource' || block.designOverlay)
             continue;
+        groups.push({
+            lines: block.lines,
+            like: block,
+            pageIndex: block.pageIndex,
+            columnKey: `${block.pageIndex}:${block.columnIndex}`,
+            where: `${block.sourceStart ?? block.lines[0]?.sourceStart ?? block.id}`,
+            at: atOf(block),
+        });
+    }
+    for (const block of resourceBlocksOf(doc))
+        groups.push(...resourceTextGroups(block, atOf(block)));
+    /** The lines of each column's annotated paragraphs (of each resource
+     *  text), in order, with their reach. */
+    const columns = new Map();
+    for (const group of groups) {
         let marked = false;
         let ruby = false;
-        for (const line of block.lines) {
+        let kunten = false;
+        for (const line of group.lines) {
             const segs = line.segments;
             if (!segs)
                 continue;
             if (segs.some((s) => s.cjkMarks)) {
                 marked = true;
-                const flow = block.pageIndex >= 0 ? doc.pages[block.pageIndex]?.flow : undefined;
+                const flow = group.columnKey !== undefined && group.pageIndex >= 0 ? doc.pages[group.pageIndex]?.flow : undefined;
                 const vertical = flow?.writingMode === 'vertical-rl' ? { region: cjk?.region ?? 'mainland', uprightDigits: cjk?.uprightDigits ?? 2 } : undefined;
-                const marks = lineMarks(line, block, color, vertical);
+                const marks = lineMarks(line, group.like, color, vertical);
                 if (marks.length > 0)
                     line.marks = marks;
             }
-            // Only the CJK composer sets ruby (#194).
+            // Only the CJK composer sets ruby (#194). A footnote marker in the
+            // line gap is checked as a reading is, in any line.
             if (line.cjkComposed && segs.some((s) => s.ruby && s.ruby.position !== 'right'))
                 ruby = true;
+            if (segs.some((s) => s.sideMarker))
+                ruby = true;
+            if (line.cjkComposed && segs.some((s) => s.kunten))
+                kunten = true;
         }
-        if (!marked && !ruby)
+        if (!marked && !ruby && !kunten)
             continue;
-        const em = fontEm(block.fontString);
-        const first = block.lines[0];
+        const em = fontEm(group.like.fontString);
+        const first = group.lines[0];
         if (!first || em <= 0)
             continue;
-        if (block.pageIndex >= 0) {
+        if (group.pageIndex >= 0) {
             // Lines of plain paragraphs between two annotated ones are left
             // out: the gap is then measured across them, and is wide.
-            const key = `${block.pageIndex}:${block.columnIndex}`;
+            const key = group.columnKey ?? group.where;
             let column = columns.get(key);
             if (!column)
                 columns.set(key, (column = []));
-            for (const line of block.lines)
-                column.push({ line, block, em, reach: lineReach(line, em) });
+            for (const line of group.lines)
+                column.push({ line, group, em, reach: lineReach(line, em) });
         }
         const gapEm = (first.bbox.height - em) / em;
-        const at = atOf(block);
-        const where = whereOf(block);
+        const { at, where } = group;
         if (marked) {
-            const need = Math.max(...block.lines.map(marksNeed));
+            const need = Math.max(...group.lines.map(marksNeed));
             if (need > 0 && gapEm < need - 1e-6 && !reported.has(`m${where}`)) {
                 reported.add(`m${where}`);
                 warnings.push({ kind: 'cjkMarksExceedLeading', text: first.text, gapEm: round(gapEm), neededEm: need, ...at });
             }
         }
         if (ruby) {
-            const need = Math.max(...block.lines.map((l) => rubyNeed(l, em)));
+            const need = Math.max(...group.lines.map((l) => rubyNeed(l, em)));
             if (need > 0 && gapEm < need - 1e-6 && !reported.has(`r${where}`)) {
                 reported.add(`r${where}`);
                 warnings.push({ kind: 'rubyExceedsLeading', text: first.text, gapEm: round(gapEm), neededEm: round(need), ...at });
             }
         }
+        if (kunten) {
+            const need = Math.max(...group.lines.map((l) => kuntenNeed(l, em)));
+            if (need > 0 && gapEm < need - 1e-6 && !reported.has(`k${where}`)) {
+                reported.add(`k${where}`);
+                warnings.push({ kind: 'kuntenExceedsLeading', text: first.text, gapEm: round(gapEm), neededEm: round(need), ...at });
+            }
+        }
     }
     // The gaps two lines of a column share.
     for (const column of columns.values()) {
@@ -422,16 +623,17 @@ export function annotateDocument(doc, cjk) {
             if (need <= gap + 1e-6)
                 continue;
             const ruby = a.reach.footRuby || b.reach.headRuby;
-            const key = `${ruby ? 'r' : 'm'}${whereOf(b.block)}`;
+            const kanbun = !ruby && (a.reach.footKunten === true || b.reach.headKunten === true);
+            const key = `${ruby ? 'r' : kanbun ? 'k' : 'm'}${b.group.where}`;
             if (reported.has(key))
                 continue;
             reported.add(key);
             warnings.push({
-                kind: ruby ? 'rubyExceedsLeading' : 'cjkMarksExceedLeading',
+                kind: ruby ? 'rubyExceedsLeading' : kanbun ? 'kuntenExceedsLeading' : 'cjkMarksExceedLeading',
                 text: b.line.text,
                 gapEm: round(gap / b.em),
                 neededEm: round(need / b.em),
-                ...atOf(b.block),
+                ...b.group.at,
             });
         }
     }