postext 0.3.16 → 0.3.17
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__/createLayout.test.js +12 -13
- package/dist/__tests__/createLayout.test.js.map +1 -1
- package/dist/__tests__/defaults/resourceTypes.test.d.ts +2 -0
- package/dist/__tests__/defaults/resourceTypes.test.d.ts.map +1 -0
- package/dist/__tests__/defaults/resourceTypes.test.js +69 -0
- package/dist/__tests__/defaults/resourceTypes.test.js.map +1 -0
- package/dist/__tests__/exports.test.js +54 -0
- package/dist/__tests__/exports.test.js.map +1 -1
- package/dist/__tests__/parse/inlineRef.test.d.ts +2 -0
- package/dist/__tests__/parse/inlineRef.test.d.ts.map +1 -0
- package/dist/__tests__/parse/inlineRef.test.js +83 -0
- package/dist/__tests__/parse/inlineRef.test.js.map +1 -0
- package/dist/__tests__/parse/resourceDirective.test.d.ts +2 -0
- package/dist/__tests__/parse/resourceDirective.test.d.ts.map +1 -0
- package/dist/__tests__/parse/resourceDirective.test.js +55 -0
- package/dist/__tests__/parse/resourceDirective.test.js.map +1 -0
- package/dist/__tests__/pipeline/floatPlacement.test.d.ts +2 -0
- package/dist/__tests__/pipeline/floatPlacement.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/floatPlacement.test.js +141 -0
- package/dist/__tests__/pipeline/floatPlacement.test.js.map +1 -0
- package/dist/__tests__/pipeline/inlineRefRender.test.d.ts +2 -0
- package/dist/__tests__/pipeline/inlineRefRender.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/inlineRefRender.test.js +107 -0
- package/dist/__tests__/pipeline/inlineRefRender.test.js.map +1 -0
- package/dist/__tests__/pipeline/resourceNumbering.test.d.ts +2 -0
- package/dist/__tests__/pipeline/resourceNumbering.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/resourceNumbering.test.js +186 -0
- package/dist/__tests__/pipeline/resourceNumbering.test.js.map +1 -0
- package/dist/__tests__/table/model.test.d.ts +2 -0
- package/dist/__tests__/table/model.test.d.ts.map +1 -0
- package/dist/__tests__/table/model.test.js +187 -0
- package/dist/__tests__/table/model.test.js.map +1 -0
- package/dist/canvas-backend/blockRender.d.ts.map +1 -1
- package/dist/canvas-backend/blockRender.js +25 -6
- package/dist/canvas-backend/blockRender.js.map +1 -1
- package/dist/canvas-backend/headerFooter.d.ts +3 -2
- package/dist/canvas-backend/headerFooter.d.ts.map +1 -1
- package/dist/canvas-backend/headerFooter.js +63 -2
- package/dist/canvas-backend/headerFooter.js.map +1 -1
- package/dist/canvas-backend/index.d.ts +2 -0
- package/dist/canvas-backend/index.d.ts.map +1 -1
- package/dist/canvas-backend/index.js +11 -0
- package/dist/canvas-backend/index.js.map +1 -1
- package/dist/canvas-backend/renderResourceBlock.d.ts +28 -0
- package/dist/canvas-backend/renderResourceBlock.d.ts.map +1 -0
- package/dist/canvas-backend/renderResourceBlock.js +146 -0
- package/dist/canvas-backend/renderResourceBlock.js.map +1 -0
- package/dist/defaults/bodyText.d.ts.map +1 -1
- package/dist/defaults/bodyText.js +30 -0
- package/dist/defaults/bodyText.js.map +1 -1
- package/dist/defaults/captionStyle.d.ts +9 -0
- package/dist/defaults/captionStyle.d.ts.map +1 -0
- package/dist/defaults/captionStyle.js +74 -0
- package/dist/defaults/captionStyle.js.map +1 -0
- package/dist/defaults/debug.d.ts.map +1 -1
- package/dist/defaults/debug.js +6 -0
- package/dist/defaults/debug.js.map +1 -1
- package/dist/defaults/headerFooter.d.ts +20 -18
- package/dist/defaults/headerFooter.d.ts.map +1 -1
- package/dist/defaults/headerFooter.js +269 -165
- package/dist/defaults/headerFooter.js.map +1 -1
- package/dist/defaults/headings.d.ts.map +1 -1
- package/dist/defaults/headings.js +29 -6
- package/dist/defaults/headings.js.map +1 -1
- package/dist/defaults/index.d.ts +3 -0
- package/dist/defaults/index.d.ts.map +1 -1
- package/dist/defaults/index.js +19 -0
- package/dist/defaults/index.js.map +1 -1
- package/dist/defaults/resourceTypes.d.ts +8 -0
- package/dist/defaults/resourceTypes.d.ts.map +1 -0
- package/dist/defaults/resourceTypes.js +43 -0
- package/dist/defaults/resourceTypes.js.map +1 -0
- package/dist/defaults/shared.d.ts.map +1 -1
- package/dist/defaults/shared.js +30 -0
- package/dist/defaults/shared.js.map +1 -1
- package/dist/defaults/tableStyle.d.ts +11 -0
- package/dist/defaults/tableStyle.d.ts.map +1 -0
- package/dist/defaults/tableStyle.js +114 -0
- package/dist/defaults/tableStyle.js.map +1 -0
- package/dist/design/layout.d.ts +94 -0
- package/dist/design/layout.d.ts.map +1 -0
- package/dist/design/layout.js +642 -0
- package/dist/design/layout.js.map +1 -0
- package/dist/design/placeholders.d.ts +29 -0
- package/dist/design/placeholders.d.ts.map +1 -0
- package/dist/design/placeholders.js +126 -0
- package/dist/design/placeholders.js.map +1 -0
- package/dist/html-backend.d.ts.map +1 -1
- package/dist/html-backend.js +91 -1
- package/dist/html-backend.js.map +1 -1
- package/dist/index.d.ts +12 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -2
- package/dist/index.js.map +1 -1
- package/dist/knuthPlass/richAdapter.d.ts +1 -0
- package/dist/knuthPlass/richAdapter.d.ts.map +1 -1
- package/dist/knuthPlass/richAdapter.js +2 -1
- package/dist/knuthPlass/richAdapter.js.map +1 -1
- package/dist/measure/cache.js +1 -1
- package/dist/measure/cache.js.map +1 -1
- package/dist/measure/rich.d.ts +7 -0
- package/dist/measure/rich.d.ts.map +1 -1
- package/dist/measure/rich.js +30 -0
- package/dist/measure/rich.js.map +1 -1
- package/dist/numbering.d.ts +16 -0
- package/dist/numbering.d.ts.map +1 -1
- package/dist/numbering.js +28 -18
- package/dist/numbering.js.map +1 -1
- package/dist/parse/blockParser.d.ts.map +1 -1
- package/dist/parse/blockParser.js +37 -9
- package/dist/parse/blockParser.js.map +1 -1
- package/dist/parse/inlineFormatting.d.ts +38 -0
- package/dist/parse/inlineFormatting.d.ts.map +1 -1
- package/dist/parse/inlineFormatting.js +84 -0
- package/dist/parse/inlineFormatting.js.map +1 -1
- package/dist/parse/sourceMapping.d.ts.map +1 -1
- package/dist/parse/sourceMapping.js +20 -0
- package/dist/parse/sourceMapping.js.map +1 -1
- package/dist/parse/types.d.ts +20 -1
- package/dist/parse/types.d.ts.map +1 -1
- package/dist/pipeline/build.d.ts.map +1 -1
- package/dist/pipeline/build.js +389 -17
- package/dist/pipeline/build.js.map +1 -1
- package/dist/pipeline/buildBlockKind.d.ts +14 -0
- package/dist/pipeline/buildBlockKind.d.ts.map +1 -1
- package/dist/pipeline/buildBlockKind.js +16 -1
- package/dist/pipeline/buildBlockKind.js.map +1 -1
- package/dist/pipeline/buildHelpers.d.ts.map +1 -1
- package/dist/pipeline/buildHelpers.js +7 -1
- package/dist/pipeline/buildHelpers.js.map +1 -1
- package/dist/pipeline/buildMeasurement.d.ts +17 -1
- package/dist/pipeline/buildMeasurement.d.ts.map +1 -1
- package/dist/pipeline/buildMeasurement.js +32 -0
- package/dist/pipeline/buildMeasurement.js.map +1 -1
- package/dist/pipeline/config.d.ts.map +1 -1
- package/dist/pipeline/config.js +3 -1
- package/dist/pipeline/config.js.map +1 -1
- package/dist/pipeline/floatPlacement.d.ts +45 -0
- package/dist/pipeline/floatPlacement.d.ts.map +1 -0
- package/dist/pipeline/floatPlacement.js +68 -0
- package/dist/pipeline/floatPlacement.js.map +1 -0
- package/dist/pipeline/headerFooter.d.ts +23 -7
- package/dist/pipeline/headerFooter.d.ts.map +1 -1
- package/dist/pipeline/headerFooter.js +258 -100
- package/dist/pipeline/headerFooter.js.map +1 -1
- package/dist/pipeline/placeholders.d.ts +6 -0
- package/dist/pipeline/placeholders.d.ts.map +1 -1
- package/dist/pipeline/placeholders.js +46 -0
- package/dist/pipeline/placeholders.js.map +1 -1
- package/dist/pipeline/placement.d.ts +15 -2
- package/dist/pipeline/placement.d.ts.map +1 -1
- package/dist/pipeline/placement.js +38 -3
- package/dist/pipeline/placement.js.map +1 -1
- package/dist/pipeline/resourceLayout.d.ts +58 -0
- package/dist/pipeline/resourceLayout.d.ts.map +1 -0
- package/dist/pipeline/resourceLayout.js +338 -0
- package/dist/pipeline/resourceLayout.js.map +1 -0
- package/dist/pipeline/resourceNumbering.d.ts +54 -0
- package/dist/pipeline/resourceNumbering.d.ts.map +1 -0
- package/dist/pipeline/resourceNumbering.js +218 -0
- package/dist/pipeline/resourceNumbering.js.map +1 -0
- package/dist/pipeline/styles.d.ts +6 -0
- package/dist/pipeline/styles.d.ts.map +1 -1
- package/dist/pipeline/styles.js +1 -1
- package/dist/pipeline/styles.js.map +1 -1
- package/dist/table/model.d.ts +53 -0
- package/dist/table/model.d.ts.map +1 -0
- package/dist/table/model.js +253 -0
- package/dist/table/model.js.map +1 -0
- package/dist/types.d.ts +397 -41
- package/dist/types.d.ts.map +1 -1
- package/dist/vdt.d.ts +165 -18
- package/dist/vdt.d.ts.map +1 -1
- package/dist/vdt.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { buildDocument } from '../../pipeline';
|
|
3
|
+
// The build pipeline measures text via an OffscreenCanvas 2D context. The node
|
|
4
|
+
// test environment has none, so install a deterministic stub (width ∝ length)
|
|
5
|
+
// before any measurement runs. Exact widths don't matter here — the assertions
|
|
6
|
+
// are about segment text, ref tagging, and source offsets, and the inputs are
|
|
7
|
+
// short enough never to wrap.
|
|
8
|
+
class StubCtx {
|
|
9
|
+
font = '';
|
|
10
|
+
measureText(s) {
|
|
11
|
+
return { width: s.length * 7 };
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
globalThis.OffscreenCanvas = class {
|
|
15
|
+
getContext() {
|
|
16
|
+
return new StubCtx();
|
|
17
|
+
}
|
|
18
|
+
};
|
|
19
|
+
const now = 0;
|
|
20
|
+
const figure = (id) => ({
|
|
21
|
+
id,
|
|
22
|
+
typeId: 'figure',
|
|
23
|
+
kind: 'bitmap',
|
|
24
|
+
caption: 'A test figure.',
|
|
25
|
+
createdAt: now,
|
|
26
|
+
updatedAt: now,
|
|
27
|
+
bitmap: { fileId: `${id}.png`, format: 'png', width: 100, height: 80 },
|
|
28
|
+
});
|
|
29
|
+
/** Collect every rendered text segment across all paragraph blocks. */
|
|
30
|
+
const paragraphSegments = (content) => {
|
|
31
|
+
const doc = buildDocument(content);
|
|
32
|
+
const segs = [];
|
|
33
|
+
for (const block of doc.blocks) {
|
|
34
|
+
if (block.type !== 'paragraph')
|
|
35
|
+
continue;
|
|
36
|
+
for (const line of block.lines) {
|
|
37
|
+
for (const seg of line.segments ?? []) {
|
|
38
|
+
segs.push({ text: seg.text, refResourceId: seg.refResourceId });
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
return segs;
|
|
43
|
+
};
|
|
44
|
+
describe('inline :ref rendering in body text', () => {
|
|
45
|
+
it('renders the computed number for a :ref inside a paragraph', () => {
|
|
46
|
+
const content = {
|
|
47
|
+
markdown: 'As shown in :ref{id="fig-a"}, the result holds.',
|
|
48
|
+
resources: [figure('fig-a')],
|
|
49
|
+
};
|
|
50
|
+
const segs = paragraphSegments(content);
|
|
51
|
+
// The reference must appear as a tagged, atomic segment carrying the label.
|
|
52
|
+
const refSeg = segs.find((s) => s.refResourceId === 'fig-a');
|
|
53
|
+
expect(refSeg).toBeDefined();
|
|
54
|
+
// Default style: short label + number ("Fig." + NBSP + "1"). With no h1 in
|
|
55
|
+
// the document the "{h1}." part of the template collapses away.
|
|
56
|
+
expect(refSeg.text).toBe('Fig. 1');
|
|
57
|
+
// The raw directive must not leak into the rendered text.
|
|
58
|
+
const joined = segs.map((s) => s.text).join('');
|
|
59
|
+
expect(joined).not.toContain(':ref{');
|
|
60
|
+
expect(joined).toContain('Fig. 1');
|
|
61
|
+
});
|
|
62
|
+
it('honours style="number" and style="full"', () => {
|
|
63
|
+
const number = paragraphSegments({
|
|
64
|
+
markdown: 'See :ref{id="fig-a" style="number"}.',
|
|
65
|
+
resources: [figure('fig-a')],
|
|
66
|
+
}).find((s) => s.refResourceId === 'fig-a');
|
|
67
|
+
expect(number.text).toBe('1');
|
|
68
|
+
const full = paragraphSegments({
|
|
69
|
+
markdown: 'See :ref{id="fig-a" style="full"}.',
|
|
70
|
+
resources: [figure('fig-a')],
|
|
71
|
+
}).find((s) => s.refResourceId === 'fig-a');
|
|
72
|
+
expect(full.text).toBe('Figure 1');
|
|
73
|
+
});
|
|
74
|
+
it('uses verbatim override text', () => {
|
|
75
|
+
const seg = paragraphSegments({
|
|
76
|
+
markdown: 'See :ref{id="fig-a" text="the diagram"}.',
|
|
77
|
+
resources: [figure('fig-a')],
|
|
78
|
+
}).find((s) => s.refResourceId === 'fig-a');
|
|
79
|
+
expect(seg.text).toBe('the diagram');
|
|
80
|
+
});
|
|
81
|
+
it('styles references bold + emphasis colour by default, and honours overrides', () => {
|
|
82
|
+
const md = 'See :ref{id="fig-a"} now.';
|
|
83
|
+
// Default: emphasis colour (#295AA3) on the block, ref segment bold.
|
|
84
|
+
const doc = buildDocument({ markdown: md, resources: [figure('fig-a')] });
|
|
85
|
+
const para = doc.blocks.find((b) => b.type === 'paragraph');
|
|
86
|
+
expect(para.refColor?.toLowerCase()).toBe('#295aa3');
|
|
87
|
+
const refSeg = (para.lines[0].segments ?? []).find((s) => s.refResourceId === 'fig-a');
|
|
88
|
+
expect(refSeg?.bold).toBe(true);
|
|
89
|
+
// Custom reference colour + non-bold applies.
|
|
90
|
+
const doc2 = buildDocument({ markdown: md, resources: [figure('fig-a')] }, { bodyText: { referenceColor: { hex: '#ff0000', model: 'hex' }, referenceBold: false } });
|
|
91
|
+
const para2 = doc2.blocks.find((b) => b.type === 'paragraph');
|
|
92
|
+
expect(para2.refColor?.toLowerCase()).toBe('#ff0000');
|
|
93
|
+
const refSeg2 = (para2.lines[0].segments ?? []).find((s) => s.refResourceId === 'fig-a');
|
|
94
|
+
expect(refSeg2?.bold).toBeFalsy();
|
|
95
|
+
});
|
|
96
|
+
it('keeps source mapping aligned for text after a ref', () => {
|
|
97
|
+
const md = 'A :ref{id="fig-a"} B';
|
|
98
|
+
const doc = buildDocument({ markdown: md, resources: [figure('fig-a')] });
|
|
99
|
+
const para = doc.blocks.find((b) => b.type === 'paragraph');
|
|
100
|
+
expect(para).toBeDefined();
|
|
101
|
+
const line = para.lines[0];
|
|
102
|
+
// The trailing "B" maps back to its real source offset, not the block end —
|
|
103
|
+
// i.e. the multi-char label did not push subsequent offsets out of range.
|
|
104
|
+
expect(line.sourceEnd).toBe(md.length);
|
|
105
|
+
});
|
|
106
|
+
});
|
|
107
|
+
//# sourceMappingURL=inlineRefRender.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"inlineRefRender.test.js","sourceRoot":"","sources":["../../../src/__tests__/pipeline/inlineRefRender.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resourceNumbering.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/pipeline/resourceNumbering.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,186 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { parseMarkdown } from '../../parse';
|
|
3
|
+
import { computeHeadingContext, computeResourceNumbering, } from '../../pipeline/resourceNumbering';
|
|
4
|
+
const now = 0;
|
|
5
|
+
const makeResource = (id, typeId) => ({
|
|
6
|
+
id,
|
|
7
|
+
typeId,
|
|
8
|
+
kind: 'bitmap',
|
|
9
|
+
createdAt: now,
|
|
10
|
+
updatedAt: now,
|
|
11
|
+
bitmap: { fileId: `${id}.png`, format: 'png', width: 1, height: 1 },
|
|
12
|
+
});
|
|
13
|
+
const makeType = (over) => ({
|
|
14
|
+
name: over.id,
|
|
15
|
+
shortLabel: over.id,
|
|
16
|
+
numberingTemplate: '{n}',
|
|
17
|
+
resetOn: 'never',
|
|
18
|
+
counterFormat: 'decimal',
|
|
19
|
+
captionPrefix: over.id,
|
|
20
|
+
...over,
|
|
21
|
+
});
|
|
22
|
+
/** Run the numbering pipeline on markdown + a resource/type set. */
|
|
23
|
+
const number = (md, types, resources) => {
|
|
24
|
+
const blocks = parseMarkdown(md);
|
|
25
|
+
const ctx = computeHeadingContext(blocks);
|
|
26
|
+
const map = computeResourceNumbering(blocks, types, resources, ctx);
|
|
27
|
+
return Object.fromEntries(Object.entries(map).map(([id, entry]) => [id, entry.number]));
|
|
28
|
+
};
|
|
29
|
+
describe('resource numbering — first-reference ordering', () => {
|
|
30
|
+
const types = [makeType({ id: 'figure', numberingTemplate: '{n}' })];
|
|
31
|
+
const resources = [
|
|
32
|
+
makeResource('a', 'figure'),
|
|
33
|
+
makeResource('b', 'figure'),
|
|
34
|
+
makeResource('c', 'figure'),
|
|
35
|
+
];
|
|
36
|
+
it('numbers embeds in reading order', () => {
|
|
37
|
+
const out = number('::resource{id="a"}\n\n::resource{id="b"}\n\n::resource{id="c"}\n', types, resources);
|
|
38
|
+
expect(out).toEqual({ a: '1', b: '2', c: '3' });
|
|
39
|
+
});
|
|
40
|
+
it('numbers a ref before its embed (ref-before-embed)', () => {
|
|
41
|
+
const out = number('See :ref{id="b"} first.\n\n::resource{id="a"}\n\n::resource{id="b"}\n', types, resources);
|
|
42
|
+
// b is first-referenced before a's embed
|
|
43
|
+
expect(out).toEqual({ b: '1', a: '2' });
|
|
44
|
+
});
|
|
45
|
+
it('numbers an embed before its ref (embed-before-ref)', () => {
|
|
46
|
+
const out = number('::resource{id="a"}\n\nlater :ref{id="a"} again\n', types, resources);
|
|
47
|
+
expect(out).toEqual({ a: '1' });
|
|
48
|
+
});
|
|
49
|
+
it('numbers ref-only resources (no embed present)', () => {
|
|
50
|
+
const out = number('see :ref{id="c"} and :ref{id="a"}\n', types, resources);
|
|
51
|
+
expect(out).toEqual({ c: '1', a: '2' });
|
|
52
|
+
});
|
|
53
|
+
it('handles interleaved types preserving per-type counters', () => {
|
|
54
|
+
const mixedTypes = [
|
|
55
|
+
makeType({ id: 'figure', numberingTemplate: '{n}' }),
|
|
56
|
+
makeType({ id: 'table', numberingTemplate: '{n}' }),
|
|
57
|
+
];
|
|
58
|
+
const mixedResources = [
|
|
59
|
+
makeResource('f1', 'figure'),
|
|
60
|
+
makeResource('t1', 'table'),
|
|
61
|
+
makeResource('f2', 'figure'),
|
|
62
|
+
makeResource('t2', 'table'),
|
|
63
|
+
];
|
|
64
|
+
const out = number('::resource{id="f1"}\n\n::resource{id="t1"}\n\n::resource{id="f2"}\n\n::resource{id="t2"}\n', mixedTypes, mixedResources);
|
|
65
|
+
expect(out).toEqual({ f1: '1', t1: '1', f2: '2', t2: '2' });
|
|
66
|
+
});
|
|
67
|
+
it('uses the first reference even when it later appears again', () => {
|
|
68
|
+
const out = number(':ref{id="a"} ... ::resource{id="a"} ... :ref{id="a"}\n\n::resource{id="b"}\n', types, resources);
|
|
69
|
+
// first line is a paragraph (embed mid-line is not a block), so only the
|
|
70
|
+
// inline refs to "a" count there; b's embed comes after.
|
|
71
|
+
expect(out.a).toBe('1');
|
|
72
|
+
expect(out.b).toBe('2');
|
|
73
|
+
});
|
|
74
|
+
});
|
|
75
|
+
describe('resource numbering — resetOn', () => {
|
|
76
|
+
const types = [
|
|
77
|
+
makeType({
|
|
78
|
+
id: 'figure',
|
|
79
|
+
numberingTemplate: '{h1}.{n}',
|
|
80
|
+
resetOn: 'h1',
|
|
81
|
+
}),
|
|
82
|
+
];
|
|
83
|
+
const resources = [
|
|
84
|
+
makeResource('a', 'figure'),
|
|
85
|
+
makeResource('b', 'figure'),
|
|
86
|
+
makeResource('c', 'figure'),
|
|
87
|
+
];
|
|
88
|
+
it("resetOn:'h1' restarts the counter at each h1", () => {
|
|
89
|
+
const md = [
|
|
90
|
+
'# Chapter One',
|
|
91
|
+
'',
|
|
92
|
+
'::resource{id="a"}',
|
|
93
|
+
'',
|
|
94
|
+
'::resource{id="b"}',
|
|
95
|
+
'',
|
|
96
|
+
'# Chapter Two',
|
|
97
|
+
'',
|
|
98
|
+
'::resource{id="c"}',
|
|
99
|
+
'',
|
|
100
|
+
].join('\n');
|
|
101
|
+
const out = number(md, types, resources);
|
|
102
|
+
expect(out).toEqual({ a: '1.1', b: '1.2', c: '2.1' });
|
|
103
|
+
});
|
|
104
|
+
it("resetOn:'never' keeps a single running counter across h1s", () => {
|
|
105
|
+
const neverTypes = [
|
|
106
|
+
makeType({ id: 'figure', numberingTemplate: '{n}', resetOn: 'never' }),
|
|
107
|
+
];
|
|
108
|
+
const md = [
|
|
109
|
+
'# One',
|
|
110
|
+
'',
|
|
111
|
+
'::resource{id="a"}',
|
|
112
|
+
'',
|
|
113
|
+
'# Two',
|
|
114
|
+
'',
|
|
115
|
+
'::resource{id="b"}',
|
|
116
|
+
'',
|
|
117
|
+
].join('\n');
|
|
118
|
+
const out = number(md, neverTypes, resources);
|
|
119
|
+
expect(out).toEqual({ a: '1', b: '2' });
|
|
120
|
+
});
|
|
121
|
+
});
|
|
122
|
+
describe('resource numbering — template rendering', () => {
|
|
123
|
+
const resources = [makeResource('a', 'figure')];
|
|
124
|
+
it('renders {h1}.{n}', () => {
|
|
125
|
+
const types = [makeType({ id: 'figure', numberingTemplate: '{h1}.{n}', resetOn: 'h1' })];
|
|
126
|
+
const out = number('# C\n\n::resource{id="a"}\n', types, resources);
|
|
127
|
+
expect(out.a).toBe('1.1');
|
|
128
|
+
});
|
|
129
|
+
it('collapses {h1}.{n} to bare {n} when no h1 is in effect', () => {
|
|
130
|
+
const types = [makeType({ id: 'figure', numberingTemplate: '{h1}.{n}', resetOn: 'never' })];
|
|
131
|
+
const out = number('::resource{id="a"}\n', types, resources);
|
|
132
|
+
expect(out.a).toBe('1');
|
|
133
|
+
});
|
|
134
|
+
it('renders literal text around the counter', () => {
|
|
135
|
+
const types = [makeType({ id: 'figure', numberingTemplate: 'No. {n}', resetOn: 'never' })];
|
|
136
|
+
const out = number('::resource{id="a"}\n', types, resources);
|
|
137
|
+
expect(out.a).toBe('No. 1');
|
|
138
|
+
});
|
|
139
|
+
});
|
|
140
|
+
describe('resource numbering — counter formats', () => {
|
|
141
|
+
const resources = [
|
|
142
|
+
makeResource('a', 'figure'),
|
|
143
|
+
makeResource('b', 'figure'),
|
|
144
|
+
makeResource('c', 'figure'),
|
|
145
|
+
makeResource('d', 'figure'),
|
|
146
|
+
];
|
|
147
|
+
const md = '::resource{id="a"}\n\n::resource{id="b"}\n\n::resource{id="c"}\n\n::resource{id="d"}\n';
|
|
148
|
+
const run = (format) => {
|
|
149
|
+
const types = [
|
|
150
|
+
makeType({ id: 'figure', numberingTemplate: '{n}', counterFormat: format }),
|
|
151
|
+
];
|
|
152
|
+
const out = number(md, types, resources);
|
|
153
|
+
return ['a', 'b', 'c', 'd'].map((id) => out[id]);
|
|
154
|
+
};
|
|
155
|
+
it('decimal', () => {
|
|
156
|
+
expect(run('decimal')).toEqual(['1', '2', '3', '4']);
|
|
157
|
+
});
|
|
158
|
+
it('roman-lower', () => {
|
|
159
|
+
expect(run('roman-lower')).toEqual(['i', 'ii', 'iii', 'iv']);
|
|
160
|
+
});
|
|
161
|
+
it('roman-upper', () => {
|
|
162
|
+
expect(run('roman-upper')).toEqual(['I', 'II', 'III', 'IV']);
|
|
163
|
+
});
|
|
164
|
+
it('alpha-lower', () => {
|
|
165
|
+
expect(run('alpha-lower')).toEqual(['a', 'b', 'c', 'd']);
|
|
166
|
+
});
|
|
167
|
+
it('alpha-upper', () => {
|
|
168
|
+
expect(run('alpha-upper')).toEqual(['A', 'B', 'C', 'D']);
|
|
169
|
+
});
|
|
170
|
+
});
|
|
171
|
+
describe('resource numbering — unknown resources/types', () => {
|
|
172
|
+
it('skips refs to unknown resource ids', () => {
|
|
173
|
+
const types = [makeType({ id: 'figure', numberingTemplate: '{n}' })];
|
|
174
|
+
const resources = [makeResource('a', 'figure')];
|
|
175
|
+
const out = number(':ref{id="ghost"} and ::resource{id="a"}\n\n::resource{id="a"}\n', types, resources);
|
|
176
|
+
expect(out.ghost).toBeUndefined();
|
|
177
|
+
expect(out.a).toBe('1');
|
|
178
|
+
});
|
|
179
|
+
it('skips resources whose type is undefined', () => {
|
|
180
|
+
const types = [];
|
|
181
|
+
const resources = [makeResource('a', 'figure')];
|
|
182
|
+
const out = number('::resource{id="a"}\n', types, resources);
|
|
183
|
+
expect(out).toEqual({});
|
|
184
|
+
});
|
|
185
|
+
});
|
|
186
|
+
//# sourceMappingURL=resourceNumbering.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resourceNumbering.test.js","sourceRoot":"","sources":["../../../src/__tests__/pipeline/resourceNumbering.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"model.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/table/model.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,187 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { addRow, addColumn, removeRow, removeColumn, mergeCells, unmergeCell, setCellContent, setAlignment, parseTSV, } from '../../table/model';
|
|
3
|
+
/** Build a rectangular model whose cell contents are "r,c". */
|
|
4
|
+
const grid = (rows, cols) => ({
|
|
5
|
+
rows: Array.from({ length: rows }, (_r, r) => Array.from({ length: cols }, (_c, c) => ({ content: `${r},${c}` }))),
|
|
6
|
+
});
|
|
7
|
+
const colCount = (m) => m.rows.reduce((max, row) => Math.max(max, row.length), 0);
|
|
8
|
+
/** Cells covered by a merge must point at a real primary cell that is itself
|
|
9
|
+
* spanning — i.e. no orphaned hidden cells. */
|
|
10
|
+
const noOrphanHiddenCells = (m) => m.rows.every((row) => row.every((cell) => {
|
|
11
|
+
if (!cell.hiddenBy)
|
|
12
|
+
return true;
|
|
13
|
+
const { row: pr, col: pc } = cell.hiddenBy;
|
|
14
|
+
const primary = m.rows[pr]?.[pc];
|
|
15
|
+
if (!primary)
|
|
16
|
+
return false;
|
|
17
|
+
return (primary.colSpan ?? 1) > 1 || (primary.rowSpan ?? 1) > 1;
|
|
18
|
+
}));
|
|
19
|
+
describe('table model — row/col structure', () => {
|
|
20
|
+
it('addRow inserts a row at the index and keeps width', () => {
|
|
21
|
+
const m = grid(2, 3);
|
|
22
|
+
const next = addRow(m, 1);
|
|
23
|
+
expect(next.rows).toHaveLength(3);
|
|
24
|
+
expect(next.rows[1]).toHaveLength(3);
|
|
25
|
+
expect(next.rows[1].every((c) => c.content === '')).toBe(true);
|
|
26
|
+
// original untouched (no mutation)
|
|
27
|
+
expect(m.rows).toHaveLength(2);
|
|
28
|
+
});
|
|
29
|
+
it('addRow clamps an out-of-range index to append', () => {
|
|
30
|
+
const next = addRow(grid(2, 2), 99);
|
|
31
|
+
expect(next.rows).toHaveLength(3);
|
|
32
|
+
});
|
|
33
|
+
it('addColumn inserts a column in every row', () => {
|
|
34
|
+
const m = grid(2, 3);
|
|
35
|
+
const next = addColumn(m, 1);
|
|
36
|
+
expect(colCount(next)).toBe(4);
|
|
37
|
+
expect(next.rows.every((r) => r.length === 4)).toBe(true);
|
|
38
|
+
expect(m.rows[0]).toHaveLength(3); // original untouched
|
|
39
|
+
});
|
|
40
|
+
it('removeRow drops the row', () => {
|
|
41
|
+
const next = removeRow(grid(3, 2), 1);
|
|
42
|
+
expect(next.rows).toHaveLength(2);
|
|
43
|
+
expect(next.rows[0][0].content).toBe('0,0');
|
|
44
|
+
expect(next.rows[1][0].content).toBe('2,0');
|
|
45
|
+
});
|
|
46
|
+
it('removeRow on an out-of-range index is a no-op clone', () => {
|
|
47
|
+
const m = grid(2, 2);
|
|
48
|
+
const next = removeRow(m, 5);
|
|
49
|
+
expect(next.rows).toHaveLength(2);
|
|
50
|
+
expect(next).not.toBe(m); // new object
|
|
51
|
+
});
|
|
52
|
+
it('removeColumn drops the column from every row', () => {
|
|
53
|
+
const next = removeColumn(grid(2, 3), 1);
|
|
54
|
+
expect(colCount(next)).toBe(2);
|
|
55
|
+
expect(next.rows[0].map((c) => c.content)).toEqual(['0,0', '0,2']);
|
|
56
|
+
});
|
|
57
|
+
it('preserves headerRowCount through structural edits', () => {
|
|
58
|
+
const m = { ...grid(3, 2), headerRowCount: 1 };
|
|
59
|
+
expect(addRow(m, 0).headerRowCount).toBe(2);
|
|
60
|
+
expect(addRow(m, 2).headerRowCount).toBe(1);
|
|
61
|
+
expect(removeRow(m, 0).headerRowCount).toBe(0);
|
|
62
|
+
});
|
|
63
|
+
});
|
|
64
|
+
describe('table model — content & alignment', () => {
|
|
65
|
+
it('setCellContent replaces only the target cell', () => {
|
|
66
|
+
const m = grid(2, 2);
|
|
67
|
+
const next = setCellContent(m, { row: 0, col: 1 }, 'hello');
|
|
68
|
+
expect(next.rows[0][1].content).toBe('hello');
|
|
69
|
+
expect(next.rows[0][0].content).toBe('0,0');
|
|
70
|
+
expect(m.rows[0][1].content).toBe('0,1'); // original untouched
|
|
71
|
+
});
|
|
72
|
+
it('setCellContent on an out-of-bounds cell is a no-op clone', () => {
|
|
73
|
+
const m = grid(1, 1);
|
|
74
|
+
const next = setCellContent(m, { row: 5, col: 5 }, 'x');
|
|
75
|
+
expect(next.rows[0][0].content).toBe('0,0');
|
|
76
|
+
});
|
|
77
|
+
it('setAlignment sets and clears alignment', () => {
|
|
78
|
+
const m = grid(1, 1);
|
|
79
|
+
const set = setAlignment(m, { row: 0, col: 0 }, 'center', 'middle');
|
|
80
|
+
expect(set.rows[0][0].align).toBe('center');
|
|
81
|
+
expect(set.rows[0][0].verticalAlign).toBe('middle');
|
|
82
|
+
const cleared = setAlignment(set, { row: 0, col: 0 }, undefined, undefined);
|
|
83
|
+
expect(cleared.rows[0][0].align).toBeUndefined();
|
|
84
|
+
expect(cleared.rows[0][0].verticalAlign).toBeUndefined();
|
|
85
|
+
});
|
|
86
|
+
it('content round-trips through a structural edit', () => {
|
|
87
|
+
let m = grid(2, 2);
|
|
88
|
+
m = setCellContent(m, { row: 0, col: 0 }, 'keep');
|
|
89
|
+
m = addColumn(m, 2);
|
|
90
|
+
expect(m.rows[0][0].content).toBe('keep');
|
|
91
|
+
});
|
|
92
|
+
});
|
|
93
|
+
describe('table model — merge / unmerge invariants', () => {
|
|
94
|
+
it('merge spans the primary and hides the rest', () => {
|
|
95
|
+
const m = grid(3, 3);
|
|
96
|
+
const merged = mergeCells(m, { start: { row: 0, col: 0 }, end: { row: 1, col: 1 } });
|
|
97
|
+
const primary = merged.rows[0][0];
|
|
98
|
+
expect(primary.colSpan).toBe(2);
|
|
99
|
+
expect(primary.rowSpan).toBe(2);
|
|
100
|
+
expect(primary.hiddenBy).toBeUndefined();
|
|
101
|
+
expect(merged.rows[0][1].hiddenBy).toEqual({ row: 0, col: 0 });
|
|
102
|
+
expect(merged.rows[1][0].hiddenBy).toEqual({ row: 0, col: 0 });
|
|
103
|
+
expect(merged.rows[1][1].hiddenBy).toEqual({ row: 0, col: 0 });
|
|
104
|
+
expect(noOrphanHiddenCells(merged)).toBe(true);
|
|
105
|
+
});
|
|
106
|
+
it('a 1x1 merge is a no-op', () => {
|
|
107
|
+
const m = grid(2, 2);
|
|
108
|
+
const merged = mergeCells(m, { start: { row: 0, col: 0 }, end: { row: 0, col: 0 } });
|
|
109
|
+
expect(merged.rows[0][0].colSpan).toBeUndefined();
|
|
110
|
+
expect(merged.rows[0][0].rowSpan).toBeUndefined();
|
|
111
|
+
});
|
|
112
|
+
it('merge accepts a reversed (bottom-right to top-left) range', () => {
|
|
113
|
+
const m = grid(3, 3);
|
|
114
|
+
const merged = mergeCells(m, { start: { row: 1, col: 1 }, end: { row: 0, col: 0 } });
|
|
115
|
+
expect(merged.rows[0][0].colSpan).toBe(2);
|
|
116
|
+
expect(merged.rows[0][0].rowSpan).toBe(2);
|
|
117
|
+
expect(noOrphanHiddenCells(merged)).toBe(true);
|
|
118
|
+
});
|
|
119
|
+
it('unmerge from the primary clears spans and hidden markers', () => {
|
|
120
|
+
const m = grid(3, 3);
|
|
121
|
+
const merged = mergeCells(m, { start: { row: 0, col: 0 }, end: { row: 1, col: 1 } });
|
|
122
|
+
const un = unmergeCell(merged, { row: 0, col: 0 });
|
|
123
|
+
expect(un.rows[0][0].colSpan).toBeUndefined();
|
|
124
|
+
expect(un.rows[0][0].rowSpan).toBeUndefined();
|
|
125
|
+
expect(un.rows.every((r) => r.every((c) => c.hiddenBy === undefined))).toBe(true);
|
|
126
|
+
expect(noOrphanHiddenCells(un)).toBe(true);
|
|
127
|
+
});
|
|
128
|
+
it('unmerge from a hidden cell also clears the whole merge', () => {
|
|
129
|
+
const m = grid(3, 3);
|
|
130
|
+
const merged = mergeCells(m, { start: { row: 0, col: 0 }, end: { row: 1, col: 1 } });
|
|
131
|
+
const un = unmergeCell(merged, { row: 1, col: 1 });
|
|
132
|
+
expect(un.rows[0][0].colSpan).toBeUndefined();
|
|
133
|
+
expect(un.rows.every((r) => r.every((c) => c.hiddenBy === undefined))).toBe(true);
|
|
134
|
+
});
|
|
135
|
+
it('merge then unmerge round-trips to an equivalent grid', () => {
|
|
136
|
+
const m = grid(3, 3);
|
|
137
|
+
const merged = mergeCells(m, { start: { row: 0, col: 0 }, end: { row: 2, col: 2 } });
|
|
138
|
+
const un = unmergeCell(merged, { row: 0, col: 0 });
|
|
139
|
+
const contents = un.rows.map((r) => r.map((c) => c.content));
|
|
140
|
+
expect(contents).toEqual([
|
|
141
|
+
['0,0', '0,1', '0,2'],
|
|
142
|
+
['1,0', '1,1', '1,2'],
|
|
143
|
+
['2,0', '2,1', '2,2'],
|
|
144
|
+
]);
|
|
145
|
+
expect(noOrphanHiddenCells(un)).toBe(true);
|
|
146
|
+
});
|
|
147
|
+
it('unmerge on a non-merged cell is a harmless no-op', () => {
|
|
148
|
+
const m = grid(2, 2);
|
|
149
|
+
const un = unmergeCell(m, { row: 0, col: 0 });
|
|
150
|
+
expect(un.rows[0][0].colSpan).toBeUndefined();
|
|
151
|
+
expect(noOrphanHiddenCells(un)).toBe(true);
|
|
152
|
+
});
|
|
153
|
+
});
|
|
154
|
+
describe('table model — TSV paste normalization', () => {
|
|
155
|
+
it('splits rows on newlines and cells on tabs', () => {
|
|
156
|
+
const m = parseTSV('a\tb\tc\nd\te\tf');
|
|
157
|
+
expect(m.rows).toHaveLength(2);
|
|
158
|
+
expect(m.rows[0].map((c) => c.content)).toEqual(['a', 'b', 'c']);
|
|
159
|
+
expect(m.rows[1].map((c) => c.content)).toEqual(['d', 'e', 'f']);
|
|
160
|
+
});
|
|
161
|
+
it('normalizes CRLF and CR line endings', () => {
|
|
162
|
+
const m = parseTSV('a\tb\r\nc\td\re\tf');
|
|
163
|
+
expect(m.rows.map((r) => r.map((c) => c.content))).toEqual([
|
|
164
|
+
['a', 'b'],
|
|
165
|
+
['c', 'd'],
|
|
166
|
+
['e', 'f'],
|
|
167
|
+
]);
|
|
168
|
+
});
|
|
169
|
+
it('pads ragged rows so the grid is rectangular', () => {
|
|
170
|
+
const m = parseTSV('a\tb\tc\nd\ne\tf');
|
|
171
|
+
expect(m.rows.every((r) => r.length === 3)).toBe(true);
|
|
172
|
+
expect(m.rows[1].map((c) => c.content)).toEqual(['d', '', '']);
|
|
173
|
+
});
|
|
174
|
+
it('drops a single trailing newline but keeps interior blank rows', () => {
|
|
175
|
+
const m = parseTSV('a\tb\n\nc\td\n');
|
|
176
|
+
expect(m.rows).toHaveLength(3);
|
|
177
|
+
expect(m.rows[1].map((c) => c.content)).toEqual(['', '']);
|
|
178
|
+
});
|
|
179
|
+
it('empty input yields an empty model', () => {
|
|
180
|
+
expect(parseTSV('').rows).toEqual([]);
|
|
181
|
+
});
|
|
182
|
+
it('a single cell parses as a 1x1 grid', () => {
|
|
183
|
+
const m = parseTSV('solo');
|
|
184
|
+
expect(m.rows).toEqual([[{ content: 'solo' }]]);
|
|
185
|
+
});
|
|
186
|
+
});
|
|
187
|
+
//# sourceMappingURL=model.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"model.test.js","sourceRoot":"","sources":["../../../src/__tests__/table/model.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blockRender.d.ts","sourceRoot":"","sources":["../../src/canvas-backend/blockRender.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAsC,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"blockRender.d.ts","sourceRoot":"","sources":["../../src/canvas-backend/blockRender.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAsC,MAAM,QAAQ,CAAC;AAqN3E,wBAAgB,WAAW,CACzB,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE,QAAQ,EACf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,IAAI,CAiCN"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { getMathRaster } from '../math/rasterCache';
|
|
2
|
+
import { renderDesignSlot } from './headerFooter';
|
|
3
|
+
import { renderResourceBlock } from './renderResourceBlock';
|
|
2
4
|
function pickSegmentFont(bold, italic, font, boldFont, italicFont, boldItalicFont) {
|
|
3
5
|
if (bold && italic && boldItalicFont)
|
|
4
6
|
return boldItalicFont;
|
|
@@ -47,7 +49,7 @@ function renderMathSegment(ctx, seg, x, baselineY, fallbackColor) {
|
|
|
47
49
|
return;
|
|
48
50
|
renderMathRender(ctx, seg.mathRender, x, baselineY - seg.mathRender.ascentPx, fallbackColor);
|
|
49
51
|
}
|
|
50
|
-
function renderLine(ctx, line, font, boldFont, italicFont, boldItalicFont, color, boldColor, italicColor, textAlign, columnWidth, columnX) {
|
|
52
|
+
function renderLine(ctx, line, font, boldFont, italicFont, boldItalicFont, color, boldColor, italicColor, refColor, textAlign, columnWidth, columnX) {
|
|
51
53
|
ctx.fillStyle = color;
|
|
52
54
|
ctx.textBaseline = 'alphabetic';
|
|
53
55
|
const hasRichSegments = line.segments && line.segments.some((s) => s.bold || s.italic);
|
|
@@ -77,7 +79,9 @@ function renderLine(ctx, line, font, boldFont, italicFont, boldItalicFont, color
|
|
|
77
79
|
}
|
|
78
80
|
else {
|
|
79
81
|
ctx.font = pickSegmentFont(!!seg.bold, !!seg.italic, font, boldFont, italicFont, boldItalicFont);
|
|
80
|
-
ctx.fillStyle =
|
|
82
|
+
ctx.fillStyle = seg.refResourceId !== undefined && refColor
|
|
83
|
+
? refColor
|
|
84
|
+
: pickSegmentColor(!!seg.bold, !!seg.italic, color, boldColor, italicColor);
|
|
81
85
|
ctx.fillText(seg.text, x, line.baseline);
|
|
82
86
|
x += seg.width;
|
|
83
87
|
}
|
|
@@ -100,7 +104,9 @@ function renderLine(ctx, line, font, boldFont, italicFont, boldItalicFont, color
|
|
|
100
104
|
}
|
|
101
105
|
else {
|
|
102
106
|
ctx.font = pickSegmentFont(!!seg.bold, !!seg.italic, font, boldFont, italicFont, boldItalicFont);
|
|
103
|
-
ctx.fillStyle =
|
|
107
|
+
ctx.fillStyle = seg.refResourceId !== undefined && refColor
|
|
108
|
+
? refColor
|
|
109
|
+
: pickSegmentColor(!!seg.bold, !!seg.italic, color, boldColor, italicColor);
|
|
104
110
|
ctx.fillText(seg.text, x, line.baseline);
|
|
105
111
|
x += seg.width;
|
|
106
112
|
}
|
|
@@ -110,7 +116,8 @@ function renderLine(ctx, line, font, boldFont, italicFont, boldItalicFont, color
|
|
|
110
116
|
// Ragged (left-aligned) rendering — also used for last lines of justified blocks
|
|
111
117
|
// If there are bold/italic segments, render per-segment to apply correct fonts
|
|
112
118
|
const hasMathSegments = line.segments && line.segments.some((s) => s.kind === 'math');
|
|
113
|
-
|
|
119
|
+
const hasRefSegments = line.segments && line.segments.some((s) => s.refResourceId !== undefined);
|
|
120
|
+
if ((hasRichSegments || hasMathSegments || hasRefSegments) && line.segments) {
|
|
114
121
|
let x = line.bbox.x;
|
|
115
122
|
for (const seg of line.segments) {
|
|
116
123
|
if (seg.kind === 'space') {
|
|
@@ -122,7 +129,9 @@ function renderLine(ctx, line, font, boldFont, italicFont, boldItalicFont, color
|
|
|
122
129
|
}
|
|
123
130
|
else {
|
|
124
131
|
ctx.font = pickSegmentFont(!!seg.bold, !!seg.italic, font, boldFont, italicFont, boldItalicFont);
|
|
125
|
-
ctx.fillStyle =
|
|
132
|
+
ctx.fillStyle = seg.refResourceId !== undefined && refColor
|
|
133
|
+
? refColor
|
|
134
|
+
: pickSegmentColor(!!seg.bold, !!seg.italic, color, boldColor, italicColor);
|
|
126
135
|
ctx.fillText(seg.text, x, line.baseline);
|
|
127
136
|
x += seg.width;
|
|
128
137
|
}
|
|
@@ -163,11 +172,21 @@ function renderStrikethrough(ctx, block) {
|
|
|
163
172
|
ctx.restore();
|
|
164
173
|
}
|
|
165
174
|
export function renderBlock(ctx, block, columnWidth, columnX) {
|
|
175
|
+
if (block.hidden)
|
|
176
|
+
return;
|
|
177
|
+
if (block.designOverlay) {
|
|
178
|
+
renderDesignSlot(ctx, block.designOverlay);
|
|
179
|
+
return;
|
|
180
|
+
}
|
|
181
|
+
if (block.type === 'resource') {
|
|
182
|
+
renderResourceBlock(ctx, block);
|
|
183
|
+
return;
|
|
184
|
+
}
|
|
166
185
|
if (block.type === 'listItem') {
|
|
167
186
|
renderBullet(ctx, block);
|
|
168
187
|
}
|
|
169
188
|
for (const line of block.lines) {
|
|
170
|
-
renderLine(ctx, line, block.fontString, block.boldFontString, block.italicFontString, block.boldItalicFontString, block.color, block.boldColor, block.italicColor, block.textAlign, columnWidth, columnX);
|
|
189
|
+
renderLine(ctx, line, block.fontString, block.boldFontString, block.italicFontString, block.boldItalicFontString, block.color, block.boldColor, block.italicColor, block.refColor, block.textAlign, columnWidth, columnX);
|
|
171
190
|
}
|
|
172
191
|
if (block.strikethroughText) {
|
|
173
192
|
renderStrikethrough(ctx, block);
|