postext 1.19.3 → 1.20.1
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__/comics/art.test.d.ts +2 -0
- package/dist/__tests__/comics/art.test.d.ts.map +1 -0
- package/dist/__tests__/comics/art.test.js +96 -0
- package/dist/__tests__/comics/art.test.js.map +1 -0
- package/dist/__tests__/comics/build.test.d.ts +2 -0
- package/dist/__tests__/comics/build.test.d.ts.map +1 -0
- package/dist/__tests__/comics/build.test.js +215 -0
- package/dist/__tests__/comics/build.test.js.map +1 -0
- package/dist/__tests__/comics/canvas.test.d.ts +2 -0
- package/dist/__tests__/comics/canvas.test.d.ts.map +1 -0
- package/dist/__tests__/comics/canvas.test.js +161 -0
- package/dist/__tests__/comics/canvas.test.js.map +1 -0
- package/dist/__tests__/comics/config.test.d.ts +2 -0
- package/dist/__tests__/comics/config.test.d.ts.map +1 -0
- package/dist/__tests__/comics/config.test.js +97 -0
- package/dist/__tests__/comics/config.test.js.map +1 -0
- package/dist/__tests__/comics/geometry.test.d.ts +2 -0
- package/dist/__tests__/comics/geometry.test.d.ts.map +1 -0
- package/dist/__tests__/comics/geometry.test.js +118 -0
- package/dist/__tests__/comics/geometry.test.js.map +1 -0
- package/dist/__tests__/comics/html.test.d.ts +2 -0
- package/dist/__tests__/comics/html.test.d.ts.map +1 -0
- package/dist/__tests__/comics/html.test.js +253 -0
- package/dist/__tests__/comics/html.test.js.map +1 -0
- package/dist/__tests__/comics/lettering.test.d.ts +2 -0
- package/dist/__tests__/comics/lettering.test.d.ts.map +1 -0
- package/dist/__tests__/comics/lettering.test.js +241 -0
- package/dist/__tests__/comics/lettering.test.js.map +1 -0
- package/dist/__tests__/comics/script.test.d.ts +2 -0
- package/dist/__tests__/comics/script.test.d.ts.map +1 -0
- package/dist/__tests__/comics/script.test.js +147 -0
- package/dist/__tests__/comics/script.test.js.map +1 -0
- package/dist/__tests__/comics/split.test.d.ts +2 -0
- package/dist/__tests__/comics/split.test.d.ts.map +1 -0
- package/dist/__tests__/comics/split.test.js +120 -0
- package/dist/__tests__/comics/split.test.js.map +1 -0
- package/dist/__tests__/comics/spread.test.d.ts +2 -0
- package/dist/__tests__/comics/spread.test.d.ts.map +1 -0
- package/dist/__tests__/comics/spread.test.js +161 -0
- package/dist/__tests__/comics/spread.test.js.map +1 -0
- package/dist/__tests__/comics/strip.test.d.ts +2 -0
- package/dist/__tests__/comics/strip.test.d.ts.map +1 -0
- package/dist/__tests__/comics/strip.test.js +231 -0
- package/dist/__tests__/comics/strip.test.js.map +1 -0
- package/dist/__tests__/exports.test.js +89 -0
- package/dist/__tests__/exports.test.js.map +1 -1
- package/dist/__tests__/parse/containers.test.js +1 -1
- package/dist/__tests__/parse/containers.test.js.map +1 -1
- package/dist/canvas-backend/comic.d.ts +32 -0
- package/dist/canvas-backend/comic.d.ts.map +1 -0
- package/dist/canvas-backend/comic.js +216 -0
- package/dist/canvas-backend/comic.js.map +1 -0
- package/dist/canvas-backend/headerFooter.d.ts +4 -1
- package/dist/canvas-backend/headerFooter.d.ts.map +1 -1
- package/dist/canvas-backend/headerFooter.js +3 -1
- package/dist/canvas-backend/headerFooter.js.map +1 -1
- package/dist/canvas-backend/index.d.ts.map +1 -1
- package/dist/canvas-backend/index.js +7 -1
- package/dist/canvas-backend/index.js.map +1 -1
- package/dist/comics/art.d.ts +72 -0
- package/dist/comics/art.d.ts.map +1 -0
- package/dist/comics/art.js +154 -0
- package/dist/comics/art.js.map +1 -0
- package/dist/comics/fonts.d.ts +20 -0
- package/dist/comics/fonts.d.ts.map +1 -0
- package/dist/comics/fonts.js +42 -0
- package/dist/comics/fonts.js.map +1 -0
- package/dist/comics/geometry.d.ts +87 -0
- package/dist/comics/geometry.d.ts.map +1 -0
- package/dist/comics/geometry.js +272 -0
- package/dist/comics/geometry.js.map +1 -0
- package/dist/comics/index.d.ts +29 -0
- package/dist/comics/index.d.ts.map +1 -0
- package/dist/comics/index.js +18 -0
- package/dist/comics/index.js.map +1 -0
- package/dist/comics/layoutPage.d.ts +156 -0
- package/dist/comics/layoutPage.d.ts.map +1 -0
- package/dist/comics/layoutPage.js +698 -0
- package/dist/comics/layoutPage.js.map +1 -0
- package/dist/comics/lettering/__tests__/harness.test.d.ts +2 -0
- package/dist/comics/lettering/__tests__/harness.test.d.ts.map +1 -0
- package/dist/comics/lettering/__tests__/harness.test.js +273 -0
- package/dist/comics/lettering/__tests__/harness.test.js.map +1 -0
- package/dist/comics/lettering/__tests__/letterPanel.test.d.ts +2 -0
- package/dist/comics/lettering/__tests__/letterPanel.test.d.ts.map +1 -0
- package/dist/comics/lettering/__tests__/letterPanel.test.js +224 -0
- package/dist/comics/lettering/__tests__/letterPanel.test.js.map +1 -0
- package/dist/comics/lettering/__tests__/polish.test.d.ts +2 -0
- package/dist/comics/lettering/__tests__/polish.test.d.ts.map +1 -0
- package/dist/comics/lettering/__tests__/polish.test.js +357 -0
- package/dist/comics/lettering/__tests__/polish.test.js.map +1 -0
- package/dist/comics/lettering/__tests__/round2.test.d.ts +2 -0
- package/dist/comics/lettering/__tests__/round2.test.d.ts.map +1 -0
- package/dist/comics/lettering/__tests__/round2.test.js +289 -0
- package/dist/comics/lettering/__tests__/round2.test.js.map +1 -0
- package/dist/comics/lettering/__tests__/round3.test.d.ts +2 -0
- package/dist/comics/lettering/__tests__/round3.test.d.ts.map +1 -0
- package/dist/comics/lettering/__tests__/round3.test.js +240 -0
- package/dist/comics/lettering/__tests__/round3.test.js.map +1 -0
- package/dist/comics/lettering/__tests__/shapeText.test.d.ts +2 -0
- package/dist/comics/lettering/__tests__/shapeText.test.d.ts.map +1 -0
- package/dist/comics/lettering/__tests__/shapeText.test.js +98 -0
- package/dist/comics/lettering/__tests__/shapeText.test.js.map +1 -0
- package/dist/comics/lettering/__tests__/shapes.test.d.ts +2 -0
- package/dist/comics/lettering/__tests__/shapes.test.d.ts.map +1 -0
- package/dist/comics/lettering/__tests__/shapes.test.js +137 -0
- package/dist/comics/lettering/__tests__/shapes.test.js.map +1 -0
- package/dist/comics/lettering/__tests__/stubMeasure.d.ts +5 -0
- package/dist/comics/lettering/__tests__/stubMeasure.d.ts.map +1 -0
- package/dist/comics/lettering/__tests__/stubMeasure.js +47 -0
- package/dist/comics/lettering/__tests__/stubMeasure.js.map +1 -0
- package/dist/comics/lettering/__tests__/text.test.d.ts +2 -0
- package/dist/comics/lettering/__tests__/text.test.d.ts.map +1 -0
- package/dist/comics/lettering/__tests__/text.test.js +86 -0
- package/dist/comics/lettering/__tests__/text.test.js.map +1 -0
- package/dist/comics/lettering/geom.d.ts +78 -0
- package/dist/comics/lettering/geom.d.ts.map +1 -0
- package/dist/comics/lettering/geom.js +376 -0
- package/dist/comics/lettering/geom.js.map +1 -0
- package/dist/comics/lettering/index.d.ts +7 -0
- package/dist/comics/lettering/index.d.ts.map +1 -0
- package/dist/comics/lettering/index.js +8 -0
- package/dist/comics/lettering/index.js.map +1 -0
- package/dist/comics/lettering/letter.d.ts +7 -0
- package/dist/comics/lettering/letter.d.ts.map +1 -0
- package/dist/comics/lettering/letter.js +496 -0
- package/dist/comics/lettering/letter.js.map +1 -0
- package/dist/comics/lettering/placement.d.ts +133 -0
- package/dist/comics/lettering/placement.d.ts.map +1 -0
- package/dist/comics/lettering/placement.js +1095 -0
- package/dist/comics/lettering/placement.js.map +1 -0
- package/dist/comics/lettering/presets.d.ts +15 -0
- package/dist/comics/lettering/presets.d.ts.map +1 -0
- package/dist/comics/lettering/presets.js +61 -0
- package/dist/comics/lettering/presets.js.map +1 -0
- package/dist/comics/lettering/shape-text.d.ts +72 -0
- package/dist/comics/lettering/shape-text.d.ts.map +1 -0
- package/dist/comics/lettering/shape-text.js +550 -0
- package/dist/comics/lettering/shape-text.js.map +1 -0
- package/dist/comics/lettering/shapes.d.ts +83 -0
- package/dist/comics/lettering/shapes.d.ts.map +1 -0
- package/dist/comics/lettering/shapes.js +512 -0
- package/dist/comics/lettering/shapes.js.map +1 -0
- package/dist/comics/lettering/text.d.ts +79 -0
- package/dist/comics/lettering/text.d.ts.map +1 -0
- package/dist/comics/lettering/text.js +488 -0
- package/dist/comics/lettering/text.js.map +1 -0
- package/dist/comics/lettering/types.d.ts +279 -0
- package/dist/comics/lettering/types.d.ts.map +1 -0
- package/dist/comics/lettering/types.js +9 -0
- package/dist/comics/lettering/types.js.map +1 -0
- package/dist/comics/page.d.ts +37 -0
- package/dist/comics/page.d.ts.map +1 -0
- package/dist/comics/page.js +285 -0
- package/dist/comics/page.js.map +1 -0
- package/dist/comics/paint.d.ts +65 -0
- package/dist/comics/paint.d.ts.map +1 -0
- package/dist/comics/paint.js +219 -0
- package/dist/comics/paint.js.map +1 -0
- package/dist/comics/script.d.ts +42 -0
- package/dist/comics/script.d.ts.map +1 -0
- package/dist/comics/script.js +302 -0
- package/dist/comics/script.js.map +1 -0
- package/dist/comics/split.d.ts +135 -0
- package/dist/comics/split.d.ts.map +1 -0
- package/dist/comics/split.js +514 -0
- package/dist/comics/split.js.map +1 -0
- package/dist/comics/spread.d.ts +36 -0
- package/dist/comics/spread.d.ts.map +1 -0
- package/dist/comics/spread.js +172 -0
- package/dist/comics/spread.js.map +1 -0
- package/dist/comics/strip.d.ts +77 -0
- package/dist/comics/strip.d.ts.map +1 -0
- package/dist/comics/strip.js +89 -0
- package/dist/comics/strip.js.map +1 -0
- package/dist/comics/transform.d.ts +37 -0
- package/dist/comics/transform.d.ts.map +1 -0
- package/dist/comics/transform.js +161 -0
- package/dist/comics/transform.js.map +1 -0
- package/dist/comics/types.d.ts +143 -0
- package/dist/comics/types.d.ts.map +1 -0
- package/dist/comics/types.js +13 -0
- package/dist/comics/types.js.map +1 -0
- package/dist/comics/warnings.d.ts +14 -0
- package/dist/comics/warnings.d.ts.map +1 -0
- package/dist/comics/warnings.js +94 -0
- package/dist/comics/warnings.js.map +1 -0
- package/dist/configWarnings.d.ts.map +1 -1
- package/dist/configWarnings.js +42 -0
- package/dist/configWarnings.js.map +1 -1
- package/dist/defaults/comics.d.ts +51 -0
- package/dist/defaults/comics.d.ts.map +1 -0
- package/dist/defaults/comics.js +385 -0
- package/dist/defaults/comics.js.map +1 -0
- package/dist/defaults/index.d.ts +1 -0
- package/dist/defaults/index.d.ts.map +1 -1
- package/dist/defaults/index.js +9 -0
- package/dist/defaults/index.js.map +1 -1
- package/dist/design/layout.d.ts +13 -1
- package/dist/design/layout.d.ts.map +1 -1
- package/dist/design/layout.js +17 -0
- package/dist/design/layout.js.map +1 -1
- package/dist/html-backend.d.ts +3 -0
- package/dist/html-backend.d.ts.map +1 -1
- package/dist/html-backend.js +44 -8
- package/dist/html-backend.js.map +1 -1
- package/dist/htmlComic.d.ts +69 -0
- package/dist/htmlComic.d.ts.map +1 -0
- package/dist/htmlComic.js +179 -0
- package/dist/htmlComic.js.map +1 -0
- package/dist/index.d.ts +8 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -0
- package/dist/index.js.map +1 -1
- package/dist/parse/blockParser.d.ts.map +1 -1
- package/dist/parse/blockParser.js +25 -1
- package/dist/parse/blockParser.js.map +1 -1
- package/dist/parse/indexMarks.d.ts.map +1 -1
- package/dist/parse/indexMarks.js +3 -0
- package/dist/parse/indexMarks.js.map +1 -1
- package/dist/parse/types.d.ts +7 -1
- package/dist/parse/types.d.ts.map +1 -1
- package/dist/pipeline/build.d.ts.map +1 -1
- package/dist/pipeline/build.js +251 -9
- package/dist/pipeline/build.js.map +1 -1
- package/dist/pipeline/config.d.ts.map +1 -1
- package/dist/pipeline/config.js +4 -1
- package/dist/pipeline/config.js.map +1 -1
- package/dist/pipeline/contentWarnings.d.ts.map +1 -1
- package/dist/pipeline/contentWarnings.js +58 -0
- package/dist/pipeline/contentWarnings.js.map +1 -1
- package/dist/pipeline/floatSlots.js +1 -1
- package/dist/pipeline/floatSlots.js.map +1 -1
- package/dist/pipeline/headerFooter.d.ts +6 -2
- package/dist/pipeline/headerFooter.d.ts.map +1 -1
- package/dist/pipeline/headerFooter.js +11 -3
- package/dist/pipeline/headerFooter.js.map +1 -1
- package/dist/pipeline/pageRoles.d.ts +1 -0
- package/dist/pipeline/pageRoles.d.ts.map +1 -1
- package/dist/pipeline/pageRoles.js +3 -0
- package/dist/pipeline/pageRoles.js.map +1 -1
- package/dist/pipeline/placement.d.ts +3 -3
- package/dist/pipeline/placement.d.ts.map +1 -1
- package/dist/pipeline/placement.js +4 -4
- package/dist/pipeline/placement.js.map +1 -1
- package/dist/types.d.ts +338 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/vdt.d.ts +271 -2
- package/dist/vdt.d.ts.map +1 -1
- package/dist/vdt.js.map +1 -1
- package/dist/worker/fonts.d.ts +2 -1
- package/dist/worker/fonts.d.ts.map +1 -1
- package/dist/worker/fonts.js +11 -1
- package/dist/worker/fonts.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,240 @@
|
|
|
1
|
+
// Lettering rules of the third engine round (#584), each found on a real
|
|
2
|
+
// page of the comic recipes where the script still carried a workaround: a
|
|
3
|
+
// `break` balloon keeps out of the margin, a joined pair in a narrow cell
|
|
4
|
+
// reads in order, a reply never stands before the line it answers, a
|
|
5
|
+
// balloon keeps off the other character, a strip title stays at the head
|
|
6
|
+
// of its panel, short CJK lines in a close-up keep off the face.
|
|
7
|
+
import { describe, it, expect, beforeAll } from 'vitest';
|
|
8
|
+
import { installStubMeasure } from './stubMeasure';
|
|
9
|
+
import { letterPanel, letterPanelDetailed } from '../letter';
|
|
10
|
+
import { presetLetteringStyles } from '../presets';
|
|
11
|
+
import { placeUnits } from '../placement';
|
|
12
|
+
import { buildBody } from '../shapes';
|
|
13
|
+
beforeAll(() => installStubMeasure());
|
|
14
|
+
const EM = 12;
|
|
15
|
+
const rect = (x, y, width, height) => ({ x, y, width, height });
|
|
16
|
+
const corners = (r) => [{ x: r.x, y: r.y }, { x: r.x + r.width, y: r.y }, { x: r.x + r.width, y: r.y + r.height }, { x: r.x, y: r.y + r.height }];
|
|
17
|
+
const overlapArea = (a, b) => Math.max(0, Math.min(a.x + a.width, b.x + b.width) - Math.max(a.x, b.x)) * Math.max(0, Math.min(a.y + a.height, b.y + b.height) - Math.max(a.y, b.y));
|
|
18
|
+
const overlap = (a, b) => overlapArea(a, b) > 0;
|
|
19
|
+
const centre = (r) => ({ x: r.x + r.width / 2, y: r.y + r.height / 2 });
|
|
20
|
+
const inside = (r, of, slack = 0.5) => r.x >= of.x - slack && r.y >= of.y - slack && r.x + r.width <= of.x + of.width + slack && r.y + r.height <= of.y + of.height + slack;
|
|
21
|
+
const en = presetLetteringStyles({ fontSizePx: EM, locale: 'en', fontFamily: 'Test' });
|
|
22
|
+
const ja = presetLetteringStyles({ fontSizePx: EM, locale: 'ja', fontFamily: 'Test' });
|
|
23
|
+
function panel(cell, extra = {}) {
|
|
24
|
+
return { index: 0, polygon: corners(cell), bbox: cell, insetPx: 6, direction: 'ltr', writingMode: 'horizontal', locale: 'en', anchors: [], dpi: 96, ...extra };
|
|
25
|
+
}
|
|
26
|
+
const item = (id, order, speaker, text, style = en.speech, extra = {}) => ({
|
|
27
|
+
id, order, kind: 'balloon', ...(speaker ? { speaker } : {}), text, sourceStart: order * 100, sourceEnd: order * 100 + 10, style, ...extra,
|
|
28
|
+
});
|
|
29
|
+
/** A face and what the layout derives from it (see `headGuards`,
|
|
30
|
+
* `bodyZones` in layoutPage.ts): the guard over the hair as an avoid
|
|
31
|
+
* zone, the figure under it as a soft zone of its owner. */
|
|
32
|
+
function figure(id, face, mouth) {
|
|
33
|
+
return {
|
|
34
|
+
anchor: { id, mouth, face, visible: true },
|
|
35
|
+
guard: { ...rect(face.x - 0.2 * face.width, face.y - 0.4 * face.height, 1.4 * face.width, 1.4 * face.height), guard: true },
|
|
36
|
+
body: { ...rect(face.x - 0.3 * face.width, face.y + face.height, 1.6 * face.width, 2 * face.height), weight: 1.5, owner: id },
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
describe('a `break` balloon left to the engine', () => {
|
|
40
|
+
// Nº150's last panel, the cheering student, in the bottom left corner of
|
|
41
|
+
// the live area: the margin left of it and below it, the panels above
|
|
42
|
+
// and to the right (its slanted right edge).
|
|
43
|
+
const trim = rect(-41, -49, 476, 677);
|
|
44
|
+
const limit = rect(0, 0, 394, 573);
|
|
45
|
+
const CELL = [{ x: 138.6, y: 572.7 }, { x: 0, y: 572.7 }, { x: 0, y: 442.9 }, { x: 159.4, y: 442.9 }];
|
|
46
|
+
const neighbours = [rect(0, 0, 394, 130), rect(0, 145, 394, 88), rect(185, 248, 210, 180), rect(0, 248, 229, 180), rect(147, 443, 248, 130)];
|
|
47
|
+
const sora = figure('sora', rect(63.6, 493.3, 35.3, 39.7), { x: 81.3, y: 521 });
|
|
48
|
+
const avoid = [rect(12.6, 445.4, 18.9, 20.2), rect(102, 502.7, 15.8, 23.9), sora.guard];
|
|
49
|
+
const cell = (polygon, extra = {}) => ({
|
|
50
|
+
...panel(rect(0, 442.9, 159.4, 129.8), { polygon, limit, trim, sheet: trim, neighbours, anchors: [sora.anchor], avoid, softAvoid: [sora.body] }), ...extra,
|
|
51
|
+
});
|
|
52
|
+
const shout = (extra = {}) => item('s', 0, 'sora', '¡¡Lo ha conseguido!!', en.shout, { breakBorder: true, sizeScale: 0.8, ...extra });
|
|
53
|
+
it('crosses into the gutter and the next panel, never into the margin', () => {
|
|
54
|
+
const { balloons, diagnostics } = letterPanelDetailed(cell(CELL), [shout()]);
|
|
55
|
+
const b = balloons[0].bbox;
|
|
56
|
+
expect(diagnostics).toEqual([]);
|
|
57
|
+
expect(inside(b, limit, 1)).toBe(true);
|
|
58
|
+
});
|
|
59
|
+
it('may run off the live area when its panel bleeds', () => {
|
|
60
|
+
// The same panel bled off the foot of the page.
|
|
61
|
+
const bled = CELL.map((q) => (q.y > 500 ? { x: q.x, y: q.y + 40 } : q));
|
|
62
|
+
const { diagnostics } = letterPanelDetailed(cell(bled, { bbox: rect(0, 442.9, 159.4, 169.8) }), [shout()]);
|
|
63
|
+
expect(diagnostics).toEqual([]);
|
|
64
|
+
});
|
|
65
|
+
});
|
|
66
|
+
describe('a joined pair in a narrow cell', () => {
|
|
67
|
+
// Nº144 plan C: the keeper in a cell a fifth of the page wide, the
|
|
68
|
+
// lighthouse and Maya's panels either side, the live area's margin above.
|
|
69
|
+
const CELL = rect(0, 0, 109.4, 280.8);
|
|
70
|
+
const limit = rect(-189.4, 0, 612, 965.5);
|
|
71
|
+
const neighbours = [rect(-190, 0, 177, 280.8), rect(122.4, 0, 299.5, 280.8), rect(272, 140, 138, 130), rect(-190, 298, 612, 667)];
|
|
72
|
+
const lines = [
|
|
73
|
+
item('a', 0, 'tomas', 'Llegas justo a tiempo. La radio se ha quedado sorda,'),
|
|
74
|
+
item('b', 1, 'tomas', 'y viene tormenta.'),
|
|
75
|
+
];
|
|
76
|
+
it('reads in order, never sets the second balloon beside the first against the reading', () => {
|
|
77
|
+
// A low strip cell, the speaker at its end: side by side is the only
|
|
78
|
+
// way the pair fits, and the second goes after the first or not at all.
|
|
79
|
+
const STRIP = rect(0, 0, 420, 95);
|
|
80
|
+
const s = { id: 'tomas', mouth: { x: 395, y: 80 }, visible: true };
|
|
81
|
+
const { balloons } = letterPanelDetailed(panel(STRIP, { anchors: [s] }), [
|
|
82
|
+
item('a', 0, 'tomas', 'Just in time, the radio is gone deaf,'),
|
|
83
|
+
item('b', 1, 'tomas', 'and a storm is coming.'),
|
|
84
|
+
]);
|
|
85
|
+
const [a, b] = [balloons[0].bbox, balloons[1].bbox];
|
|
86
|
+
expect(balloons[0].group).toBe(balloons[1].group);
|
|
87
|
+
expect(centre(b).x).toBeGreaterThanOrEqual(centre(a).x - 0.25 * a.width);
|
|
88
|
+
});
|
|
89
|
+
it('fits a cell it can stack in with each balloon fitted to the width alike', () => {
|
|
90
|
+
// His face low in the cell: room above it for the pair, stacked.
|
|
91
|
+
const low = figure('tomas', rect(18, 200, 44.6, 50.4), { x: 33.8, y: 233 });
|
|
92
|
+
const { balloons, diagnostics } = letterPanelDetailed(panel(CELL, { limit, trim: limit, neighbours, anchors: [low.anchor], avoid: [low.guard], softAvoid: [low.body] }), lines);
|
|
93
|
+
expect(diagnostics).toEqual([]);
|
|
94
|
+
expect(centre(balloons[1].bbox).y).toBeGreaterThan(centre(balloons[0].bbox).y);
|
|
95
|
+
});
|
|
96
|
+
});
|
|
97
|
+
describe('a reply after the line it answers', () => {
|
|
98
|
+
it('lets the first balloon touch the hair above its speaker rather than set the reply before it', () => {
|
|
99
|
+
// Nº152 t2: Lola (right) speaks first, her grandfather (left) answers;
|
|
100
|
+
// their heads all but touch the top of the panel.
|
|
101
|
+
const CELL = rect(0, 0, 278, 222);
|
|
102
|
+
const paco = figure('paco', rect(60.3, 15.2, 48.1, 53.6), { x: 85.3, y: 57.2 });
|
|
103
|
+
const lola = figure('lola', rect(167.1, 76, 48.1, 48.1), { x: 195.1, y: 108 });
|
|
104
|
+
const out = letterPanel(panel(CELL, { anchors: [paco.anchor, lola.anchor], avoid: [paco.guard, lola.guard], softAvoid: [paco.body, lola.body] }), [
|
|
105
|
+
item('l', 0, 'lola', 'Hurry up, Grandpa!'),
|
|
106
|
+
item('p', 1, 'paco', 'The oranges aren\'t going anywhere, Lola.'),
|
|
107
|
+
{ id: 'c', order: 2, kind: 'caption', text: 'Grandpa had been a baker for forty years. He walked slowly out of habit.', sourceStart: 200, sourceEnd: 210, style: { ...en.caption, position: 'bottom-start' } },
|
|
108
|
+
]);
|
|
109
|
+
const [l, p] = [out[0].bbox, out[1].bbox];
|
|
110
|
+
// The reply (left of the line) starts below it.
|
|
111
|
+
expect(p.y).toBeGreaterThanOrEqual(l.y + l.height - 0.25 * EM - 0.5);
|
|
112
|
+
});
|
|
113
|
+
});
|
|
114
|
+
describe('a reply in a strip cell', () => {
|
|
115
|
+
// Nº146's first strip panel: the penguin (left, low) asks, the walrus
|
|
116
|
+
// (right, high) answers. The only room for the line in reading order is
|
|
117
|
+
// above the penguin's head, touching the top of his hair, and the reply
|
|
118
|
+
// placed alone takes that room first: the line has to move there once
|
|
119
|
+
// the reply stands by the walrus.
|
|
120
|
+
const CELL = rect(0, 0, 295, 304);
|
|
121
|
+
const pip = figure('pip', rect(31, 134, 67, 61), { x: 80, y: 176 });
|
|
122
|
+
const otto = figure('otto', rect(168, 70, 73, 67), { x: 201, y: 113 });
|
|
123
|
+
for (const direction of ['ltr', 'rtl']) {
|
|
124
|
+
it(`sets the line above the penguin and the reply after it (${direction})`, () => {
|
|
125
|
+
const { balloons } = letterPanelDetailed(panel(CELL, { direction, anchors: [pip.anchor, otto.anchor], avoid: [pip.guard, otto.guard], softAvoid: [pip.body, otto.body] }), [
|
|
126
|
+
item('p', 0, 'pip', 'Good morning, dear Otto! One big warm croissant and two rolls, please.'),
|
|
127
|
+
item('o', 1, 'otto', 'Coming up!'),
|
|
128
|
+
]);
|
|
129
|
+
const [a, b] = [balloons[0].bbox, balloons[1].bbox];
|
|
130
|
+
// The reply below the line, or ahead of it in the reading direction
|
|
131
|
+
// and no higher than its top.
|
|
132
|
+
const ahead = (centre(b).x - centre(a).x) * (direction === 'rtl' ? -1 : 1) > 0;
|
|
133
|
+
expect(b.y).toBeGreaterThanOrEqual((ahead ? a.y : a.y + a.height) - 0.25 * EM - 0.5);
|
|
134
|
+
});
|
|
135
|
+
}
|
|
136
|
+
});
|
|
137
|
+
describe('balloons and the other character', () => {
|
|
138
|
+
it('sets a speaker\'s balloons over his own side, not over the one he speaks to (right to left)', () => {
|
|
139
|
+
// Nº149's charm panel with Sora (left) speaking first on a page read
|
|
140
|
+
// right to left: no room above the heads.
|
|
141
|
+
const CELL = rect(0, 0, 330, 300);
|
|
142
|
+
const sora = figure('sora', rect(50, 45, 52, 63), { x: 81, y: 96 });
|
|
143
|
+
const hana = figure('hana', rect(220, 45, 52, 63), { x: 246, y: 96 });
|
|
144
|
+
const out = letterPanel(panel(CELL, { direction: 'rtl', anchors: [sora.anchor, hana.anchor], avoid: [sora.guard, hana.guard], softAvoid: [sora.body, hana.body] }), [
|
|
145
|
+
item('s1', 0, 'sora', 'S-sorry! It is a charm from my grandma\'s shrine.'),
|
|
146
|
+
item('s2', 1, 'sora', 'Take it tomorrow.'),
|
|
147
|
+
item('h', 2, 'hana', '…Aizawa?'),
|
|
148
|
+
]);
|
|
149
|
+
for (const b of out.filter((x) => x.speaker === 'sora'))
|
|
150
|
+
expect(overlapArea(b.bbox, hana.body)).toBeLessThan(0.15 * b.bbox.width * b.bbox.height);
|
|
151
|
+
});
|
|
152
|
+
it('keeps off two figures that touch (a hug), the speaker\'s own included', () => {
|
|
153
|
+
// Nº154's reunion: the girl's arms around her grandfather's neck, his
|
|
154
|
+
// mouth over the hug, the market far on either side; his line goes over
|
|
155
|
+
// the market.
|
|
156
|
+
const CELL = rect(0, 0, 700, 300);
|
|
157
|
+
const lola = { ...rect(150, 0, 180, 300), weight: 1.5, owner: 'lola' };
|
|
158
|
+
const paco = { ...rect(280, 0, 180, 300), weight: 1.5, owner: 'paco' };
|
|
159
|
+
const mouth = { x: 340, y: 60 };
|
|
160
|
+
const body = buildBody([{ x: -40, y: -25, width: 80, height: 50 }], EM, en.speech, 'u');
|
|
161
|
+
const variant = { bodies: [body], reshaped: false, bbox: body.bbox, samples: [...body.core, body.centre], rim: body.hull };
|
|
162
|
+
const unit = { id: 'u', order: 0, kind: 'balloon', variants: [variant], target: { kind: 'point', point: mouth }, speaker: 'paco', sourceStart: 0, sourceEnd: 1, em: EM };
|
|
163
|
+
const faces = [rect(240, 6, 70, 70), rect(310, 6, 70, 70)];
|
|
164
|
+
const { placed } = placeUnits(panel(CELL, {
|
|
165
|
+
anchors: [{ id: 'lola', mouth: { x: 270, y: 60 }, face: faces[0], visible: true }, { id: 'paco', mouth, face: faces[1], visible: true }],
|
|
166
|
+
softAvoid: [lola, paco],
|
|
167
|
+
}), [unit]);
|
|
168
|
+
const box = { ...variant.bbox, x: variant.bbox.x + placed[0].at.x, y: variant.bbox.y + placed[0].at.y };
|
|
169
|
+
expect(overlap(box, paco)).toBe(false);
|
|
170
|
+
expect(overlap(box, lola)).toBe(false);
|
|
171
|
+
});
|
|
172
|
+
});
|
|
173
|
+
describe('a strip title', () => {
|
|
174
|
+
it('stays at the head of its panel, between two heads, before it goes to the foot', () => {
|
|
175
|
+
// Nº151's second strip: both top corners and the middle hold a head.
|
|
176
|
+
const CELL = rect(0, 0, 330, 250);
|
|
177
|
+
const boy = figure('boy', rect(50, 30, 72, 67), { x: 90, y: 80 });
|
|
178
|
+
const girl = figure('girl', rect(222, 25, 62, 64), { x: 253, y: 75 });
|
|
179
|
+
const out = letterPanel(panel(CELL, { anchors: [boy.anchor, girl.anchor], avoid: [boy.guard, girl.guard] }), [
|
|
180
|
+
{ id: 't', order: 0, kind: 'caption', text: 'Therapy', sourceStart: 0, sourceEnd: 7, style: en.caption },
|
|
181
|
+
]);
|
|
182
|
+
const t = out[0].bbox;
|
|
183
|
+
expect(t.y).toBeLessThan(CELL.y + 8);
|
|
184
|
+
expect(overlap(t, boy.guard)).toBe(false);
|
|
185
|
+
expect(overlap(t, girl.guard)).toBe(false);
|
|
186
|
+
});
|
|
187
|
+
});
|
|
188
|
+
describe('a caption at the foot of a panel', () => {
|
|
189
|
+
it('stays at the foot its keyword names, alone in its panel', () => {
|
|
190
|
+
const CELL = rect(0, 0, 278, 222);
|
|
191
|
+
for (const position of ['bottom-start', 'bottom', 'bottom-end']) {
|
|
192
|
+
const [c] = letterPanel(panel(CELL), [{ id: 'c', order: 0, kind: 'caption', text: 'Grandpa had been a baker.', sourceStart: 0, sourceEnd: 5, style: en.caption, position }]);
|
|
193
|
+
expect(c.bbox.y + c.bbox.height).toBeGreaterThan(CELL.height - 1);
|
|
194
|
+
}
|
|
195
|
+
});
|
|
196
|
+
});
|
|
197
|
+
describe('short CJK lines in a close shot', () => {
|
|
198
|
+
it('sets a column too long for the room above the face in more, shorter columns', () => {
|
|
199
|
+
// Nº144 plan A, Japanese: Maya's head fills the cell.
|
|
200
|
+
const CELL = rect(0, 0, 254, 330);
|
|
201
|
+
const maya = figure('maya', rect(20, 40, 214, 190), { x: 127, y: 200 });
|
|
202
|
+
const { balloons, diagnostics } = letterPanelDetailed(panel(CELL, { locale: 'ja', writingMode: 'vertical', direction: 'rtl', anchors: [maya.anchor], avoid: [maya.guard], softAvoid: [maya.body] }), [item('m', 0, 'maya', 'おじいちゃん……原因、見つけたかも。', ja.speech)]);
|
|
203
|
+
expect(diagnostics).toEqual([]);
|
|
204
|
+
expect(inside(centre(balloons[0].bbox), rect(20, 40, 214, 190))).toBe(false);
|
|
205
|
+
});
|
|
206
|
+
it('may cover a top corner of a close-up face\'s box, which is hair, not face', () => {
|
|
207
|
+
// A close-up whose face box fills all but the corners of the cell: a
|
|
208
|
+
// small balloon fits in a top corner, outside the oval of the face.
|
|
209
|
+
const CELL = rect(0, 0, 400, 400);
|
|
210
|
+
const face = rect(10, 10, 380, 380);
|
|
211
|
+
const body = buildBody([{ x: -10, y: -10, width: 20, height: 20 }], EM, en.speech, 'u');
|
|
212
|
+
const variant = { bodies: [body], reshaped: false, bbox: body.bbox, samples: [...body.core, body.centre], rim: body.hull };
|
|
213
|
+
const mouth = { x: 200, y: 300 };
|
|
214
|
+
const unit = { id: 'u', order: 0, kind: 'balloon', variants: [variant], target: { kind: 'point', point: mouth }, sourceStart: 0, sourceEnd: 1, em: EM };
|
|
215
|
+
const { placed, diagnostics } = placeUnits(panel(CELL, { anchors: [{ id: 'k', mouth, face, visible: true }] }), [unit]);
|
|
216
|
+
expect(diagnostics).toEqual([]);
|
|
217
|
+
// In a top corner of the box (the bottom ones are cheek and jaw).
|
|
218
|
+
const at = placed[0].at;
|
|
219
|
+
expect(Math.min(at.x, 400 - at.x)).toBeLessThan(80);
|
|
220
|
+
expect(at.y).toBeLessThan(80);
|
|
221
|
+
});
|
|
222
|
+
});
|
|
223
|
+
describe('the last fallback', () => {
|
|
224
|
+
it('covers the hair over a head before what the art marks to keep clear', () => {
|
|
225
|
+
// No clean spot: the left of the strip is the guard over a head, its
|
|
226
|
+
// right a hand the art marks, the middle a face; the speaker is nearer
|
|
227
|
+
// the hand.
|
|
228
|
+
const CELL = rect(0, 0, 300, 100);
|
|
229
|
+
const body = buildBody([{ x: -20, y: -12, width: 40, height: 24 }], EM, en.speech, 'u');
|
|
230
|
+
const variant = { bodies: [body], reshaped: false, bbox: body.bbox, samples: [...body.core, body.centre], rim: body.hull };
|
|
231
|
+
const mouth = { x: 190, y: 90 };
|
|
232
|
+
const unit = { id: 'u', order: 0, kind: 'balloon', variants: [variant], target: { kind: 'point', point: mouth }, sourceStart: 0, sourceEnd: 1, em: EM };
|
|
233
|
+
const { placed } = placeUnits(panel(CELL, {
|
|
234
|
+
anchors: [{ id: 'k', mouth, face: rect(105, 0, 90, 100), visible: true }],
|
|
235
|
+
avoid: [{ ...rect(0, 0, 105, 100), guard: true }, rect(195, 0, 105, 100)],
|
|
236
|
+
}), [unit]);
|
|
237
|
+
expect(placed[0].at.x).toBeLessThan(105);
|
|
238
|
+
});
|
|
239
|
+
});
|
|
240
|
+
//# sourceMappingURL=round3.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"round3.test.js","sourceRoot":"","sources":["../../../../src/comics/lettering/__tests__/round3.test.ts"],"names":[],"mappings":"AAAA,yEAAyE;AACzE,2EAA2E;AAC3E,0EAA0E;AAC1E,qEAAqE;AACrE,yEAAyE;AACzE,iEAAiE;AAEjE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,UAAU,EAAoC,MAAM,cAAc,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAGtC,SAAS,CAAC,GAAG,EAAE,CAAC,kBAAkB,EAAE,CAAC,CAAC;AAEtC,MAAM,EAAE,GAAG,EAAE,CAAC;AACd,MAAM,IAAI,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,KAAa,EAAE,MAAc,EAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;AACtG,MAAM,OAAO,GAAG,CAAC,CAAO,EAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;AACjK,MAAM,WAAW,GAAG,CAAC,CAAO,EAAE,CAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChM,MAAM,OAAO,GAAG,CAAC,CAAO,EAAE,CAAO,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;AAC5D,MAAM,MAAM,GAAG,CAAC,CAAO,EAAS,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC;AACrF,MAAM,MAAM,GAAG,CAAC,CAAO,EAAE,EAAQ,EAAE,KAAK,GAAG,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,GAAG,KAAK,CAAC;AAExL,MAAM,EAAE,GAAG,qBAAqB,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;AACvF,MAAM,EAAE,GAAG,qBAAqB,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;AAEvF,SAAS,KAAK,CAAC,IAAU,EAAE,QAAiC,EAAE;IAC5D,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,KAAK,EAAE,CAAC;AACjK,CAAC;AAED,MAAM,IAAI,GAAG,CAAC,EAAU,EAAE,KAAa,EAAE,OAA2B,EAAE,IAA2B,EAAE,QAAQ,EAAE,CAAC,MAAO,EAAE,QAAgC,EAAE,EAAiB,EAAE,CAAC,CAAC;IAC5K,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,GAAG,GAAG,EAAE,SAAS,EAAE,KAAK,GAAG,GAAG,GAAG,EAAE,EAAE,KAAK,EAAE,GAAG,KAAK;CAC1I,CAAC,CAAC;AAEH;;6DAE6D;AAC7D,SAAS,MAAM,CAAC,EAAU,EAAE,IAAU,EAAE,KAAY;IAClD,OAAO;QACL,MAAM,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAqB;QAC7D,KAAK,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,IAAI,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE;QAC3H,IAAI,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE;KAC9H,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,sCAAsC,EAAE,GAAG,EAAE;IACpD,yEAAyE;IACzE,sEAAsE;IACtE,6CAA6C;IAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACtC,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACnC,MAAM,IAAI,GAAY,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAC/G,MAAM,UAAU,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAC7I,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IAChF,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACxF,MAAM,IAAI,GAAG,CAAC,OAAgB,EAAE,QAAiC,EAAE,EAAkB,EAAE,CAAC,CAAC;QACvF,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,GAAG,KAAK;KAC3J,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,CAAC,QAAgC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,sBAAsB,EAAE,EAAE,CAAC,KAAM,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;IAE/J,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC7E,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAE,CAAC,IAAI,CAAC;QAC5B,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,gDAAgD;QAChD,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACxE,MAAM,EAAE,WAAW,EAAE,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC3G,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,gCAAgC,EAAE,GAAG,EAAE;IAC9C,mEAAmE;IACnE,0EAA0E;IAC1E,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IACtC,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAClI,MAAM,KAAK,GAAG;QACZ,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,sDAAsD,CAAC;QAC7E,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,mBAAmB,CAAC;KAC3C,CAAC;IAEF,EAAE,CAAC,oFAAoF,EAAE,GAAG,EAAE;QAC5F,qEAAqE;QACrE,wEAAwE;QACxE,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAClC,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QACnE,MAAM,EAAE,QAAQ,EAAE,GAAG,mBAAmB,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE;YACvE,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,uCAAuC,CAAC;YAC9D,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,wBAAwB,CAAC;SAChD,CAAC,CAAC;QACH,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAE,CAAC,IAAI,CAAC,CAAC;QACtD,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC,KAAK,CAAC,CAAC;QACpD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yEAAyE,EAAE,GAAG,EAAE;QACjF,iEAAiE;QACjE,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;QAC5E,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,mBAAmB,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;QAChL,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACnF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,mCAAmC,EAAE,GAAG,EAAE;IACjD,EAAE,CAAC,6FAA6F,EAAE,GAAG,EAAE;QACrG,uEAAuE;QACvE,kDAAkD;QAClD,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QAChF,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;QAC/E,MAAM,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;YAChJ,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,oBAAoB,CAAC;YAC1C,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,2CAA2C,CAAC;YACjE,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,0EAA0E,EAAE,WAAW,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC,OAAQ,EAAE,QAAQ,EAAE,cAAc,EAAE,EAAE;SAChN,CAAC,CAAC;QACH,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAE,CAAC,IAAI,CAAC,CAAC;QAC5C,gDAAgD;QAChD,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,IAAI,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACvC,sEAAsE;IACtE,wEAAwE;IACxE,wEAAwE;IACxE,sEAAsE;IACtE,kCAAkC;IAClC,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAClC,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IACpE,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IACvE,KAAK,MAAM,SAAS,IAAI,CAAC,KAAK,EAAE,KAAK,CAAU,EAAE,CAAC;QAChD,EAAE,CAAC,2DAA2D,SAAS,GAAG,EAAE,GAAG,EAAE;YAC/E,MAAM,EAAE,QAAQ,EAAE,GAAG,mBAAmB,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;gBACzK,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,wEAAwE,CAAC;gBAC7F,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC;aACnC,CAAC,CAAC;YACH,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAE,CAAC,IAAI,CAAC,CAAC;YACtD,oEAAoE;YACpE,8BAA8B;YAC9B,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YAC/E,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC;QACvF,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,kCAAkC,EAAE,GAAG,EAAE;IAChD,EAAE,CAAC,6FAA6F,EAAE,GAAG,EAAE;QACrG,qEAAqE;QACrE,0CAA0C;QAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACpE,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACtE,MAAM,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;YAClK,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,mDAAmD,CAAC;YAC1E,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,mBAAmB,CAAC;YAC1C,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC;SACjC,CAAC,CAAC;QACH,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,MAAM,CAAC;YAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;QAC/E,sEAAsE;QACtE,wEAAwE;QACxE,cAAc;QACd,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QACvE,MAAM,IAAI,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QACvE,MAAM,KAAK,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,MAAO,EAAE,GAAG,CAAC,CAAC;QACzF,MAAM,OAAO,GAAgB,EAAE,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;QACxI,MAAM,IAAI,GAAc,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;QACpL,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;QAC3D,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE;YACxC,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;YAC1I,SAAS,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;SACxB,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QACZ,MAAM,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QAC1G,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,+EAA+E,EAAE,GAAG,EAAE;QACvF,qEAAqE;QACrE,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAClC,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAClE,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACtE,MAAM,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;YAC3G,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,OAAQ,EAAE;SAC1G,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAE,CAAC,IAAI,CAAC;QACvB,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACrC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,kCAAkC,EAAE,GAAG,EAAE;IAChD,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAClC,KAAK,MAAM,QAAQ,IAAI,CAAC,cAAc,EAAE,QAAQ,EAAE,YAAY,CAAU,EAAE,CAAC;YACzE,MAAM,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,2BAA2B,EAAE,WAAW,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,OAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;YAC9K,MAAM,CAAC,CAAE,CAAC,IAAI,CAAC,CAAC,GAAG,CAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACtE,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;IAC/C,EAAE,CAAC,6EAA6E,EAAE,GAAG,EAAE;QACrF,sDAAsD;QACtD,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;QACxE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,mBAAmB,CACnD,KAAK,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAC7I,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,oBAAoB,EAAE,EAAE,CAAC,MAAO,CAAC,CAAC,CACzD,CAAC;QACF,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC,IAAI,CAAoB,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2EAA2E,EAAE,GAAG,EAAE;QACnF,qEAAqE;QACrE,oEAAoE;QACpE,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QACpC,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,MAAO,EAAE,GAAG,CAAC,CAAC;QACzF,MAAM,OAAO,GAAgB,EAAE,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;QACxI,MAAM,KAAK,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC;QACjC,MAAM,IAAI,GAAc,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;QACnK,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QACxH,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAChC,kEAAkE;QAClE,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAE,CAAC,EAAE,CAAC;QACzB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QACpD,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;QAC7E,qEAAqE;QACrE,uEAAuE;QACvE,YAAY;QACZ,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,MAAO,EAAE,GAAG,CAAC,CAAC;QACzF,MAAM,OAAO,GAAgB,EAAE,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;QACxI,MAAM,KAAK,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;QAChC,MAAM,IAAI,GAAc,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;QACnK,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE;YACxC,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;YACzE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;SAC1E,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QACZ,MAAM,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shapeText.test.d.ts","sourceRoot":"","sources":["../../../../src/comics/lettering/__tests__/shapeText.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
import { describe, it, expect, beforeAll } from 'vitest';
|
|
2
|
+
import { installStubMeasure } from './stubMeasure';
|
|
3
|
+
import { prepareText, readLetteringText } from '../text';
|
|
4
|
+
import { shapeText } from '../shape-text';
|
|
5
|
+
import { presetLetteringStyles } from '../presets';
|
|
6
|
+
beforeAll(() => installStubMeasure());
|
|
7
|
+
const EM = 12;
|
|
8
|
+
const styleFor = (locale, id = 'speech') => presetLetteringStyles({ fontSizePx: EM, locale, fontFamily: 'Test' })[id];
|
|
9
|
+
function shape(text, locale, vertical = false, style = styleFor(locale)) {
|
|
10
|
+
const p = prepareText(readLetteringText(text, undefined), style, { locale, vertical });
|
|
11
|
+
return { p, s: shapeText(p, style, { locale, vertical, dpi: 96 }) };
|
|
12
|
+
}
|
|
13
|
+
const LATIN = [
|
|
14
|
+
['en', 'Did you hear that? Something is moving down in the cellar, and I do not like it one bit.'],
|
|
15
|
+
['es', '¿Has oído eso? Algo se mueve abajo, en el sótano, y no me gusta nada de nada.'],
|
|
16
|
+
['fr', 'Tu as entendu ça ? Quelque chose bouge en bas, dans la cave, et ça ne me plaît pas du tout.'],
|
|
17
|
+
];
|
|
18
|
+
describe('text shaping (SPEC D3.1)', () => {
|
|
19
|
+
for (const [locale, text] of LATIN) {
|
|
20
|
+
it(`sets ${locale} dialogue as a diamond of 2 to 5 lines`, () => {
|
|
21
|
+
const { p, s } = shape(text, locale);
|
|
22
|
+
const widths = s.lines.map((l) => l.width);
|
|
23
|
+
expect(widths.length).toBeGreaterThanOrEqual(2);
|
|
24
|
+
expect(widths.length).toBeLessThanOrEqual(5);
|
|
25
|
+
const max = Math.max(...widths);
|
|
26
|
+
// No parking space, and the longest line is not an end line.
|
|
27
|
+
expect(widths[widths.length - 1]).toBeGreaterThanOrEqual(0.4 * max);
|
|
28
|
+
if (widths.length >= 3)
|
|
29
|
+
expect(Math.max(...widths.slice(1, -1))).toBe(max);
|
|
30
|
+
// The lines are the text, broken at spaces only (no hyphenation).
|
|
31
|
+
expect(s.block.lines.map((l) => l.text).join(' ')).toBe(p.text);
|
|
32
|
+
// A block about as wide as the target aspect asks.
|
|
33
|
+
expect(s.aspect).toBeGreaterThan(1);
|
|
34
|
+
expect(s.aspect).toBeLessThan(3.5);
|
|
35
|
+
// Centred lines.
|
|
36
|
+
const mids = s.block.lines.map((l) => l.xOffset + l.width / 2);
|
|
37
|
+
for (const m of mids)
|
|
38
|
+
expect(m).toBeCloseTo(s.block.bbox.width / 2, 0);
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
it('keeps a short text on one line', () => {
|
|
42
|
+
const { s } = shape('Huh?', 'en');
|
|
43
|
+
expect(s.lines).toHaveLength(1);
|
|
44
|
+
});
|
|
45
|
+
it('sets the same size whatever the length (never shrinks to fit)', () => {
|
|
46
|
+
const short = shape('Hi.', 'en').s;
|
|
47
|
+
const long = shape(LATIN[0][1], 'en').s;
|
|
48
|
+
expect(short.block.fontString).toBe(long.block.fontString);
|
|
49
|
+
expect(long.em).toBe(EM);
|
|
50
|
+
});
|
|
51
|
+
it('honours forced breaks', () => {
|
|
52
|
+
const { s } = shape('First line\nsecond line', 'en');
|
|
53
|
+
expect(s.block.lines.map((l) => l.text)).toEqual(['FIRST LINE', 'SECOND LINE']);
|
|
54
|
+
});
|
|
55
|
+
it('sets Japanese vertically, in columns of at most maxColumnChars, broken at phrases', () => {
|
|
56
|
+
const style = styleFor('ja');
|
|
57
|
+
const { p, s } = shape('いまの音、聞こえた?地下室で何かが動いているみたい。', 'ja', true, style);
|
|
58
|
+
expect(s.vertical).toBe(true);
|
|
59
|
+
expect(s.block.vertical).toBeDefined();
|
|
60
|
+
expect(s.block.vertical.region).toBe('japan');
|
|
61
|
+
for (const l of s.lines)
|
|
62
|
+
expect(l.width).toBeLessThanOrEqual(style.maxColumnChars * EM + 0.01);
|
|
63
|
+
expect(s.block.lines.map((l) => l.text).join('')).toBe(p.text);
|
|
64
|
+
// No column opens with a closing mark or a small kana.
|
|
65
|
+
for (const l of s.block.lines)
|
|
66
|
+
expect('、。?)」ゃゅょっ').not.toContain(l.text[0]);
|
|
67
|
+
// A taller than wide block.
|
|
68
|
+
expect(s.block.bbox.height).toBeGreaterThan(s.block.bbox.width);
|
|
69
|
+
});
|
|
70
|
+
it('sets tate-chu-yoko in one cell of a vertical balloon', () => {
|
|
71
|
+
const { s } = shape([{ text: 'あと', bold: false, italic: false }, { text: '12', bold: false, italic: false, combineUpright: true }, { text: '分だ', bold: false, italic: false }], 'ja', true);
|
|
72
|
+
const runs = s.block.lines.flatMap((l) => l.runs ?? []);
|
|
73
|
+
expect(runs.some((r) => r.tcy && r.text === '12')).toBe(true);
|
|
74
|
+
});
|
|
75
|
+
it('sets Traditional Chinese vertically with Taiwan punctuation', () => {
|
|
76
|
+
const { p, s } = shape('你聽到了嗎?地下室裡有東西在動,我一點也不喜歡。', 'zh-Hant', true);
|
|
77
|
+
expect(s.block.vertical.region).toBe('taiwan');
|
|
78
|
+
expect(s.block.lines.map((l) => l.text).join('')).toBe(p.text);
|
|
79
|
+
expect(s.lines.length).toBeGreaterThanOrEqual(2);
|
|
80
|
+
});
|
|
81
|
+
it('sets Arabic right to left, untracked, never cutting a word', () => {
|
|
82
|
+
const style = { ...styleFor('ar'), letterSpacing: 2 };
|
|
83
|
+
const text = 'هل سمعت ذلك؟ شيء ما يتحرك في القبو، ولا يعجبني ذلك أبدا.';
|
|
84
|
+
const { s } = shape(text, 'ar', false, style);
|
|
85
|
+
expect(s.block.direction).toBe('rtl');
|
|
86
|
+
expect(s.block.letterSpacingPx ?? 0).toBe(0);
|
|
87
|
+
const words = new Set(text.split(' '));
|
|
88
|
+
for (const l of s.block.lines)
|
|
89
|
+
for (const w of l.text.split(' '))
|
|
90
|
+
expect(words.has(w)).toBe(true);
|
|
91
|
+
});
|
|
92
|
+
it('is deterministic', () => {
|
|
93
|
+
const a = shape(LATIN[1][1], 'es').s;
|
|
94
|
+
const b = shape(LATIN[1][1], 'es').s;
|
|
95
|
+
expect(JSON.stringify(a.block)).toBe(JSON.stringify(b.block));
|
|
96
|
+
});
|
|
97
|
+
});
|
|
98
|
+
//# sourceMappingURL=shapeText.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shapeText.test.js","sourceRoot":"","sources":["../../../../src/comics/lettering/__tests__/shapeText.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shapes.test.d.ts","sourceRoot":"","sources":["../../../../src/comics/lettering/__tests__/shapes.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,137 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { buildBody, buildNeck, buildTail, fitSuperellipse, tailLength, translateBody } from '../shapes';
|
|
3
|
+
import { pathData, pointInConvex, pointInRect, dist } from '../geom';
|
|
4
|
+
import { presetLetteringStyles } from '../presets';
|
|
5
|
+
const EM = 12;
|
|
6
|
+
const styles = presetLetteringStyles({ fontSizePx: EM, locale: 'en', fontFamily: 'Test' });
|
|
7
|
+
const speech = styles.speech;
|
|
8
|
+
// A diamond text block: three lines, the middle one longest.
|
|
9
|
+
const INK = [
|
|
10
|
+
{ x: 20, y: 0, width: 60, height: 11 },
|
|
11
|
+
{ x: 0, y: 14, width: 100, height: 11 },
|
|
12
|
+
{ x: 15, y: 28, width: 70, height: 11 },
|
|
13
|
+
];
|
|
14
|
+
const corners = (r) => [
|
|
15
|
+
{ x: r.x, y: r.y }, { x: r.x + r.width, y: r.y }, { x: r.x + r.width, y: r.y + r.height }, { x: r.x, y: r.y + r.height },
|
|
16
|
+
];
|
|
17
|
+
/** Distance from `p` to the polygon's boundary. */
|
|
18
|
+
function edgeDistance(p, poly) {
|
|
19
|
+
let best = Infinity;
|
|
20
|
+
for (let i = 0; i < poly.length; i++) {
|
|
21
|
+
const a = poly[i];
|
|
22
|
+
const b = poly[(i + 1) % poly.length];
|
|
23
|
+
const abx = b.x - a.x;
|
|
24
|
+
const aby = b.y - a.y;
|
|
25
|
+
const t = Math.max(0, Math.min(1, ((p.x - a.x) * abx + (p.y - a.y) * aby) / (abx * abx + aby * aby || 1)));
|
|
26
|
+
best = Math.min(best, dist(p, { x: a.x + abx * t, y: a.y + aby * t }));
|
|
27
|
+
}
|
|
28
|
+
return best;
|
|
29
|
+
}
|
|
30
|
+
const isClosed = (d) => d.startsWith('M') && d.endsWith('Z') && /^[MLCZ0-9 .\-]+$/.test(d);
|
|
31
|
+
describe('balloon bodies (SPEC D3.2)', () => {
|
|
32
|
+
for (const shape of ['oval', 'cloud', 'burst', 'wavy', 'electric', 'rounded', 'rectangle']) {
|
|
33
|
+
it(`${shape}: a closed outline holding the text with its air`, () => {
|
|
34
|
+
const style = { ...speech, shape };
|
|
35
|
+
const body = buildBody(INK, EM, style, 'b1');
|
|
36
|
+
const d = pathData(body.cmds);
|
|
37
|
+
expect(isClosed(d)).toBe(true);
|
|
38
|
+
for (const r of INK) {
|
|
39
|
+
for (const c of corners(r)) {
|
|
40
|
+
expect(pointInConvex(c, body.core)).toBe(true);
|
|
41
|
+
// Constant air: no ink corner closer to the outline than the
|
|
42
|
+
// padding (2 % for the sampled outline).
|
|
43
|
+
expect(edgeDistance(c, body.core)).toBeGreaterThanOrEqual(style.padding * 0.98 - 0.5);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
const b = body.bbox;
|
|
47
|
+
expect(b.x).toBeLessThan(0 - style.padding + 1);
|
|
48
|
+
expect(b.x + b.width).toBeGreaterThan(100 + style.padding - 1);
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
it('hugs a diamond: an oval no wider than the text plus generous air', () => {
|
|
52
|
+
const body = buildBody(INK, EM, speech, 'b1');
|
|
53
|
+
expect(body.bbox.width).toBeLessThan(100 + 2 * speech.padding + 0.6 * 100);
|
|
54
|
+
expect(body.bbox.height).toBeLessThan(39 + 2 * speech.padding + 0.8 * 39);
|
|
55
|
+
});
|
|
56
|
+
it('fits the smallest superellipse around points', () => {
|
|
57
|
+
const pts = [{ x: -10, y: -5 }, { x: 10, y: 5 }, { x: 10, y: -5 }, { x: -10, y: 5 }];
|
|
58
|
+
const { a, b } = fitSuperellipse(pts, { x: 0, y: 0 }, 2);
|
|
59
|
+
expect(a * b).toBeCloseTo(100, 0); // a = 10√2, b = 5√2 for an ellipse
|
|
60
|
+
});
|
|
61
|
+
it('jitters bursts and clouds from the seed only', () => {
|
|
62
|
+
const burst = { ...speech, shape: 'burst' };
|
|
63
|
+
const a = pathData(buildBody(INK, EM, burst, 'x').cmds);
|
|
64
|
+
const b = pathData(buildBody(INK, EM, burst, 'x').cmds);
|
|
65
|
+
const c = pathData(buildBody(INK, EM, burst, 'y').cmds);
|
|
66
|
+
expect(a).toBe(b);
|
|
67
|
+
expect(a).not.toBe(c);
|
|
68
|
+
const wobbly = (seed) => pathData(buildBody(INK, EM, { ...speech, wobble: 0.04 }, seed).cmds);
|
|
69
|
+
expect(wobbly('s')).toBe(wobbly('s'));
|
|
70
|
+
expect(wobbly('s')).not.toBe(wobbly('t'));
|
|
71
|
+
});
|
|
72
|
+
it('points every burst spike away from the centre', () => {
|
|
73
|
+
const body = buildBody(INK, EM, { ...speech, shape: 'burst' }, 'z');
|
|
74
|
+
for (let i = 1; i < body.hull.length; i += 2) {
|
|
75
|
+
expect(dist(body.hull[i], body.centre)).toBeGreaterThan(dist(body.hull[i - 1], body.centre));
|
|
76
|
+
}
|
|
77
|
+
});
|
|
78
|
+
});
|
|
79
|
+
describe('tails (SPEC D3.2)', () => {
|
|
80
|
+
const body = translateBody(buildBody(INK, EM, speech, 't'), 200, 100);
|
|
81
|
+
const target = { x: 160, y: 260 };
|
|
82
|
+
it('leaves the body, aims at the target and stops at the reach', () => {
|
|
83
|
+
const tail = buildTail(body, target, speech, { strokeWidth: speech.strokeWidth });
|
|
84
|
+
expect(tail).toBeDefined();
|
|
85
|
+
expect(isClosed(pathData(tail.cmds))).toBe(true);
|
|
86
|
+
const gap = dist(tail.base, target);
|
|
87
|
+
// 0.55 of the gap, the tip never farther than 2.5 em from the target.
|
|
88
|
+
expect(dist(tail.base, tail.tip)).toBeCloseTo(gap - Math.min(0.45 * gap, 2.5 * EM), 0);
|
|
89
|
+
expect(dist(tail.tip, target)).toBeGreaterThanOrEqual(0.5 * EM);
|
|
90
|
+
expect(dist(tail.tip, target)).toBeLessThanOrEqual(2.5 * EM + 0.5);
|
|
91
|
+
// The tip lies on the line from the exit to the target.
|
|
92
|
+
const ux = (target.x - tail.base.x) / gap;
|
|
93
|
+
const uy = (target.y - tail.base.y) / gap;
|
|
94
|
+
const along = (tail.tip.x - tail.base.x) * ux + (tail.tip.y - tail.base.y) * uy;
|
|
95
|
+
expect(along).toBeCloseTo(dist(tail.base, tail.tip), 3);
|
|
96
|
+
// It starts inside the body (the layer method merges the outlines).
|
|
97
|
+
const first = tail.cmds[0].pts[0];
|
|
98
|
+
expect(pointInConvex(first, body.core)).toBe(true);
|
|
99
|
+
});
|
|
100
|
+
it('ends about as near its target whatever the gap (consistent reach)', () => {
|
|
101
|
+
expect(tailLength(4 * EM, EM, speech, false)).toBeCloseTo(2.2 * EM, 6);
|
|
102
|
+
// A far balloon: the tip still ends 2.5 em from the mouth.
|
|
103
|
+
expect(tailLength(20 * EM, EM, speech, false)).toBeCloseTo(17.5 * EM, 6);
|
|
104
|
+
// Close: never nearer than tailGap (0.5 em).
|
|
105
|
+
expect(tailLength(EM, EM, speech, false)).toBeCloseTo(0.5 * EM, 6);
|
|
106
|
+
expect(tailLength(7 * EM, EM, speech, true)).toBe(7 * EM);
|
|
107
|
+
});
|
|
108
|
+
it('stops short of the speaker\'s face', () => {
|
|
109
|
+
const face = { x: 120, y: 185, width: 110, height: 100 };
|
|
110
|
+
const tail = buildTail(body, target, speech, { strokeWidth: 1, face });
|
|
111
|
+
expect(pointInRect(tail.tip, face)).toBe(false);
|
|
112
|
+
const free = buildTail(body, target, speech, { strokeWidth: 1 });
|
|
113
|
+
expect(pointInRect(free.tip, face)).toBe(true);
|
|
114
|
+
});
|
|
115
|
+
it('runs to the border for an off-panel speaker', () => {
|
|
116
|
+
const border = { x: 200, y: 400 };
|
|
117
|
+
const tail = buildTail(body, border, speech, { strokeWidth: 1, offPanel: true });
|
|
118
|
+
expect(dist(tail.tip, border)).toBeLessThan(0.01);
|
|
119
|
+
});
|
|
120
|
+
it('draws thought bubbles, a lightning bolt and no tail', () => {
|
|
121
|
+
const bubbles = buildTail(body, target, { ...speech, tail: 'bubbles' }, { strokeWidth: 1 });
|
|
122
|
+
expect(bubbles.cmds.filter((c) => c.op === 'M')).toHaveLength(3);
|
|
123
|
+
const zig = buildTail(body, target, { ...speech, tail: 'zigzag' }, { strokeWidth: 1 });
|
|
124
|
+
expect(zig.cmds.every((c) => c.op !== 'C')).toBe(true);
|
|
125
|
+
expect(buildTail(body, target, { ...speech, tail: 'none' }, { strokeWidth: 1 })).toBeUndefined();
|
|
126
|
+
// A target inside the body has no tail.
|
|
127
|
+
expect(buildTail(body, body.centre, speech, { strokeWidth: 1 })).toBeUndefined();
|
|
128
|
+
});
|
|
129
|
+
it('joins two bodies with a neck that starts inside both', () => {
|
|
130
|
+
const other = translateBody(buildBody(INK, EM, speech, 'u'), 260, 190);
|
|
131
|
+
const neck = buildNeck(body, other, 1);
|
|
132
|
+
expect(isClosed(pathData(neck))).toBe(true);
|
|
133
|
+
const start = neck[0].pts[0];
|
|
134
|
+
expect(pointInConvex(start, body.core)).toBe(true);
|
|
135
|
+
});
|
|
136
|
+
});
|
|
137
|
+
//# sourceMappingURL=shapes.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shapes.test.js","sourceRoot":"","sources":["../../../../src/comics/lettering/__tests__/shapes.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AACxG,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAGnD,MAAM,EAAE,GAAG,EAAE,CAAC;AACd,MAAM,MAAM,GAAG,qBAAqB,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;AAC3F,MAAM,MAAM,GAAG,MAAM,CAAC,MAAO,CAAC;AAC9B,6DAA6D;AAC7D,MAAM,GAAG,GAAW;IAClB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;IACtC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE;IACvC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;CACxC,CAAC;AAEF,MAAM,OAAO,GAAG,CAAC,CAAO,EAAW,EAAE,CAAC;IACpC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE;CACzH,CAAC;AACF,mDAAmD;AACnD,SAAS,YAAY,CAAC,CAAQ,EAAE,IAAa;IAC3C,IAAI,IAAI,GAAG,QAAQ,CAAC;IACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAE,CAAC;QACnB,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAE,CAAC;QACvC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACtB,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACtB,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3G,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACzE,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AACD,MAAM,QAAQ,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAEnG,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,KAAK,MAAM,KAAK,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,CAAU,EAAE,CAAC;QACpG,EAAE,CAAC,GAAG,KAAK,kDAAkD,EAAE,GAAG,EAAE;YAClE,MAAM,KAAK,GAAmB,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,CAAC;YACnD,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YAC7C,MAAM,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9B,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/B,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC;gBACpB,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC3B,MAAM,CAAC,aAAa,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAC/C,6DAA6D;oBAC7D,yCAAyC;oBACzC,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,sBAAsB,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,GAAG,GAAG,CAAC,CAAC;gBACxF,CAAC;YACH,CAAC;YACD,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;YACpB,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;YAChD,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,GAAG,GAAG,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;IACL,CAAC;IAED,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QAC1E,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAC9C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,GAAG,MAAM,CAAC,OAAO,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC;QAC3E,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,OAAO,GAAG,GAAG,GAAG,EAAE,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,GAAG,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACrF,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,eAAe,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QACzD,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,mCAAmC;IACxE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,KAAK,GAAmB,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;QAC5D,MAAM,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACtB,MAAM,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;QACtG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACtC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,CAAC,CAAC;QACpE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QACjG,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,MAAM,IAAI,GAAG,aAAa,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACtE,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC;IAElC,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;QACpE,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAE,CAAC;QACnF,MAAM,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;QAC3B,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACpC,sEAAsE;QACtE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACvF,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,sBAAsB,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC;QAChE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC;QACnE,wDAAwD;QACxD,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;QAC1C,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;QAC1C,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;QAChF,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QACxD,oEAAoE;QACpE,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,GAAG,CAAC,CAAC,CAAE,CAAC;QACpC,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;QACvE,2DAA2D;QAC3D,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;QACzE,6CAA6C;QAC7C,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;QACnE,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,IAAI,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;QACzD,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,CAAE,CAAC;QACxE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChD,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,CAAE,CAAC;QAClE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAE,CAAC;QAClF,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,CAAE,CAAC;QAC7F,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACjE,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,CAAE,CAAC;QACxF,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QACjG,wCAAwC;QACxC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IACnF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,KAAK,GAAG,aAAa,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QACvE,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QACvC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5C,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAE,CAAC,GAAG,CAAC,CAAC,CAAE,CAAC;QAC/B,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stubMeasure.d.ts","sourceRoot":"","sources":["../../../../src/comics/lettering/__tests__/stubMeasure.ts"],"names":[],"mappings":"AAQA,uCAAuC;AACvC,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAW9C;AAaD,yDAAyD;AACzD,wBAAgB,kBAAkB,IAAI,IAAI,CAOzC"}
|