postext 1.83.1 → 1.84.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/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/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,102 @@
|
|
|
1
|
+
// Text wrap round die-cut holes (#1565). A hole is known before its page
|
|
2
|
+
// is filled: `dieCuts.pages` names its page, a `:::diecut` run starts the
|
|
3
|
+
// page it cuts, and the leaf rule gives the other side and the leaves
|
|
4
|
+
// after. Each hole, grown by its gap, becomes a fixed exclusion of every
|
|
5
|
+
// column it crosses (`OpenWrap` kind `'fixed'`): the lines beside it are
|
|
6
|
+
// set short by its shape (a contour), on the side of the column it is
|
|
7
|
+
// nearer; the text runs on the other.
|
|
8
|
+
//
|
|
9
|
+
// A column's exclusion takes one side, as every wrap of the flow does: a
|
|
10
|
+
// hole in the middle of a wide column leaves the text the wider side, and
|
|
11
|
+
// the narrower one empty.
|
|
12
|
+
import { extentInBand, flattenPath, growBox, intersectBoxes, pathBounds } from '../../dieCut/geometry.js';
|
|
13
|
+
import { configPlacements, holesOnPage, shapePlacement } from '../../dieCut/place.js';
|
|
14
|
+
import { dieMetricsOf } from '../../dieCut/shapes.js';
|
|
15
|
+
import { dieByBlock } from '../pages/dieCuts.js';
|
|
16
|
+
/** How many bands a hole's contour is cut into, top to bottom. */
|
|
17
|
+
const CONTOUR_BANDS = 48;
|
|
18
|
+
/** The exclusions the holes of a page make in `col` (see the module
|
|
19
|
+
* comment); none for a hole that does not wrap (gap 0) or misses it. */
|
|
20
|
+
export function holeExclusions(col, holes) {
|
|
21
|
+
const out = [];
|
|
22
|
+
const c = col.bbox;
|
|
23
|
+
for (const h of holes) {
|
|
24
|
+
const gap = h.wrapGapPx;
|
|
25
|
+
const b = pathBounds(h.path);
|
|
26
|
+
if (!b || !(gap > 0))
|
|
27
|
+
continue;
|
|
28
|
+
const grown = growBox(b, gap);
|
|
29
|
+
if (!intersectBoxes(grown, c))
|
|
30
|
+
continue;
|
|
31
|
+
const leftInset = grown.x + grown.width - c.x;
|
|
32
|
+
const rightInset = c.x + c.width - grown.x;
|
|
33
|
+
const side = leftInset <= rightInset ? 'left' : 'right';
|
|
34
|
+
const width = Math.max(0, Math.min(c.width, side === 'left' ? leftInset : rightInset));
|
|
35
|
+
const polys = flattenPath(h.path);
|
|
36
|
+
const spans = [];
|
|
37
|
+
const step = Math.max(1, b.height / CONTOUR_BANDS);
|
|
38
|
+
for (let y = b.y; y < b.y + b.height - 1e-6; y += step) {
|
|
39
|
+
const ext = extentInBand(polys, y, Math.min(b.y + b.height, y + step));
|
|
40
|
+
if (ext)
|
|
41
|
+
spans.push({ y, height: Math.min(step, b.y + b.height - y), left: ext.left, right: ext.right });
|
|
42
|
+
}
|
|
43
|
+
out.push({
|
|
44
|
+
x: side === 'left' ? c.x : c.x + c.width - width,
|
|
45
|
+
y: grown.y,
|
|
46
|
+
width,
|
|
47
|
+
height: grown.height,
|
|
48
|
+
side,
|
|
49
|
+
gap,
|
|
50
|
+
ownerId: `diecut:${h.id}`,
|
|
51
|
+
...(spans.length > 0 ? { contour: { spans, margin: gap } } : {}),
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
return out;
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* The obstacle source of a pass (`setColumnObstacleSource`): the holes the
|
|
58
|
+
* die-cuts make in each column, from `dieCuts.pages` and the `:::diecut`
|
|
59
|
+
* runs met so far. `undefined` when the document cuts nothing it could
|
|
60
|
+
* know of before its pages are filled (a template's cut element is laid
|
|
61
|
+
* with the decoration, after the frames).
|
|
62
|
+
*/
|
|
63
|
+
export function dieWrapSource(doc, contentBlocks, at) {
|
|
64
|
+
const dice = doc.config.dieCuts;
|
|
65
|
+
if (!dice)
|
|
66
|
+
return undefined;
|
|
67
|
+
const byBlock = dieByBlock(contentBlocks);
|
|
68
|
+
const runs = byBlock.some((d) => d !== undefined);
|
|
69
|
+
if (dice.pages.length === 0 && !runs)
|
|
70
|
+
return undefined;
|
|
71
|
+
const offset = doc.pageIndexOffset ?? 0;
|
|
72
|
+
let metrics;
|
|
73
|
+
let base;
|
|
74
|
+
const runPlacements = new Map();
|
|
75
|
+
const pageOf = (col, hint) => {
|
|
76
|
+
if (doc.pages[hint]?.columns.includes(col))
|
|
77
|
+
return hint;
|
|
78
|
+
for (let i = doc.pages.length - 1; i >= 0; i--)
|
|
79
|
+
if (doc.pages[i].columns.includes(col))
|
|
80
|
+
return i;
|
|
81
|
+
return -1;
|
|
82
|
+
};
|
|
83
|
+
return (col) => {
|
|
84
|
+
const now = at();
|
|
85
|
+
const pageIndex = pageOf(col, now.pageIndex);
|
|
86
|
+
if (pageIndex < 0)
|
|
87
|
+
return undefined;
|
|
88
|
+
metrics ??= dieMetricsOf(doc);
|
|
89
|
+
base ??= configPlacements(dice, metrics, Number.POSITIVE_INFINITY, offset).placements;
|
|
90
|
+
// The run the block being set belongs to cuts the page it lands on
|
|
91
|
+
// (not the page a run's opening marker closes).
|
|
92
|
+
const block = contentBlocks[now.blockIdx];
|
|
93
|
+
const marker = block && (block.type === 'containerStart' || block.type === 'containerEnd') && block.containerName === 'diecut';
|
|
94
|
+
const die = marker ? undefined : byBlock[now.blockIdx];
|
|
95
|
+
const shape = die ? dice.shapes.find((s) => s.id === die) : undefined;
|
|
96
|
+
if (shape && pageIndex === now.pageIndex && !runPlacements.has(pageIndex))
|
|
97
|
+
runPlacements.set(pageIndex, shapePlacement(shape, pageIndex, metrics));
|
|
98
|
+
const holes = holesOnPage([...base, ...runPlacements.values()], pageIndex, metrics, offset);
|
|
99
|
+
return holes.length > 0 ? holeExclusions(col, holes) : undefined;
|
|
100
|
+
};
|
|
101
|
+
}
|
|
102
|
+
//# sourceMappingURL=dieWrap.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dieWrap.js","sourceRoot":"","sources":["../../../src/pipeline/floats/dieWrap.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,9 +61,17 @@ export interface OpenWrap {
|
|
|
61
61
|
/** `'top'`: it starts at or above the flow's cursor (an inline figure, a
|
|
62
62
|
* float at the column's head); settling takes the cursor under it.
|
|
63
63
|
* `'bottom'`: it stands at the column's foot, below the cursor;
|
|
64
|
-
* settling ends the column at its top.
|
|
65
|
-
|
|
64
|
+
* settling ends the column at its top. `'fixed'` (#1565): it stands
|
|
65
|
+
* where the sheet puts it, a die-cut hole: settling takes a cursor
|
|
66
|
+
* beside it under it and leaves it open while the cursor is above it. */
|
|
67
|
+
kind: 'top' | 'bottom' | 'fixed';
|
|
66
68
|
}
|
|
69
|
+
/** What a column's sheet keeps text away from before anything is placed in
|
|
70
|
+
* it (#1565: the die-cut holes of its page), asked once per column. */
|
|
71
|
+
export type ColumnObstacleSource = (col: VDTColumn) => readonly VDTExclusion[] | undefined;
|
|
72
|
+
/** Sets the source of the columns' fixed obstacles for the pass that lays
|
|
73
|
+
* out now (`undefined`: none); returns the one before, to put back. */
|
|
74
|
+
export declare function setColumnObstacleSource(source: ColumnObstacleSource | undefined): ColumnObstacleSource | undefined;
|
|
67
75
|
/** Record an exclusion of `col` and open it to the flow. */
|
|
68
76
|
export declare function openColumnWrap(col: VDTColumn, ex: VDTExclusion, kind: OpenWrap['kind']): void;
|
|
69
77
|
/** The exclusions of `col` the flow may still run beside. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textWrap.d.ts","sourceRoot":"","sources":["../../../src/pipeline/floats/textWrap.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAChG,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAS5D;yDACyD;AACzD,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAIvE;AAED;iDACiD;AACjD,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd;+CAC2C;IAC3C,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,yEAAyE;IACzE,OAAO,CAAC,EAAE,IAAI,CAAC;CAChB;AAED;6DAC6D;AAC7D,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,YAAY,GAAG,SAAS,EAC9B,QAAQ,EAAE,sBAAsB,GAC/B,YAAY,GAAG,SAAS,CAiB1B;AAED,2EAA2E;AAC3E,wBAAgB,SAAS,CAAC,GAAG,EAAE,SAAS,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAErH;AAED,wEAAwE;AACxE,wBAAgB,cAAc,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAExH;AAED;;;gBAGgB;AAChB,wBAAgB,cAAc,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAI3D;AAED;;wBAEwB;AACxB,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAM9D;AAED,4EAA4E;AAC5E,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,YAAY,CAAC;IACjB
|
|
1
|
+
{"version":3,"file":"textWrap.d.ts","sourceRoot":"","sources":["../../../src/pipeline/floats/textWrap.ts"],"names":[],"mappings":"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"}
|
|
@@ -83,11 +83,28 @@ export function runsBesideWrap(block) {
|
|
|
83
83
|
export function transparentToWrap(block) {
|
|
84
84
|
if (block.type === 'containerStart' || block.type === 'containerEnd') {
|
|
85
85
|
const name = block.containerName;
|
|
86
|
-
return name !== 'callout' && name !== 'part' && name !== 'paper' && name !== 'composedPage' && name !== 'exercise' && name !== 'solution' && name !== 'hint';
|
|
86
|
+
return name !== 'callout' && name !== 'part' && name !== 'paper' && name !== 'diecut' && name !== 'composedPage' && name !== 'exercise' && name !== 'solution' && name !== 'hint';
|
|
87
87
|
}
|
|
88
88
|
return block.type === 'directive' && block.directiveName === 'numbering';
|
|
89
89
|
}
|
|
90
90
|
const openWraps = new WeakMap();
|
|
91
|
+
let obstacleSource;
|
|
92
|
+
const obstaclesAsked = new WeakSet();
|
|
93
|
+
/** Sets the source of the columns' fixed obstacles for the pass that lays
|
|
94
|
+
* out now (`undefined`: none); returns the one before, to put back. */
|
|
95
|
+
export function setColumnObstacleSource(source) {
|
|
96
|
+
const before = obstacleSource;
|
|
97
|
+
obstacleSource = source;
|
|
98
|
+
return before;
|
|
99
|
+
}
|
|
100
|
+
/** Opens the fixed obstacles of `col` the first time it is asked about. */
|
|
101
|
+
function askObstacles(col) {
|
|
102
|
+
if (!obstacleSource || obstaclesAsked.has(col))
|
|
103
|
+
return;
|
|
104
|
+
obstaclesAsked.add(col);
|
|
105
|
+
for (const ex of obstacleSource(col) ?? [])
|
|
106
|
+
openColumnWrap(col, ex, 'fixed');
|
|
107
|
+
}
|
|
91
108
|
/** Record an exclusion of `col` and open it to the flow. */
|
|
92
109
|
export function openColumnWrap(col, ex, kind) {
|
|
93
110
|
(col.exclusions ??= []).push(ex);
|
|
@@ -99,6 +116,7 @@ export function openColumnWrap(col, ex, kind) {
|
|
|
99
116
|
}
|
|
100
117
|
/** The exclusions of `col` the flow may still run beside. */
|
|
101
118
|
export function openColumnWraps(col) {
|
|
119
|
+
askObstacles(col);
|
|
102
120
|
return openWraps.get(col) ?? [];
|
|
103
121
|
}
|
|
104
122
|
/** The flow's cursor in `col` (page y of the next block's top, before its
|
|
@@ -113,15 +131,26 @@ export function columnCursorY(col) {
|
|
|
113
131
|
* space the text was owing is then taken by the wrap's own gap).
|
|
114
132
|
*/
|
|
115
133
|
export function settleColumnWraps(col) {
|
|
134
|
+
askObstacles(col);
|
|
116
135
|
const list = openWraps.get(col);
|
|
117
136
|
if (!list || list.length === 0)
|
|
118
137
|
return false;
|
|
119
138
|
openWraps.delete(col);
|
|
120
139
|
const before = col.availableHeight;
|
|
121
140
|
const colBottom = col.bbox.y + col.bbox.height;
|
|
122
|
-
|
|
141
|
+
const kept = [];
|
|
142
|
+
for (const item of list) {
|
|
143
|
+
const { ex, kind } = item;
|
|
123
144
|
const y = columnCursorY(col);
|
|
124
|
-
if (kind === '
|
|
145
|
+
if (kind === 'fixed') {
|
|
146
|
+
const bottom = ex.y + ex.height;
|
|
147
|
+
// Still above it: what comes may run beside it later.
|
|
148
|
+
if (y < ex.y - 0.01)
|
|
149
|
+
kept.push(item);
|
|
150
|
+
else if (y < bottom - 0.01)
|
|
151
|
+
col.availableHeight = Math.max(0, Math.min(col.availableHeight, colBottom - bottom));
|
|
152
|
+
}
|
|
153
|
+
else if (kind === 'top') {
|
|
125
154
|
const bottom = ex.y + ex.height;
|
|
126
155
|
if (y < bottom - 0.01)
|
|
127
156
|
col.availableHeight = Math.max(0, Math.min(col.availableHeight, colBottom - bottom));
|
|
@@ -130,6 +159,8 @@ export function settleColumnWraps(col) {
|
|
|
130
159
|
col.availableHeight = Math.max(0, Math.min(col.availableHeight, ex.y - y));
|
|
131
160
|
}
|
|
132
161
|
}
|
|
162
|
+
if (kept.length > 0)
|
|
163
|
+
openWraps.set(col, kept);
|
|
133
164
|
return col.availableHeight < before - 0.01;
|
|
134
165
|
}
|
|
135
166
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textWrap.js","sourceRoot":"","sources":["../../../src/pipeline/floats/textWrap.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"textWrap.js","sourceRoot":"","sources":["../../../src/pipeline/floats/textWrap.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import type { ContentBlock } from '../../parse/types.js';
|
|
2
|
+
import type { ResolvedDieCutsConfig } from '../../types.js';
|
|
3
|
+
import type { VDTDocument, VDTPage } from '../../vdt.js';
|
|
4
|
+
import { type DieCutMetrics } from '../../dieCut/shapes.js';
|
|
5
|
+
import { type DiePlacement } from '../../dieCut/place.js';
|
|
6
|
+
/** The die each content block is set under: that of the innermost
|
|
7
|
+
* `:::diecut` around it, `undefined` outside any. The fence markers carry
|
|
8
|
+
* the die they open or close. */
|
|
9
|
+
export declare function dieByBlock(blocks: readonly ContentBlock[]): (string | undefined)[];
|
|
10
|
+
type RunPage = Pick<VDTPage, 'columns' | 'floats'>;
|
|
11
|
+
/** The die of each page's `:::diecut` run (`undefined` outside one). A run
|
|
12
|
+
* starts and ends on a page boundary, so a page's first block decides; a
|
|
13
|
+
* page without one (a parity blank) between two pages of one run belongs
|
|
14
|
+
* to it. */
|
|
15
|
+
export declare function dieOfPages(pages: readonly RunPage[], byBlock: readonly (string | undefined)[]): (string | undefined)[];
|
|
16
|
+
/** The cut elements of `page`'s composed decoration as placements, taken
|
|
17
|
+
* out of the decoration (it never paints them). */
|
|
18
|
+
export declare function liftCutElements(page: VDTPage, pageIndex: number, dice: ResolvedDieCutsConfig | undefined, metrics: DieCutMetrics): DiePlacement[];
|
|
19
|
+
/** The placements `doc`'s pages ask for before their decoration is laid:
|
|
20
|
+
* `dieCuts.pages`, and the `:::diecut` run each page is set in (`dies`,
|
|
21
|
+
* one per page). */
|
|
22
|
+
export declare function earlyPlacements(doc: Pick<VDTDocument, 'config' | 'trimOffset' | 'pages' | 'pageIndexOffset'>, dies: readonly (string | undefined)[]): DiePlacement[];
|
|
23
|
+
/**
|
|
24
|
+
* Stamps `page.dieCut` on every page of `doc` a die cuts or whose leaf has
|
|
25
|
+
* a shape (see `buildDieCuts`), and takes every page's cut elements out of
|
|
26
|
+
* its decoration. Pages nothing cuts are left without the key.
|
|
27
|
+
*/
|
|
28
|
+
export declare function stampDieCuts(doc: VDTDocument, contentBlocks: readonly ContentBlock[]): void;
|
|
29
|
+
export {};
|
|
30
|
+
//# sourceMappingURL=dieCuts.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dieCuts.d.ts","sourceRoot":"","sources":["../../../src/pipeline/pages/dieCuts.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAa,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,KAAK,EAAsB,WAAW,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE7E,OAAO,EAAE,KAAK,aAAa,EAA+B,MAAM,wBAAwB,CAAC;AACzF,OAAO,EAAE,KAAK,YAAY,EAAkD,MAAM,uBAAuB,CAAC;AAK1G;;kCAEkC;AAClC,wBAAgB,UAAU,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAmBlF;AAKD,KAAK,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,QAAQ,CAAC,CAAC;AASnD;;;aAGa;AACb,wBAAgB,UAAU,CAAC,KAAK,EAAE,SAAS,OAAO,EAAE,EAAE,OAAO,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAgBtH;AAED;oDACoD;AACpD,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,qBAAqB,GAAG,SAAS,EAAE,OAAO,EAAE,aAAa,GAAG,YAAY,EAAE,CAUjJ;AAYD;;qBAEqB;AACrB,wBAAgB,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,EAAE,QAAQ,GAAG,YAAY,GAAG,OAAO,GAAG,iBAAiB,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,GAAG,YAAY,EAAE,CAUpK;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,WAAW,EAAE,aAAa,EAAE,SAAS,YAAY,EAAE,GAAG,IAAI,CAwB3F"}
|
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
// Die-cuts on the laid-out pages (#1565): the dice `dieCuts.pages` puts on
|
|
2
|
+
// page numbers, the `:::diecut{die=…}` runs, and the cut elements of the
|
|
3
|
+
// page templates, gathered once the pages and their decoration are laid,
|
|
4
|
+
// then stamped on `VDTPage.dieCut` through the leaf rule (`buildDieCuts`).
|
|
5
|
+
import { dimensionToPx } from '../../units.js';
|
|
6
|
+
import { dieMetricsOf, dieShapeInBox } from '../../dieCut/shapes.js';
|
|
7
|
+
import { buildDieCuts, configPlacements, shapePlacement } from '../../dieCut/place.js';
|
|
8
|
+
/** A cut element's gap when neither it nor its die sets one. */
|
|
9
|
+
const DEFAULT_GAP = { value: 3, unit: 'mm' };
|
|
10
|
+
/** The die each content block is set under: that of the innermost
|
|
11
|
+
* `:::diecut` around it, `undefined` outside any. The fence markers carry
|
|
12
|
+
* the die they open or close. */
|
|
13
|
+
export function dieByBlock(blocks) {
|
|
14
|
+
const out = new Array(blocks.length);
|
|
15
|
+
const stack = [];
|
|
16
|
+
for (let i = 0; i < blocks.length; i++) {
|
|
17
|
+
const b = blocks[i];
|
|
18
|
+
if (b.type === 'containerStart' && b.containerName === 'diecut') {
|
|
19
|
+
stack.push({ id: b.containerId, die: (b.containerAttrs?.die ?? '').trim() });
|
|
20
|
+
out[i] = stack[stack.length - 1].die;
|
|
21
|
+
continue;
|
|
22
|
+
}
|
|
23
|
+
if (b.type === 'containerEnd' && b.containerName === 'diecut') {
|
|
24
|
+
out[i] = stack[stack.length - 1]?.die;
|
|
25
|
+
const at = stack.findIndex((s) => s.id === b.containerId);
|
|
26
|
+
if (at >= 0)
|
|
27
|
+
stack.length = at;
|
|
28
|
+
continue;
|
|
29
|
+
}
|
|
30
|
+
out[i] = stack[stack.length - 1]?.die;
|
|
31
|
+
}
|
|
32
|
+
return out;
|
|
33
|
+
}
|
|
34
|
+
/** The die of the first block of `blocks` that names its source block;
|
|
35
|
+
* `null` when none does. */
|
|
36
|
+
function firstDie(blocks, byBlock) {
|
|
37
|
+
for (const b of blocks ?? [])
|
|
38
|
+
if (b.contentIndex !== undefined)
|
|
39
|
+
return byBlock[b.contentIndex];
|
|
40
|
+
return null;
|
|
41
|
+
}
|
|
42
|
+
/** The die of each page's `:::diecut` run (`undefined` outside one). A run
|
|
43
|
+
* starts and ends on a page boundary, so a page's first block decides; a
|
|
44
|
+
* page without one (a parity blank) between two pages of one run belongs
|
|
45
|
+
* to it. */
|
|
46
|
+
export function dieOfPages(pages, byBlock) {
|
|
47
|
+
const found = pages.map((page) => {
|
|
48
|
+
for (const col of page.columns) {
|
|
49
|
+
const d = firstDie(col.blocks, byBlock);
|
|
50
|
+
if (d !== null)
|
|
51
|
+
return d;
|
|
52
|
+
}
|
|
53
|
+
return firstDie(page.floats, byBlock);
|
|
54
|
+
});
|
|
55
|
+
return found.map((d, i) => {
|
|
56
|
+
if (d !== null)
|
|
57
|
+
return d;
|
|
58
|
+
let before = null;
|
|
59
|
+
for (let j = i - 1; j >= 0 && before === null; j--)
|
|
60
|
+
before = found[j];
|
|
61
|
+
let after = null;
|
|
62
|
+
for (let j = i + 1; j < found.length && after === null; j++)
|
|
63
|
+
after = found[j];
|
|
64
|
+
return before && before === after ? before : undefined;
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
/** The cut elements of `page`'s composed decoration as placements, taken
|
|
68
|
+
* out of the decoration (it never paints them). */
|
|
69
|
+
export function liftCutElements(page, pageIndex, dice, metrics) {
|
|
70
|
+
const deco = page.composed?.decoration;
|
|
71
|
+
if (!deco || !deco.blocks.some((b) => b.kind === 'path' && b.dieCut))
|
|
72
|
+
return [];
|
|
73
|
+
const out = [];
|
|
74
|
+
deco.blocks = deco.blocks.filter((b) => {
|
|
75
|
+
if (b.kind !== 'path' || !b.dieCut)
|
|
76
|
+
return true;
|
|
77
|
+
out.push(cutPlacement(b, pageIndex, dice, metrics));
|
|
78
|
+
return false;
|
|
79
|
+
});
|
|
80
|
+
return out;
|
|
81
|
+
}
|
|
82
|
+
function cutPlacement(b, pageIndex, dice, metrics) {
|
|
83
|
+
const c = b.dieCut;
|
|
84
|
+
const shape = c.die !== undefined ? dice?.shapes.find((s) => s.id === c.die) : undefined;
|
|
85
|
+
const path = shape ? dieShapeInBox(shape, c.box, metrics) : b.subpaths.flat();
|
|
86
|
+
const leaves = typeof c.leaves === 'number' && c.leaves >= 1 ? Math.floor(c.leaves) : shape?.leaves ?? 1;
|
|
87
|
+
const wrap = c.wrap ?? shape?.wrap ?? { gap: DEFAULT_GAP };
|
|
88
|
+
const wrapGapPx = wrap === false ? 0 : Math.max(0, dimensionToPx(wrap.gap ?? DEFAULT_GAP, metrics.dpi, metrics.fontSizePx ?? 16));
|
|
89
|
+
return { pageIndex, id: c.die ?? `#cut`, path, leaves, wrapGapPx };
|
|
90
|
+
}
|
|
91
|
+
/** The placements `doc`'s pages ask for before their decoration is laid:
|
|
92
|
+
* `dieCuts.pages`, and the `:::diecut` run each page is set in (`dies`,
|
|
93
|
+
* one per page). */
|
|
94
|
+
export function earlyPlacements(doc, dies) {
|
|
95
|
+
const dice = doc.config.dieCuts;
|
|
96
|
+
if (!dice)
|
|
97
|
+
return [];
|
|
98
|
+
const metrics = dieMetricsOf(doc);
|
|
99
|
+
const { placements } = configPlacements(dice, metrics, doc.pages.length, doc.pageIndexOffset ?? 0);
|
|
100
|
+
dies.forEach((die, i) => {
|
|
101
|
+
const shape = die ? dice.shapes.find((s) => s.id === die) : undefined;
|
|
102
|
+
if (shape)
|
|
103
|
+
placements.push(shapePlacement(shape, i, metrics));
|
|
104
|
+
});
|
|
105
|
+
return placements;
|
|
106
|
+
}
|
|
107
|
+
/**
|
|
108
|
+
* Stamps `page.dieCut` on every page of `doc` a die cuts or whose leaf has
|
|
109
|
+
* a shape (see `buildDieCuts`), and takes every page's cut elements out of
|
|
110
|
+
* its decoration. Pages nothing cuts are left without the key.
|
|
111
|
+
*/
|
|
112
|
+
export function stampDieCuts(doc, contentBlocks) {
|
|
113
|
+
const dice = doc.config.dieCuts;
|
|
114
|
+
const metrics = dieMetricsOf(doc);
|
|
115
|
+
const lifted = doc.pages.flatMap((page, i) => liftCutElements(page, i, dice, metrics));
|
|
116
|
+
const byBlock = dieByBlock(contentBlocks);
|
|
117
|
+
const dies = byBlock.some((d) => d !== undefined) ? dieOfPages(doc.pages, byBlock) : [];
|
|
118
|
+
if (!dice && lifted.length === 0) {
|
|
119
|
+
for (const page of doc.pages)
|
|
120
|
+
delete page.dieCut;
|
|
121
|
+
return;
|
|
122
|
+
}
|
|
123
|
+
const config = dice ?? { shapes: [], pages: [] };
|
|
124
|
+
const cuts = buildDieCuts({
|
|
125
|
+
config,
|
|
126
|
+
metrics,
|
|
127
|
+
pageCount: doc.pages.length,
|
|
128
|
+
offset: doc.pageIndexOffset ?? 0,
|
|
129
|
+
binding: doc.config.page.binding,
|
|
130
|
+
placements: [...earlyPlacements(doc, dies), ...lifted],
|
|
131
|
+
});
|
|
132
|
+
doc.pages.forEach((page, i) => {
|
|
133
|
+
const cut = cuts[i];
|
|
134
|
+
if (cut)
|
|
135
|
+
page.dieCut = cut;
|
|
136
|
+
else
|
|
137
|
+
delete page.dieCut;
|
|
138
|
+
});
|
|
139
|
+
}
|
|
140
|
+
//# sourceMappingURL=dieCuts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dieCuts.js","sourceRoot":"","sources":["../../../src/pipeline/pages/dieCuts.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,6 +77,8 @@ function pathPrimitiveToBlock(prim) {
|
|
|
77
77
|
...(prim.markers ? { markers: prim.markers.map((m) => ({ ...m })) } : {}),
|
|
78
78
|
// Painted after the frames (#1076).
|
|
79
79
|
...(prim.over ? { over: true } : {}),
|
|
80
|
+
// A template's die-cut (#1565), lifted off the decoration later.
|
|
81
|
+
...(prim.dieCut ? { dieCut: structuredClone(prim.dieCut) } : {}),
|
|
80
82
|
};
|
|
81
83
|
block.bbox = pathInkBox(block);
|
|
82
84
|
return block;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"primitives.js","sourceRoot":"","sources":["../../../../src/pipeline/pages/headerFooter/primitives.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"primitives.js","sourceRoot":"","sources":["../../../../src/pipeline/pages/headerFooter/primitives.ts"],"names":[],"mappings":"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"}
|
package/dist/svg/spotPaints.d.ts
CHANGED
|
@@ -22,6 +22,23 @@ export declare function inkTintPercent(raw: string): number | undefined;
|
|
|
22
22
|
* length of the value.
|
|
23
23
|
*/
|
|
24
24
|
export declare function splitIccPaint(value: string): IccPaint | undefined;
|
|
25
|
+
/** What {@link scanSvgPaints} hands its visitor. */
|
|
26
|
+
interface PaintVisitor {
|
|
27
|
+
/** A paint value (raw, entities not decoded): return a replacement to
|
|
28
|
+
* rewrite it, or undefined to keep it. `spot` is the `data-spot` of the
|
|
29
|
+
* element whose attribute holds it (none in a `<style>` sheet). */
|
|
30
|
+
paint?: (raw: string, spot?: string) => string | undefined;
|
|
31
|
+
/** An element's `data-spot` / `data-spot-tint` attributes, decoded. */
|
|
32
|
+
dataSpot?: (name: string, tint: string | undefined) => void;
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
* Walk the paints of SVG markup — the paint attributes, `style` attributes
|
|
36
|
+
* and `<style>` sheets — and the `data-spot` attributes, skipping comments,
|
|
37
|
+
* processing instructions, declarations and text. Returns the markup with
|
|
38
|
+
* the paints `visitor.paint` rewrote (the same string when it rewrote
|
|
39
|
+
* none).
|
|
40
|
+
*/
|
|
41
|
+
export declare function scanSvgPaints(svg: string, visitor: PaintVisitor): string;
|
|
25
42
|
/**
|
|
26
43
|
* SVG markup with its ICC colours taken off, each paint left as the colour
|
|
27
44
|
* before it: browsers paint `#e4002b icc-named-color(…)` black, as an
|
|
@@ -38,4 +55,5 @@ export declare function screenSvgColors(svgText: string): string;
|
|
|
38
55
|
* them with the job's inks; a print PDF puts each on its own plate.
|
|
39
56
|
*/
|
|
40
57
|
export declare function svgSpotInks(svgText: string): SvgSpotInk[];
|
|
58
|
+
export {};
|
|
41
59
|
//# sourceMappingURL=spotPaints.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spotPaints.d.ts","sourceRoot":"","sources":["../../src/svg/spotPaints.ts"],"names":[],"mappings":"AAaA;iBACiB;AACjB,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,6CAA6C;IAC7C,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;kCACkC;AAClC,MAAM,WAAW,QAAQ;IACvB,gEAAgE;IAChE,IAAI,EAAE,MAAM,CAAC;IACb,kEAAkE;IAClE,GAAG,CAAC,EAAE,UAAU,CAAC;CAClB;AAID,iEAAiE;AACjE,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAM9D;AA2BD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAoBjE;
|
|
1
|
+
{"version":3,"file":"spotPaints.d.ts","sourceRoot":"","sources":["../../src/svg/spotPaints.ts"],"names":[],"mappings":"AAaA;iBACiB;AACjB,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,6CAA6C;IAC7C,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;kCACkC;AAClC,MAAM,WAAW,QAAQ;IACvB,gEAAgE;IAChE,IAAI,EAAE,MAAM,CAAC;IACb,kEAAkE;IAClE,GAAG,CAAC,EAAE,UAAU,CAAC;CAClB;AAID,iEAAiE;AACjE,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAM9D;AA2BD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAoBjE;AAkCD,oDAAoD;AACpD,UAAU,YAAY;IACpB;;wEAEoE;IACpE,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IAC3D,uEAAuE;IACvE,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;CAC7D;AA4ED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,MAAM,CAoExE;AAOD;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAYvD;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,EAAE,CAoBzD"}
|
package/dist/svg/spotPaints.js
CHANGED
|
@@ -204,7 +204,7 @@ function tagEnd(text, lt) {
|
|
|
204
204
|
* the paints `visitor.paint` rewrote (the same string when it rewrote
|
|
205
205
|
* none).
|
|
206
206
|
*/
|
|
207
|
-
function scanSvgPaints(svg, visitor) {
|
|
207
|
+
export function scanSvgPaints(svg, visitor) {
|
|
208
208
|
let out = '';
|
|
209
209
|
let copied = 0;
|
|
210
210
|
let i = 0;
|
|
@@ -242,19 +242,24 @@ function scanSvgPaints(svg, visitor) {
|
|
|
242
242
|
const tag = svg.slice(lt, end);
|
|
243
243
|
let spotName;
|
|
244
244
|
let spotTint;
|
|
245
|
-
|
|
245
|
+
const attrs = attributes(tag, nameEnd - lt);
|
|
246
|
+
for (const a of attrs) {
|
|
246
247
|
const name = a.name.toLowerCase();
|
|
247
248
|
if (name === 'data-spot')
|
|
248
249
|
spotName = decodeEntities(a.value).trim();
|
|
249
250
|
else if (name === 'data-spot-tint')
|
|
250
251
|
spotTint = decodeEntities(a.value);
|
|
251
|
-
|
|
252
|
-
|
|
252
|
+
}
|
|
253
|
+
const paint = visitor.paint;
|
|
254
|
+
for (const a of attrs) {
|
|
255
|
+
const name = a.name.toLowerCase();
|
|
256
|
+
if (paint && PAINT_PROPERTIES.has(name)) {
|
|
257
|
+
const next = paint(a.value, spotName || undefined);
|
|
253
258
|
if (next !== undefined)
|
|
254
259
|
replace(lt + a.start, lt + a.end, next);
|
|
255
260
|
}
|
|
256
|
-
else if (
|
|
257
|
-
const next = scanDeclarations(a.value,
|
|
261
|
+
else if (paint && name === 'style' && a.value.includes(':')) {
|
|
262
|
+
const next = scanDeclarations(a.value, (raw) => paint(raw, spotName || undefined));
|
|
258
263
|
if (next !== a.value)
|
|
259
264
|
replace(lt + a.start, lt + a.end, next);
|
|
260
265
|
}
|