postext 1.8.6 → 1.9.1

package/dist/__tests__/cjk/latinFastPath.test.js

@@ -0,0 +1,208 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+// The renderers and the measurer decide once per line (or paragraph)
+// whether text needs the CJK features: a Latin page must not pay for them
+// word by word. `hasCJK` is counted to hold that.
+const calls = vi.hoisted(() => ({ hasCJK: 0 }));
+vi.mock('../../measure/cjk', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        hasCJK: (text) => {
+            calls.hasCJK++;
+            return actual.hasCJK(text);
+        },
+    };
+});
+import { buildDocument, renderPageToCanvas, columnClipRect } from '../../index';
+import { renderToHtml } from '../../html-backend';
+import { measureRichBlock } from '../../measure/rich';
+import { hasCJK } from '../../measure/cjk';
+// CJK characters one em, a space a quarter, anything else half.
+const adv = (s, em = 16) => {
+    let w = 0;
+    for (const ch of s)
+        w += ch === ' ' ? em / 4 : ch.codePointAt(0) >= 0x2e80 ? em : em / 2;
+    return w;
+};
+class StubCtx {
+    font = '';
+    letterSpacing = '0px';
+    measureText(s) {
+        return { width: adv(s) };
+    }
+}
+globalThis.OffscreenCanvas = class {
+    getContext() {
+        return new StubCtx();
+    }
+};
+/** A canvas whose context records every `fillText` and every state set. */
+function recordingCanvas() {
+    const texts = [];
+    const sets = [];
+    const target = { letterSpacing: '0px' };
+    const ctx = new Proxy(target, {
+        get(t, key) {
+            if (key === 'fillText')
+                return (text) => { texts.push(text); };
+            if (key === 'measureText')
+                return (s) => ({ width: adv(s) });
+            if (key in t)
+                return t[key];
+            return () => undefined;
+        },
+        set(t, key, value) {
+            sets.push(String(key));
+            t[key] = value;
+            return true;
+        },
+    });
+    const canvas = { width: 0, height: 0, getContext: () => ctx };
+    return { canvas, texts, sets };
+}
+const pt = (value) => ({ value, unit: 'pt' });
+const config = (extra = {}) => ({
+    page: { width: pt(300), height: pt(420), dpi: 72, margins: { top: pt(20), bottom: pt(20), left: pt(20), right: pt(20) } },
+    layout: { layoutType: 'single' },
+    header: { elements: [] },
+    footer: { elements: [] },
+    bodyText: { fontSize: pt(10), lineHeight: pt(14), textAlign: 'justify', hyphenation: { enabled: false } },
+    ...extra,
+});
+const QUIJOTE = [
+    'En un lugar de la Mancha, de cuyo nombre no quiero acordarme, no ha mucho tiempo que vivía un hidalgo de los de lanza en astillero, adarga antigua, rocín flaco y galgo corredor.',
+    'Una olla de algo más **vaca que carnero**, salpicón las más noches, duelos y quebrantos los sábados, lantejas los viernes, algún palomino de añadidura los domingos, consumían las tres partes de su hacienda.',
+    'El resto della concluían sayo de velarte, calzas de velludo para las fiestas, con sus pantuflos de lo mesmo, y los días de entresemana se honraba con su *vellorí de lo más fino*.',
+].join('\n\n');
+/** Every line of the document's pages: flow blocks, floats and the lines
+ *  of resource blocks (captions, cells), with the block they belong to. */
+function everyLine(doc) {
+    const out = [];
+    const visit = (value, block) => {
+        if (Array.isArray(value)) {
+            for (const v of value)
+                visit(v, block);
+            return;
+        }
+        if (!value || typeof value !== 'object')
+            return;
+        const o = value;
+        const owner = typeof o.type === 'string' && Array.isArray(o.lines) && 'bbox' in o ? o : block;
+        if (Array.isArray(o.lines)) {
+            for (const l of o.lines) {
+                const line = l;
+                if (line && typeof line.text === 'string' && line.bbox && owner)
+                    out.push({ line, block: owner });
+            }
+        }
+        for (const [key, v] of Object.entries(o))
+            if (key !== 'lines' && key !== 'config')
+                visit(v, owner);
+    };
+    visit(doc.pages, undefined);
+    return out;
+}
+const COMPOSER_FIELDS = ['tracking', 'inkOffset', 'inkScale', 'hangs', 'autospace', 'ruby', 'warichu'];
+const painted = (s) => s.kind !== 'space' && s.kind !== 'math' && s.kind !== 'swatch' && !s.chip;
+describe('a Latin page and the CJK features', () => {
+    beforeEach(() => {
+        calls.hasCJK = 0;
+    });
+    it('paints on the canvas with one CJK test per line, not one per word', () => {
+        const doc = buildDocument({ markdown: QUIJOTE }, config());
+        const lines = everyLine(doc);
+        const words = lines.reduce((n, { line }) => n + (line.segments ?? []).filter(painted).length, 0);
+        expect(words).toBeGreaterThan(3 * lines.length);
+        calls.hasCJK = 0;
+        const { canvas, texts, sets } = recordingCanvas();
+        for (const page of doc.pages)
+            renderPageToCanvas(page, doc, canvas);
+        expect(calls.hasCJK).toBeLessThanOrEqual(lines.length);
+        // Every word one `fillText`, and the tracking never touched.
+        expect(texts.length).toBeGreaterThanOrEqual(words - lines.length);
+        expect(sets).not.toContain('letterSpacing');
+    });
+    it('renders HTML with one CJK test per line, not one per word', () => {
+        const doc = buildDocument({ markdown: QUIJOTE }, config());
+        const lines = everyLine(doc);
+        calls.hasCJK = 0;
+        const html = renderToHtml(doc);
+        expect(calls.hasCJK).toBeLessThanOrEqual(lines.length);
+        expect(html).not.toContain('text-spacing-trim');
+    });
+    it('measures a Latin paragraph with one CJK test, not one per word', () => {
+        const spans = [
+            { text: 'En un lugar de la Mancha, de cuyo nombre no quiero acordarme, ', bold: false, italic: false },
+            { text: 'no ha mucho tiempo', bold: true, italic: false },
+            { text: ' que vivía un hidalgo de los de lanza en astillero, adarga antigua, rocín flaco y galgo corredor.', bold: false, italic: false },
+        ];
+        const measure = () => measureRichBlock(spans, '16px Test', 'bold 16px Test', 'italic 16px Test', 'bold italic 16px Test', 200, 20, { textAlign: 'justify', optimal: true });
+        // The words' widths cached first: a width measured for the first time
+        // is looked at for CJK marks that meet (`measureTextWidth`).
+        measure();
+        calls.hasCJK = 0;
+        expect(measure().lines.length).toBeGreaterThan(3);
+        expect(calls.hasCJK).toBeLessThanOrEqual(2);
+    });
+    it('leaves a line set word by word without the fields only the CJK composer sets', () => {
+        const markdown = [
+            '# Capítulo',
+            '',
+            ':::toc',
+            '',
+            '## Uno',
+            '',
+            'Una línea latina cita 紅樓夢 y “end.”“Yes” con marcas que se tocan, :tcy[12] y :dots[punto].',
+            '',
+            '賈寶玉{紅樓|hóng|lóu}夢，一個latin詞。說：「此開卷第一回也。作者自云：因曾歷過一番夢幻之後，故將真事隱去。」',
+            '',
+            '此開卷第一回也。作者自云：因曾歷過一番夢幻之後，故將真事隱去，而借「通靈」之說，撰此《石頭記》一書也。',
+            '',
+            QUIJOTE,
+        ].join('\n');
+        const doc = buildDocument({ markdown }, config({
+            locale: 'es',
+            cjk: { hangingPunctuation: 'force' },
+            toc: { leader: { enabled: true, char: '・' } },
+        }));
+        const lines = everyLine(doc);
+        expect(lines.some(({ line }) => line.cjkComposed)).toBe(true);
+        expect(lines.some(({ line }) => !line.cjkComposed && hasCJK(line.text))).toBe(true);
+        for (const { line, block } of lines) {
+            if (line.cjkComposed)
+                continue;
+            for (const seg of line.segments ?? []) {
+                for (const field of COMPOSER_FIELDS)
+                    expect(seg[field], `${field} on "${line.text}"`).toBeUndefined();
+                // The line's text holds the text of every painted segment, but for
+                // the leader of a contents entry: a segment with CJK text sits on a
+                // line whose text holds CJK text.
+                if (painted(seg) && hasCJK(seg.text) && block.tocEntry === undefined) {
+                    expect(hasCJK(line.text), `"${seg.text}" on "${line.text}"`).toBe(true);
+                }
+            }
+        }
+    });
+    it('hangs no mark when the document does not hang them, so the clip needs no look at the lines', () => {
+        // Ten characters and a comma, again and again: at some measure a
+        // comma meets the end of a line.
+        const markdown = '一二三四五六七八九十，'.repeat(24);
+        const hungAt = (hangingPunctuation, width) => {
+            const doc = buildDocument({ markdown }, config({
+                locale: 'zh-Hans',
+                page: { width: pt(width), height: pt(420), dpi: 72, margins: { top: pt(20), bottom: pt(20), left: pt(20), right: pt(20) } },
+                cjk: { hangingPunctuation },
+            }));
+            return { doc, hung: everyLine(doc).filter(({ line }) => line.segments?.some((s) => s.hangs)).length };
+        };
+        const widths = [183, 193, 203, 213, 223, 233, 243];
+        expect(widths.some((w) => hungAt('force', w).hung > 0)).toBe(true);
+        for (const w of widths) {
+            const { doc, hung } = hungAt('none', w);
+            expect(hung).toBe(0);
+            for (const col of doc.pages[0].columns)
+                expect(columnClipRect(col, 72, false)).toEqual(columnClipRect(col, 72));
+        }
+    });
+});
+//# sourceMappingURL=latinFastPath.test.js.map

package/dist/__tests__/cjk/latinFastPath.test.js.map

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

package/dist/__tests__/cjk/markCutsLatin.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=markCutsLatin.test.d.ts.map

package/dist/__tests__/cjk/markCutsLatin.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"markCutsLatin.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/cjk/markCutsLatin.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/cjk/markCutsLatin.test.js

@@ -0,0 +1,69 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+// Spies on the per-character scan behind `markCuts`: painting a page of a
+// Latin book goes through it once per painted segment, so text with no CJK
+// must not reach it (#184, #185).
+const scans = vi.hoisted(() => ({ breakingSpace: 0, markCuts: 0 }));
+vi.mock('../../measure/spaces', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        isBreakingSpace: (ch) => {
+            scans.breakingSpace++;
+            return actual.isBreakingSpace(ch);
+        },
+    };
+});
+vi.mock('../../measure/cjkClasses', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        cjkMarkCuts: (text, shared) => {
+            scans.markCuts++;
+            return actual.cjkMarkCuts(text, shared);
+        },
+    };
+});
+import { markCuts, markPieces } from '../../measure/markCuts';
+import { isTrimmableMark } from '../../measure/cjkClasses';
+import { hasCJK } from '../../measure/cjk';
+const LATIN = [
+    'En un lugar de la Mancha, de cuyo nombre no quiero acordarme, no ha mucho tiempo que vivía un hidalgo',
+    '“end.”“Yes” — «así»·‘ya’… 37 °C, 225 000',
+    'Stay hungry.”“Stay foolish.',
+];
+describe('markCuts on text with no CJK', () => {
+    beforeEach(() => {
+        scans.breakingSpace = 0;
+        scans.markCuts = 0;
+    });
+    it('paints it whole without scanning it character by character', () => {
+        for (const text of LATIN) {
+            expect(markCuts(text, 'words')).toEqual([]);
+            expect(markCuts(text, 'text')).toEqual([]);
+            expect(markPieces(text, 'words')).toEqual([text]);
+        }
+        expect(scans.breakingSpace).toBe(0);
+        expect(scans.markCuts).toBe(0);
+    });
+    it('still cuts a line that holds CJK text as before', () => {
+        expect(markCuts('a 楼 “end.”“Yes” 本）》录', 'words')).toEqual([18]);
+        expect(markCuts('他说：”“好', 'text')).toEqual([3, 4]);
+        // The CJK composer cuts the shared marks with no Han character on the line.
+        expect(markCuts('hungry.”“Stay', 'composed')).toEqual([8]);
+        expect(scans.markCuts).toBeGreaterThan(0);
+    });
+    it('holds because every mark cut outside the shared ones is a CJK character', () => {
+        // `'text'` and `'words'` count the shared marks (“ ” ‘ ’ ·) only in
+        // text with CJK: any other mark they cut is itself CJK text, so a string
+        // with no CJK never has a cut.
+        const outside = [];
+        for (let cp = 0; cp <= 0x10FFFF; cp++) {
+            if (cp >= 0xD800 && cp <= 0xDFFF)
+                continue;
+            if (isTrimmableMark(cp, false) && !hasCJK(String.fromCodePoint(cp)))
+                outside.push(cp.toString(16));
+        }
+        expect(outside).toEqual([]);
+    });
+});
+//# sourceMappingURL=markCutsLatin.test.js.map

package/dist/__tests__/cjk/markCutsLatin.test.js.map

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

package/dist/__tests__/cjk/markRuns.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=markRuns.test.d.ts.map

package/dist/__tests__/cjk/markRuns.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"markRuns.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/cjk/markRuns.test.ts"],"names":[],"mappings":""}