postext 1.8.6 → 1.9.1

package/dist/cjkMarks.js

@@ -0,0 +1,441 @@
+/**
+ * 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 measurer flags the segments (`VDTLineSegment.cjkMarks`); the marks are
+ * placed once the document is laid out, where the renderers paint each
+ * segment ({@link segmentPositions}: alignment and the justified word
+ * 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.
+ */
+import { lineInkExtent, lineTrailingTracking } from './lineInk';
+import { measureTextWidth } from './measure/canvas';
+import { graphemesOf } from './measure/graphemes';
+import { isCjkGrapheme } from './measure/cjkClasses';
+import { CENTRAL, ZHUYIN_SIZE_RATIO, isZhuyin } from './measure/cjkAnnotate';
+import { fontEm } from './measure/vertical';
+import { latinReadingLift } from './measure/rubyLift';
+import { verticalRuns } from './writingMode';
+/**
+ * Where the renderers paint each segment of a line: its x (absolute, in
+ * the flow frame) and the advance they give it — a word space of a
+ * justified line its share of the slack, a centred or right-aligned line
+ * shifted by its slack. Mirrors the line painters of the canvas, PDF and
+ * HTML backends.
+ */
+export function segmentPositions(line, block) {
+    const segments = line.segments ?? [];
+    const tracking = (block.letterSpacing ?? 0) + (line.letterSpacing ?? 0);
+    const lineIndent = line.bbox.x - block.bbox.x;
+    const effectiveWidth = block.bbox.width - lineIndent;
+    let start = line.bbox.x;
+    let justified;
+    if (block.textAlign === 'justify') {
+        let wordWidth = 0;
+        let natural = 0;
+        let spaces = 0;
+        for (const seg of segments) {
+            if (seg.hangs)
+                continue;
+            if (seg.kind === 'space' && !seg.autospace)
+                spaces++;
+            else
+                wordWidth += seg.width;
+            natural += seg.width;
+        }
+        if (spaces > 0 && ((!line.isLastLine && !line.ragged) || natural > effectiveWidth))
+            justified = (effectiveWidth - wordWidth) / spaces;
+    }
+    else if (block.textAlign === 'center' || block.textAlign === 'right') {
+        const trailing = lineTrailingTracking(line, tracking);
+        const slack = Math.max(0, effectiveWidth - (lineInkExtent(line, 0).width - trailing));
+        start += block.textAlign === 'center' ? slack / 2 : slack;
+    }
+    const xs = [];
+    const widths = [];
+    let x = start;
+    for (const seg of segments) {
+        xs.push(x);
+        const w = seg.kind === 'space' && !seg.autospace && justified !== undefined ? justified : seg.width;
+        widths.push(w);
+        x += w;
+    }
+    return { xs, widths };
+}
+/** The font a segment is painted in. */
+export function segmentFont(seg, block) {
+    if (seg.fontString)
+        return seg.fontString;
+    if (seg.bold && seg.italic && block.boldItalicFontString)
+        return block.boldItalicFontString;
+    if (seg.bold && block.boldFontString)
+        return block.boldFontString;
+    if (seg.italic && block.italicFontString)
+        return block.italicFontString;
+    return block.fontString;
+}
+/** Characters that take no emphasis dot: punctuation, spaces, controls. */
+const NO_DOT_RE = /^[\p{P}\p{Z}\p{Cc}\p{Cf}]/u;
+/** Mark sizes, in em of the text they mark. */
+const DOT = { dot: 0.16, circle: 0.2, sesame: 0.3 };
+const GAP = 0.06;
+const STROKE = 0.05;
+const OUTLINE = 0.035;
+const LINE_AT = 0.08;
+const WAVE_AT = 0.1;
+const WAVE_HEIGHT = 0.08;
+const WAVE_LENGTH = 0.25;
+/** 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
+ *  from the segment's start: CJK characters share the segment's width
+ *  evenly (the composer only puts characters that advance alike in one
+ *  segment); anything else is measured and scaled to the segment. Down a
+ *  vertical line a number set in one upright cell (`:tcy[…]`, or up to
+ *  `cjk.uprightDigits` digits) is one character: it takes one dot; the
+ *  letters of an `:upright[…]` run stand one to a cell, whatever their
+ *  horizontal widths. */
+function graphemeAdvances(seg, width, font, vertical) {
+    const graphemes = graphemesOf(seg.text);
+    if (graphemes.length === 0)
+        return [];
+    const out = [];
+    if (vertical && seg.tcy)
+        return [{ g: seg.text, at: 0, adv: width }];
+    if (vertical && seg.orientation === 'upright') {
+        const adv = width / graphemes.length;
+        graphemes.forEach((g, i) => out.push({ g, at: i * adv, adv }));
+        return out;
+    }
+    if (vertical && seg.orientation !== 'sideways' && vertical.uprightDigits > 0 && /[0-9]/.test(seg.text)) {
+        const em = fontEm(font);
+        const pieces = verticalRuns(graphemes, vertical.region, vertical.uprightDigits).flatMap((run) => run.cell !== undefined ? [{ g: run.text, w: em * run.cell }] : graphemesOf(run.text).map((g) => ({ g, w: measureTextWidth(g, font) })));
+        const sum = pieces.reduce((a, p) => a + p.w, 0);
+        const k = sum > 0 ? width / sum : 1;
+        let at = 0;
+        for (const p of pieces) {
+            out.push({ g: p.g, at, adv: p.w * k });
+            at += p.w * k;
+        }
+        return out;
+    }
+    if (graphemes.every(isCjkGrapheme)) {
+        const adv = width / graphemes.length;
+        graphemes.forEach((g, i) => out.push({ g, at: i * adv, adv }));
+        return out;
+    }
+    const natural = graphemes.map((g) => measureTextWidth(g, font));
+    const sum = natural.reduce((a, b) => a + b, 0);
+    const scale = sum > 0 ? width / sum : 1;
+    let at = 0;
+    graphemes.forEach((g, i) => {
+        const adv = natural[i] * scale;
+        out.push({ g, at, adv });
+        at += adv;
+    });
+    return out;
+}
+/** The marks of one line (see the module comment), relative to it; empty
+ *  when it has none. `color` is `cjk.annotationColor` (hex), if set;
+ *  `vertical` is set on a vertical page. */
+export function lineMarks(line, block, color, vertical) {
+    const segments = line.segments;
+    if (!segments || !segments.some((s) => s.cjkMarks))
+        return [];
+    const { xs, widths } = segmentPositions(line, block);
+    const x0 = line.bbox.x;
+    const tracking = (block.letterSpacing ?? 0) + (line.letterSpacing ?? 0);
+    const out = [];
+    const paint = color !== undefined ? { color } : {};
+    const runs = [];
+    const lined = new Set();
+    for (const kind of ['line', 'wavy']) {
+        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.
+                let j = i + 1;
+                while (j < segments.length && segments[j].kind === 'space')
+                    j++;
+                const nextId = kind === 'line' ? segments[j]?.cjkMarks?.properName : segments[j]?.cjkMarks?.bookTitle;
+                if (nextId !== undefined && `${kind}:${nextId}` === open.key)
+                    continue;
+            }
+            if (id === undefined || seg.warichu || seg.inserted) {
+                open = undefined;
+                continue;
+            }
+            const key = `${kind}:${id}`;
+            const font = segmentFont(seg, block);
+            const em = fontEm(font);
+            const end = xs[i] + widths[i] - (seg.kind === 'text' ? tracking + (seg.tracking ?? 0) : 0);
+            if (open && open.key === key) {
+                open.to = Math.max(open.to, end);
+                open.endSeg = i;
+                lined.add(i);
+                continue;
+            }
+            open = { kind, key, from: xs[i], to: end, em, axis: -CENTRAL * em + (seg.baselineShift ?? 0), startSeg: i, endSeg: i };
+            runs.push(open);
+            lined.add(i);
+        }
+    }
+    // Two runs that meet each give up an eighth of an em.
+    for (const a of runs) {
+        for (const b of runs) {
+            if (a === b || a.kind !== b.kind || b.startSeg !== a.endSeg + 1)
+                continue;
+            a.to -= a.em / 8;
+            b.from += b.em / 8;
+        }
+    }
+    for (const r of runs) {
+        const length = r.to - r.from;
+        if (length <= 0)
+            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 });
+        }
+        else {
+            out.push({
+                kind: 'wavy',
+                x: r.from - x0,
+                y: edge + WAVE_AT * r.em,
+                length,
+                thickness: Math.max(0.5, STROKE * r.em * 0.9),
+                amplitude: WAVE_HEIGHT * r.em,
+                wavelength: WAVE_LENGTH * r.em,
+                ...paint,
+            });
+        }
+    }
+    // Emphasis dots, one per character.
+    segments.forEach((seg, i) => {
+        const dots = seg.cjkMarks?.dots;
+        if (!dots || seg.kind !== 'text' || seg.warichu || seg.inserted)
+            return;
+        const font = segmentFont(seg, block);
+        const em = fontEm(font);
+        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 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];
+        for (const { g, at, adv } of graphemeAdvances(seg, box, font, vertical)) {
+            if (NO_DOT_RE.test(g))
+                continue;
+            out.push({
+                kind: dots.style === 'dot' ? 'dot' : dots.style,
+                x: xs[i] + inset + at + (adv - t) / 2 - x0,
+                y,
+                size,
+                thickness: Math.max(0.4, OUTLINE * em),
+                ...(dots.fill === 'open' ? { open: true } : {}),
+                ...paint,
+            });
+        }
+    });
+    return out;
+}
+/** 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) {
+    const sides = new Set();
+    for (const seg of line.segments ?? []) {
+        const m = seg.cjkMarks;
+        if (!m)
+            continue;
+        if (m.dots)
+            sides.add(m.dots.position);
+        if (m.properName !== undefined || m.bookTitle !== undefined)
+            sides.add('under');
+    }
+    return sides.size === 0 ? 0 : sides.size > 1 ? 0.625 : 0.5;
+}
+/** How much line gap (em of the text) a line's ruby readings over or under
+ *  it need: the reading's size (a zhuyin column's, with its tone mark; a
+ *  Latin reading over the base, with the lift that clears its descenders). */
+function rubyNeed(line, em) {
+    let need = 0;
+    for (const seg of line.segments ?? []) {
+        const r = seg.ruby;
+        if (!r || r.position === 'right')
+            continue;
+        const rtEm = fontEm(r.fontString);
+        // A Latin reading over its base stands higher by its lift (rubyLift.ts).
+        const lift = r.position === 'under' ? 0 : latinReadingLift(r.text, r.fontString, em);
+        const size = isZhuyin(r.text) ? rtEm * ZHUYIN_SIZE_RATIO * (/[ˊˇˋˉ]/.test(r.text) ? 1.75 : 1) : rtEm + lift;
+        need = Math.max(need, size / em);
+    }
+    return need;
+}
+/** 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). */
+function lineReach(line, em) {
+    const top = -(CENTRAL + 0.5) * em;
+    const bottom = (0.5 - CENTRAL) * em;
+    const reach = { head: 0, foot: 0, headRuby: false, footRuby: false };
+    const extend = (lo, hi, ruby) => {
+        if (top - lo > reach.head + 1e-9) {
+            reach.head = top - lo;
+            reach.headRuby = ruby;
+        }
+        else if (ruby && top - lo > 1e-9)
+            reach.headRuby = true;
+        if (hi - bottom > reach.foot + 1e-9) {
+            reach.foot = hi - bottom;
+            reach.footRuby = ruby;
+        }
+        else if (ruby && hi - bottom > 1e-9)
+            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;
+        extend(m.y - half, m.y + half, false);
+    }
+    for (const seg of line.segments ?? []) {
+        const r = seg.ruby;
+        if (!r || r.position === 'right')
+            continue;
+        for (const run of r.runs) {
+            const runEm = fontEm(run.fontString);
+            if (run.upright) {
+                const axis = run.dy - CENTRAL * runEm;
+                let w = 0;
+                for (const g of graphemesOf(run.text))
+                    w = Math.max(w, measureTextWidth(g, run.fontString));
+                extend(axis - w / 2, axis + w / 2, true);
+            }
+            else {
+                extend(run.dy - (CENTRAL + 0.5) * runEm, run.dy + (0.5 - CENTRAL) * runEm, true);
+            }
+        }
+    }
+    return reach;
+}
+/**
+ * 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`).
+ *
+ * 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`).
+ */
+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();
+    for (const block of doc.blocks) {
+        if (block.type === 'resource' || block.designOverlay)
+            continue;
+        let marked = false;
+        let ruby = false;
+        for (const line of block.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 vertical = flow?.writingMode === 'vertical-rl' ? { region: cjk?.region ?? 'mainland', uprightDigits: cjk?.uprightDigits ?? 2 } : undefined;
+                const marks = lineMarks(line, block, color, vertical);
+                if (marks.length > 0)
+                    line.marks = marks;
+            }
+            // Only the CJK composer sets ruby (#194).
+            if (line.cjkComposed && segs.some((s) => s.ruby && s.ruby.position !== 'right'))
+                ruby = true;
+        }
+        if (!marked && !ruby)
+            continue;
+        const em = fontEm(block.fontString);
+        const first = block.lines[0];
+        if (!first || em <= 0)
+            continue;
+        if (block.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}`;
+            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) });
+        }
+        const gapEm = (first.bbox.height - em) / em;
+        const at = atOf(block);
+        const where = whereOf(block);
+        if (marked) {
+            const need = Math.max(...block.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)));
+            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 });
+            }
+        }
+    }
+    // The gaps two lines of a column share.
+    for (const column of columns.values()) {
+        for (let i = 1; i < column.length; i++) {
+            const a = column[i - 1];
+            const b = column[i];
+            const need = a.reach.foot + b.reach.head;
+            if (need <= 0)
+                continue;
+            const gap = (b.line.baseline - (CENTRAL + 0.5) * b.em) - (a.line.baseline + (0.5 - CENTRAL) * a.em);
+            if (need <= gap + 1e-6)
+                continue;
+            const ruby = a.reach.footRuby || b.reach.headRuby;
+            const key = `${ruby ? 'r' : 'm'}${whereOf(b.block)}`;
+            if (reported.has(key))
+                continue;
+            reported.add(key);
+            warnings.push({
+                kind: ruby ? 'rubyExceedsLeading' : 'cjkMarksExceedLeading',
+                text: b.line.text,
+                gapEm: round(gap / b.em),
+                neededEm: round(need / b.em),
+                ...atOf(b.block),
+            });
+        }
+    }
+    return warnings;
+}
+const round = (v) => Math.round(v * 1000) / 1000;
+//# sourceMappingURL=cjkMarks.js.map

package/dist/cjkMarks.js.map

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

package/dist/columnClip.d.ts

@@ -2,6 +2,11 @@ import type { BoundingBox, VDTBlock, VDTColumn } from './vdt';
 /** How far the design overlays of `blocks` reach past `x0` on the left and
  *  `x1` on the right, in px (0 when they stay inside). */
 export declare function designOverlayOverhang(blocks: readonly VDTBlock[], x0: number, x1: number): [number, number];
+/** How far the marks hung past the end of their lines
+ *  (`cjk.hangingPunctuation`) in `blocks` reach past `x1`, in px (0 when
+ *  none does). Only the CJK composer hangs a mark, so no other line is
+ *  looked into. */
+export declare function hangingPunctuationOverhang(blocks: readonly VDTBlock[], x1: number): number;
 /** How far the design overlays of the heading blocks among `blocks` reach
  *  above `y0`, in px (0 when they stay below it). */
 export declare function headingDesignOverhangAbove(blocks: readonly VDTBlock[], y0: number): number;
@@ -16,12 +21,16 @@ export declare function headingDesignOverhangAbove(blocks: readonly VDTBlock[],
  * design may also reach above the column — a band anchored to the top of
  * the page or of the bleed — and the clip grows up to take that in too
  * (EF-113), and so does the first block of a column under a page-span
- * opener set a little above the column's top (EF-139). The column's foot
- * stays the edge: the flow ends there, and a design reaching past it is cut
- * and reported (`collectHeadingDesignCuts`).
+ * opener set a little above the column's top (EF-139). A CJK mark hung
+ * past the end of its line widens it on the right
+ * (`cjk.hangingPunctuation`); `hanging` false says no line of the document
+ * hangs one (its `cjk.hangingPunctuation` is `'none'`), and the lines are
+ * not looked into. The column's foot stays the edge: the flow ends there,
+ * and a design reaching past it is cut and reported
+ * (`collectHeadingDesignCuts`).
  * A box frame (a callout) is cut at the column's top as well, with the text
  * inside it. Shared by the canvas and PDF backends so both paint the same
  * thing.
  */
-export declare function columnClipRect(col: VDTColumn, dpi: number): BoundingBox;
+export declare function columnClipRect(col: VDTColumn, dpi: number, hanging?: boolean): BoundingBox;
 //# sourceMappingURL=columnClip.d.ts.map

package/dist/columnClip.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"columnClip.d.ts","sourceRoot":"","sources":["../src/columnClip.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAG9D;0DAC0D;AAC1D,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,SAAS,QAAQ,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAW3G;AAED;qDACqD;AACrD,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,SAAS,QAAQ,EAAE,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAO1F;AAcD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,WAAW,CAUvE"}
+{"version":3,"file":"columnClip.d.ts","sourceRoot":"","sources":["../src/columnClip.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAI9D;0DAC0D;AAC1D,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,SAAS,QAAQ,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAW3G;AAED;;;mBAGmB;AACnB,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,SAAS,QAAQ,EAAE,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAa1F;AAED;qDACqD;AACrD,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,SAAS,QAAQ,EAAE,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAO1F;AAcD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,UAAO,GAAG,WAAW,CAYvF"}

package/dist/columnClip.js

@@ -1,4 +1,5 @@
 import { dimensionToPx } from './units';
+import { lineInkExtent } from './lineInk';
 /** How far the design overlays of `blocks` reach past `x0` on the left and
  *  `x1` on the right, in px (0 when they stay inside). */
 export function designOverlayOverhang(blocks, x0, x1) {
@@ -14,6 +15,27 @@ export function designOverlayOverhang(blocks, x0, x1) {
     }
     return [left, right];
 }
+/** How far the marks hung past the end of their lines
+ *  (`cjk.hangingPunctuation`) in `blocks` reach past `x1`, in px (0 when
+ *  none does). Only the CJK composer hangs a mark, so no other line is
+ *  looked into. */
+export function hangingPunctuationOverhang(blocks, x1) {
+    let right = 0;
+    for (const block of blocks) {
+        if (block.hidden || !block.lines)
+            continue;
+        for (const line of block.lines) {
+            if (!line.cjkComposed)
+                continue;
+            const segments = line.segments;
+            if (!segments || !segments[segments.length - 1]?.hangs)
+                continue;
+            const { hang } = lineInkExtent(line, 0);
+            right = Math.max(right, line.bbox.x + line.bbox.width + hang - x1);
+        }
+    }
+    return right;
+}
 /** How far the design overlays of the heading blocks among `blocks` reach
  *  above `y0`, in px (0 when they stay below it). */
 export function headingDesignOverhangAbove(blocks, y0) {
@@ -49,16 +71,22 @@ function firstBlockAbove(blocks, y0) {
  * design may also reach above the column — a band anchored to the top of
  * the page or of the bleed — and the clip grows up to take that in too
  * (EF-113), and so does the first block of a column under a page-span
- * opener set a little above the column's top (EF-139). The column's foot
- * stays the edge: the flow ends there, and a design reaching past it is cut
- * and reported (`collectHeadingDesignCuts`).
+ * opener set a little above the column's top (EF-139). A CJK mark hung
+ * past the end of its line widens it on the right
+ * (`cjk.hangingPunctuation`); `hanging` false says no line of the document
+ * hangs one (its `cjk.hangingPunctuation` is `'none'`), and the lines are
+ * not looked into. The column's foot stays the edge: the flow ends there,
+ * and a design reaching past it is cut and reported
+ * (`collectHeadingDesignCuts`).
  * A box frame (a callout) is cut at the column's top as well, with the text
  * inside it. Shared by the canvas and PDF backends so both paint the same
  * thing.
  */
-export function columnClipRect(col, dpi) {
+export function columnClipRect(col, dpi, hanging = true) {
     const overhang = dimensionToPx({ value: 2, unit: 'pt' }, dpi);
-    const [left, right] = designOverlayOverhang(col.blocks, col.bbox.x, col.bbox.x + col.bbox.width);
+    const [left, overlayRight] = designOverlayOverhang(col.blocks, col.bbox.x, col.bbox.x + col.bbox.width);
+    // A mark hung past the measure is shown whole.
+    const right = Math.max(overlayRight, hanging ? hangingPunctuationOverhang(col.blocks, col.bbox.x + col.bbox.width) : 0);
     const above = Math.max(headingDesignOverhangAbove(col.blocks, col.bbox.y), firstBlockAbove(col.blocks, col.bbox.y));
     return {
         x: col.bbox.x - overhang - left,

package/dist/columnClip.js.map

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

package/dist/configWarnings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configWarnings.d.ts","sourceRoot":"","sources":["../src/configWarnings.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAMV,aAAa,EAEd,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EAAE,aAAa,EAAkB,MAAM,OAAO,CAAC;AA0B3D;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG,SAAS,GAAG,aAAa,EAAE,CAGxF"}
+{"version":3,"file":"configWarnings.d.ts","sourceRoot":"","sources":["../src/configWarnings.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAMV,aAAa,EAEd,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EAAE,aAAa,EAAkB,MAAM,OAAO,CAAC;AA2B3D;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG,SAAS,GAAG,aAAa,EAAE,CAGxF"}

package/dist/configWarnings.js

@@ -13,6 +13,7 @@ import { dimensionToPx } from './units';
 import { resolveAllConfig, sideColumnPercentUsed } from './pipeline/config';
 import { computePageMetrics } from './pipeline/buildHelpers';
 import { deriveSectionGeometryConfig } from './pipeline/headingStyles';
+import { cjkGridGeometry } from './pipeline/cjkGrid';
 /** The format fields and the decimal spelling each falls back to. A
  *  `format` is a format field only under `pageNumbering`. */
 function numberFormatFallback(key, parentKey) {
@@ -47,7 +48,7 @@ function percentText(n) {
 export function collectConfigWarnings(config) {
     if (!config)
         return [];
-    return [...collectValueWarnings(config), ...collectSideColumnWarnings(config), ...collectUnknownKeyWarnings(config)];
+    return [...collectValueWarnings(config), ...collectSideColumnWarnings(config), ...collectUnknownKeyWarnings(config), ...collectCjkGridWarnings(config)];
 }
 // The keys of the heading settings, checked against their types: a key
 // added to (or removed from) a type fails to compile until it is listed
@@ -63,14 +64,14 @@ const BALANCING_KEYS = {
 };
 const HEADING_LEVEL_KEYS = {
     level: true, fontSize: true, lineHeight: true, fontFamily: true, color: true, fontWeight: true,
-    marginTop: true, marginBottom: true, numberingTemplate: true, italic: true, letterSpacing: true,
+    marginTop: true, marginBottom: true, numberingTemplate: true, numberSeparator: true, italic: true, letterSpacing: true,
     breakBefore: true, span: true, advancedDesign: true, textTransform: true, hidden: true, snapToGrid: true,
 };
 const HEADING_STYLE_KEYS = {
     id: true, name: true, numberingTemplate: true, numbered: true, toc: true, runningChapter: true, header: true, footer: true,
     margins: true, layout: true, bodyStyle: true, palette: true,
     fontSize: true, lineHeight: true, fontFamily: true, color: true, fontWeight: true, marginTop: true,
-    marginBottom: true, italic: true, letterSpacing: true, breakBefore: true, span: true,
+    marginBottom: true, numberSeparator: true, italic: true, letterSpacing: true, breakBefore: true, span: true,
     advancedDesign: true, textTransform: true, hidden: true, snapToGrid: true,
 };
 const PARAGRAPH_STYLE_KEYS = {
@@ -220,4 +221,18 @@ function collectSideColumnWarnings(config) {
     });
     return out;
 }
+/** A character grid (`cjk.grid`) with more characters per line or lines
+ *  per page than the page's margins leave room for: the grid is reduced to
+ *  what fits (`cjkGridClamped`, `used` the number set). */
+function collectCjkGridWarnings(config) {
+    const g = cjkGridGeometry(config);
+    if (!g)
+        return [];
+    const out = [];
+    if (g.clamped.charsPerLine !== undefined)
+        out.push({ kind: 'cjkGridClamped', path: 'cjk.grid.charsPerLine', value: String(g.clamped.charsPerLine), used: String(g.charsPerLine) });
+    if (g.clamped.linesPerPage !== undefined)
+        out.push({ kind: 'cjkGridClamped', path: 'cjk.grid.linesPerPage', value: String(g.clamped.linesPerPage), used: String(g.linesPerPage) });
+    return out;
+}
 //# sourceMappingURL=configWarnings.js.map