postext 1.56.0 → 1.57.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__/composed/moduleText.test.d.ts +2 -0
- package/dist/__tests__/composed/moduleText.test.d.ts.map +1 -0
- package/dist/__tests__/composed/moduleText.test.js +168 -0
- package/dist/__tests__/composed/moduleText.test.js.map +1 -0
- package/dist/__tests__/defaults/debugFitMarks.test.js +11 -9
- package/dist/__tests__/defaults/debugFitMarks.test.js.map +1 -1
- package/dist/__tests__/htmlLineBaseline.test.d.ts +2 -0
- package/dist/__tests__/htmlLineBaseline.test.d.ts.map +1 -0
- package/dist/__tests__/htmlLineBaseline.test.js +86 -0
- package/dist/__tests__/htmlLineBaseline.test.js.map +1 -0
- package/dist/composed/furniture.d.ts +4 -3
- package/dist/composed/furniture.d.ts.map +1 -1
- package/dist/composed/furniture.js +5 -4
- package/dist/composed/furniture.js.map +1 -1
- package/dist/composed/modules.d.ts +36 -0
- package/dist/composed/modules.d.ts.map +1 -1
- package/dist/composed/modules.js +27 -0
- package/dist/composed/modules.js.map +1 -1
- package/dist/composed/paint.d.ts +4 -2
- package/dist/composed/paint.d.ts.map +1 -1
- package/dist/composed/paint.js +3 -2
- package/dist/composed/paint.js.map +1 -1
- package/dist/composed/types.d.ts +7 -0
- package/dist/composed/types.d.ts.map +1 -1
- package/dist/configWarnings.d.ts.map +1 -1
- package/dist/configWarnings.js +20 -1
- package/dist/configWarnings.js.map +1 -1
- package/dist/contrast.d.ts.map +1 -1
- package/dist/contrast.js +10 -3
- package/dist/contrast.js.map +1 -1
- package/dist/defaults/debug.d.ts.map +1 -1
- package/dist/defaults/debug.js +3 -1
- package/dist/defaults/debug.js.map +1 -1
- package/dist/design/elementKeys.d.ts +1 -0
- package/dist/design/elementKeys.d.ts.map +1 -1
- package/dist/design/elementKeys.js +1 -1
- package/dist/design/elementKeys.js.map +1 -1
- package/dist/design/layout.d.ts +8 -3
- package/dist/design/layout.d.ts.map +1 -1
- package/dist/design/layout.js +27 -11
- package/dist/design/layout.js.map +1 -1
- package/dist/html-backend.d.ts.map +1 -1
- package/dist/html-backend.js +54 -4
- package/dist/html-backend.js.map +1 -1
- package/dist/measure/canvas.d.ts +24 -0
- package/dist/measure/canvas.d.ts.map +1 -1
- package/dist/measure/canvas.js +80 -1
- package/dist/measure/canvas.js.map +1 -1
- package/dist/measure/fontString.d.ts +4 -0
- package/dist/measure/fontString.d.ts.map +1 -1
- package/dist/measure/fontString.js +11 -0
- package/dist/measure/fontString.js.map +1 -1
- package/dist/parse/blockParser.js +2 -2
- package/dist/parse/blockParser.js.map +1 -1
- package/dist/parse/types.d.ts +4 -0
- package/dist/parse/types.d.ts.map +1 -1
- package/dist/pipeline/composedLayout.d.ts.map +1 -1
- package/dist/pipeline/composedLayout.js +4 -3
- package/dist/pipeline/composedLayout.js.map +1 -1
- package/dist/pipeline/headerFooter.d.ts +13 -0
- package/dist/pipeline/headerFooter.d.ts.map +1 -1
- package/dist/pipeline/headerFooter.js +71 -6
- package/dist/pipeline/headerFooter.js.map +1 -1
- package/dist/types.d.ts +10 -3
- package/dist/types.d.ts.map +1 -1
- package/dist/vdt.d.ts +16 -3
- package/dist/vdt.d.ts.map +1 -1
- package/dist/vdt.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"moduleText.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/composed/moduleText.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,168 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { buildDocument } from '../../pipeline/build.js';
|
|
3
|
+
import { createMeasurementCache } from '../../measure/index.js';
|
|
4
|
+
import { renderToHtmlIndexed } from '../../html-backend.js';
|
|
5
|
+
import { renderPageToCanvas } from '../../canvas-backend/index.js';
|
|
6
|
+
import { composedPaintOrder, decorationOver, decorationUnder } from '../../composed/paint.js';
|
|
7
|
+
import { collectConfigWarnings } from '../../configWarnings.js';
|
|
8
|
+
import { contrastPairs } from '../../contrast.js';
|
|
9
|
+
import { flowRectToPage } from '../../vdt.js';
|
|
10
|
+
import { CARD_MODULE, NOTICE_MODULE, ROWS_CONFIG, ROWS_TEMPLATE, rowsPage } from './fixtures/moduleRows.js';
|
|
11
|
+
import { MODULE_CONFIG, MODULE_RESOURCES, TOPIC_TEMPLATE, TREE_MODULE, treeModule } from './fixtures/modules.js';
|
|
12
|
+
// #1189: a module template's text elements are drawn, over the module's
|
|
13
|
+
// frames, and their `{attr.x}` reads the `:::module` fence first.
|
|
14
|
+
class StubCtx {
|
|
15
|
+
font = '';
|
|
16
|
+
measureText(s) {
|
|
17
|
+
return { width: s.length * 7 };
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
globalThis.OffscreenCanvas = class {
|
|
21
|
+
getContext() {
|
|
22
|
+
return new StubCtx();
|
|
23
|
+
}
|
|
24
|
+
};
|
|
25
|
+
const pt = (value) => ({ value, unit: 'pt' });
|
|
26
|
+
const text = (id, content, to, edge, extra = {}) => ({ kind: 'text', id, content, fontSize: pt(9), placement: { anchor: { to, edge } }, ...extra });
|
|
27
|
+
const TREE_ELEMENTS = TREE_MODULE.decoration.elements;
|
|
28
|
+
/** The tree module with a literal on its root node (a filled frame), the
|
|
29
|
+
* `num` attribute in its top right corner, a text shown only when the
|
|
30
|
+
* fence sets `extra`, and one with no id. */
|
|
31
|
+
const textModule = (extra = {}) => ({
|
|
32
|
+
...TREE_MODULE,
|
|
33
|
+
decoration: {
|
|
34
|
+
elements: [
|
|
35
|
+
...TREE_ELEMENTS,
|
|
36
|
+
text('rotulo', 'Literal', '#raiz', 'top-left', extra),
|
|
37
|
+
text('num', '{attr.num}', 'container', 'top-right'),
|
|
38
|
+
text('extra', 'Extra', 'container', 'bottom-right', { when: 'extra' }),
|
|
39
|
+
{ kind: 'text', content: 'NoId', fontSize: pt(9), placement: { anchor: { to: 'container', edge: 'bottom-left' } } },
|
|
40
|
+
],
|
|
41
|
+
},
|
|
42
|
+
});
|
|
43
|
+
const build = (markdown, templates = [TOPIC_TEMPLATE, textModule()]) => buildDocument({ markdown, resources: MODULE_RESOURCES }, { ...MODULE_CONFIG, pageTemplates: templates }, createMeasurementCache());
|
|
44
|
+
const composedPages = (doc) => doc.pages.filter((p) => p.composed);
|
|
45
|
+
const textBlock = (page, id) => page.composed.decoration.blocks.find((b) => b.kind === 'text' && b.elementId === id);
|
|
46
|
+
const printed = (page, id) => textBlock(page, id)?.lines.map((l) => l.text).join(' ');
|
|
47
|
+
const page = (fenceAttrs, ...modules) => `::::page{template="tema"${fenceAttrs}}\n# T\n\n${modules.join('\n')}::::\n`;
|
|
48
|
+
describe('text elements of a module template (#1189)', () => {
|
|
49
|
+
it('draws them over the module\'s frames, in the module\'s box', () => {
|
|
50
|
+
const doc = build(page('', treeModule('en', ' num="7"')));
|
|
51
|
+
const p = composedPages(doc)[0];
|
|
52
|
+
for (const id of ['arbol[1].rotulo', 'arbol[1].num'])
|
|
53
|
+
expect(textBlock(p, id)?.over, id).toBe(true);
|
|
54
|
+
expect(printed(p, 'arbol[1].rotulo')).toBe('Literal');
|
|
55
|
+
// On the root node, a filled frame painted before the over item.
|
|
56
|
+
const raiz = flowRectToPage(p, p.composed.frames.find((f) => f.name === 'arbol[1].raiz').rect);
|
|
57
|
+
const lit = textBlock(p, 'arbol[1].rotulo');
|
|
58
|
+
expect(lit.bbox.x).toBeCloseTo(raiz.x, 3);
|
|
59
|
+
expect(lit.bbox.y).toBeCloseTo(raiz.y, 3);
|
|
60
|
+
const order = composedPaintOrder(p).map((i) => (i.kind === 'frame' ? i.frame.name : i.kind));
|
|
61
|
+
expect(order.at(-1)).toBe('over');
|
|
62
|
+
expect(order.indexOf('arbol[1].raiz')).toBeLessThan(order.indexOf('over'));
|
|
63
|
+
// The module's other elements stay with the decoration, under the
|
|
64
|
+
// frames; an element with no id is a module text too.
|
|
65
|
+
const deco = p.composed.decoration;
|
|
66
|
+
expect(decorationUnder(deco).blocks.map((b) => b.elementId)).toEqual(['arbol[1].suelo', 'arbol[1].tronco', 'arbol[1].rama', 'arbol[1].hacia-izq', 'arbol[1].hacia-der']);
|
|
67
|
+
expect(decorationOver(deco).blocks.map((b) => b.elementId)).toEqual(['arbol[1].rotulo', 'arbol[1].num', 'text-9']);
|
|
68
|
+
expect(doc.contentWarnings ?? []).toEqual([]);
|
|
69
|
+
});
|
|
70
|
+
it('over: false keeps a module text under the frames; a page template\'s text is under them unless over: true', () => {
|
|
71
|
+
const under = composedPages(build(page('', treeModule('en')), [TOPIC_TEMPLATE, textModule({ over: false })]))[0];
|
|
72
|
+
expect(textBlock(under, 'arbol[1].rotulo').over).toBeUndefined();
|
|
73
|
+
expect(decorationUnder(under.composed.decoration).blocks.map((b) => b.elementId)).toContain('arbol[1].rotulo');
|
|
74
|
+
const shell = (extra) => ({ ...TOPIC_TEMPLATE, decoration: { elements: [text('sello', 'Sello', '#titulo', 'top-left', extra)] } });
|
|
75
|
+
const plain = composedPages(build(page('', treeModule('en')), [shell({}), TREE_MODULE]))[0];
|
|
76
|
+
expect(textBlock(plain, 'sello').over).toBeUndefined();
|
|
77
|
+
expect(composedPaintOrder(plain).map((i) => i.kind)).not.toContain('over');
|
|
78
|
+
const raised = composedPages(build(page('', treeModule('en')), [shell({ over: true }), TREE_MODULE]))[0];
|
|
79
|
+
expect(textBlock(raised, 'sello').over).toBe(true);
|
|
80
|
+
});
|
|
81
|
+
it('{attr.x} reads the :::module fence first, then the page fence, and maps back to the value written', () => {
|
|
82
|
+
const md = page(' num="P"', treeModule('en', ' num="7"'), treeModule('en'), treeModule('en', ' name="tercero" num="9" extra'));
|
|
83
|
+
const doc = build(md);
|
|
84
|
+
const p = composedPages(doc)[0];
|
|
85
|
+
expect(printed(p, 'arbol[1].num')).toBe('7');
|
|
86
|
+
expect(printed(p, 'arbol[2].num')).toBe('P');
|
|
87
|
+
expect(printed(p, 'tercero.num')).toBe('9');
|
|
88
|
+
// The module's `when` reads its own fence too.
|
|
89
|
+
expect(textBlock(p, 'arbol[1].extra')).toBeUndefined();
|
|
90
|
+
expect(printed(p, 'tercero.extra')).toBe('Extra');
|
|
91
|
+
// Each value maps back to where it is written.
|
|
92
|
+
const at = (needle) => md.indexOf(needle) + needle.length - 2;
|
|
93
|
+
const seven = textBlock(p, 'arbol[1].num');
|
|
94
|
+
expect([seven.sourceStart, seven.sourceEnd, seven.attr]).toEqual([at('num="7"'), at('num="7"') + 1, 'num']);
|
|
95
|
+
const fromPage = textBlock(p, 'arbol[2].num');
|
|
96
|
+
expect([fromPage.sourceStart, fromPage.attr]).toEqual([at('num="P"'), 'num']);
|
|
97
|
+
// The page records what each module's fence writes, besides template
|
|
98
|
+
// and name; a module that writes nothing else records nothing.
|
|
99
|
+
expect(p.composed.modules.map((m) => m.attrs)).toEqual([{ num: '7' }, undefined, { num: '9', extra: '' }]);
|
|
100
|
+
expect(p.composed.modules[0].attrSources).toEqual({ num: { sourceStart: at('num="7"'), sourceEnd: at('num="7"') + 1 } });
|
|
101
|
+
expect(doc.contentWarnings ?? []).toEqual([]);
|
|
102
|
+
});
|
|
103
|
+
it('a module that goes on whole to a next page reads its fence there', () => {
|
|
104
|
+
const goingOn = { ...TOPIC_TEMPLATE, groups: [{ ...TOPIC_TEMPLATE.groups[0], overflow: { continueIn: 'next-page' } }] };
|
|
105
|
+
const trees = Array.from({ length: 7 }, (_, k) => treeModule('en', ` num="n${k + 1}"`));
|
|
106
|
+
const [first, second] = composedPages(build(page('', ...trees), [goingOn, textModule()]));
|
|
107
|
+
expect(second).toBeDefined();
|
|
108
|
+
const laid = (p) => p.composed.modules.filter((m) => m.rect).map((m) => m.name);
|
|
109
|
+
for (const p of [first, second]) {
|
|
110
|
+
for (const name of laid(p))
|
|
111
|
+
expect(printed(p, `${name}.num`), name).toBe(`n${/\[(\d+)\]/.exec(name)[1]}`);
|
|
112
|
+
}
|
|
113
|
+
expect(laid(second).length).toBeGreaterThan(0);
|
|
114
|
+
});
|
|
115
|
+
it('draws the texts of modules laid in rows and grids', () => {
|
|
116
|
+
const notice = { ...NOTICE_MODULE, decoration: { elements: [text('rotulo', 'Aviso', '#texto', 'top-right'), text('num', '{attr.num}', 'container', 'top-right')] } };
|
|
117
|
+
const card = { ...CARD_MODULE, decoration: { elements: [text('rotulo', 'Foto', '#foto', 'top-left')] } };
|
|
118
|
+
const md = rowsPage('en').replace(':::module{template="aviso"', ':::module{template="aviso" num="1"');
|
|
119
|
+
const doc = buildDocument({ markdown: md, resources: MODULE_RESOURCES }, { ...ROWS_CONFIG, pageTemplates: [ROWS_TEMPLATE, notice, card] }, createMeasurementCache());
|
|
120
|
+
const p = composedPages(doc)[0];
|
|
121
|
+
const over = decorationOver(p.composed.decoration).blocks.map((b) => [b.elementId, b.lines.map((l) => l.text).join(' ')]);
|
|
122
|
+
expect(over).toEqual([
|
|
123
|
+
['aviso[1].rotulo', 'Aviso'], ['aviso[1].num', '1'], ['aviso[2].rotulo', 'Aviso'], ['aviso[2].num', ''],
|
|
124
|
+
['tarjeta[1].rotulo', 'Foto'], ['tarjeta[2].rotulo', 'Foto'], ['tarjeta[3].rotulo', 'Foto'], ['tarjeta[4].rotulo', 'Foto'],
|
|
125
|
+
]);
|
|
126
|
+
});
|
|
127
|
+
it('the backends paint a module text after the module\'s frames', () => {
|
|
128
|
+
const doc = build(page('', treeModule('en', ' num="7"')));
|
|
129
|
+
const p = composedPages(doc)[0];
|
|
130
|
+
// HTML: in the over box, above every frame.
|
|
131
|
+
const html = renderToHtmlIndexed(doc).pages[p.index].innerHtml;
|
|
132
|
+
const over = /class="pt-frame-decoration pt-frame-decoration-over" style="[^"]*z-index:(\d+);/.exec(html);
|
|
133
|
+
expect(over).not.toBeNull();
|
|
134
|
+
const frames = [...html.matchAll(/class="pt-frame[^"]*" data-frame-id="[^"]*" data-layer="-?\d+"[^>]*z-index:(\d+)/g)].map((m) => Number(m[1]));
|
|
135
|
+
expect(Number(over[1])).toBeGreaterThan(Math.max(...frames));
|
|
136
|
+
expect(html.indexOf('Literal')).toBeGreaterThan(over.index);
|
|
137
|
+
// Canvas: filled after the words of the root node.
|
|
138
|
+
const ops = [];
|
|
139
|
+
const ctx = new Proxy({ font: '', fillStyle: '#000000' }, {
|
|
140
|
+
get(target, key) {
|
|
141
|
+
if (key === 'fillText')
|
|
142
|
+
return (t) => ops.push(t);
|
|
143
|
+
if (key === 'measureText')
|
|
144
|
+
return (s) => ({ width: [...s].length * 7 });
|
|
145
|
+
if (key in target)
|
|
146
|
+
return target[key];
|
|
147
|
+
return () => undefined;
|
|
148
|
+
},
|
|
149
|
+
set(target, key, value) { target[key] = value; return true; },
|
|
150
|
+
});
|
|
151
|
+
renderPageToCanvas(p, doc, { width: 0, height: 0, getContext: () => ctx });
|
|
152
|
+
const words = ops.join(' ');
|
|
153
|
+
expect(words.indexOf('Literal')).toBeGreaterThan(words.lastIndexOf('river'));
|
|
154
|
+
});
|
|
155
|
+
it('the contrast check reads an over text on the frame it lies on', () => {
|
|
156
|
+
const groundOf = (doc) => contrastPairs(doc).find((p) => p.text === 'Literal')?.background;
|
|
157
|
+
// On the root node's white fill, not on the module's tinted ground.
|
|
158
|
+
expect(groundOf(build(page('', treeModule('en'))))).toBe('#ffffff');
|
|
159
|
+
expect(groundOf(build(page('', treeModule('en')), [TOPIC_TEMPLATE, textModule({ over: false })]))).toBe('#eef6ea');
|
|
160
|
+
});
|
|
161
|
+
it('an over that is no boolean is reported and read as unset', () => {
|
|
162
|
+
const warnings = collectConfigWarnings({ pageTemplates: [TOPIC_TEMPLATE, textModule({ over: 'yes' })] });
|
|
163
|
+
expect(warnings.filter((w) => w.path.endsWith('.over'))).toEqual([
|
|
164
|
+
{ kind: 'unknownConfigValue', path: 'pageTemplates[1].decoration.elements[5].over', value: 'yes', used: 'true' },
|
|
165
|
+
]);
|
|
166
|
+
});
|
|
167
|
+
});
|
|
168
|
+
//# sourceMappingURL=moduleText.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"moduleText.test.js","sourceRoot":"","sources":["../../../src/__tests__/composed/moduleText.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,23 +1,25 @@
|
|
|
1
1
|
import { describe, expect, it } from 'vitest';
|
|
2
2
|
import { DEFAULT_DEBUG_CONFIG, FIT_MARKS_MODES, resolveDebugConfig, stripConfigDefaults, stripDebugDefaults } from '../../index.js';
|
|
3
3
|
// #1160: the book's default for the fit marks the Sandbox canvas draws over
|
|
4
|
-
// composed pages, and the scale at which a scale badge is left out.
|
|
4
|
+
// composed pages, and the scale at which a scale badge is left out. Since
|
|
5
|
+
// #1200 the default shows the problems only.
|
|
5
6
|
describe('debug.fitMarks and debug.fitMarksMinScale', () => {
|
|
6
|
-
it('default to every
|
|
7
|
-
expect(DEFAULT_DEBUG_CONFIG.fitMarks).toBe('
|
|
7
|
+
it('default to the problems, every scale badge kept when all are shown', () => {
|
|
8
|
+
expect(DEFAULT_DEBUG_CONFIG.fitMarks).toBe('problems');
|
|
8
9
|
expect(DEFAULT_DEBUG_CONFIG.fitMarksMinScale).toBe(1);
|
|
9
|
-
expect(resolveDebugConfig(undefined)).toMatchObject({ fitMarks: '
|
|
10
|
-
expect(resolveDebugConfig({})).toMatchObject({ fitMarks: '
|
|
10
|
+
expect(resolveDebugConfig(undefined)).toMatchObject({ fitMarks: 'problems', fitMarksMinScale: 1 });
|
|
11
|
+
expect(resolveDebugConfig({})).toMatchObject({ fitMarks: 'problems', fitMarksMinScale: 1 });
|
|
11
12
|
expect(FIT_MARKS_MODES).toEqual(['all', 'problems', 'none']);
|
|
12
13
|
});
|
|
13
14
|
it('resolve what the book sets, and fall back on a value they do not know', () => {
|
|
14
|
-
expect(resolveDebugConfig({ fitMarks: '
|
|
15
|
-
expect(resolveDebugConfig({ fitMarks: 'some', fitMarksMinScale: -1 })).toMatchObject({ fitMarks: '
|
|
15
|
+
expect(resolveDebugConfig({ fitMarks: 'all', fitMarksMinScale: 0.95 })).toMatchObject({ fitMarks: 'all', fitMarksMinScale: 0.95 });
|
|
16
|
+
expect(resolveDebugConfig({ fitMarks: 'some', fitMarksMinScale: -1 })).toMatchObject({ fitMarks: 'problems', fitMarksMinScale: 1 });
|
|
16
17
|
});
|
|
17
18
|
it('are stripped at their defaults and kept otherwise', () => {
|
|
18
|
-
expect(stripDebugDefaults({ fitMarks: '
|
|
19
|
+
expect(stripDebugDefaults({ fitMarks: 'problems', fitMarksMinScale: 1 })).toBeUndefined();
|
|
19
20
|
expect(stripDebugDefaults({ fitMarks: 'none', fitMarksMinScale: 0.9 })).toEqual({ fitMarks: 'none', fitMarksMinScale: 0.9 });
|
|
20
|
-
|
|
21
|
+
// A book that asks for every mark keeps asking.
|
|
22
|
+
expect(stripConfigDefaults({ debug: { fitMarks: 'all' } }).debug).toEqual({ fitMarks: 'all' });
|
|
21
23
|
});
|
|
22
24
|
});
|
|
23
25
|
//# sourceMappingURL=debugFitMarks.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debugFitMarks.test.js","sourceRoot":"","sources":["../../../src/__tests__/defaults/debugFitMarks.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpI,4EAA4E;AAC5E,
|
|
1
|
+
{"version":3,"file":"debugFitMarks.test.js","sourceRoot":"","sources":["../../../src/__tests__/defaults/debugFitMarks.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpI,4EAA4E;AAC5E,0EAA0E;AAC1E,6CAA6C;AAE7C,QAAQ,CAAC,2CAA2C,EAAE,GAAG,EAAE;IACzD,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;QAC5E,MAAM,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACvD,MAAM,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACtD,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,gBAAgB,EAAE,CAAC,EAAE,CAAC,CAAC;QACnG,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,gBAAgB,EAAE,CAAC,EAAE,CAAC,CAAC;QAC5F,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;QAC/E,MAAM,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;QACnI,MAAM,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,MAAe,EAAE,gBAAgB,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,gBAAgB,EAAE,CAAC,EAAE,CAAC,CAAC;IAC/I,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,gBAAgB,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QAC1F,MAAM,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAAC,CAAC;QAC7H,gDAAgD;QAChD,MAAM,CAAC,mBAAmB,CAAC,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IACjG,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"htmlLineBaseline.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/htmlLineBaseline.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
import { describe, it, expect, beforeEach } from 'vitest';
|
|
2
|
+
import { buildDocument } from '../pipeline/index.js';
|
|
3
|
+
import { renderToHtml } from '../html-backend.js';
|
|
4
|
+
import { clearTextWidthCache } from '../measure/canvas.js';
|
|
5
|
+
// A line box stands its text on the line's baseline, which the engine puts
|
|
6
|
+
// at 0.8 of the leading (`lineBaselineOffset`) and the canvas and the PDF
|
|
7
|
+
// paint on. A box left at `line-height: normal` stands it on the face's own
|
|
8
|
+
// ascent instead, while the band of a `:mark[…]`, an emphasis mark, a
|
|
9
|
+
// formula and a leader are all placed from the baseline: with a leading
|
|
10
|
+
// away from the face's natural line they drift apart. The box takes the
|
|
11
|
+
// `line-height` that brings the two together — a box of height L sets its
|
|
12
|
+
// text `(L + ascent − descent) / 2` from its top.
|
|
13
|
+
/** A measurer whose faces have a line box, as a browser's has: 7 px a
|
|
14
|
+
* character, and the ascent and descent of `box`. */
|
|
15
|
+
let box = { ascent: 0.75, descent: 0.25 };
|
|
16
|
+
class StubCtx {
|
|
17
|
+
font = '';
|
|
18
|
+
measureText(s) {
|
|
19
|
+
const size = Number(/([\d.]+)px/.exec(this.font)?.[1] ?? 10);
|
|
20
|
+
return {
|
|
21
|
+
width: s.length * 7,
|
|
22
|
+
...(box ? { fontBoundingBoxAscent: box.ascent * size, fontBoundingBoxDescent: box.descent * size } : {}),
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
globalThis.OffscreenCanvas = class {
|
|
27
|
+
getContext() {
|
|
28
|
+
return new StubCtx();
|
|
29
|
+
}
|
|
30
|
+
};
|
|
31
|
+
const pt = (value) => ({ value, unit: 'pt' });
|
|
32
|
+
const config = (lineHeight) => ({
|
|
33
|
+
page: { dpi: 72, width: pt(300), height: pt(500), margins: { top: pt(20), bottom: pt(20), left: pt(20), right: pt(20) } },
|
|
34
|
+
layout: { layoutType: 'single' },
|
|
35
|
+
bodyText: { fontFamily: 'Test', fontSize: pt(10), lineHeight: pt(lineHeight), textAlign: 'left', hyphenation: { enabled: false } },
|
|
36
|
+
});
|
|
37
|
+
/** The first body line's box: its height, its font size and the
|
|
38
|
+
* `line-height` it was given (undefined where it has none). */
|
|
39
|
+
function lineBox(html) {
|
|
40
|
+
const style = /<div class="pt-line" data-block="[^"]*" style="([^"]*)"/.exec(html)?.[1];
|
|
41
|
+
if (style === undefined)
|
|
42
|
+
throw new Error('no line box in the markup');
|
|
43
|
+
const decl = new Map();
|
|
44
|
+
for (const part of style.split(';')) {
|
|
45
|
+
const colon = part.indexOf(':');
|
|
46
|
+
if (colon > 0)
|
|
47
|
+
decl.set(part.slice(0, colon).trim(), part.slice(colon + 1).trim());
|
|
48
|
+
}
|
|
49
|
+
const px = (value) => (value?.endsWith('px') ? Number(value.slice(0, -2)) : undefined);
|
|
50
|
+
const size = (decl.get('font') ?? '').split(' ').map(px).find((v) => v !== undefined);
|
|
51
|
+
const height = px(decl.get('height'));
|
|
52
|
+
if (height === undefined || size === undefined)
|
|
53
|
+
throw new Error('no line box in the markup');
|
|
54
|
+
const lineHeight = px(decl.get('line-height'));
|
|
55
|
+
return { height, size, ...(lineHeight !== undefined ? { lineHeight } : {}) };
|
|
56
|
+
}
|
|
57
|
+
const TEXT = 'The quick brown fox jumps over the lazy dog.';
|
|
58
|
+
describe('a line box stands its text on the line baseline', () => {
|
|
59
|
+
beforeEach(() => {
|
|
60
|
+
box = { ascent: 0.75, descent: 0.25 };
|
|
61
|
+
clearTextWidthCache();
|
|
62
|
+
});
|
|
63
|
+
it('gives the box the line height that puts the baseline at 0.8 of the leading', () => {
|
|
64
|
+
for (const leading of [11, 15, 20]) {
|
|
65
|
+
const doc = buildDocument({ markdown: TEXT }, config(leading));
|
|
66
|
+
const { height, size, lineHeight } = lineBox(renderToHtml(doc));
|
|
67
|
+
expect(lineHeight).toBeDefined();
|
|
68
|
+
// Where a box of that height sets its text, as a browser does.
|
|
69
|
+
const baseline = (lineHeight + (0.75 - 0.25) * size) / 2;
|
|
70
|
+
expect(baseline).toBeCloseTo(0.8 * height, 3);
|
|
71
|
+
}
|
|
72
|
+
});
|
|
73
|
+
it('is written after `font:`, which would reset it to `normal`', () => {
|
|
74
|
+
const doc = buildDocument({ markdown: TEXT }, config(15));
|
|
75
|
+
const html = renderToHtml(doc);
|
|
76
|
+
const style = /<div class="pt-line" data-block="[^"]*" style="([^"]*)"/.exec(html)[1];
|
|
77
|
+
expect(style.indexOf('line-height:')).toBeGreaterThan(style.indexOf('font:'));
|
|
78
|
+
});
|
|
79
|
+
it('leaves the box at `normal` where the measurer gives no face metrics', () => {
|
|
80
|
+
box = null;
|
|
81
|
+
clearTextWidthCache();
|
|
82
|
+
const doc = buildDocument({ markdown: TEXT }, config(15));
|
|
83
|
+
expect(lineBox(renderToHtml(doc)).lineHeight).toBeUndefined();
|
|
84
|
+
});
|
|
85
|
+
});
|
|
86
|
+
//# sourceMappingURL=htmlLineBaseline.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"htmlLineBaseline.test.js","sourceRoot":"","sources":["../../src/__tests__/htmlLineBaseline.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,9 +27,10 @@ export interface PageFurniture {
|
|
|
27
27
|
/** The furniture elements of a slot that are drawn on a page: text
|
|
28
28
|
* elements (of a running head, any; of a decoration, those that read a
|
|
29
29
|
* running placeholder) that the parity, the page-role filter and the page
|
|
30
|
-
* fence's `when` / `unless` let draw there
|
|
31
|
-
*
|
|
32
|
-
|
|
30
|
+
* fence's `when` / `unless` let draw there (`own`: the attributes an
|
|
31
|
+
* element reads first, a module's fence, #1189). `pageNumberIndex` is the
|
|
32
|
+
* index the parity filter reads (`page.index + pageIndexOffset`). */
|
|
33
|
+
export declare function expectedFurniture(elements: readonly ResolvedDesignElement[], slot: FurnitureSlot, pageNumberIndex: number, role: PageRole | undefined, attrs: Readonly<Record<string, string>> | undefined, own?: ReadonlyMap<string, Readonly<Record<string, string>>>): FurnitureElement[];
|
|
33
34
|
/** The `folioMissing` warnings of a laid document: for each template and
|
|
34
35
|
* side, an element that at least two pages draw and that more than half
|
|
35
36
|
* of the other pages meant to draw it do, reported on each page that
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"furniture.d.ts","sourceRoot":"","sources":["../../src/composed/furniture.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAiB,OAAO,EAAE,MAAM,WAAW,CAAC;AAGxE;;;;;;;GAOG;AAEH,4CAA4C;AAC5C,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,QAAQ,GAAG,YAAY,CAAC;AAE/D,8DAA8D;AAC9D,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,aAAa,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,6CAA6C;IAC7C,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,0EAA0E;AAC1E,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC;IACxB,QAAQ,EAAE,gBAAgB,EAAE,CAAC;CAC9B;AAOD
|
|
1
|
+
{"version":3,"file":"furniture.d.ts","sourceRoot":"","sources":["../../src/composed/furniture.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAiB,OAAO,EAAE,MAAM,WAAW,CAAC;AAGxE;;;;;;;GAOG;AAEH,4CAA4C;AAC5C,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,QAAQ,GAAG,YAAY,CAAC;AAE/D,8DAA8D;AAC9D,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,aAAa,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,6CAA6C;IAC7C,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,0EAA0E;AAC1E,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC;IACxB,QAAQ,EAAE,gBAAgB,EAAE,CAAC;CAC9B;AAOD;;;;;sEAKsE;AACtE,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,SAAS,qBAAqB,EAAE,EAC1C,IAAI,EAAE,aAAa,EACnB,eAAe,EAAE,MAAM,EACvB,IAAI,EAAE,QAAQ,GAAG,SAAS,EAC1B,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,SAAS,EACnD,GAAG,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAC1D,gBAAgB,EAAE,CAUpB;AAgBD;;;;;;uCAMuC;AACvC,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,SAAS,OAAO,EAAE,EAAE,OAAO,EAAE,SAAS,aAAa,EAAE,GAAG,cAAc,EAAE,CAoDnH"}
|
|
@@ -6,10 +6,11 @@ const RUNNING_PLACEHOLDER = /\{(?:pageNumber|chapterTitle|chapterTitleAtTop|chap
|
|
|
6
6
|
/** The furniture elements of a slot that are drawn on a page: text
|
|
7
7
|
* elements (of a running head, any; of a decoration, those that read a
|
|
8
8
|
* running placeholder) that the parity, the page-role filter and the page
|
|
9
|
-
* fence's `when` / `unless` let draw there
|
|
10
|
-
*
|
|
11
|
-
|
|
12
|
-
|
|
9
|
+
* fence's `when` / `unless` let draw there (`own`: the attributes an
|
|
10
|
+
* element reads first, a module's fence, #1189). `pageNumberIndex` is the
|
|
11
|
+
* index the parity filter reads (`page.index + pageIndexOffset`). */
|
|
12
|
+
export function expectedFurniture(elements, slot, pageNumberIndex, role, attrs, own) {
|
|
13
|
+
const dropped = fenceDroppedIds(elements, attrs, own);
|
|
13
14
|
const out = [];
|
|
14
15
|
for (const el of elements) {
|
|
15
16
|
if (el.kind !== 'text' || dropped.has(el.id))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"furniture.js","sourceRoot":"","sources":["../../src/composed/furniture.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AA8B1F;;wDAEwD;AACxD,MAAM,mBAAmB,GAAG,qIAAqI,CAAC;AAElK
|
|
1
|
+
{"version":3,"file":"furniture.js","sourceRoot":"","sources":["../../src/composed/furniture.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,26 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Modules (#1062, DESIGN §12.7): a template with `role: 'module'` is a box
|
|
3
|
+
* of frames, groups and decoration that a page stacks in its modules group
|
|
4
|
+
* (`groups: [{ name, modules: true }]`), one per `:::module{template="…"}`
|
|
5
|
+
* block of the page fence, in Markdown order.
|
|
6
|
+
*
|
|
7
|
+
* {@link expandModules} turns a page template and the modules its page
|
|
8
|
+
* lays into one template with every module's frames, groups and decoration
|
|
9
|
+
* as the page's own, scoped by the instance name: `<name>.<frame>` (the
|
|
10
|
+
* fence's `name`, else `<template>[n]`). Anchors, `next` and `continueIn:
|
|
11
|
+
* '#x'` inside a module are rewritten to the instance; a module frame
|
|
12
|
+
* anchored to `'container'` (or to nothing) reads its module's box, which
|
|
13
|
+
* the layout gives it (as wide as the group, as tall as its frames); a
|
|
14
|
+
* decoration element anchored to `'container'` is anchored to `#<name>`,
|
|
15
|
+
* the module's box. The modules group lists every module frame, in module
|
|
16
|
+
* order, and its `items` say which belong to which module (and, #1088,
|
|
17
|
+
* which modules group inside it lays the module); the module's own groups
|
|
18
|
+
* follow the page's. Everything after (the stories, the
|
|
19
|
+
* ladder, continuation, ids, the source map) sees plain frames.
|
|
20
|
+
*
|
|
21
|
+
* Pure. Run by `resolvePageTemplate` when it is given the page's modules.
|
|
22
|
+
*/
|
|
23
|
+
import type { ComposedPageFence } from '../parse/types.js';
|
|
1
24
|
import type { ComposedModuleUse, ResolvedFrameGroup, ResolvedModule, ResolvedPageTemplate } from './types.js';
|
|
2
25
|
/** The name of a module's frame, group or element `local` in instance
|
|
3
26
|
* `instance`. */
|
|
@@ -36,4 +59,17 @@ export declare function moduleUsesOf(list: readonly {
|
|
|
36
59
|
template: string;
|
|
37
60
|
nested?: true;
|
|
38
61
|
}[] | undefined): ComposedModuleUse[] | undefined;
|
|
62
|
+
/** The attributes the `:::module` fence of instance `name` writes besides
|
|
63
|
+
* `template` and `name` (#1189), with each value's source range moved by
|
|
64
|
+
* `offset` (the chapter's body offset): what `{attr.x}` in the module's
|
|
65
|
+
* decoration reads before the page fence's (`VDTComposedPage.modules[]`).
|
|
66
|
+
* Empty when it writes none, so a page whose modules write no attribute
|
|
67
|
+
* records the same modules as before. */
|
|
68
|
+
export declare function moduleFenceAttrs(fence: Pick<ComposedPageFence, 'modules'>, name: string, offset: number): {
|
|
69
|
+
attrs?: Record<string, string>;
|
|
70
|
+
attrSources?: Record<string, {
|
|
71
|
+
sourceStart: number;
|
|
72
|
+
sourceEnd: number;
|
|
73
|
+
}>;
|
|
74
|
+
};
|
|
39
75
|
//# sourceMappingURL=modules.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modules.d.ts","sourceRoot":"","sources":["../../src/composed/modules.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"modules.d.ts","sourceRoot":"","sources":["../../src/composed/modules.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,KAAK,EAAE,iBAAiB,EAAiB,kBAAkB,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAK7H;kBACkB;AAClB,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAEpE;AA6CD;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,oBAAoB,EAC1B,IAAI,EAAE,SAAS,iBAAiB,EAAE,EAClC,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,oBAAoB,GAAG,SAAS,GACzD,oBAAoB,CA2GtB;AAED;;;yCAGyC;AACzC,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,SAAS,IAAI,CAAC,kBAAkB,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,kBAAkB,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC,GAAG,MAAM,GAAG,SAAS,CAU3L;AACD;;gDAEgD;AAChD,wBAAgB,WAAW,CAAC,MAAM,EAAE,SAAS,IAAI,CAAC,kBAAkB,EAAE,MAAM,GAAG,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,EAAE,CAShI;AAED;uEACuE;AACvE,wBAAgB,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,GAAG,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,KAAK,EAAE,kBAAkB,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,SAAS,CAUzM;AAED,kFAAkF;AAClF,wBAAgB,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,GAAG,iBAAiB,EAAE,GAAG,SAAS,CAE3G;AAED;uEACuE;AACvE,wBAAgB,YAAY,CAAC,IAAI,EAAE,SAAS;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,IAAI,CAAA;CAAE,EAAE,GAAG,SAAS,GAAG,iBAAiB,EAAE,GAAG,SAAS,CAU5I;AAED;;;;;0CAK0C;AAC1C,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,EACzC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GACb;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,CAY9G"}
|
package/dist/composed/modules.js
CHANGED
|
@@ -138,6 +138,10 @@ export function expandModules(page, uses, moduleOf) {
|
|
|
138
138
|
for (const f of m.frames)
|
|
139
139
|
if (f.takes && takes[f.takes] === undefined)
|
|
140
140
|
takes[f.takes] = scope(f.name);
|
|
141
|
+
// Where its elements sit in the page's decoration (#1189): the
|
|
142
|
+
// layout reads their `{attr.x}` from the module's fence first, and
|
|
143
|
+
// paints its texts over the frames.
|
|
144
|
+
const at = page.decoration.elements.length + elements.length;
|
|
141
145
|
frames.push(...own);
|
|
142
146
|
groups.push(...ownGroups);
|
|
143
147
|
elements.push(...ownElements);
|
|
@@ -156,6 +160,7 @@ export function expandModules(page, uses, moduleOf) {
|
|
|
156
160
|
...(m.grow !== undefined ? { grow: m.grow } : {}),
|
|
157
161
|
...(m.shrink !== undefined ? { shrink: m.shrink } : {}),
|
|
158
162
|
...(nested !== undefined ? { nested } : {}),
|
|
163
|
+
...(ownElements.length > 0 ? { decoration: { start: at, end: at + ownElements.length } } : {}),
|
|
159
164
|
});
|
|
160
165
|
}
|
|
161
166
|
if (modules.length === 0)
|
|
@@ -240,4 +245,26 @@ export function moduleUsesOf(list) {
|
|
|
240
245
|
}
|
|
241
246
|
return out.length > 0 ? out : undefined;
|
|
242
247
|
}
|
|
248
|
+
/** The attributes the `:::module` fence of instance `name` writes besides
|
|
249
|
+
* `template` and `name` (#1189), with each value's source range moved by
|
|
250
|
+
* `offset` (the chapter's body offset): what `{attr.x}` in the module's
|
|
251
|
+
* decoration reads before the page fence's (`VDTComposedPage.modules[]`).
|
|
252
|
+
* Empty when it writes none, so a page whose modules write no attribute
|
|
253
|
+
* records the same modules as before. */
|
|
254
|
+
export function moduleFenceAttrs(fence, name, offset) {
|
|
255
|
+
const m = fence.modules?.find((x) => x.name === name);
|
|
256
|
+
if (!m)
|
|
257
|
+
return {};
|
|
258
|
+
const attrs = {};
|
|
259
|
+
const attrSources = {};
|
|
260
|
+
for (const [k, v] of Object.entries(m.attrs ?? {})) {
|
|
261
|
+
if (k === 'template' || k === 'name')
|
|
262
|
+
continue;
|
|
263
|
+
attrs[k] = v;
|
|
264
|
+
const at = m.attrSources[k];
|
|
265
|
+
if (at)
|
|
266
|
+
attrSources[k] = { sourceStart: at.sourceStart + offset, sourceEnd: at.sourceEnd + offset };
|
|
267
|
+
}
|
|
268
|
+
return Object.keys(attrs).length > 0 ? { attrs, attrSources } : {};
|
|
269
|
+
}
|
|
243
270
|
//# sourceMappingURL=modules.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modules.js","sourceRoot":"","sources":["../../src/composed/modules.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"modules.js","sourceRoot":"","sources":["../../src/composed/modules.ts"],"names":[],"mappings":"AA0BA,uCAAuC;AACvC,MAAM,MAAM,GAAG,QAAQ,CAAC;AAExB;kBACkB;AAClB,MAAM,UAAU,YAAY,CAAC,QAAgB,EAAE,KAAa;IAC1D,OAAO,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC;AAChC,CAAC;AAED;;kBAEkB;AAClB,SAAS,gBAAgB,CAAC,SAAuC,EAAE,MAA4C,EAAE,SAAkB;IACjI,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IACjC,MAAM,GAAG,GAAG,CAAC,EAAW,EAAW,EAAE;QACnC,IAAI,OAAO,EAAE,KAAK,QAAQ;YAAE,OAAO,EAAE,CAAC;QACtC,IAAI,EAAE,KAAK,WAAW,IAAI,SAAS,KAAK,SAAS;YAAE,OAAO,IAAI,SAAS,EAAE,CAAC;QAC1E,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,OAAO,EAAE,CAAC;QACnC,MAAM,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACpC,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACpD,CAAC,CAAC;IACF,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI,WAAW,CAAqC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC;IAC9J,IAAI,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC;IAC1B,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,GAAG,GAA4B,EAAE,GAAG,IAAI,EAAE,CAAC;QACjD,KAAK,MAAM,GAAG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,UAAU,CAAU,EAAE,CAAC;YAC3D,MAAM,CAAC,GAAI,IAAgC,CAAC,GAAG,CAAC,CAAC;YACjD,IAAI,CAAC,KAAK,IAAI,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,IAAI,IAAK,CAAY;gBAAE,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,GAAI,CAAY,EAAE,EAAE,EAAE,GAAG,CAAE,CAAqB,CAAC,EAAE,CAAC,EAAE,CAAC;QACxI,CAAC;QACD,IAAI,GAAG,GAA+B,CAAC;IACzC,CAAC;IACD,OAAO,EAAE,GAAG,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;AAC7D,CAAC;AAED;;2EAE2E;AAC3E,SAAS,oBAAoB,CAC3B,SAAiC,EACjC,MAA4C;IAE5C,MAAM,GAAG,GAAG,CAAC,CAAe,EAAgB,EAAE;QAC5C,IAAI,OAAO,CAAC,EAAE,EAAE,KAAK,QAAQ,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,OAAO,CAAC,CAAC;QACjE,MAAM,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC1B,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACjC,MAAM,IAAI,GAAG,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QACxD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;QAC7B,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,IAAI,OAAO,GAAG,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC;IAC1G,CAAC,CAAC;IACF,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;AACpH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAC3B,IAA0B,EAC1B,IAAkC,EAClC,QAA0D;IAE1D,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC9D,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAC7C,qEAAqE;IACrE,sEAAsE;IACtE,oEAAoE;IACpE,2DAA2D;IAC3D,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,gBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC;IAChI,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAO,CAAC,CAAC,CAAC;IACnD,MAAM,QAAQ,GAAG,CAAC,QAAgB,EAAsB,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC;IACxJ,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,MAAM,MAAM,GAAoB,EAAE,CAAC;IACnC,MAAM,MAAM,GAAyB,EAAE,CAAC;IACxC,MAAM,QAAQ,GAAmD,EAAE,CAAC;IACpE,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,OAAO,GAAqB,EAAE,CAAC;IACrC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,SAAS;QAC7D,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpB,MAAM,KAAK,GAAG,IAAI,GAAG,CAAS,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAChG,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,QAAQ;YAAE,IAAI,OAAO,CAAC,CAAC,EAAE,KAAK,QAAQ;gBAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACrF,MAAM,KAAK,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAC/D,MAAM,MAAM,GAAG,CAAC,CAAS,EAAsB,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACxF,MAAM,GAAG,GAAoB,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC9C,MAAM,GAAG,GAAkB,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;YACxH,IAAI,GAAG,CAAC,SAAS,KAAK,SAAS;gBAAE,OAAO,GAAG,CAAC,SAAS,CAAC;YACtD,iEAAiE;YACjE,OAAO,GAAG,CAAC,IAAI,CAAC;YAChB,kEAAkE;YAClE,OAAO,GAAG,CAAC,KAAK,CAAC;YACjB,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBACzB,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;oBAAE,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;;oBAC3C,OAAO,GAAG,CAAC,IAAI,CAAC;YACvB,CAAC;YACD,4DAA4D;YAC5D,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC9B,MAAM,KAAK,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAChE,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;oBAAE,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAC;;oBACtC,OAAO,GAAG,CAAC,QAAQ,CAAC;YAC3B,CAAC;YACD,MAAM,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;YACjC,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACjD,GAAG,CAAC,QAAQ,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACjC,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBAAE,GAAG,CAAC,QAAQ,CAAC,UAAU,GAAG,IAAI,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;;oBAC1E,OAAO,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC;YACtC,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC,CAAC,CAAC;QACH,MAAM,SAAS,GAAyB,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACzD,MAAM,GAAG,GAAuB,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3F,IAAI,CAAC,CAAC,MAAM;gBAAE,GAAG,CAAC,MAAM,GAAG,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/E,MAAM,SAAS,GAAG,gBAAgB,CAAC,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACxD,IAAI,SAAS;gBAAE,GAAG,CAAC,SAAS,GAAG,SAAS,CAAC;YACzC,OAAO,GAAG,CAAC,IAAI,CAAC;YAChB,OAAO,GAAG,CAAC;QACb,CAAC,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAClD,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/D,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW;gBAAE,OAAO,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,oBAAoB,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC;YACvF,OAAO,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAE,EAAE,CAAC;QACtF,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACtC,MAAM,KAAK,GAA4B,EAAE,CAAC;QAC1C,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM;YAAE,IAAI,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,SAAS;gBAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACtG,+DAA+D;QAC/D,mEAAmE;QACnE,oCAAoC;QACpC,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC7D,MAAM,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;QACpB,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;QAC1B,QAAQ,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;QAC9B,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,CAAC;QACjC,OAAO,CAAC,IAAI,CAAC;YACX,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,KAAK,EAAE,KAAK,CAAC,IAAI;YACjB,UAAU,EAAE,CAAC,CAAC,UAAU;YACxB,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAC9B,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YACpC,QAAQ,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC9E,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3C,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACnD,GAAG,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACpD,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACjD,GAAG,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvD,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3C,GAAG,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,GAAG,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC/F,CAAC,CAAC;IACL,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACtC,MAAM,YAAY,GAAuB;QACvC,GAAG,KAAK;QACR,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACjC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;KAChJ,CAAC;IACF,OAAO;QACL,GAAG,IAAI;QACP,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC;QACnC,qEAAqE;QACrE,gCAAgC;QAChC,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC;QAChF,UAAU,EAAE,EAAE,GAAG,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,EAAE;QACxF,eAAe,EAAE,CAAC,GAAG,IAAI,CAAC,eAAe,EAAE,GAAG,KAAK,CAAC;QACpD,OAAO;KACR,CAAC;AACJ,CAAC;AAED;;;yCAGyC;AACzC,MAAM,UAAU,gBAAgB,CAAC,MAA0E,EAAE,CAA0D;IACrK,MAAM,IAAI,GAAG,IAAI,GAAG,CAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IACvC,IAAI,EAAE,GAAG,CAAC,CAAC;IACX,OAAO,EAAE,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC;QACxD,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;YAAE,OAAO,SAAS,CAAC;QAC1E,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACtB,EAAE,GAAG,MAAM,CAAC;IACd,CAAC;IACD,OAAO,EAAE,CAAC,IAAI,CAAC;AACjB,CAAC;AACD;;gDAEgD;AAChD,MAAM,UAAU,WAAW,CAAC,MAA8D,EAAE,MAA0B;IACpH,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,IAAI,EAAE,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAClF,OAAO,EAAE,IAAI,EAAE,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/D,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QAClB,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;QACzB,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;uEACuE;AACvE,MAAM,UAAU,aAAa,CAAC,QAA0D,EAAE,IAAY;IACpG,IAAI,CAAC,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACzE,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;QACpC,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK;YAAE,SAAS;QAC7C,sEAAsE;QACtE,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9D,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAClF,IAAI,IAAI,IAAI,CAAC;YAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;IACnF,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,kFAAkF;AAClF,MAAM,UAAU,UAAU,CAAC,QAA+C;IACxE,OAAO,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7I,CAAC;AAED;uEACuE;AACvE,MAAM,UAAU,YAAY,CAAC,IAA8E;IACzG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACjD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,GAAG,GAAwB,EAAE,CAAC;IACpC,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QACrB,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,IAAI,KAAK,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;YAAE,SAAS;QAC5D,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACjB,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IACnD,CAAC;IACD,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;AAC1C,CAAC;AAED;;;;;0CAK0C;AAC1C,MAAM,UAAU,gBAAgB,CAC9B,KAAyC,EACzC,IAAY,EACZ,MAAc;IAEd,MAAM,CAAC,GAAG,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IACtD,IAAI,CAAC,CAAC;QAAE,OAAO,EAAE,CAAC;IAClB,MAAM,KAAK,GAA2B,EAAE,CAAC;IACzC,MAAM,WAAW,GAA+D,EAAE,CAAC;IACnF,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,CAAC;QACnD,IAAI,CAAC,KAAK,UAAU,IAAI,CAAC,KAAK,MAAM;YAAE,SAAS;QAC/C,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACb,MAAM,EAAE,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAI,EAAE;YAAE,WAAW,CAAC,CAAC,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE,CAAC,WAAW,GAAG,MAAM,EAAE,SAAS,EAAE,EAAE,CAAC,SAAS,GAAG,MAAM,EAAE,CAAC;IACtG,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACrE,CAAC"}
|
package/dist/composed/paint.d.ts
CHANGED
|
@@ -23,12 +23,14 @@ export type ComposedPaintItem =
|
|
|
23
23
|
kind: 'decoration';
|
|
24
24
|
}
|
|
25
25
|
/** The decoration's blocks painted over every frame (#1076: connectors
|
|
26
|
-
* into pictures, {@link decorationOver}); last
|
|
26
|
+
* into pictures; #1189: a module's texts, {@link decorationOver}); last
|
|
27
|
+
* in the order, present
|
|
27
28
|
* only when the decoration has such a block. */
|
|
28
29
|
| {
|
|
29
30
|
kind: 'over';
|
|
30
31
|
};
|
|
31
|
-
/** Whether a decoration block is painted over the frames
|
|
32
|
+
/** Whether a decoration block is painted over the frames: a connector's
|
|
33
|
+
* path (#1076) or a text (#1189) marked `over`. */
|
|
32
34
|
export declare function paintsOverFrames(block: VDTDesignBlock): boolean;
|
|
33
35
|
/** The part of a composed page's decoration painted at layer 0, under
|
|
34
36
|
* the frames of layer 0 and up: the slot itself when none of its blocks
|