postext-pdf 1.34.0 → 1.35.0

package/dist/__tests__/composedFixture.test.d.ts

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

package/dist/__tests__/composedFixture.test.d.ts.map

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

package/dist/__tests__/composedFixture.test.js

@@ -0,0 +1,64 @@
+import { describe, it, expect } from 'vitest';
+import fs from 'node:fs';
+import { PDFDocument } from 'pdf-lib';
+import fontkit from '@pdf-lib/fontkit';
+import { buildDocument } from 'postext';
+import { renderToPdf } from '../pdf-backend';
+import { parseFontString } from '../fontString';
+// #855: a composed page laid out by the engine (a tabbed title, running
+// text, two boxes with tabs, one turned) and written as a tagged PDF.
+const fontBytes = fs.readFileSync(new URL('../../../../apps/web/public/fonts/Lora-Regular.ttf', import.meta.url));
+const face = fontkit.create(fontBytes);
+class StubCtx {
+    font = '';
+    measureText(s) {
+        const sizePx = parseFontString(this.font)?.sizePx ?? 16;
+        return { width: (face.layout(s).advanceWidth / face.unitsPerEm) * sizePx };
+    }
+}
+globalThis.OffscreenCanvas = class {
+    getContext() {
+        return new StubCtx();
+    }
+};
+describe('composed page to PDF (#855)', () => {
+    it('writes a composed page as one tagged page', async () => {
+        const mm = (value) => ({ value, unit: 'mm' });
+        const config = {
+            calloutStyles: [{ id: 'box', backgroundEnabled: true, background: { hex: '#d8ecf9' }, label: { position: 'top-left', offset: mm(5), height: mm(5) } }],
+            pageTemplates: [{
+                    id: 'page',
+                    decoration: { elements: [{ kind: 'box', id: 'card', placement: { anchor: { to: 'container', edge: 'top-left' }, size: { width: 'fill', height: 'fill' } }, style: { backgroundColor: { hex: '#ffffff' } } }] },
+                    frames: [
+                        { name: 'title', takes: 'h1', placement: { anchor: { to: 'container', edge: 'top-left' } } },
+                        { name: 'text', flow: true, placement: { anchor: { to: '#title', edge: 'below' } } },
+                        { name: 'money', style: 'box', width: mm(100), placement: { anchor: { to: '#text', edge: 'below' }, offset: { y: mm(8) } } },
+                        { name: 'saving', style: 'box', width: mm(80), rotate: -4, layer: 2, height: mm(15), placement: { anchor: { to: '#money', edge: 'below' }, offset: { y: mm(8) } } },
+                    ],
+                }],
+        };
+        const markdown = [
+            '::::page{template="page"}',
+            '# Money and everyday life',
+            '',
+            'Every family needs food, clothes and a home.',
+            '',
+            ':::frame{slot="money" label="What money is for"}',
+            'Money lets us swap our work for the things we need.',
+            ':::',
+            '',
+            ':::frame{slot="saving" label="Saving"}',
+            'When we spend less than we earn, we can save for later. '.repeat(6),
+            ':::',
+            '::::',
+        ].join('\n');
+        const doc = buildDocument({ markdown }, config);
+        expect(doc.pages[0].composed.frames.find((f) => f.name === 'saving').overflowPx).toBeGreaterThan(0);
+        expect(doc.pages[0].composed).toBeDefined();
+        const bytes = await renderToPdf(doc, { fontProvider: async () => new Uint8Array(fontBytes), accessible: true });
+        const pdf = await PDFDocument.load(bytes);
+        expect(pdf.getPageCount()).toBe(1);
+        expect(bytes.byteLength).toBeGreaterThan(1000);
+    });
+});
+//# sourceMappingURL=composedFixture.test.js.map

package/dist/__tests__/composedFixture.test.js.map

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

package/dist/__tests__/composedPage.test.d.ts

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

package/dist/__tests__/composedPage.test.d.ts.map

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

package/dist/__tests__/composedPage.test.js

@@ -0,0 +1,167 @@
+import { describe, it, expect, beforeAll } from 'vitest';
+import fs from 'node:fs';
+import { PDFArray, PDFDict, PDFDocument, PDFName, PDFRawStream, PDFRef, decodePDFRawStream } from 'pdf-lib';
+import fontkit from '@pdf-lib/fontkit';
+import { buildDocument, frameMatrix } from 'postext';
+import { renderToPdf } from '../pdf-backend';
+import { collectFontText } from '../pdf-backend/fontHelpers';
+import { sheetMatrixToPdf } from '../pdf-backend/comic';
+import { parseFontString } from '../fontString';
+// #855: the PDF paints a composed page's frames in layer order (the
+// decoration at layer 0), each turned by its matrix (`cm`) and clipped to
+// its box when its content overflows (`W n`), embeds the decoration's
+// face, and reads the frames in Markdown order, not in paint order.
+const fontBytes = fs.readFileSync(new URL('../../../../apps/web/public/fonts/Lora-Regular.ttf', import.meta.url));
+const face = fontkit.create(fontBytes);
+const asked = [];
+const fontProvider = async (family) => {
+    asked.push(family);
+    return new Uint8Array(fontBytes);
+};
+class StubCtx {
+    font = '';
+    measureText(s) {
+        const sizePx = parseFontString(this.font)?.sizePx ?? 16;
+        const run = face.layout(s);
+        return { width: (run.advanceWidth / face.unitsPerEm) * sizePx };
+    }
+}
+globalThis.OffscreenCanvas = class {
+    getContext() {
+        return new StubCtx();
+    }
+};
+const markdown = [
+    'Intro paragraph.',
+    '',
+    ':::callout{placement="top"}',
+    'Alpha one.',
+    ':::',
+    '',
+    ':::callout{placement="top"}',
+    'Bravo one.',
+    '',
+    'Bravo two.',
+    ':::',
+    '',
+    ':::callout{placement="bottom"}',
+    'Charlie one.',
+    '',
+    'Charlie two.',
+    '',
+    'Charlie three.',
+    ':::',
+    '',
+    'Outro.',
+].join('\n');
+/** A laid-out page whose three floated boxes are made the frames of a
+ *  composed page by hand: alpha (one paragraph) turned 15° at layer 2,
+ *  bravo (two) clipped at layer 1, charlie (three) at layer −1, under a
+ *  decoration set in Decofont (the page's running head, moved). */
+function composedDoc() {
+    const doc = buildDocument({ markdown }, {
+        locale: 'en-us',
+        header: { elements: [{ kind: 'text', id: 'deco', content: 'DECO', fontFamily: 'Decofont', fontSize: { value: 10, unit: 'pt' }, placement: { anchor: { to: 'container', edge: 'top-left' } } }] },
+        footer: { elements: [] },
+    });
+    const page = doc.pages[0];
+    const floats = page.floats ?? [];
+    const boxes = floats.filter((f) => f.type === 'callout');
+    const frame = (name, i, layer, rotate, overflowPx) => {
+        const box = boxes[i];
+        return {
+            id: `cp0:${name}`,
+            name,
+            rect: { ...box.bbox },
+            rotate,
+            layer,
+            scale: 1,
+            overflowPx,
+            blockIds: floats.filter((f) => f.containerId === box.containerId).map((f) => f.id),
+            configPath: `/pageTemplates/0/frames/${i}`,
+        };
+    };
+    const frames = {
+        alpha: frame('alpha', 0, 2, 15, 0),
+        bravo: frame('bravo', 1, 1, 0, 24),
+        charlie: frame('charlie', 2, -1, 0, 0),
+    };
+    page.composed = {
+        template: 't',
+        fenceIndex: 0,
+        role: 'composed',
+        attrs: {},
+        attrSources: {},
+        frames: [frames.alpha, frames.bravo, frames.charlie],
+        decoration: page.header,
+        log: [],
+        configPath: '/pageTemplates/0',
+        sourceStart: 0,
+        sourceEnd: 0,
+    };
+    delete page.header;
+    return { doc, page, frames };
+}
+function readElem(pdf, ref) {
+    const dict = pdf.context.lookup(ref, PDFDict);
+    const elem = { type: dict.get(PDFName.of('S')).decodeText(), kids: [] };
+    const k = dict.get(PDFName.of('K'));
+    for (const kid of k instanceof PDFArray ? k.asArray() : k ? [k] : []) {
+        if (kid instanceof PDFRef)
+            elem.kids.push(readElem(pdf, kid));
+    }
+    return elem;
+}
+function pageText(pdf, index) {
+    const contents = pdf.getPage(index).node.Contents();
+    const streams = contents instanceof PDFArray ? contents.asArray().map((r) => pdf.context.lookup(r)) : [contents];
+    return streams.map((s) => (s instanceof PDFRawStream ? Buffer.from(decodePDFRawStream(s).decode()).toString('latin1') : '')).join('\n');
+}
+let fixture;
+let pdf;
+let root;
+beforeAll(async () => {
+    fixture = composedDoc();
+    const bytes = await renderToPdf(fixture.doc, { fontProvider, accessible: true });
+    pdf = await PDFDocument.load(bytes);
+    const treeRoot = pdf.catalog.lookup(PDFName.of('StructTreeRoot'), PDFDict);
+    root = readElem(pdf, treeRoot.get(PDFName.of('K')).get(0));
+}, 60_000);
+describe('a composed page in the PDF (#855)', () => {
+    it('turns the rotated frame through its matrix', () => {
+        const text = pageText(pdf, 0);
+        const m = sheetMatrixToPdf(frameMatrix(fixture.frames.alpha), 72 / fixture.doc.config.page.dpi, fixture.page.height * (72 / fixture.doc.config.page.dpi));
+        // cos 15° and sin 15° (a clockwise turn on the sheet is −15° in PDF space).
+        expect(m[0]).toBeCloseTo(0.9659, 4);
+        expect(m[1]).toBeCloseTo(-0.2588, 4);
+        expect(/(^|\s)0\.9659\d* -0\.2588\d* 0\.2588\d* 0\.9659\d* [-\d.]+ [-\d.]+ cm/.test(text)).toBe(true);
+    });
+    it('clips the overflowing frame to its box', () => {
+        const text = pageText(pdf, 0);
+        const s = 72 / fixture.doc.config.page.dpi;
+        const r = fixture.frames.bravo.rect;
+        const H = fixture.page.height * s;
+        const re = [r.x * s, H - (r.y + r.height) * s, r.width * s, r.height * s];
+        const ops = text.split(/\s+/);
+        // `x y w h re W n` with the frame's box.
+        const found = ops.some((op, i) => op === 're' && ops[i + 1] === 'W' && ops[i + 2] === 'n'
+            && ops.slice(i - 4, i).every((v, j) => Math.abs(Number(v) - re[j]) < 0.01));
+        expect(found).toBe(true);
+    });
+    it('balances its graphics states', () => {
+        const text = pageText(pdf, 0);
+        const ops = text.split(/\s+/);
+        expect(ops.filter((o) => o === 'q').length).toBe(ops.filter((o) => o === 'Q').length);
+    });
+    it('collects and embeds the decoration face', () => {
+        const fonts = collectFontText(fixture.doc);
+        expect([...fonts.keys()].some((k) => k.includes('Decofont'))).toBe(true);
+        expect(asked).toContain('Decofont');
+    });
+    it('reads the frames in Markdown order, whatever order the layers paint them in', () => {
+        const top = root.kids.map((k) => (k.type === 'Div' ? `Div(${k.kids.filter((c) => c.type === 'P').length})` : k.type));
+        // Intro, then alpha (one paragraph), bravo (two), charlie (three), outro.
+        expect(top).toEqual(['P', 'Div(1)', 'Div(2)', 'Div(3)', 'P']);
+    });
+});
+//# sourceMappingURL=composedPage.test.js.map

package/dist/__tests__/composedPage.test.js.map

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

package/dist/__tests__/composedReadingOrder.test.d.ts

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

package/dist/__tests__/composedReadingOrder.test.d.ts.map

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

package/dist/__tests__/composedReadingOrder.test.js

@@ -0,0 +1,80 @@
+import { describe, it, expect, beforeAll } from 'vitest';
+import fs from 'node:fs';
+import { PDFArray, PDFDict, PDFDocument, PDFHexString, PDFName, PDFRef, PDFString } from 'pdf-lib';
+import fontkit from '@pdf-lib/fontkit';
+import { buildDocument } from 'postext';
+import { renderToPdf } from '../pdf-backend';
+import { parseFontString } from '../fontString';
+// #862: the tagged PDF of the stand-in for a textbook's page 8 (#855's
+// fixture) reads the composed page's frames in Markdown order — the
+// title, the running text, each box followed by its photo — whatever
+// order the template's layers paint them in, and a `:::figure`'s labels
+// as part of its figure's alternative text.
+const fontBytes = fs.readFileSync(new URL('../../../../apps/web/public/fonts/Lora-Regular.ttf', import.meta.url));
+const face = fontkit.create(fontBytes);
+class StubCtx {
+    font = '';
+    measureText(s) {
+        const sizePx = parseFontString(this.font)?.sizePx ?? 16;
+        return { width: (face.layout(s).advanceWidth / face.unitsPerEm) * sizePx };
+    }
+}
+globalThis.OffscreenCanvas = class {
+    getContext() {
+        return new StubCtx();
+    }
+};
+/** The fixture, read from the engine's tests as it is (outside this
+ *  package's sources: a dynamic import the compiler does not follow). */
+const FIXTURE = new URL('../../../postext/src/__tests__/composed/fixtures/page8.ts', import.meta.url).href;
+function readElem(pdf, ref) {
+    const dict = pdf.context.lookup(ref, PDFDict);
+    const altObj = dict.get(PDFName.of('Alt'));
+    const alt = altObj instanceof PDFHexString || altObj instanceof PDFString ? altObj.decodeText() : undefined;
+    const elem = { type: dict.get(PDFName.of('S')).decodeText(), ...(alt !== undefined ? { alt } : {}), kids: [] };
+    const k = dict.get(PDFName.of('K'));
+    for (const kid of k instanceof PDFArray ? k.asArray() : k ? [k] : []) {
+        if (kid instanceof PDFRef)
+            elem.kids.push(readElem(pdf, kid));
+    }
+    return elem;
+}
+/** An element as `Type(kid types)`, figures with their alternative text. */
+const shape = (e) => (e.type === 'Figure' ? `Figure[${e.alt}]` : `${e.type}(${e.kids.map(shape).join(' ')})`);
+let root;
+beforeAll(async () => {
+    const { page8Fixture } = (await import(/* @vite-ignore */ FIXTURE));
+    const fixture = page8Fixture('en');
+    const markdown = fixture.markdown.replace('::resource{id="foto-gasto" slot="gasto-fotos"}', [':::figure{resource="foto-gasto" slot="gasto-fotos"}', '::label[Rent]{at="20% 30%"}', '::label[Electricity]{at="70% 25%"}', '::label[Food]{at="50% 80%"}', ':::'].join('\n'));
+    const alt = { 'foto-dinero': 'A card payment', 'foto-gasto': 'A shopping basket', 'foto-ahorro': 'A piggy bank' };
+    const resources = fixture.resources.map((r) => (alt[r.id] ? { ...r, altText: alt[r.id] } : r));
+    const doc = buildDocument({ markdown, resources }, fixture.config);
+    expect(doc.pages[0].composed?.frames.map((f) => f.layer)).toEqual([1, 1, 1, 2, 1, 2, 1, 2]);
+    const bytes = await renderToPdf(doc, { fontProvider: async () => new Uint8Array(fontBytes), accessible: true });
+    const pdf = await PDFDocument.load(bytes);
+    const treeRoot = pdf.catalog.lookup(PDFName.of('StructTreeRoot'), PDFDict);
+    root = readElem(pdf, treeRoot.get(PDFName.of('K')).get(0));
+}, 60_000);
+describe('the composed page 8 stand-in in the tagged PDF (#862)', () => {
+    it('reads the frames in Markdown order, each photo after its box, not in layer order', () => {
+        expect(root.kids.map(shape)).toEqual([
+            // titulo: the tabbed title.
+            'Div(H1())',
+            // texto: the running text.
+            'Div(H2() P() L(LI(Lbl() LBody()) LI(Lbl() LBody())))',
+            // dinero (its tab is its title paragraph), then its photo.
+            'Div(P() P() P())',
+            'Div(Figure[A card payment])',
+            'Div(P() P() L(LI(Lbl() LBody()) LI(Lbl() LBody()) LI(Lbl() LBody())))',
+            'Div(Figure[A shopping basket (Rent, Electricity, Food)])',
+            'Div(P() P())',
+            'Div(Figure[A piggy bank])',
+        ]);
+    });
+    it('leaves the decoration out of the structure', () => {
+        const all = JSON.stringify(root);
+        expect(all).not.toContain('banda');
+        expect(root.kids.every((k) => k.type === 'Div')).toBe(true);
+    });
+});
+//# sourceMappingURL=composedReadingOrder.test.js.map

package/dist/__tests__/composedReadingOrder.test.js.map

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

package/dist/__tests__/composedSpread.test.d.ts

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

package/dist/__tests__/composedSpread.test.d.ts.map

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

package/dist/__tests__/composedSpread.test.js

@@ -0,0 +1,126 @@
+import { describe, it, expect, beforeAll } from 'vitest';
+import fs from 'node:fs';
+import { PDFArray, PDFDict, PDFDocument, PDFName, PDFRawStream, PDFRef, decodePDFRawStream } from 'pdf-lib';
+import fontkit from '@pdf-lib/fontkit';
+import { buildDocument } from 'postext';
+import { renderToPdf } from '../pdf-backend';
+import { parseFontString } from '../fontString';
+// #861: a spread template in the PDF is two pages, each painting its share
+// of the sheet (clipped to its bleed box); the half of a frame crossing the
+// spine that the facing page holds is an artifact there, so the tagged
+// text reads it once.
+const fontBytes = fs.readFileSync(new URL('../../../../apps/web/public/fonts/Lora-Regular.ttf', import.meta.url));
+const face = fontkit.create(fontBytes);
+class StubCtx {
+    font = '';
+    measureText(s) {
+        const sizePx = parseFontString(this.font)?.sizePx ?? 16;
+        return { width: (face.layout(s).advanceWidth / face.unitsPerEm) * sizePx };
+    }
+}
+globalThis.OffscreenCanvas = class {
+    getContext() {
+        return new StubCtx();
+    }
+};
+const mm = (value) => ({ value, unit: 'mm' });
+const config = {
+    page: { width: mm(200), height: mm(260), margins: { top: mm(20), bottom: mm(20), left: mm(20), right: mm(20) } },
+    calloutStyles: [{ id: 'band', backgroundEnabled: true, background: { hex: '#f2a65a' } }],
+    pageTemplates: [{
+            id: 'tl',
+            spread: true,
+            gutter: mm(10),
+            grid: { columns: 4, rows: 4, columnGap: mm(12) },
+            decoration: { elements: [{ kind: 'box', id: 'card', placement: { anchor: { to: 'page', edge: 'top-left' }, offset: { x: mm(10), y: mm(10) }, size: { width: mm(380), height: mm(240) } }, style: { backgroundColor: { hex: '#ffffff' } } }] },
+            frames: [
+                { name: 'band', style: 'band', crossGutter: true, grid: { col: 1, row: 1, cols: 4 } },
+                { name: 'left', grid: { col: 1, row: 2 } },
+                { name: 'right', grid: { col: 4, row: 2 } },
+            ],
+        }],
+};
+const markdown = [
+    'Before the spread.',
+    '',
+    '::::page{template="tl" spread}',
+    ':::frame{slot="band"}',
+    'Band across the spine',
+    ':::',
+    '',
+    ':::frame{slot="left"}',
+    'Left card',
+    ':::',
+    '',
+    ':::frame{slot="right"}',
+    'Right card',
+    ':::',
+    '::::',
+].join('\n');
+function readElem(pdf, ref) {
+    const dict = pdf.context.lookup(ref, PDFDict);
+    const elem = { type: dict.get(PDFName.of('S')).decodeText(), kids: [] };
+    const k = dict.get(PDFName.of('K'));
+    for (const kid of k instanceof PDFArray ? k.asArray() : k ? [k] : []) {
+        if (kid instanceof PDFRef)
+            elem.kids.push(readElem(pdf, kid));
+    }
+    return elem;
+}
+const count = (e, type) => (e.type === type ? 1 : 0) + e.kids.reduce((n, k) => n + count(k, type), 0);
+function pageText(pdf, index) {
+    const contents = pdf.getPage(index).node.Contents();
+    const streams = contents instanceof PDFArray ? contents.asArray().map((r) => pdf.context.lookup(r)) : [contents];
+    return streams.map((s) => (s instanceof PDFRawStream ? Buffer.from(decodePDFRawStream(s).decode()).toString('latin1') : '')).join('\n');
+}
+async function render(doc) {
+    const bytes = await renderToPdf(doc, { fontProvider: async () => new Uint8Array(fontBytes), accessible: true });
+    const pdf = await PDFDocument.load(bytes);
+    const treeRoot = pdf.catalog.lookup(PDFName.of('StructTreeRoot'), PDFDict);
+    const k = treeRoot.get(PDFName.of('K'));
+    const first = k instanceof PDFArray ? k.get(0) : k;
+    return { pdf, root: readElem(pdf, first) };
+}
+let doc;
+let verso;
+let recto;
+let out;
+beforeAll(async () => {
+    doc = buildDocument({ markdown }, config);
+    [verso, recto] = doc.pages.filter((p) => p.composed?.spread);
+    out = await render(doc);
+}, 60_000);
+describe('a spread template in the PDF (#861)', () => {
+    it('writes the sheet as two facing pages after the text before it', () => {
+        expect(out.pdf.getPageCount()).toBe(3);
+        expect([verso.index, recto.index]).toEqual([1, 2]);
+        expect(verso.composed.spread).toBe('left');
+    });
+    it('clips each page to its share of the sheet', () => {
+        const s = 72 / doc.config.page.dpi;
+        for (const page of [verso, recto]) {
+            const c = page.composed.sheetClip;
+            const H = page.height * s;
+            const re = [c.x * s, H - (c.y + c.height) * s, c.width * s, c.height * s];
+            const ops = pageText(out.pdf, page.index).split(/\s+/);
+            const found = ops.some((op, i) => op === 're' && ops[i + 1] === 'W' && ops[i + 2] === 'n'
+                && ops.slice(i - 4, i).every((v, j) => Math.abs(Number(v) - re[j]) < 0.01));
+            expect(found).toBe(true);
+            expect(ops.filter((o) => o === 'q').length).toBe(ops.filter((o) => o === 'Q').length);
+        }
+    });
+    it('paints the facing half of the band as a layout artifact, so its text is tagged once', async () => {
+        const band = recto.composed.frames.find((f) => f.name === 'band');
+        expect(band.facingBlocks.length).toBeGreaterThan(0);
+        expect(pageText(out.pdf, recto.index)).toMatch(/\/Artifact\s*<<\s*\/Type\s*\/Layout\s*>>\s*BDC/);
+        // Without the copy the structure tree is the same.
+        const bare = buildDocument({ markdown }, config);
+        for (const p of bare.pages)
+            for (const f of p.composed?.frames ?? [])
+                delete f.facingBlocks;
+        const plain = await render(bare);
+        expect(count(out.root, 'P')).toBe(count(plain.root, 'P'));
+        expect(count(out.root, 'P')).toBeGreaterThan(0);
+    });
+});
+//# sourceMappingURL=composedSpread.test.js.map

package/dist/__tests__/composedSpread.test.js.map

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

package/dist/pdf-backend/annotations.d.ts

@@ -16,6 +16,10 @@ import type { VDTKunten, VDTLine, VDTLineSegment, VDTRuby, VDTWarichu } from 'po
 import type { FontCache } from '../fontCache';
 import { type PageCtx } from './primitives';
 import { type StructElem } from './tagging';
+/** Draw the highlight bands of a line (`VDTLine.highlights`, `:mark[…]`,
+ *  #888) as artifacts, under its text: called before the line is
+ *  painted. */
+export declare function paintLineHighlights(ctx: PageCtx, line: VDTLine): void;
 /** Draw the marks of a line (`VDTLine.marks`) as artifacts, in `ink`
  *  unless a mark has its own colour. */
 export declare function paintLineMarks(ctx: PageCtx, line: VDTLine, ink: Color): void;

package/dist/pdf-backend/annotations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"annotations.d.ts","sourceRoot":"","sources":["../../src/pdf-backend/annotations.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAYL,KAAK,KAAK,EACV,KAAK,OAAO,EAEb,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EAAoB,SAAS,EAAE,OAAO,EAAe,cAAc,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEtH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,KAAK,OAAO,EAAmD,MAAM,cAAc,CAAC;AAC7F,OAAO,EAA2B,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAmGrE;wCACwC;AACxC,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,IAAI,CAK5E;AAkBD;qBACqB;AACrB,KAAK,SAAS,GAAG,MAAM,GAAG,KAAK,CAAC;AA0BhC;;;GAGG;AACH,wBAAgB,SAAS,CACvB,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,OAAO,EACb,CAAC,EAAE,MAAM,EACT,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,OAAO,EACjB,IAAI,EAAE,UAAU,GAAG,SAAS,GAC3B,IAAI,CAIN;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CACzB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,SAAS,EACjB,CAAC,EAAE,MAAM,EACT,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,OAAO,EACjB,IAAI,EAAE,UAAU,GAAG,SAAS,GAC3B,IAAI,CAON;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,OAAO,EACZ,OAAO,EAAE,UAAU,EACnB,CAAC,EAAE,MAAM,EACT,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,OAAO,EACjB,IAAI,EAAE,UAAU,GAAG,SAAS,GAC3B,IAAI,CAGN;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,WAAW,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,EACjD,CAAC,EAAE,MAAM,EACT,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,OAAO,GAChB,IAAI,CAEN"}
+{"version":3,"file":"annotations.d.ts","sourceRoot":"","sources":["../../src/pdf-backend/annotations.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAYL,KAAK,KAAK,EACV,KAAK,OAAO,EAEb,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EAAoB,SAAS,EAAE,OAAO,EAAe,cAAc,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEtH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,KAAK,OAAO,EAAkE,MAAM,cAAc,CAAC;AAC5G,OAAO,EAA2B,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAmGrE;;eAEe;AACf,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,GAAG,IAAI,CAarE;AAED;wCACwC;AACxC,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,IAAI,CAK5E;AAkBD;qBACqB;AACrB,KAAK,SAAS,GAAG,MAAM,GAAG,KAAK,CAAC;AA0BhC;;;GAGG;AACH,wBAAgB,SAAS,CACvB,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,OAAO,EACb,CAAC,EAAE,MAAM,EACT,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,OAAO,EACjB,IAAI,EAAE,UAAU,GAAG,SAAS,GAC3B,IAAI,CAIN;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CACzB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,SAAS,EACjB,CAAC,EAAE,MAAM,EACT,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,OAAO,EACjB,IAAI,EAAE,UAAU,GAAG,SAAS,GAC3B,IAAI,CAON;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,OAAO,EACZ,OAAO,EAAE,UAAU,EACnB,CAAC,EAAE,MAAM,EACT,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,OAAO,EACjB,IAAI,EAAE,UAAU,GAAG,SAAS,GAC3B,IAAI,CAGN;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,WAAW,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,EACjD,CAAC,EAAE,MAAM,EACT,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,OAAO,GAChB,IAAI,CAEN"}

package/dist/pdf-backend/annotations.js

@@ -13,7 +13,7 @@
  */
 import { appendBezierCurve, closePath, fill, lineTo, moveTo, popGraphicsState, pushGraphicsState, setFillingColor, setLineWidth, setStrokingColor, stroke, } from 'pdf-lib';
 import { parseFontString } from '../fontString';
-import { alphaOf, alphaStateOp, colorFromHex, drawTextPx } from './primitives';
+import { alphaOf, alphaStateOp, colorFromHex, drawTextPx, fillOutlinePx } from './primitives';
 import { tagArtifact, tagContent } from './tagging';
 /** A sesame dot (﹅): a lens `size` long and 0.3 of it wide,
  *  leaning a third of a right angle (as the canvas draws it). Two
@@ -109,6 +109,24 @@ function markOps(ctx, m, xPx, yPx) {
         }
     }
 }
+/** Draw the highlight bands of a line (`VDTLine.highlights`, `:mark[…]`,
+ *  #888) as artifacts, under its text: called before the line is
+ *  painted. */
+export function paintLineHighlights(ctx, line) {
+    const bands = line.highlights;
+    if (!bands || bands.length === 0)
+        return;
+    tagArtifact(ctx, { type: 'Layout' });
+    for (const b of bands) {
+        fillOutlinePx(ctx, {
+            x: line.bbox.x + b.x,
+            y: line.baseline + b.y,
+            width: b.width,
+            height: b.height,
+            radii: [b.radiusLeft, b.radiusRight, b.radiusRight, b.radiusLeft],
+        }, colorFromHex(b.color, ctx.colorSpace));
+    }
+}
 /** Draw the marks of a line (`VDTLine.marks`) as artifacts, in `ink`
  *  unless a mark has its own colour. */
 export function paintLineMarks(ctx, line, ink) {