postext-pdf 1.35.1 → 1.37.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/__tests__/composedContinuation.test.d.ts +2 -0
- package/dist/__tests__/composedContinuation.test.d.ts.map +1 -0
- package/dist/__tests__/composedContinuation.test.js +79 -0
- package/dist/__tests__/composedContinuation.test.js.map +1 -0
- package/dist/__tests__/composedDecorationImages.test.d.ts +2 -0
- package/dist/__tests__/composedDecorationImages.test.d.ts.map +1 -0
- package/dist/__tests__/composedDecorationImages.test.js +63 -0
- package/dist/__tests__/composedDecorationImages.test.js.map +1 -0
- package/dist/__tests__/composedFrameBoxes.test.d.ts +2 -0
- package/dist/__tests__/composedFrameBoxes.test.d.ts.map +1 -0
- package/dist/__tests__/composedFrameBoxes.test.js +103 -0
- package/dist/__tests__/composedFrameBoxes.test.js.map +1 -0
- package/dist/__tests__/composedReadingOrder.test.js +4 -2
- package/dist/__tests__/composedReadingOrder.test.js.map +1 -1
- package/dist/__tests__/composedRtlLayers.test.d.ts +2 -0
- package/dist/__tests__/composedRtlLayers.test.d.ts.map +1 -0
- package/dist/__tests__/composedRtlLayers.test.js +66 -0
- package/dist/__tests__/composedRtlLayers.test.js.map +1 -0
- package/dist/__tests__/composedRtlTagging.test.d.ts +2 -0
- package/dist/__tests__/composedRtlTagging.test.d.ts.map +1 -0
- package/dist/__tests__/composedRtlTagging.test.js +141 -0
- package/dist/__tests__/composedRtlTagging.test.js.map +1 -0
- package/dist/__tests__/figureLabels.test.d.ts +2 -0
- package/dist/__tests__/figureLabels.test.d.ts.map +1 -0
- package/dist/__tests__/figureLabels.test.js +81 -0
- package/dist/__tests__/figureLabels.test.js.map +1 -0
- package/dist/__tests__/floatReadingOrder.test.js +38 -0
- package/dist/__tests__/floatReadingOrder.test.js.map +1 -1
- package/dist/__tests__/paragraphStyleTracking.test.d.ts +2 -0
- package/dist/__tests__/paragraphStyleTracking.test.d.ts.map +1 -0
- package/dist/__tests__/paragraphStyleTracking.test.js +79 -0
- package/dist/__tests__/paragraphStyleTracking.test.js.map +1 -0
- package/dist/pdf-backend/fontHelpers.d.ts.map +1 -1
- package/dist/pdf-backend/fontHelpers.js +6 -0
- package/dist/pdf-backend/fontHelpers.js.map +1 -1
- package/dist/pdf-backend/index.d.ts.map +1 -1
- package/dist/pdf-backend/index.js +67 -33
- package/dist/pdf-backend/index.js.map +1 -1
- package/dist/pdf-backend/primitives.d.ts +6 -1
- package/dist/pdf-backend/primitives.d.ts.map +1 -1
- package/dist/pdf-backend/primitives.js +20 -4
- package/dist/pdf-backend/primitives.js.map +1 -1
- package/dist/pdf-backend/renderResourceBlock.d.ts.map +1 -1
- package/dist/pdf-backend/renderResourceBlock.js +60 -5
- package/dist/pdf-backend/renderResourceBlock.js.map +1 -1
- package/dist/pdf-backend/structureFlow.d.ts +6 -0
- package/dist/pdf-backend/structureFlow.d.ts.map +1 -1
- package/dist/pdf-backend/structureFlow.js +14 -0
- package/dist/pdf-backend/structureFlow.js.map +1 -1
- package/dist/pdf-backend/tagging.d.ts +16 -0
- package/dist/pdf-backend/tagging.d.ts.map +1 -1
- package/dist/pdf-backend/tagging.js +17 -0
- package/dist/pdf-backend/tagging.js.map +1 -1
- package/package.json +3 -3
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"composedContinuation.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/composedContinuation.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import { describe, it, expect, beforeAll } from 'vitest';
|
|
2
|
+
import fs from 'node:fs';
|
|
3
|
+
import { PDFArray, PDFDict, PDFDocument, PDFName, PDFRef } from 'pdf-lib';
|
|
4
|
+
import fontkit from '@pdf-lib/fontkit';
|
|
5
|
+
import { buildDocument } from 'postext';
|
|
6
|
+
import { renderToPdf } from '../pdf-backend';
|
|
7
|
+
import { parseFontString } from '../fontString';
|
|
8
|
+
// #859: a frame whose content goes on on pages added after its composed
|
|
9
|
+
// page is one box in the tagged PDF: one Div holding every paragraph, a
|
|
10
|
+
// paragraph cut between the pages one P, the continuation mark an
|
|
11
|
+
// artifact.
|
|
12
|
+
const fontBytes = fs.readFileSync(new URL('../../../../apps/web/public/fonts/Lora-Regular.ttf', import.meta.url));
|
|
13
|
+
const face = fontkit.create(fontBytes);
|
|
14
|
+
class StubCtx {
|
|
15
|
+
font = '';
|
|
16
|
+
measureText(s) {
|
|
17
|
+
const sizePx = parseFontString(this.font)?.sizePx ?? 16;
|
|
18
|
+
return { width: (face.layout(s).advanceWidth / face.unitsPerEm) * sizePx };
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
globalThis.OffscreenCanvas = class {
|
|
22
|
+
getContext() {
|
|
23
|
+
return new StubCtx();
|
|
24
|
+
}
|
|
25
|
+
};
|
|
26
|
+
function readElem(pdf, ref) {
|
|
27
|
+
const dict = pdf.context.lookup(ref, PDFDict);
|
|
28
|
+
const elem = { type: dict.get(PDFName.of('S')).decodeText(), kids: [] };
|
|
29
|
+
const k = dict.get(PDFName.of('K'));
|
|
30
|
+
for (const kid of k instanceof PDFArray ? k.asArray() : k ? [k] : []) {
|
|
31
|
+
if (kid instanceof PDFRef)
|
|
32
|
+
elem.kids.push(readElem(pdf, kid));
|
|
33
|
+
}
|
|
34
|
+
return elem;
|
|
35
|
+
}
|
|
36
|
+
const shape = (e) => `${e.type}(${e.kids.map(shape).join(' ')})`;
|
|
37
|
+
const PARAS = Array.from({ length: 6 }, (_, i) => `Paragraph ${i} ${'word '.repeat(160).trim()} end${i}.`);
|
|
38
|
+
const config = {
|
|
39
|
+
locale: 'en-us',
|
|
40
|
+
page: { width: { value: 150, unit: 'mm' }, height: { value: 200, unit: 'mm' } },
|
|
41
|
+
pageTemplates: [
|
|
42
|
+
{
|
|
43
|
+
id: 't',
|
|
44
|
+
overflowTemplate: 'more',
|
|
45
|
+
frames: [
|
|
46
|
+
{ name: 'title', takes: 'h1' },
|
|
47
|
+
{ name: 'box', placement: { anchor: { to: '#title', edge: 'below' } }, height: { value: 40, unit: 'mm' }, overflow: { continueIn: 'next-page' } },
|
|
48
|
+
],
|
|
49
|
+
},
|
|
50
|
+
{ id: 'more', frames: [{ name: 'box' }] },
|
|
51
|
+
],
|
|
52
|
+
};
|
|
53
|
+
const markdown = ['::::page{template="t"}', '# The page', '', ':::frame{slot="box"}', ...PARAS.flatMap((p) => [p, '']), ':::', '::::', '', 'After the page.'].join('\n');
|
|
54
|
+
let doc;
|
|
55
|
+
let root;
|
|
56
|
+
beforeAll(async () => {
|
|
57
|
+
doc = buildDocument({ markdown }, config);
|
|
58
|
+
const bytes = await renderToPdf(doc, { fontProvider: async () => new Uint8Array(fontBytes), accessible: true });
|
|
59
|
+
const pdf = await PDFDocument.load(bytes);
|
|
60
|
+
const treeRoot = pdf.catalog.lookup(PDFName.of('StructTreeRoot'), PDFDict);
|
|
61
|
+
root = readElem(pdf, treeRoot.get(PDFName.of('K')).get(0));
|
|
62
|
+
}, 60_000);
|
|
63
|
+
describe('a frame continued on added pages in the tagged PDF (#859)', () => {
|
|
64
|
+
it('the box went on over more than one page, a paragraph cut between them', () => {
|
|
65
|
+
const pages = doc.pages.filter((p) => p.composed);
|
|
66
|
+
expect(pages.length).toBeGreaterThan(1);
|
|
67
|
+
const box = (i) => pages[i].floats.filter((b) => pages[i].composed.frames.find((f) => f.name === 'box').blockIds.includes(b.id) && b.type === 'paragraph');
|
|
68
|
+
// The first piece ends inside a paragraph the next piece opens with.
|
|
69
|
+
expect(box(0)[box(0).length - 1].contentIndex).toBe(box(1)[0].contentIndex);
|
|
70
|
+
});
|
|
71
|
+
it('reads the box as one Div of its six paragraphs, the title first and the text after the page last', () => {
|
|
72
|
+
expect(root.kids.map(shape)).toEqual([
|
|
73
|
+
'Div(H1())',
|
|
74
|
+
`Div(${PARAS.map(() => 'P()').join(' ')})`,
|
|
75
|
+
'P()',
|
|
76
|
+
]);
|
|
77
|
+
});
|
|
78
|
+
});
|
|
79
|
+
//# sourceMappingURL=composedContinuation.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"composedContinuation.test.js","sourceRoot":"","sources":["../../src/__tests__/composedContinuation.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"composedDecorationImages.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/composedDecorationImages.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import fs from 'node:fs';
|
|
3
|
+
import fontkit from '@pdf-lib/fontkit';
|
|
4
|
+
import { PDFDocument } from 'pdf-lib';
|
|
5
|
+
import { buildDocument } from 'postext';
|
|
6
|
+
import { renderToPdf } from '../pdf-backend';
|
|
7
|
+
import { preloadResourceImages } from '../pdf-backend/renderResourceBlock';
|
|
8
|
+
import { parseFontString } from '../fontString';
|
|
9
|
+
// A picture in a composed page's decoration (a ground drawn to the bleed,
|
|
10
|
+
// #878) is embedded like a running head's: the PDF used to paint the grey
|
|
11
|
+
// placeholder for it and report it as a missing image.
|
|
12
|
+
const fontBytes = fs.readFileSync(new URL('../../../../apps/web/public/fonts/Lora-Regular.ttf', import.meta.url));
|
|
13
|
+
const face = fontkit.create(fontBytes);
|
|
14
|
+
class StubCtx {
|
|
15
|
+
font = '';
|
|
16
|
+
measureText(s) {
|
|
17
|
+
const sizePx = parseFontString(this.font)?.sizePx ?? 16;
|
|
18
|
+
return { width: (face.layout(s).advanceWidth / face.unitsPerEm) * sizePx };
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
globalThis.OffscreenCanvas = class {
|
|
22
|
+
getContext() {
|
|
23
|
+
return new StubCtx();
|
|
24
|
+
}
|
|
25
|
+
};
|
|
26
|
+
const SVG = new TextEncoder().encode('<svg xmlns="http://www.w3.org/2000/svg" width="200" height="100" viewBox="0 0 200 100"><rect width="200" height="100" fill="#1d659c"/></svg>');
|
|
27
|
+
const mm = (value) => ({ value, unit: 'mm' });
|
|
28
|
+
const resources = [{
|
|
29
|
+
id: 'sky', typeId: 'figure', kind: 'svg', caption: '', createdAt: 0, updatedAt: 0,
|
|
30
|
+
svg: { fileId: 'sky.svg', width: 200, height: 100 },
|
|
31
|
+
}];
|
|
32
|
+
const config = {
|
|
33
|
+
locale: 'en-us',
|
|
34
|
+
page: { dpi: 72 },
|
|
35
|
+
header: { elements: [] },
|
|
36
|
+
footer: { elements: [] },
|
|
37
|
+
pageTemplates: [{
|
|
38
|
+
id: 'cover',
|
|
39
|
+
decoration: { elements: [{ kind: 'image', id: 'sky', resourceId: 'sky', decorative: true,
|
|
40
|
+
placement: { anchor: { to: 'bleed', edge: 'top-left' }, size: { width: 'fill', height: mm(80) } } }] },
|
|
41
|
+
frames: [{ name: 'title', takes: 'h1', placement: { anchor: { to: 'container', edge: 'top-left' }, offset: { y: mm(90) } } }],
|
|
42
|
+
}],
|
|
43
|
+
};
|
|
44
|
+
const markdown = '::::page{template="cover"}\n# Water on the move\n::::\n';
|
|
45
|
+
describe('pictures of a composed page decoration in the PDF (#878)', () => {
|
|
46
|
+
it('are preloaded with the page design slots', async () => {
|
|
47
|
+
const doc = buildDocument({ markdown, resources }, config);
|
|
48
|
+
expect(doc.pages[0].composed?.decoration?.blocks.some((b) => b.kind === 'image')).toBe(true);
|
|
49
|
+
const images = await preloadResourceImages(await PDFDocument.create(), doc, (id) => (id === 'sky.svg' ? SVG : undefined));
|
|
50
|
+
expect(images.get('sky.svg')?.kind).toBe('vector');
|
|
51
|
+
});
|
|
52
|
+
it('are painted, not reported as missing', async () => {
|
|
53
|
+
const doc = buildDocument({ markdown, resources }, config);
|
|
54
|
+
const warnings = [];
|
|
55
|
+
await renderToPdf(doc, {
|
|
56
|
+
fontProvider: async () => new Uint8Array(fontBytes),
|
|
57
|
+
resourceBytes: (id) => (id === 'sky.svg' ? SVG : undefined),
|
|
58
|
+
onWarning: (w) => warnings.push(w.kind),
|
|
59
|
+
});
|
|
60
|
+
expect(warnings).not.toContain('missingImage');
|
|
61
|
+
});
|
|
62
|
+
});
|
|
63
|
+
//# sourceMappingURL=composedDecorationImages.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"composedDecorationImages.test.js","sourceRoot":"","sources":["../../src/__tests__/composedDecorationImages.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"composedFrameBoxes.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/composedFrameBoxes.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import fs from 'node:fs';
|
|
3
|
+
import { PDFArray, PDFDict, PDFDocument, PDFName, PDFRef } from 'pdf-lib';
|
|
4
|
+
import fontkit from '@pdf-lib/fontkit';
|
|
5
|
+
import { buildDocument, frameMatrix } from 'postext';
|
|
6
|
+
import { renderToPdf } from '../pdf-backend';
|
|
7
|
+
import { sheetMatrixToPdf } from '../pdf-backend/comic';
|
|
8
|
+
import { parseFontString } from '../fontString';
|
|
9
|
+
// #910: the tagged PDF's `BBox` of a figure in a composed frame whose text
|
|
10
|
+
// is scaled (#858) or that is turned is the box the figure is painted in on
|
|
11
|
+
// the sheet, not its box in the frame's own coordinates; for a frame turned
|
|
12
|
+
// by any angle, the box its four corners cover.
|
|
13
|
+
const fontBytes = fs.readFileSync(new URL('../../../../apps/web/public/fonts/Lora-Regular.ttf', import.meta.url));
|
|
14
|
+
const face = fontkit.create(fontBytes);
|
|
15
|
+
class StubCtx {
|
|
16
|
+
font = '';
|
|
17
|
+
measureText(s) {
|
|
18
|
+
const sizePx = parseFontString(this.font)?.sizePx ?? 16;
|
|
19
|
+
return { width: (face.layout(s).advanceWidth / face.unitsPerEm) * sizePx };
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
globalThis.OffscreenCanvas = class {
|
|
23
|
+
getContext() {
|
|
24
|
+
return new StubCtx();
|
|
25
|
+
}
|
|
26
|
+
};
|
|
27
|
+
const mm = (value) => ({ value, unit: 'mm' });
|
|
28
|
+
const PNG = Uint8Array.from(Buffer.from('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8DwHwAFBQIAX8jx0gAAAABJRU5ErkJggg==', 'base64'));
|
|
29
|
+
const picture = (id) => ({
|
|
30
|
+
id, typeId: 'figure', kind: 'bitmap', caption: `Caption ${id}.`, altText: `Alt ${id}`, createdAt: 0, updatedAt: 0,
|
|
31
|
+
bitmap: { fileId: `${id}.png`, format: 'png', width: 400, height: 300 },
|
|
32
|
+
});
|
|
33
|
+
const config = {
|
|
34
|
+
page: { width: mm(200), height: mm(260), dpi: 72, margins: { top: mm(20), bottom: mm(20), left: mm(20), right: mm(20) } },
|
|
35
|
+
header: { elements: [] },
|
|
36
|
+
footer: { elements: [] },
|
|
37
|
+
pageTemplates: [{
|
|
38
|
+
id: 't',
|
|
39
|
+
frames: [
|
|
40
|
+
{ name: 'turned', width: mm(60), rotate: 12, placement: { anchor: { to: 'container', edge: 'top-left' }, offset: { x: mm(10), y: mm(20) } } },
|
|
41
|
+
{ name: 'small', width: mm(60), placement: { anchor: { to: 'container', edge: 'top-left' }, offset: { x: mm(90), y: mm(120) } } },
|
|
42
|
+
],
|
|
43
|
+
}],
|
|
44
|
+
};
|
|
45
|
+
const markdown = ['::::page{template="t"}', '::resource{id="a" slot="turned"}', '', '::resource{id="b" slot="small"}', '::::'].join('\n');
|
|
46
|
+
/** The `BBox` of each figure, by alternative text. */
|
|
47
|
+
async function boxes(doc) {
|
|
48
|
+
const bytes = await renderToPdf(doc, { fontProvider: async () => new Uint8Array(fontBytes), accessible: true, resourceBytes: () => PNG });
|
|
49
|
+
const pdf = await PDFDocument.load(bytes);
|
|
50
|
+
const out = {};
|
|
51
|
+
const visit = (ref) => {
|
|
52
|
+
const obj = ref instanceof PDFRef ? pdf.context.lookup(ref) : ref;
|
|
53
|
+
if (obj instanceof PDFArray) {
|
|
54
|
+
for (const k of obj.asArray())
|
|
55
|
+
visit(k);
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
if (!(obj instanceof PDFDict))
|
|
59
|
+
return;
|
|
60
|
+
if (obj.get(PDFName.of('S'))?.decodeText() === 'Figure') {
|
|
61
|
+
const alt = obj.get(PDFName.of('Alt')).decodeText();
|
|
62
|
+
const a = pdf.context.lookup(obj.get(PDFName.of('A')));
|
|
63
|
+
out[alt] = a.get(PDFName.of('BBox')).asArray().map((n) => n.asNumber());
|
|
64
|
+
}
|
|
65
|
+
visit(obj.get(PDFName.of('K')));
|
|
66
|
+
};
|
|
67
|
+
visit(pdf.catalog.lookup(PDFName.of('StructTreeRoot'), PDFDict).get(PDFName.of('K')));
|
|
68
|
+
return out;
|
|
69
|
+
}
|
|
70
|
+
/** `box` (pt, `[x1 y1 x2 y2]`) of the upright frame put through the
|
|
71
|
+
* frame's matrix on the sheet: the box its four corners cover. */
|
|
72
|
+
function through(frame, doc, box) {
|
|
73
|
+
const scale = 72 / doc.config.page.dpi;
|
|
74
|
+
const [a, b, c, d, e, f] = sheetMatrixToPdf(frameMatrix(frame), scale, doc.pages[0].height * scale);
|
|
75
|
+
const pts = [[box[0], box[1]], [box[2], box[1]], [box[0], box[3]], [box[2], box[3]]].map(([x, y]) => [a * x + c * y + e, b * x + d * y + f]);
|
|
76
|
+
const xs = pts.map((p) => p[0]);
|
|
77
|
+
const ys = pts.map((p) => p[1]);
|
|
78
|
+
return [Math.min(...xs), Math.min(...ys), Math.max(...xs), Math.max(...ys)];
|
|
79
|
+
}
|
|
80
|
+
describe('figure boxes of scaled and turned frames in the tagged PDF (#910)', () => {
|
|
81
|
+
it('gives each figure the box it is painted in', async () => {
|
|
82
|
+
const doc = buildDocument({ markdown, resources: [picture('a'), picture('b')] }, config);
|
|
83
|
+
const frames = doc.pages[0].composed.frames;
|
|
84
|
+
const turned = frames.find((f) => f.name === 'turned');
|
|
85
|
+
const small = frames.find((f) => f.name === 'small');
|
|
86
|
+
expect(turned.blockIds.length).toBeGreaterThan(0);
|
|
87
|
+
expect(small.blockIds.length).toBeGreaterThan(0);
|
|
88
|
+
// Upright at full size: the boxes in the frames' own coordinates.
|
|
89
|
+
turned.rotate = 0;
|
|
90
|
+
const upright = await boxes(doc);
|
|
91
|
+
// Turned 12°, and scaled to one half as the reflow ladder leaves a
|
|
92
|
+
// frame (its blocks laid out where they were).
|
|
93
|
+
turned.rotate = 12;
|
|
94
|
+
small.scale = 0.5;
|
|
95
|
+
const painted = await boxes(doc);
|
|
96
|
+
const close = (got, want) => want.forEach((v, i) => expect(got[i]).toBeCloseTo(v, 1));
|
|
97
|
+
close(painted['Alt a'], through(turned, doc, upright['Alt a']));
|
|
98
|
+
close(painted['Alt b'], through(small, doc, upright['Alt b']));
|
|
99
|
+
// Half as wide and as tall as upright.
|
|
100
|
+
expect(painted['Alt b'][2] - painted['Alt b'][0]).toBeCloseTo((upright['Alt b'][2] - upright['Alt b'][0]) / 2, 1);
|
|
101
|
+
}, 60_000);
|
|
102
|
+
});
|
|
103
|
+
//# sourceMappingURL=composedFrameBoxes.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"composedFrameBoxes.test.js","sourceRoot":"","sources":["../../src/__tests__/composedFrameBoxes.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ import { parseFontString } from '../fontString';
|
|
|
9
9
|
// fixture) reads the composed page's frames in Markdown order — the
|
|
10
10
|
// title, the running text, each box followed by its photo — whatever
|
|
11
11
|
// order the template's layers paint them in, and a `:::figure`'s labels
|
|
12
|
-
// as
|
|
12
|
+
// after its figure, as the text drawn on it (#860).
|
|
13
13
|
const fontBytes = fs.readFileSync(new URL('../../../../apps/web/public/fonts/Lora-Regular.ttf', import.meta.url));
|
|
14
14
|
const face = fontkit.create(fontBytes);
|
|
15
15
|
class StubCtx {
|
|
@@ -66,7 +66,9 @@ describe('the composed page 8 stand-in in the tagged PDF (#862)', () => {
|
|
|
66
66
|
'Div(P() P() P())',
|
|
67
67
|
'Div(Figure[A card payment])',
|
|
68
68
|
'Div(P() P() L(LI(Lbl() LBody()) LI(Lbl() LBody()) LI(Lbl() LBody())))',
|
|
69
|
-
|
|
69
|
+
// The labels drawn on the photo are text (#860): read after it, one
|
|
70
|
+
// paragraph each, and no longer part of its alternative text.
|
|
71
|
+
'Div(Figure[A shopping basket] Div(P() P() P()))',
|
|
70
72
|
'Div(P() P())',
|
|
71
73
|
'Div(Figure[A piggy bank])',
|
|
72
74
|
]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"composedReadingOrder.test.js","sourceRoot":"","sources":["../../src/__tests__/composedReadingOrder.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzD,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACnG,OAAO,OAAO,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,uEAAuE;AACvE,oEAAoE;AACpE,qEAAqE;AACrE,wEAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"composedReadingOrder.test.js","sourceRoot":"","sources":["../../src/__tests__/composedReadingOrder.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"composedRtlLayers.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/composedRtlLayers.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import fs from 'node:fs';
|
|
3
|
+
import { PDFArray, PDFDocument, PDFRawStream, decodePDFRawStream } from 'pdf-lib';
|
|
4
|
+
import fontkit from '@pdf-lib/fontkit';
|
|
5
|
+
import { buildDocument } from 'postext';
|
|
6
|
+
import { renderToPdf } from '../pdf-backend';
|
|
7
|
+
import { parseFontString } from '../fontString';
|
|
8
|
+
// #876 (R3, the school atlas): on a right-to-left page the frames are set
|
|
9
|
+
// through the mirrored flow and the decoration on the sheet; a title
|
|
10
|
+
// frame above layer 0 still paints over the band of the decoration, and
|
|
11
|
+
// a frame below layer 0 under it.
|
|
12
|
+
const fontBytes = fs.readFileSync(new URL('../../../../apps/web/public/fonts/Lora-Regular.ttf', import.meta.url));
|
|
13
|
+
const face = fontkit.create(fontBytes);
|
|
14
|
+
const fontProvider = async () => new Uint8Array(fontBytes);
|
|
15
|
+
class StubCtx {
|
|
16
|
+
font = '';
|
|
17
|
+
measureText(s) {
|
|
18
|
+
const sizePx = parseFontString(this.font)?.sizePx ?? 16;
|
|
19
|
+
const run = face.layout(s);
|
|
20
|
+
return { width: (run.advanceWidth / face.unitsPerEm) * sizePx };
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
globalThis.OffscreenCanvas = class {
|
|
24
|
+
getContext() {
|
|
25
|
+
return new StubCtx();
|
|
26
|
+
}
|
|
27
|
+
};
|
|
28
|
+
const mm = (value) => ({ value, unit: 'mm' });
|
|
29
|
+
const config = (direction) => ({
|
|
30
|
+
locale: 'en-us',
|
|
31
|
+
direction,
|
|
32
|
+
header: { elements: [] },
|
|
33
|
+
footer: { elements: [] },
|
|
34
|
+
headings: { levels: [{ level: 1, breakBefore: { enabled: false } }] },
|
|
35
|
+
pageTemplates: [{
|
|
36
|
+
id: 'sheet',
|
|
37
|
+
frames: [
|
|
38
|
+
{ name: 'title', takes: 'h1', placement: { anchor: { to: 'container', edge: 'top-left' } } },
|
|
39
|
+
{ name: 'under', layer: -1, width: mm(40), height: mm(10), placement: { anchor: { to: 'container', edge: 'bottom-left' } } },
|
|
40
|
+
],
|
|
41
|
+
decoration: { elements: [{ kind: 'box', id: 'band', style: { backgroundColor: { hex: '#1d5f73', model: 'hex' } },
|
|
42
|
+
placement: { anchor: { to: 'bleed', edge: 'top-left' }, size: { width: 'fill', height: mm(50) } } }] },
|
|
43
|
+
}],
|
|
44
|
+
});
|
|
45
|
+
const markdown = '::::page{template="sheet"}\n# Title on the band\n\n:::frame{slot="under"}\nUnder the band\n:::\n::::\n';
|
|
46
|
+
function pageText(pdf, index) {
|
|
47
|
+
const contents = pdf.getPage(index).node.Contents();
|
|
48
|
+
const streams = contents instanceof PDFArray ? contents.asArray().map((r) => pdf.context.lookup(r)) : [contents];
|
|
49
|
+
return streams.map((s) => (s instanceof PDFRawStream ? Buffer.from(decodePDFRawStream(s).decode()).toString('latin1') : '')).join('\n');
|
|
50
|
+
}
|
|
51
|
+
describe('the layers of a composed page on a right-to-left page (#876)', () => {
|
|
52
|
+
for (const direction of ['ltr', 'rtl']) {
|
|
53
|
+
it(`${direction}: a text object under the band, the band, then a text object over it`, async () => {
|
|
54
|
+
const doc = buildDocument({ markdown }, config(direction));
|
|
55
|
+
const pdf = await PDFDocument.load(await renderToPdf(doc, { fontProvider }));
|
|
56
|
+
const ops = pageText(pdf, 0).split(/\s+/);
|
|
57
|
+
// The band's fill colour, #1d5f73.
|
|
58
|
+
const band = ops.findIndex((op, i) => op === 'rg' && Math.abs(Number(ops[i - 3]) - 0x1d / 255) < 0.002 && Math.abs(Number(ops[i - 2]) - 0x5f / 255) < 0.002);
|
|
59
|
+
expect(band).toBeGreaterThan(0);
|
|
60
|
+
const texts = ops.map((op, i) => (op === 'BT' ? i : -1)).filter((i) => i >= 0);
|
|
61
|
+
expect(texts.filter((i) => i < band).length).toBeGreaterThanOrEqual(1);
|
|
62
|
+
expect(texts.filter((i) => i > band).length).toBeGreaterThanOrEqual(1);
|
|
63
|
+
}, 60_000);
|
|
64
|
+
}
|
|
65
|
+
});
|
|
66
|
+
//# sourceMappingURL=composedRtlLayers.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"composedRtlLayers.test.js","sourceRoot":"","sources":["../../src/__tests__/composedRtlLayers.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"composedRtlTagging.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/composedRtlTagging.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,141 @@
|
|
|
1
|
+
import { describe, it, expect, beforeAll } from 'vitest';
|
|
2
|
+
import fs from 'node:fs';
|
|
3
|
+
import os from 'node:os';
|
|
4
|
+
import path from 'node:path';
|
|
5
|
+
import { spawnSync } from 'node:child_process';
|
|
6
|
+
import { PDFArray, PDFDocument, PDFRawStream, decodePDFRawStream } from 'pdf-lib';
|
|
7
|
+
import { buildDocument, resolveParagraph } from 'postext';
|
|
8
|
+
import { renderToPdf } from '../pdf-backend';
|
|
9
|
+
import { parseFontString } from '../fontString';
|
|
10
|
+
import { complexShaperReady, shapeRun } from '../complexShaping';
|
|
11
|
+
// #900: on a right-to-left page a picture is painted turned back in its
|
|
12
|
+
// box (`counterFlipPx`), and the graphics state pushed for that closed the
|
|
13
|
+
// figure's marked content, so the picture was painted untagged and the
|
|
14
|
+
// page failed PDF/UA-1 7.1-3: an Arabic composed page (a `takes: h1` title
|
|
15
|
+
// frame and a frame holding a `:::figure` with labels) did, and so did a
|
|
16
|
+
// figure in the flow of any right-to-left page.
|
|
17
|
+
const AMIRI = new Uint8Array(fs.readFileSync(new URL('./fixtures/arabic/amiri-subset.ttf', import.meta.url)));
|
|
18
|
+
const fontProvider = async () => AMIRI;
|
|
19
|
+
class HarfBuzzCtx {
|
|
20
|
+
font = '';
|
|
21
|
+
measureText(s) {
|
|
22
|
+
const sizePx = parseFontString(this.font)?.sizePx ?? 16;
|
|
23
|
+
const run = complexShaperReady() ? shapeRun(AMIRI, s, { direction: (resolveParagraph(s).paragraphLevel === 1 ? 'rtl' : 'ltr') }) : undefined;
|
|
24
|
+
if (!run)
|
|
25
|
+
return { width: s.length * sizePx * 0.5 };
|
|
26
|
+
return { width: (run.glyphs.reduce((sum, g) => sum + g.xAdvance, 0) / run.upem) * sizePx };
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
globalThis.OffscreenCanvas = class {
|
|
30
|
+
getContext() {
|
|
31
|
+
return new HarfBuzzCtx();
|
|
32
|
+
}
|
|
33
|
+
};
|
|
34
|
+
const mm = (value) => ({ value, unit: 'mm' });
|
|
35
|
+
const pt = (value) => ({ value, unit: 'pt' });
|
|
36
|
+
const PNG = Uint8Array.from(Buffer.from('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8DwHwAFBQIAX8jx0gAAAABJRU5ErkJggg==', 'base64'));
|
|
37
|
+
const map = {
|
|
38
|
+
id: 'map', typeId: 'map', kind: 'bitmap', caption: '', altText: 'خريطة', createdAt: 0, updatedAt: 0,
|
|
39
|
+
bitmap: { fileId: 'map.png', format: 'png', width: 1600, height: 1100 },
|
|
40
|
+
};
|
|
41
|
+
function config() {
|
|
42
|
+
return {
|
|
43
|
+
direction: 'rtl',
|
|
44
|
+
locale: 'ar',
|
|
45
|
+
page: { width: mm(170), height: mm(130), dpi: 72, margins: { top: mm(8), bottom: mm(8), left: mm(8), right: mm(8) } },
|
|
46
|
+
layout: { layoutType: 'single' },
|
|
47
|
+
bodyText: { fontFamily: 'Amiri', fontSize: pt(10), lineHeight: pt(16), hyphenation: { enabled: false } },
|
|
48
|
+
headings: { levels: [{ level: 1, fontFamily: 'Amiri', fontSize: pt(16), lineHeight: pt(24), breakBefore: { enabled: false } }] },
|
|
49
|
+
header: { elements: [] },
|
|
50
|
+
footer: { elements: [] },
|
|
51
|
+
// A map with no number and no caption, as the #900 book has (the
|
|
52
|
+
// fixture font holds the test sentences' letters only).
|
|
53
|
+
resourceTypes: [{ id: 'map', name: 'Map', shortLabel: 'Map', numberingTemplate: '', resetOn: 'never', counterFormat: 'decimal', captionPrefix: '', defaultPlacement: { position: 'here' } }],
|
|
54
|
+
pageTemplates: [{
|
|
55
|
+
id: 'map',
|
|
56
|
+
header: false,
|
|
57
|
+
frames: [
|
|
58
|
+
{ name: 'title', takes: 'h1', placement: { anchor: { to: 'page', edge: 'top-left' }, offset: { x: mm(8), y: mm(5) } }, width: mm(154) },
|
|
59
|
+
{ name: 'map', placement: { anchor: { to: 'page', edge: 'top-left' }, offset: { x: mm(8), y: mm(18) } }, width: mm(154) },
|
|
60
|
+
],
|
|
61
|
+
}],
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
/** The page's content stream, decoded. */
|
|
65
|
+
function pageContent(pdf, index) {
|
|
66
|
+
const contents = pdf.getPage(index).node.Contents();
|
|
67
|
+
const refs = contents instanceof PDFArray ? contents.asArray() : contents ? [contents] : [];
|
|
68
|
+
return refs
|
|
69
|
+
.map((ref) => {
|
|
70
|
+
const s = pdf.context.lookup(ref);
|
|
71
|
+
return s instanceof PDFRawStream ? new TextDecoder('latin1').decode(decodePDFRawStream(s).decode()) : '';
|
|
72
|
+
})
|
|
73
|
+
.join('\n');
|
|
74
|
+
}
|
|
75
|
+
/** The painting operators (`Do`, text objects) found outside any marked
|
|
76
|
+
* content sequence: neither tagged nor an artifact. */
|
|
77
|
+
function unmarked(content) {
|
|
78
|
+
let depth = 0;
|
|
79
|
+
const found = [];
|
|
80
|
+
for (const line of content.split('\n')) {
|
|
81
|
+
const op = line.trim().split(/\s+/).pop();
|
|
82
|
+
if (op === 'BDC' || op === 'BMC')
|
|
83
|
+
depth++;
|
|
84
|
+
else if (op === 'EMC')
|
|
85
|
+
depth--;
|
|
86
|
+
else if ((op === 'Do' || op === 'BT') && depth === 0)
|
|
87
|
+
found.push(line.trim());
|
|
88
|
+
}
|
|
89
|
+
return found;
|
|
90
|
+
}
|
|
91
|
+
const hasVerapdf = process.env.VERAPDF === '1' && spawnSync('verapdf', ['--version'], { encoding: 'utf8' }).status === 0;
|
|
92
|
+
async function ua1(bytes) {
|
|
93
|
+
const file = path.join(os.tmpdir(), `postext-rtl-ua-${process.pid}-${Math.random().toString(36).slice(2)}.pdf`);
|
|
94
|
+
fs.writeFileSync(file, bytes);
|
|
95
|
+
const out = spawnSync('verapdf', ['--flavour', 'ua1', '--format', 'text', file], { encoding: 'utf8' });
|
|
96
|
+
fs.unlinkSync(file);
|
|
97
|
+
return out.stdout;
|
|
98
|
+
}
|
|
99
|
+
const composedMarkdown = [
|
|
100
|
+
'::::page{template="map"}',
|
|
101
|
+
'# السلام عليكم',
|
|
102
|
+
'',
|
|
103
|
+
':::figure{resource="map" slot="map"}',
|
|
104
|
+
'::label[السلام]{at="20% 30%"}',
|
|
105
|
+
'::label[عليكم]{at="70% 60%"}',
|
|
106
|
+
':::',
|
|
107
|
+
'::::',
|
|
108
|
+
].join('\n');
|
|
109
|
+
let composed;
|
|
110
|
+
let flow;
|
|
111
|
+
beforeAll(async () => {
|
|
112
|
+
// Load HarfBuzz for the measurement too: one render first.
|
|
113
|
+
const warm = buildDocument({ markdown: '# السلام' }, config());
|
|
114
|
+
await renderToPdf(warm, { fontProvider, accessible: true });
|
|
115
|
+
const doc = buildDocument({ markdown: composedMarkdown, resources: [map] }, config());
|
|
116
|
+
expect(doc.pages).toHaveLength(1);
|
|
117
|
+
expect(doc.pages[0].composed?.frames.map((f) => f.name)).toEqual(['title', 'map']);
|
|
118
|
+
composed = await renderToPdf(doc, { fontProvider, accessible: true, resourceBytes: () => PNG });
|
|
119
|
+
const flowDoc = buildDocument({ markdown: '# السلام عليكم\n\nالسلام عليكم.\n\n::resource{id="map"}\n\nعليكم السلام.', resources: [map] }, config());
|
|
120
|
+
flow = await renderToPdf(flowDoc, { fontProvider, accessible: true, resourceBytes: () => PNG });
|
|
121
|
+
}, 60_000);
|
|
122
|
+
describe('a picture on a right-to-left page is tagged (#900)', () => {
|
|
123
|
+
it('paints the figure of an Arabic composed page inside marked content', async () => {
|
|
124
|
+
const pdf = await PDFDocument.load(composed);
|
|
125
|
+
const content = pageContent(pdf, 0);
|
|
126
|
+
expect(content).toMatch(/ Do$/m);
|
|
127
|
+
expect(unmarked(content)).toEqual([]);
|
|
128
|
+
});
|
|
129
|
+
it('paints a figure of a right-to-left flow inside marked content', async () => {
|
|
130
|
+
const pdf = await PDFDocument.load(flow);
|
|
131
|
+
for (let i = 0; i < pdf.getPageCount(); i++)
|
|
132
|
+
expect(unmarked(pageContent(pdf, i))).toEqual([]);
|
|
133
|
+
});
|
|
134
|
+
it.skipIf(!hasVerapdf)('passes veraPDF (PDF/UA-1): the Arabic composed page with labels', async () => {
|
|
135
|
+
expect(await ua1(composed)).toMatch(/^PASS /m);
|
|
136
|
+
}, 120_000);
|
|
137
|
+
it.skipIf(!hasVerapdf)('passes veraPDF (PDF/UA-1): a figure in a right-to-left flow', async () => {
|
|
138
|
+
expect(await ua1(flow)).toMatch(/^PASS /m);
|
|
139
|
+
}, 120_000);
|
|
140
|
+
});
|
|
141
|
+
//# sourceMappingURL=composedRtlTagging.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"composedRtlTagging.test.js","sourceRoot":"","sources":["../../src/__tests__/composedRtlTagging.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"figureLabels.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/figureLabels.test.ts"],"names":[],"mappings":""}
|