postext 1.83.1 → 1.85.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__/checks/preflightFinishes.test.d.ts +2 -0
- package/dist/__tests__/checks/preflightFinishes.test.d.ts.map +1 -0
- package/dist/__tests__/checks/preflightFinishes.test.js +59 -0
- package/dist/__tests__/checks/preflightFinishes.test.js.map +1 -0
- package/dist/__tests__/color/inkFinishes.test.d.ts +2 -0
- package/dist/__tests__/color/inkFinishes.test.d.ts.map +1 -0
- package/dist/__tests__/color/inkFinishes.test.js +158 -0
- package/dist/__tests__/color/inkFinishes.test.js.map +1 -0
- package/dist/__tests__/defaults/stripRoundTrip.harness.d.ts.map +1 -1
- package/dist/__tests__/defaults/stripRoundTrip.harness.js +3 -1
- package/dist/__tests__/defaults/stripRoundTrip.harness.js.map +1 -1
- package/dist/__tests__/exports.test.js +34 -0
- package/dist/__tests__/exports.test.js.map +1 -1
- package/dist/__tests__/paint/finishMask.test.d.ts +2 -0
- package/dist/__tests__/paint/finishMask.test.d.ts.map +1 -0
- package/dist/__tests__/paint/finishMask.test.js +243 -0
- package/dist/__tests__/paint/finishMask.test.js.map +1 -0
- package/dist/__tests__/paint/rasterCanvas.d.ts +84 -0
- package/dist/__tests__/paint/rasterCanvas.d.ts.map +1 -0
- package/dist/__tests__/paint/rasterCanvas.js +192 -0
- package/dist/__tests__/paint/rasterCanvas.js.map +1 -0
- package/dist/__tests__/parse/containers.test.js +1 -1
- package/dist/__tests__/parse/containers.test.js.map +1 -1
- package/dist/__tests__/pipeline/pages/dieCuts.test.d.ts +2 -0
- package/dist/__tests__/pipeline/pages/dieCuts.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/pages/dieCuts.test.js +194 -0
- package/dist/__tests__/pipeline/pages/dieCuts.test.js.map +1 -0
- package/dist/__tests__/pipeline/pages/headingOverHole.test.d.ts +2 -0
- package/dist/__tests__/pipeline/pages/headingOverHole.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/pages/headingOverHole.test.js +67 -0
- package/dist/__tests__/pipeline/pages/headingOverHole.test.js.map +1 -0
- package/dist/canvas-backend/cut/through.d.ts +41 -0
- package/dist/canvas-backend/cut/through.d.ts.map +1 -0
- package/dist/canvas-backend/cut/through.js +115 -0
- package/dist/canvas-backend/cut/through.js.map +1 -0
- package/dist/canvas-backend/cut/through.test.d.ts +2 -0
- package/dist/canvas-backend/cut/through.test.d.ts.map +1 -0
- package/dist/canvas-backend/cut/through.test.js +99 -0
- package/dist/canvas-backend/cut/through.test.js.map +1 -0
- package/dist/canvas-backend/finish/mask.d.ts +91 -0
- package/dist/canvas-backend/finish/mask.d.ts.map +1 -0
- package/dist/canvas-backend/finish/mask.js +284 -0
- package/dist/canvas-backend/finish/mask.js.map +1 -0
- package/dist/canvas-backend/finish/maskSvg.d.ts +25 -0
- package/dist/canvas-backend/finish/maskSvg.d.ts.map +1 -0
- package/dist/canvas-backend/finish/maskSvg.js +69 -0
- package/dist/canvas-backend/finish/maskSvg.js.map +1 -0
- package/dist/canvas-backend/finish/paint.d.ts +50 -0
- package/dist/canvas-backend/finish/paint.d.ts.map +1 -0
- package/dist/canvas-backend/finish/paint.js +131 -0
- package/dist/canvas-backend/finish/paint.js.map +1 -0
- package/dist/canvas-backend/finish/preview.d.ts +27 -0
- package/dist/canvas-backend/finish/preview.d.ts.map +1 -0
- package/dist/canvas-backend/finish/preview.js +103 -0
- package/dist/canvas-backend/finish/preview.js.map +1 -0
- package/dist/canvas-backend/index.d.ts +18 -0
- package/dist/canvas-backend/index.d.ts.map +1 -1
- package/dist/canvas-backend/index.js +23 -2
- package/dist/canvas-backend/index.js.map +1 -1
- package/dist/canvas-backend/renderResourceBlock/images.d.ts +6 -0
- package/dist/canvas-backend/renderResourceBlock/images.d.ts.map +1 -1
- package/dist/canvas-backend/renderResourceBlock/images.js +12 -0
- package/dist/canvas-backend/renderResourceBlock/images.js.map +1 -1
- package/dist/checks/configWarnings/collect.d.ts +3 -1
- package/dist/checks/configWarnings/collect.d.ts.map +1 -1
- package/dist/checks/configWarnings/collect.js +5 -2
- package/dist/checks/configWarnings/collect.js.map +1 -1
- package/dist/checks/configWarnings/dieCuts.d.ts +13 -0
- package/dist/checks/configWarnings/dieCuts.d.ts.map +1 -0
- package/dist/checks/configWarnings/dieCuts.js +68 -0
- package/dist/checks/configWarnings/dieCuts.js.map +1 -0
- package/dist/checks/preflight.d.ts +5 -161
- package/dist/checks/preflight.d.ts.map +1 -1
- package/dist/checks/preflight.js +11 -0
- package/dist/checks/preflight.js.map +1 -1
- package/dist/checks/preflightDieCuts.d.ts +20 -0
- package/dist/checks/preflightDieCuts.d.ts.map +1 -0
- package/dist/checks/preflightDieCuts.js +112 -0
- package/dist/checks/preflightDieCuts.js.map +1 -0
- package/dist/checks/preflightFinishes.d.ts +20 -0
- package/dist/checks/preflightFinishes.d.ts.map +1 -0
- package/dist/checks/preflightFinishes.js +75 -0
- package/dist/checks/preflightFinishes.js.map +1 -0
- package/dist/checks/preflightInks.d.ts +2 -2
- package/dist/checks/preflightInks.d.ts.map +1 -1
- package/dist/checks/preflightIssues.d.ts +216 -0
- package/dist/checks/preflightIssues.d.ts.map +1 -0
- package/dist/checks/preflightIssues.js +6 -0
- package/dist/checks/preflightIssues.js.map +1 -0
- package/dist/checks/preflightPlates.d.ts +2 -2
- package/dist/checks/preflightPlates.d.ts.map +1 -1
- package/dist/color/authored.d.ts +11 -7
- package/dist/color/authored.d.ts.map +1 -1
- package/dist/color/authored.js +11 -6
- package/dist/color/authored.js.map +1 -1
- package/dist/color/finishInks.d.ts +42 -0
- package/dist/color/finishInks.d.ts.map +1 -0
- package/dist/color/finishInks.js +71 -0
- package/dist/color/finishInks.js.map +1 -0
- package/dist/color/finishKinds.d.ts +28 -0
- package/dist/color/finishKinds.d.ts.map +1 -0
- package/dist/color/finishKinds.js +64 -0
- package/dist/color/finishKinds.js.map +1 -0
- package/dist/color/finishes.d.ts +22 -0
- package/dist/color/finishes.d.ts.map +1 -0
- package/dist/color/finishes.js +136 -0
- package/dist/color/finishes.js.map +1 -0
- package/dist/color/index.d.ts +2 -0
- package/dist/color/index.d.ts.map +1 -1
- package/dist/color/index.js +2 -0
- package/dist/color/index.js.map +1 -1
- package/dist/color/inks.d.ts +11 -8
- package/dist/color/inks.d.ts.map +1 -1
- package/dist/color/inks.js +13 -5
- package/dist/color/inks.js.map +1 -1
- package/dist/color/plates.d.ts +5 -5
- package/dist/color/plates.d.ts.map +1 -1
- package/dist/color/plates.js.map +1 -1
- package/dist/composed/pageMemo.d.ts +1 -1
- package/dist/composed/pageMemo.d.ts.map +1 -1
- package/dist/composed/pageMemo.js +4 -1
- package/dist/composed/pageMemo.js.map +1 -1
- package/dist/defaults/bookKeys.d.ts +1 -1
- package/dist/defaults/bookKeys.d.ts.map +1 -1
- package/dist/defaults/bookKeys.js +1 -1
- package/dist/defaults/bookKeys.js.map +1 -1
- package/dist/defaults/dieCuts.d.ts +10 -0
- package/dist/defaults/dieCuts.d.ts.map +1 -0
- package/dist/defaults/dieCuts.js +73 -0
- package/dist/defaults/dieCuts.js.map +1 -0
- package/dist/defaults/index.d.ts +2 -1
- package/dist/defaults/index.d.ts.map +1 -1
- package/dist/defaults/index.js +10 -1
- package/dist/defaults/index.js.map +1 -1
- package/dist/defaults/output/print.d.ts +5 -1
- package/dist/defaults/output/print.d.ts.map +1 -1
- package/dist/defaults/output/print.js +29 -0
- package/dist/defaults/output/print.js.map +1 -1
- package/dist/defaults/structure/headerFooter/resolve.d.ts.map +1 -1
- package/dist/defaults/structure/headerFooter/resolve.js +29 -0
- package/dist/defaults/structure/headerFooter/resolve.js.map +1 -1
- package/dist/design/elementKeys.d.ts +17 -0
- package/dist/design/elementKeys.d.ts.map +1 -1
- package/dist/design/elementKeys.js +5 -2
- package/dist/design/elementKeys.js.map +1 -1
- package/dist/design/layout/elements.d.ts.map +1 -1
- package/dist/design/layout/elements.js +6 -0
- package/dist/design/layout/elements.js.map +1 -1
- package/dist/design/layout/primitives.d.ts +3 -1
- package/dist/design/layout/primitives.d.ts.map +1 -1
- package/dist/design/layout/primitives.js.map +1 -1
- package/dist/designs/parts.d.ts +1 -1
- package/dist/designs/parts.js +1 -1
- package/dist/designs/parts.js.map +1 -1
- package/dist/dieCut/dieCut.test.d.ts +2 -0
- package/dist/dieCut/dieCut.test.d.ts.map +1 -0
- package/dist/dieCut/dieCut.test.js +146 -0
- package/dist/dieCut/dieCut.test.js.map +1 -0
- package/dist/dieCut/geometry.d.ts +50 -0
- package/dist/dieCut/geometry.d.ts.map +1 -0
- package/dist/dieCut/geometry.js +272 -0
- package/dist/dieCut/geometry.js.map +1 -0
- package/dist/dieCut/index.d.ts +7 -0
- package/dist/dieCut/index.d.ts.map +1 -0
- package/dist/dieCut/index.js +9 -0
- package/dist/dieCut/index.js.map +1 -0
- package/dist/dieCut/leaves.d.ts +16 -0
- package/dist/dieCut/leaves.d.ts.map +1 -0
- package/dist/dieCut/leaves.js +31 -0
- package/dist/dieCut/leaves.js.map +1 -0
- package/dist/dieCut/path2d.d.ts +16 -0
- package/dist/dieCut/path2d.d.ts.map +1 -0
- package/dist/dieCut/path2d.js +37 -0
- package/dist/dieCut/path2d.js.map +1 -0
- package/dist/dieCut/place.d.ts +59 -0
- package/dist/dieCut/place.d.ts.map +1 -0
- package/dist/dieCut/place.js +131 -0
- package/dist/dieCut/place.js.map +1 -0
- package/dist/dieCut/seeThrough.d.ts +19 -0
- package/dist/dieCut/seeThrough.d.ts.map +1 -0
- package/dist/dieCut/seeThrough.js +54 -0
- package/dist/dieCut/seeThrough.js.map +1 -0
- package/dist/dieCut/shapes.d.ts +42 -0
- package/dist/dieCut/shapes.d.ts.map +1 -0
- package/dist/dieCut/shapes.js +102 -0
- package/dist/dieCut/shapes.js.map +1 -0
- package/dist/html-backend/dieCut.d.ts +13 -0
- package/dist/html-backend/dieCut.d.ts.map +1 -0
- package/dist/html-backend/dieCut.js +55 -0
- package/dist/html-backend/dieCut.js.map +1 -0
- package/dist/html-backend/html-backend.d.ts +1 -0
- package/dist/html-backend/html-backend.d.ts.map +1 -1
- package/dist/html-backend/html-backend.js +1 -0
- package/dist/html-backend/html-backend.js.map +1 -1
- package/dist/html-backend/page.d.ts +5 -1
- package/dist/html-backend/page.d.ts.map +1 -1
- package/dist/html-backend/page.js +11 -4
- package/dist/html-backend/page.js.map +1 -1
- package/dist/html-backend/render.d.ts.map +1 -1
- package/dist/html-backend/render.js +32 -5
- package/dist/html-backend/render.js.map +1 -1
- package/dist/html-backend/through.d.ts +27 -0
- package/dist/html-backend/through.d.ts.map +1 -0
- package/dist/html-backend/through.js +83 -0
- package/dist/html-backend/through.js.map +1 -0
- package/dist/html-backend/through.test.d.ts +2 -0
- package/dist/html-backend/through.test.d.ts.map +1 -0
- package/dist/html-backend/through.test.js +116 -0
- package/dist/html-backend/through.test.js.map +1 -0
- package/dist/html-backend/varnish.d.ts +17 -0
- package/dist/html-backend/varnish.d.ts.map +1 -0
- package/dist/html-backend/varnish.js +68 -0
- package/dist/html-backend/varnish.js.map +1 -0
- package/dist/index.d.ts +7 -8
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -3
- package/dist/index.js.map +1 -1
- package/dist/migrate/markdownRuns.js +1 -1
- package/dist/migrate/markdownRuns.js.map +1 -1
- package/dist/paint/displayList/inline.d.ts.map +1 -1
- package/dist/paint/displayList/inline.js +4 -2
- package/dist/paint/displayList/inline.js.map +1 -1
- package/dist/paint/displayList/lines.d.ts.map +1 -1
- package/dist/paint/displayList/lines.js +2 -0
- package/dist/paint/displayList/lines.js.map +1 -1
- package/dist/paint/displayList/types.d.ts +8 -0
- package/dist/paint/displayList/types.d.ts.map +1 -1
- package/dist/parse/blockParser.d.ts.map +1 -1
- package/dist/parse/blockParser.js +1 -1
- package/dist/parse/blockParser.js.map +1 -1
- package/dist/parse/types/contentBlock.d.ts +3 -0
- package/dist/parse/types/contentBlock.d.ts.map +1 -1
- package/dist/pipeline/build/pass/blocks/blockDispatch.d.ts.map +1 -1
- package/dist/pipeline/build/pass/blocks/blockDispatch.js +3 -2
- package/dist/pipeline/build/pass/blocks/blockDispatch.js.map +1 -1
- package/dist/pipeline/build/pass/blocks/blockMeasure.d.ts.map +1 -1
- package/dist/pipeline/build/pass/blocks/blockMeasure.js +7 -0
- package/dist/pipeline/build/pass/blocks/blockMeasure.js.map +1 -1
- package/dist/pipeline/build/pass/setup/passFinish.d.ts.map +1 -1
- package/dist/pipeline/build/pass/setup/passFinish.js +4 -0
- package/dist/pipeline/build/pass/setup/passFinish.js.map +1 -1
- package/dist/pipeline/build/pass.d.ts.map +1 -1
- package/dist/pipeline/build/pass.js +9 -0
- package/dist/pipeline/build/pass.js.map +1 -1
- package/dist/pipeline/config.d.ts.map +1 -1
- package/dist/pipeline/config.js +12 -1
- package/dist/pipeline/config.js.map +1 -1
- package/dist/pipeline/contentWarnings/formatWarning.d.ts.map +1 -1
- package/dist/pipeline/contentWarnings/formatWarning.js +5 -0
- package/dist/pipeline/contentWarnings/formatWarning.js.map +1 -1
- package/dist/pipeline/contentWarnings/sourceWarnings.d.ts.map +1 -1
- package/dist/pipeline/contentWarnings/sourceWarnings.js +10 -0
- package/dist/pipeline/contentWarnings/sourceWarnings.js.map +1 -1
- package/dist/pipeline/floats/dieWrap.d.ts +24 -0
- package/dist/pipeline/floats/dieWrap.d.ts.map +1 -0
- package/dist/pipeline/floats/dieWrap.js +102 -0
- package/dist/pipeline/floats/dieWrap.js.map +1 -0
- package/dist/pipeline/floats/textWrap.d.ts +10 -2
- package/dist/pipeline/floats/textWrap.d.ts.map +1 -1
- package/dist/pipeline/floats/textWrap.js +34 -3
- package/dist/pipeline/floats/textWrap.js.map +1 -1
- package/dist/pipeline/pages/dieCuts.d.ts +30 -0
- package/dist/pipeline/pages/dieCuts.d.ts.map +1 -0
- package/dist/pipeline/pages/dieCuts.js +140 -0
- package/dist/pipeline/pages/dieCuts.js.map +1 -0
- package/dist/pipeline/pages/headerFooter/primitives.js +2 -0
- package/dist/pipeline/pages/headerFooter/primitives.js.map +1 -1
- package/dist/svg/spotPaints.d.ts +18 -0
- package/dist/svg/spotPaints.d.ts.map +1 -1
- package/dist/svg/spotPaints.js +11 -6
- package/dist/svg/spotPaints.js.map +1 -1
- package/dist/types/config.d.ts +5 -0
- package/dist/types/config.d.ts.map +1 -1
- package/dist/types/designCut.d.ts +48 -0
- package/dist/types/designCut.d.ts.map +1 -0
- package/dist/types/designCut.js +2 -0
- package/dist/types/designCut.js.map +1 -0
- package/dist/types/designElements.d.ts +7 -1
- package/dist/types/designElements.d.ts.map +1 -1
- package/dist/types/dieCuts.d.ts +88 -0
- package/dist/types/dieCuts.d.ts.map +1 -0
- package/dist/types/dieCuts.js +2 -0
- package/dist/types/dieCuts.js.map +1 -0
- package/dist/types/output/print.d.ts +29 -1
- package/dist/types/output/print.d.ts.map +1 -1
- package/dist/types/page.d.ts +26 -1
- package/dist/types/page.d.ts.map +1 -1
- package/dist/types.d.ts +1 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/vdt/contentWarnings/markup.d.ts +8 -0
- package/dist/vdt/contentWarnings/markup.d.ts.map +1 -1
- package/dist/vdt/design.d.ts +13 -1
- package/dist/vdt/design.d.ts.map +1 -1
- package/dist/vdt/design.js.map +1 -1
- package/dist/vdt/document.d.ts +5 -1
- package/dist/vdt/document.d.ts.map +1 -1
- package/dist/vdt/document.js.map +1 -1
- package/dist/vdt/pages.d.ts +20 -1
- package/dist/vdt/pages.d.ts.map +1 -1
- package/dist/vdt.d.ts +1 -1
- package/dist/vdt.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,243 @@
|
|
|
1
|
+
import { beforeEach, describe, expect, it } from 'vitest';
|
|
2
|
+
import { buildDocument } from '../../pipeline/index.js';
|
|
3
|
+
import { clearResourceImages, clearVarnishPaints, registerResourceImage, renderFinishMask, renderPageToCanvas, renderToHtml, finishMaskSvg } from '../../index.js';
|
|
4
|
+
import { maskPaintMap, overprintHexes, paintFinishMask, packFinishMask } from '../../canvas-backend/finish/mask.js';
|
|
5
|
+
import { applyFinishPreview } from '../../canvas-backend/finish/preview.js';
|
|
6
|
+
import { parsePaint } from '../../canvas-backend/finish/paint.js';
|
|
7
|
+
import { RasterCanvas } from './rasterCanvas.js';
|
|
8
|
+
// #1563 / #1564: a varnish puts no colour on a screen page, and the finish
|
|
9
|
+
// mask records where each special ink lies: R metalness, G sheen, B
|
|
10
|
+
// fluorescence, A opaque white, each at the ink's tint.
|
|
11
|
+
globalThis.OffscreenCanvas = RasterCanvas;
|
|
12
|
+
const ink = (kind, extra = {}) => ({ kind, tint: 100, name: kind, overprint: kind === 'white' || kind === 'varnish', ...extra });
|
|
13
|
+
const GOLD = '#c9a13b';
|
|
14
|
+
const FOIL = '#d0d0d0';
|
|
15
|
+
const NEON = '#ff3399';
|
|
16
|
+
const WHITE = '#f4f4f4';
|
|
17
|
+
const VARNISH = '#fefefe';
|
|
18
|
+
const INKS = new Map([
|
|
19
|
+
[GOLD, ink('metallic')],
|
|
20
|
+
[FOIL, ink('foil')],
|
|
21
|
+
[NEON, ink('fluorescent')],
|
|
22
|
+
[WHITE, ink('white', { tint: 50 })],
|
|
23
|
+
[VARNISH, ink('varnish', { sheen: 'matte' })],
|
|
24
|
+
]);
|
|
25
|
+
const createCanvas = (w, h) => new RasterCanvas(w, h);
|
|
26
|
+
/** A mask of a 40 × 10 page painted by `paint` on the raw context. */
|
|
27
|
+
function mask(paint, overprint = new Set()) {
|
|
28
|
+
return paintFinishMask(40, 10, (canvas) => {
|
|
29
|
+
const ctx = canvas.getContext('2d');
|
|
30
|
+
ctx.fillStyle = '#ffffff';
|
|
31
|
+
ctx.fillRect(0, 0, 40, 10);
|
|
32
|
+
paint(ctx);
|
|
33
|
+
}, INKS, overprint, { createCanvas });
|
|
34
|
+
}
|
|
35
|
+
const at = (m, x, y) => [...m.data.subarray((y * m.width + x) * 4, (y * m.width + x) * 4 + 4)];
|
|
36
|
+
describe('finish mask channels', () => {
|
|
37
|
+
it('writes each kind in its channel at its tint', () => {
|
|
38
|
+
const m = mask((ctx) => {
|
|
39
|
+
ctx.fillStyle = GOLD;
|
|
40
|
+
ctx.fillRect(0, 0, 8, 10);
|
|
41
|
+
ctx.fillStyle = FOIL;
|
|
42
|
+
ctx.fillRect(8, 0, 8, 10);
|
|
43
|
+
ctx.fillStyle = NEON;
|
|
44
|
+
ctx.fillRect(16, 0, 8, 10);
|
|
45
|
+
ctx.fillStyle = WHITE;
|
|
46
|
+
ctx.fillRect(24, 0, 8, 10);
|
|
47
|
+
ctx.fillStyle = VARNISH;
|
|
48
|
+
ctx.fillRect(32, 0, 8, 10);
|
|
49
|
+
});
|
|
50
|
+
expect(at(m, 4, 5)).toEqual([255, 179, 0, 0]); // metallic: satin .7
|
|
51
|
+
expect(at(m, 12, 5)).toEqual([255, 255, 0, 0]); // foil: gloss
|
|
52
|
+
expect(at(m, 20, 5)).toEqual([0, 0, 255, 0]);
|
|
53
|
+
expect(at(m, 28, 5)[3]).toBeCloseTo(128, -1); // white at 50 %
|
|
54
|
+
expect(at(m, 36, 5)).toEqual([0, 102, 0, 0]); // matte varnish .4
|
|
55
|
+
});
|
|
56
|
+
it('is undefined when the page paints no special ink', () => {
|
|
57
|
+
expect(mask((ctx) => { ctx.fillStyle = '#123456'; ctx.fillRect(0, 0, 40, 10); })).toBeUndefined();
|
|
58
|
+
});
|
|
59
|
+
it('lets an ordinary ink knock a metallic ink out, unless it overprints', () => {
|
|
60
|
+
const paint = (ctx) => {
|
|
61
|
+
ctx.fillStyle = GOLD;
|
|
62
|
+
ctx.fillRect(0, 0, 40, 10);
|
|
63
|
+
ctx.fillStyle = '#000000';
|
|
64
|
+
ctx.fillRect(10, 0, 10, 10);
|
|
65
|
+
};
|
|
66
|
+
const knocked = mask(paint);
|
|
67
|
+
expect(at(knocked, 5, 5)[0]).toBe(255);
|
|
68
|
+
expect(at(knocked, 15, 5)).toEqual([0, 0, 0, 0]);
|
|
69
|
+
const over = mask(paint, new Set(['#000000']));
|
|
70
|
+
expect(at(over, 15, 5)[0]).toBe(255);
|
|
71
|
+
// A white ink overprints: the gold under it stays, its coverage is A.
|
|
72
|
+
const white = mask((ctx) => {
|
|
73
|
+
ctx.fillStyle = GOLD;
|
|
74
|
+
ctx.fillRect(0, 0, 40, 10);
|
|
75
|
+
ctx.fillStyle = WHITE;
|
|
76
|
+
ctx.fillRect(10, 0, 10, 10);
|
|
77
|
+
}, overprintSet(WHITE));
|
|
78
|
+
expect(at(white, 15, 5)[0]).toBe(255);
|
|
79
|
+
expect(at(white, 15, 5)[3]).toBeGreaterThan(0);
|
|
80
|
+
});
|
|
81
|
+
it('lays a varnish over a picture, which knocks the inks under it out', () => {
|
|
82
|
+
const picture = { width: 4, height: 4, rgba: [10, 200, 30, 255] };
|
|
83
|
+
const m = mask((ctx) => {
|
|
84
|
+
ctx.fillStyle = GOLD;
|
|
85
|
+
ctx.fillRect(0, 0, 40, 10);
|
|
86
|
+
ctx.drawImage(picture, 10, 0, 20, 10);
|
|
87
|
+
ctx.fillStyle = VARNISH;
|
|
88
|
+
ctx.fillRect(20, 0, 20, 10);
|
|
89
|
+
});
|
|
90
|
+
expect(at(m, 5, 5)).toEqual([255, 179, 0, 0]);
|
|
91
|
+
expect(at(m, 15, 5)).toEqual([0, 0, 0, 0]); // picture: no gold
|
|
92
|
+
expect(at(m, 25, 5)).toEqual([0, 102, 0, 0]); // varnish over the picture
|
|
93
|
+
expect(at(m, 35, 5)).toEqual([255, 179, 0, 0]); // varnish over gold: the larger sheen
|
|
94
|
+
});
|
|
95
|
+
it('maps paints for each pass, leaving transparent paints and gradients as they are', () => {
|
|
96
|
+
const inks = maskPaintMap('inks', INKS, new Set());
|
|
97
|
+
expect(inks('rgba(0, 0, 0, 0)')).toBe('rgba(0, 0, 0, 0)');
|
|
98
|
+
expect(inks({})).toBe('rgba(0, 0, 0, 1)');
|
|
99
|
+
expect(inks(`${GOLD}80`)).toBe(`rgba(255, 179, 0, ${128 / 255})`);
|
|
100
|
+
expect(maskPaintMap('varnish', INKS, new Set())(GOLD)).toBe('rgba(0, 0, 0, 0)');
|
|
101
|
+
expect(parsePaint('rgb(201 161 59 / 50%)')).toEqual({ hex: GOLD, alpha: 0.5 });
|
|
102
|
+
expect(parsePaint('#abc')).toEqual({ hex: '#aabbcc', alpha: 1 });
|
|
103
|
+
});
|
|
104
|
+
it('packs varnish sheen by its coverage', () => {
|
|
105
|
+
const inks = new Uint8ClampedArray([0, 50, 0, 255]);
|
|
106
|
+
const varnish = new Uint8ClampedArray([0, 200, 0, 128]);
|
|
107
|
+
expect([...packFinishMask(1, 1, new Map([['inks', inks], ['varnish', varnish]])).data]).toEqual([0, 100, 0, 0]);
|
|
108
|
+
});
|
|
109
|
+
});
|
|
110
|
+
function overprintSet(...hexes) {
|
|
111
|
+
return new Set(hexes);
|
|
112
|
+
}
|
|
113
|
+
const mm = (value) => ({ value, unit: 'mm' });
|
|
114
|
+
const spot = (hex, s) => ({ hex, model: 'spot', spot: s });
|
|
115
|
+
const CMYK0 = { c: 0, m: 0, y: 0, k: 0 };
|
|
116
|
+
function config(background, extra = {}) {
|
|
117
|
+
return {
|
|
118
|
+
page: { width: mm(40), height: mm(30), dpi: 72, margins: { top: mm(5), bottom: mm(5), left: mm(5), right: mm(5) }, backgroundColor: background },
|
|
119
|
+
layout: { layoutType: 'single' },
|
|
120
|
+
header: { elements: [] },
|
|
121
|
+
footer: { elements: [] },
|
|
122
|
+
...extra,
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
beforeEach(() => clearResourceImages());
|
|
126
|
+
describe('renderFinishMask on a laid-out page', () => {
|
|
127
|
+
it('reads a metallic paper through the page painter, text knocking it out', () => {
|
|
128
|
+
const doc = buildDocument({ markdown: 'Gold.' }, config(spot(GOLD, { name: 'Gold', cmyk: { c: 0, m: 20, y: 60, k: 20 }, finish: { kind: 'metallic' } })));
|
|
129
|
+
const page = doc.pages[0];
|
|
130
|
+
const m = renderFinishMask(page, doc);
|
|
131
|
+
expect(m).toBeDefined();
|
|
132
|
+
expect([m.width, m.height]).toEqual([Math.round(page.width), Math.round(page.height)]);
|
|
133
|
+
expect(at(m, 1, 1)).toEqual([255, 179, 0, 0]);
|
|
134
|
+
// The first line's text is black: no gold under it.
|
|
135
|
+
const line = page.columns[0].blocks[0].lines[0];
|
|
136
|
+
const x = Math.round(line.bbox.x + 2);
|
|
137
|
+
const y = Math.round(line.bbox.y + line.bbox.height / 2);
|
|
138
|
+
expect(at(m, x, y)[0]).toBe(0);
|
|
139
|
+
});
|
|
140
|
+
it('is undefined for a plain page, and for a page whose ink has no finish', () => {
|
|
141
|
+
const plain = buildDocument({ markdown: 'Text.' }, config({ hex: '#ffffff', model: 'hex' }));
|
|
142
|
+
expect(renderFinishMask(plain.pages[0], plain)).toBeUndefined();
|
|
143
|
+
const pms = buildDocument({ markdown: 'Text.' }, config(spot('#1f3f99', { name: 'PANTONE 286 C', cmyk: { c: 100, m: 66, y: 0, k: 2 } })));
|
|
144
|
+
expect(renderFinishMask(pms.pages[0], pms)).toBeUndefined();
|
|
145
|
+
});
|
|
146
|
+
it('gives a white paper of white ink its coverage, and overprints it by default', () => {
|
|
147
|
+
const doc = buildDocument({ markdown: 'Kraft.' }, config(spot('#ececec', { name: 'Opaque white', cmyk: CMYK0, finish: { kind: 'white' } })));
|
|
148
|
+
expect(overprintHexes(doc).has('#ececec')).toBe(true);
|
|
149
|
+
const m = renderFinishMask(doc.pages[0], doc, { scale: 0.5 });
|
|
150
|
+
expect(at(m, 1, 1)).toEqual([0, 0, 0, 255]);
|
|
151
|
+
});
|
|
152
|
+
it('never counts the sheet or a white paper as a pure-white ink', () => {
|
|
153
|
+
const doc = buildDocument({ markdown: 'White ink.' }, config({ hex: '#ffffff', model: 'hex' }, {
|
|
154
|
+
colorPalette: [{ id: 'w', name: 'Opaque white', value: spot('#ffffff', { name: 'Opaque white', cmyk: CMYK0, finish: { kind: 'white' } }) }],
|
|
155
|
+
}));
|
|
156
|
+
const m = renderFinishMask(doc.pages[0], doc, { scale: 0.5 });
|
|
157
|
+
// The palette defines the ink, but nothing on the page is set in it.
|
|
158
|
+
expect(m === undefined || at(m, 1, 1)[3] === 0).toBe(true);
|
|
159
|
+
});
|
|
160
|
+
it('paints the host recoloured picture of an SVG in the mask paints', () => {
|
|
161
|
+
const resource = { id: 'fig', typeId: 'figure', kind: 'svg', createdAt: 0, updatedAt: 0, svg: { fileId: 'fig.svg', width: 100, height: 50 }, placement: { position: 'here' } };
|
|
162
|
+
const doc = buildDocument({ markdown: 'Text.\n\n::resource{id="fig"}', resources: [resource] }, config({ hex: '#ffffff', model: 'hex' }, {
|
|
163
|
+
colorPalette: [{ id: 'g', name: 'Gold', value: spot(GOLD, { name: 'Gold', cmyk: CMYK0, finish: { kind: 'metallic' } }) }],
|
|
164
|
+
}));
|
|
165
|
+
registerResourceImage('fig.svg', { width: 10, height: 10, rgba: [0, 0, 255, 255] }, { vector: false });
|
|
166
|
+
const gold = { width: 2, height: 2, rgba: [255, 179, 0, 255] };
|
|
167
|
+
const page = doc.pages.find((p) => JSON.stringify(p).includes('fig.svg'));
|
|
168
|
+
const m = renderFinishMask(page, doc, { images: (id, pass) => (id === 'fig.svg' && pass === 'inks' ? gold : undefined) });
|
|
169
|
+
expect(m).toBeDefined();
|
|
170
|
+
expect([...m.data].some((v, i) => i % 4 === 0 && v === 255)).toBe(true);
|
|
171
|
+
// Without the host's picture the page has no special ink.
|
|
172
|
+
expect(renderFinishMask(page, doc)).toBeUndefined();
|
|
173
|
+
});
|
|
174
|
+
});
|
|
175
|
+
describe('screen rule and preview', () => {
|
|
176
|
+
const varnished = () => buildDocument({ markdown: 'Varnish.' }, config(spot(VARNISH, { name: 'Varnish', cmyk: CMYK0, finish: { kind: 'varnish' } })));
|
|
177
|
+
it('leaves a varnish off the canvas, so the paper shows', () => {
|
|
178
|
+
const doc = varnished();
|
|
179
|
+
const canvas = new RasterCanvas();
|
|
180
|
+
renderPageToCanvas(doc.pages[0], doc, canvas);
|
|
181
|
+
expect(canvas.ctx.pixel(1, 1)).toEqual([255, 255, 255, 255]);
|
|
182
|
+
// The hook is gone after the paint.
|
|
183
|
+
expect(Object.getOwnPropertyDescriptor(canvas.ctx, 'fillStyle')).toBeUndefined();
|
|
184
|
+
// A plain spot paints its hex.
|
|
185
|
+
const pms = buildDocument({ markdown: 'Text.' }, config(spot('#1f3f99', { name: 'PANTONE 286 C', cmyk: CMYK0 })));
|
|
186
|
+
const c2 = new RasterCanvas();
|
|
187
|
+
renderPageToCanvas(pms.pages[0], pms, c2);
|
|
188
|
+
expect(c2.ctx.pixel(1, 1)).toEqual([0x1f, 0x3f, 0x99, 255]);
|
|
189
|
+
});
|
|
190
|
+
it('shows the varnish in false colour (map) and as a gloss (sheen)', () => {
|
|
191
|
+
const doc = varnished();
|
|
192
|
+
const map = new RasterCanvas();
|
|
193
|
+
renderPageToCanvas(doc.pages[0], doc, map, { finishes: 'map' });
|
|
194
|
+
const [r, g, b] = map.ctx.pixel(1, 1);
|
|
195
|
+
expect(b).toBeGreaterThan(r);
|
|
196
|
+
expect(g).toBeLessThan(255);
|
|
197
|
+
const flat = new RasterCanvas();
|
|
198
|
+
renderPageToCanvas(doc.pages[0], doc, flat, { finishes: 'flat' });
|
|
199
|
+
expect(flat.ctx.pixel(1, 1)).toEqual([255, 255, 255, 255]);
|
|
200
|
+
});
|
|
201
|
+
it('lights metal along a diagonal sweep', () => {
|
|
202
|
+
const pixels = new Uint8ClampedArray(4 * 4 * 4).fill(100);
|
|
203
|
+
const data = new Uint8ClampedArray(4 * 4 * 4);
|
|
204
|
+
for (let i = 0; i < data.length; i += 4)
|
|
205
|
+
data.set([255, 179, 0, 0], i);
|
|
206
|
+
applyFinishPreview(pixels, { width: 4, height: 4, data }, 'sheen');
|
|
207
|
+
const values = new Set();
|
|
208
|
+
for (let i = 0; i < pixels.length; i += 4)
|
|
209
|
+
values.add(pixels[i]);
|
|
210
|
+
expect(values.size).toBeGreaterThan(1);
|
|
211
|
+
});
|
|
212
|
+
});
|
|
213
|
+
describe('HTML varnish', () => {
|
|
214
|
+
it('clears a varnish hex in tags and sheets, never in the text', () => {
|
|
215
|
+
const set = new Set(['#fefefe']);
|
|
216
|
+
expect(clearVarnishPaints('<div style="background:#FEFEFE;color:#000000">#fefefe</div><svg><rect fill="#fefefe80"/></svg>', set))
|
|
217
|
+
.toBe('<div style="background:transparent;color:#000000">#fefefe</div><svg><rect fill="transparent"/></svg>');
|
|
218
|
+
expect(clearVarnishPaints('<style>.a{color:#fefefe}</style><p data-x="#fefefe1">x</p>', set))
|
|
219
|
+
.toBe('<style>.a{color:transparent}</style><p data-x="#fefefe1">x</p>');
|
|
220
|
+
});
|
|
221
|
+
it('leaves a varnish paper off the HTML page', () => {
|
|
222
|
+
const doc = buildDocument({ markdown: 'Varnish.' }, config(spot(VARNISH, { name: 'Varnish', cmyk: CMYK0, finish: { kind: 'varnish' } })));
|
|
223
|
+
const html = renderToHtml(doc);
|
|
224
|
+
expect(html.toLowerCase()).not.toContain(VARNISH);
|
|
225
|
+
expect(html).toContain('background:transparent');
|
|
226
|
+
const gold = buildDocument({ markdown: 'Gold.' }, config(spot(GOLD, { name: 'Gold', cmyk: CMYK0, finish: { kind: 'metallic' } })));
|
|
227
|
+
expect(renderToHtml(gold).toLowerCase()).toContain(GOLD);
|
|
228
|
+
});
|
|
229
|
+
});
|
|
230
|
+
describe('finishMaskSvg', () => {
|
|
231
|
+
const doc = buildDocument({ markdown: 'x' }, config({ hex: '#ffffff', model: 'hex' }, {
|
|
232
|
+
colorPalette: [
|
|
233
|
+
{ id: 'g', name: 'Gold', value: spot(GOLD, { name: 'Gold', cmyk: CMYK0, finish: { kind: 'metallic' } }) },
|
|
234
|
+
{ id: 'v', name: 'Varnish', value: spot(VARNISH, { name: 'Varnish', cmyk: CMYK0, finish: { kind: 'varnish' } }) },
|
|
235
|
+
],
|
|
236
|
+
}));
|
|
237
|
+
const svg = `<svg><rect fill="${GOLD}"/><rect fill="#e4002b icc-named-color(PANTONE, "Varnish")"/><path data-spot="Gold" stroke="#123456" fill="none"/><rect style="fill:#333333"/></svg>`;
|
|
238
|
+
it('recolours each paint for the paint of the mask', () => {
|
|
239
|
+
expect(finishMaskSvg(svg, doc, 'inks')).toBe('<svg><rect fill="rgb(255, 179, 0)"/><rect fill="transparent"/><path data-spot="Gold" stroke="rgb(255, 179, 0)" fill="none"/><rect style="fill:#000000"/></svg>');
|
|
240
|
+
expect(finishMaskSvg(svg, doc, 'varnish')).toBe('<svg><rect fill="transparent"/><rect fill="rgb(0, 255, 0)"/><path data-spot="Gold" stroke="transparent" fill="none"/><rect style="fill:transparent"/></svg>');
|
|
241
|
+
});
|
|
242
|
+
});
|
|
243
|
+
//# sourceMappingURL=finishMask.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"finishMask.test.js","sourceRoot":"","sources":["../../../src/__tests__/paint/finishMask.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A small canvas with real pixels for the finish tests (#1563, #1564): RGBA
|
|
3
|
+
* bytes, axis-aligned fills under scale and translation, `source-over` and
|
|
4
|
+
* `source-in`, `drawImage` of another of its kind or of a flat fake image,
|
|
5
|
+
* text as the box it would cover. Every other method of a 2D context does
|
|
6
|
+
* nothing, so the page painter runs on it whole.
|
|
7
|
+
*/
|
|
8
|
+
export declare class RasterContext {
|
|
9
|
+
canvas: RasterCanvas;
|
|
10
|
+
data: Uint8ClampedArray;
|
|
11
|
+
private st;
|
|
12
|
+
private stack;
|
|
13
|
+
textAlign: string;
|
|
14
|
+
textBaseline: string;
|
|
15
|
+
direction: string;
|
|
16
|
+
letterSpacing: string;
|
|
17
|
+
wordSpacing: string;
|
|
18
|
+
lineWidth: number;
|
|
19
|
+
filter: string;
|
|
20
|
+
constructor(canvas: RasterCanvas);
|
|
21
|
+
private static fresh;
|
|
22
|
+
reset(): void;
|
|
23
|
+
get fillStyle(): unknown;
|
|
24
|
+
set fillStyle(v: unknown);
|
|
25
|
+
get strokeStyle(): unknown;
|
|
26
|
+
set strokeStyle(v: unknown);
|
|
27
|
+
get globalAlpha(): number;
|
|
28
|
+
set globalAlpha(v: number);
|
|
29
|
+
get globalCompositeOperation(): string;
|
|
30
|
+
set globalCompositeOperation(v: string);
|
|
31
|
+
get font(): string;
|
|
32
|
+
set font(v: string);
|
|
33
|
+
save(): void;
|
|
34
|
+
restore(): void;
|
|
35
|
+
scale(x: number, y: number): void;
|
|
36
|
+
translate(x: number, y: number): void;
|
|
37
|
+
transform(a: number, b: number, c: number, d: number, e: number, f: number): void;
|
|
38
|
+
setTransform(a?: number, b?: number, c?: number, d?: number, e?: number, f?: number): void;
|
|
39
|
+
getTransform(): {
|
|
40
|
+
a: number;
|
|
41
|
+
b: number;
|
|
42
|
+
c: number;
|
|
43
|
+
d: number;
|
|
44
|
+
e: number;
|
|
45
|
+
f: number;
|
|
46
|
+
};
|
|
47
|
+
measureText(t: string): {
|
|
48
|
+
width: number;
|
|
49
|
+
actualBoundingBoxAscent: number;
|
|
50
|
+
actualBoundingBoxDescent: number;
|
|
51
|
+
};
|
|
52
|
+
/** The device box of a user-space rectangle (scale and translation only). */
|
|
53
|
+
private box;
|
|
54
|
+
private put;
|
|
55
|
+
private paintBox;
|
|
56
|
+
fillRect(x: number, y: number, w: number, h: number): void;
|
|
57
|
+
clearRect(x: number, y: number, w: number, h: number): void;
|
|
58
|
+
fillText(t: string, x: number, y: number): void;
|
|
59
|
+
drawImage(src: unknown, ...args: number[]): void;
|
|
60
|
+
getImageData(x: number, y: number, w: number, h: number): {
|
|
61
|
+
data: Uint8ClampedArray;
|
|
62
|
+
width: number;
|
|
63
|
+
height: number;
|
|
64
|
+
};
|
|
65
|
+
putImageData(img: {
|
|
66
|
+
data: Uint8ClampedArray;
|
|
67
|
+
}): void;
|
|
68
|
+
/** The pixel at (x, y), RGBA bytes. */
|
|
69
|
+
pixel(x: number, y: number): number[];
|
|
70
|
+
}
|
|
71
|
+
/** A canvas of {@link RasterContext}; usable as `OffscreenCanvas`. */
|
|
72
|
+
export declare class RasterCanvas {
|
|
73
|
+
private w;
|
|
74
|
+
private h;
|
|
75
|
+
readonly ctx: RasterContext;
|
|
76
|
+
private proxy;
|
|
77
|
+
constructor(width?: number, height?: number);
|
|
78
|
+
get width(): number;
|
|
79
|
+
set width(v: number);
|
|
80
|
+
get height(): number;
|
|
81
|
+
set height(v: number);
|
|
82
|
+
getContext(): RasterContext;
|
|
83
|
+
}
|
|
84
|
+
//# sourceMappingURL=rasterCanvas.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rasterCanvas.d.ts","sourceRoot":"","sources":["../../../src/__tests__/paint/rasterCanvas.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,192 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A small canvas with real pixels for the finish tests (#1563, #1564): RGBA
|
|
3
|
+
* bytes, axis-aligned fills under scale and translation, `source-over` and
|
|
4
|
+
* `source-in`, `drawImage` of another of its kind or of a flat fake image,
|
|
5
|
+
* text as the box it would cover. Every other method of a 2D context does
|
|
6
|
+
* nothing, so the page painter runs on it whole.
|
|
7
|
+
*/
|
|
8
|
+
function parse(v) {
|
|
9
|
+
if (typeof v !== 'string')
|
|
10
|
+
return [0, 0, 0, 255];
|
|
11
|
+
const s = v.trim().toLowerCase();
|
|
12
|
+
if (s === 'transparent')
|
|
13
|
+
return [0, 0, 0, 0];
|
|
14
|
+
let m = /^#([0-9a-f]{3,8})$/.exec(s);
|
|
15
|
+
if (m) {
|
|
16
|
+
let d = m[1];
|
|
17
|
+
if (d.length <= 4)
|
|
18
|
+
d = [...d].map((c) => c + c).join('');
|
|
19
|
+
const n = (i) => parseInt(d.slice(i, i + 2), 16);
|
|
20
|
+
return [n(0), n(2), n(4), d.length === 8 ? n(6) : 255];
|
|
21
|
+
}
|
|
22
|
+
m = /^rgba?\(([^)]*)\)$/.exec(s);
|
|
23
|
+
if (m) {
|
|
24
|
+
const p = m[1].split(/[\s,/]+/).filter(Boolean).map(Number);
|
|
25
|
+
return [p[0], p[1], p[2], p[3] === undefined ? 255 : Math.round(p[3] * 255)];
|
|
26
|
+
}
|
|
27
|
+
return [0, 0, 0, 255];
|
|
28
|
+
}
|
|
29
|
+
export class RasterContext {
|
|
30
|
+
canvas;
|
|
31
|
+
data;
|
|
32
|
+
st;
|
|
33
|
+
stack = [];
|
|
34
|
+
textAlign = 'start';
|
|
35
|
+
textBaseline = 'alphabetic';
|
|
36
|
+
direction = 'ltr';
|
|
37
|
+
letterSpacing = '0px';
|
|
38
|
+
wordSpacing = '0px';
|
|
39
|
+
lineWidth = 1;
|
|
40
|
+
filter = 'none';
|
|
41
|
+
constructor(canvas) {
|
|
42
|
+
this.canvas = canvas;
|
|
43
|
+
this.data = new Uint8ClampedArray(Math.max(1, canvas.width * canvas.height) * 4);
|
|
44
|
+
this.st = RasterContext.fresh();
|
|
45
|
+
}
|
|
46
|
+
static fresh() {
|
|
47
|
+
return { fill: [0, 0, 0, 255], stroke: [0, 0, 0, 255], fillRaw: '#000000', strokeRaw: '#000000', m: [1, 0, 0, 1, 0, 0], alpha: 1, op: 'source-over', font: '10px serif' };
|
|
48
|
+
}
|
|
49
|
+
reset() {
|
|
50
|
+
this.data = new Uint8ClampedArray(Math.max(1, this.canvas.width * this.canvas.height) * 4);
|
|
51
|
+
this.st = RasterContext.fresh();
|
|
52
|
+
this.stack = [];
|
|
53
|
+
}
|
|
54
|
+
get fillStyle() { return this.st.fillRaw; }
|
|
55
|
+
set fillStyle(v) { this.st.fillRaw = v; this.st.fill = parse(v); }
|
|
56
|
+
get strokeStyle() { return this.st.strokeRaw; }
|
|
57
|
+
set strokeStyle(v) { this.st.strokeRaw = v; this.st.stroke = parse(v); }
|
|
58
|
+
get globalAlpha() { return this.st.alpha; }
|
|
59
|
+
set globalAlpha(v) { this.st.alpha = v; }
|
|
60
|
+
get globalCompositeOperation() { return this.st.op; }
|
|
61
|
+
set globalCompositeOperation(v) { this.st.op = v; }
|
|
62
|
+
get font() { return this.st.font; }
|
|
63
|
+
set font(v) { this.st.font = v; }
|
|
64
|
+
save() { this.stack.push({ ...this.st, m: [...this.st.m] }); }
|
|
65
|
+
restore() { const s = this.stack.pop(); if (s)
|
|
66
|
+
this.st = s; }
|
|
67
|
+
scale(x, y) { const m = this.st.m; m[0] *= x; m[1] *= x; m[2] *= y; m[3] *= y; }
|
|
68
|
+
translate(x, y) { const m = this.st.m; m[4] += m[0] * x + m[2] * y; m[5] += m[1] * x + m[3] * y; }
|
|
69
|
+
transform(a, b, c, d, e, f) {
|
|
70
|
+
const [m0, m1, m2, m3, m4, m5] = this.st.m;
|
|
71
|
+
this.st.m = [m0 * a + m2 * b, m1 * a + m3 * b, m0 * c + m2 * d, m1 * c + m3 * d, m0 * e + m2 * f + m4, m1 * e + m3 * f + m5];
|
|
72
|
+
}
|
|
73
|
+
setTransform(a = 1, b = 0, c = 0, d = 1, e = 0, f = 0) { this.st.m = [a, b, c, d, e, f]; }
|
|
74
|
+
getTransform() {
|
|
75
|
+
const [a, b, c, d, e, f] = this.st.m;
|
|
76
|
+
return { a, b, c, d, e, f };
|
|
77
|
+
}
|
|
78
|
+
measureText(t) {
|
|
79
|
+
const px = Number(/([\d.]+)px/.exec(this.st.font)?.[1] ?? 10);
|
|
80
|
+
return { width: t.length * px * 0.5, actualBoundingBoxAscent: px * 0.8, actualBoundingBoxDescent: px * 0.2 };
|
|
81
|
+
}
|
|
82
|
+
/** The device box of a user-space rectangle (scale and translation only). */
|
|
83
|
+
box(x, y, w, h) {
|
|
84
|
+
const [a, , , d, e, f] = this.st.m;
|
|
85
|
+
const x0 = a * x + e;
|
|
86
|
+
const y0 = d * y + f;
|
|
87
|
+
const x1 = a * (x + w) + e;
|
|
88
|
+
const y1 = d * (y + h) + f;
|
|
89
|
+
return [Math.round(Math.min(x0, x1)), Math.round(Math.min(y0, y1)), Math.round(Math.max(x0, x1)), Math.round(Math.max(y0, y1))];
|
|
90
|
+
}
|
|
91
|
+
put(i, src) {
|
|
92
|
+
const d = this.data;
|
|
93
|
+
const sa = (src[3] / 255) * this.st.alpha;
|
|
94
|
+
if (this.st.op === 'source-in') {
|
|
95
|
+
const da = d[i + 3] / 255;
|
|
96
|
+
d[i] = src[0];
|
|
97
|
+
d[i + 1] = src[1];
|
|
98
|
+
d[i + 2] = src[2];
|
|
99
|
+
d[i + 3] = Math.round(255 * sa * da);
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
if (sa === 0)
|
|
103
|
+
return;
|
|
104
|
+
const da = d[i + 3] / 255;
|
|
105
|
+
const oa = sa + da * (1 - sa);
|
|
106
|
+
for (let k = 0; k < 3; k++)
|
|
107
|
+
d[i + k] = Math.round((src[k] * sa + d[i + k] * da * (1 - sa)) / oa);
|
|
108
|
+
d[i + 3] = Math.round(oa * 255);
|
|
109
|
+
}
|
|
110
|
+
paintBox(b, color) {
|
|
111
|
+
const W = this.canvas.width;
|
|
112
|
+
const H = this.canvas.height;
|
|
113
|
+
for (let y = Math.max(0, b[1]); y < Math.min(H, b[3]); y++) {
|
|
114
|
+
for (let x = Math.max(0, b[0]); x < Math.min(W, b[2]); x++)
|
|
115
|
+
this.put((y * W + x) * 4, color(x, y));
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
fillRect(x, y, w, h) {
|
|
119
|
+
const c = this.st.fill;
|
|
120
|
+
this.paintBox(this.box(x, y, w, h), () => c);
|
|
121
|
+
}
|
|
122
|
+
clearRect(x, y, w, h) {
|
|
123
|
+
const b = this.box(x, y, w, h);
|
|
124
|
+
const W = this.canvas.width;
|
|
125
|
+
for (let yy = Math.max(0, b[1]); yy < Math.min(this.canvas.height, b[3]); yy++) {
|
|
126
|
+
for (let xx = Math.max(0, b[0]); xx < Math.min(W, b[2]); xx++)
|
|
127
|
+
this.data.fill(0, (yy * W + xx) * 4, (yy * W + xx) * 4 + 4);
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
fillText(t, x, y) {
|
|
131
|
+
const m = this.measureText(t);
|
|
132
|
+
const c = this.st.fill;
|
|
133
|
+
this.paintBox(this.box(x, y - m.actualBoundingBoxAscent, m.width, m.actualBoundingBoxAscent + m.actualBoundingBoxDescent), () => c);
|
|
134
|
+
}
|
|
135
|
+
drawImage(src, ...args) {
|
|
136
|
+
const s = src;
|
|
137
|
+
const [sx, sy, sw, sh, dx, dy, dw, dh] = args.length >= 8 ? args : args.length >= 4 ? [0, 0, s.width, s.height, ...args] : [0, 0, s.width, s.height, args[0], args[1], s.width, s.height];
|
|
138
|
+
const b = this.box(dx, dy, dw, dh);
|
|
139
|
+
const flat = s.rgba;
|
|
140
|
+
const pixels = s.ctx?.data;
|
|
141
|
+
this.paintBox(b, (x, y) => {
|
|
142
|
+
if (flat)
|
|
143
|
+
return flat;
|
|
144
|
+
const u = Math.min(s.width - 1, Math.floor(sx + ((x + 0.5 - b[0]) / Math.max(1, b[2] - b[0])) * sw));
|
|
145
|
+
const v = Math.min(s.height - 1, Math.floor(sy + ((y + 0.5 - b[1]) / Math.max(1, b[3] - b[1])) * sh));
|
|
146
|
+
const i = (v * s.width + u) * 4;
|
|
147
|
+
return [pixels[i], pixels[i + 1], pixels[i + 2], pixels[i + 3]];
|
|
148
|
+
});
|
|
149
|
+
}
|
|
150
|
+
getImageData(x, y, w, h) {
|
|
151
|
+
const out = new Uint8ClampedArray(w * h * 4);
|
|
152
|
+
for (let yy = 0; yy < h; yy++)
|
|
153
|
+
out.set(this.data.subarray(((y + yy) * this.canvas.width + x) * 4, ((y + yy) * this.canvas.width + x + w) * 4), yy * w * 4);
|
|
154
|
+
return { data: out, width: w, height: h };
|
|
155
|
+
}
|
|
156
|
+
putImageData(img) {
|
|
157
|
+
this.data = new Uint8ClampedArray(img.data);
|
|
158
|
+
}
|
|
159
|
+
/** The pixel at (x, y), RGBA bytes. */
|
|
160
|
+
pixel(x, y) {
|
|
161
|
+
const i = (y * this.canvas.width + x) * 4;
|
|
162
|
+
return [...this.data.subarray(i, i + 4)];
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
/** A canvas of {@link RasterContext}; usable as `OffscreenCanvas`. */
|
|
166
|
+
export class RasterCanvas {
|
|
167
|
+
w;
|
|
168
|
+
h;
|
|
169
|
+
ctx;
|
|
170
|
+
proxy;
|
|
171
|
+
constructor(width = 1, height = 1) {
|
|
172
|
+
this.w = width;
|
|
173
|
+
this.h = height;
|
|
174
|
+
this.ctx = new RasterContext(this);
|
|
175
|
+
const target = this.ctx;
|
|
176
|
+
this.proxy = new Proxy(target, {
|
|
177
|
+
get(t, key) {
|
|
178
|
+
if (key in t) {
|
|
179
|
+
const v = Reflect.get(t, key, t);
|
|
180
|
+
return typeof v === 'function' ? v.bind(t) : v;
|
|
181
|
+
}
|
|
182
|
+
return () => undefined;
|
|
183
|
+
},
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
get width() { return this.w; }
|
|
187
|
+
set width(v) { this.w = v; this.ctx.reset(); }
|
|
188
|
+
get height() { return this.h; }
|
|
189
|
+
set height(v) { this.h = v; this.ctx.reset(); }
|
|
190
|
+
getContext() { return this.proxy; }
|
|
191
|
+
}
|
|
192
|
+
//# sourceMappingURL=rasterCanvas.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rasterCanvas.js","sourceRoot":"","sources":["../../../src/__tests__/paint/rasterCanvas.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ const expectSourceMapAligned = (markdown, block) => {
|
|
|
15
15
|
};
|
|
16
16
|
describe('fenced containers', () => {
|
|
17
17
|
it('exposes the known names', () => {
|
|
18
|
-
expect([...KNOWN_CONTAINERS]).toEqual(['callout', 'paragraphs', 'part', 'columns', 'paper', 'frame', 'module', 'exercise', 'solution', 'hint']);
|
|
18
|
+
expect([...KNOWN_CONTAINERS]).toEqual(['callout', 'paragraphs', 'part', 'columns', 'paper', 'diecut', 'frame', 'module', 'exercise', 'solution', 'hint']);
|
|
19
19
|
expect([...KNOWN_DIRECTIVES]).toEqual(['pagebreak', 'numbering', 'columnbreak', 'space', 'toc', 'index', 'bibliography', 'references', 'verse', 'page', 'strip', 'figure', 'solutions']);
|
|
20
20
|
});
|
|
21
21
|
it('parses callout fence into start/end markers with attrs and matching containerId', () => {
|