postext 1.65.0 → 1.66.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/README.md +2 -0
- package/dist/__tests__/exercises/remainderAndWords.test.d.ts +2 -0
- package/dist/__tests__/exercises/remainderAndWords.test.d.ts.map +1 -0
- package/dist/__tests__/exercises/remainderAndWords.test.js +84 -0
- package/dist/__tests__/exercises/remainderAndWords.test.js.map +1 -0
- package/dist/__tests__/math/mathEncloseStrokes.test.d.ts +2 -0
- package/dist/__tests__/math/mathEncloseStrokes.test.d.ts.map +1 -0
- package/dist/__tests__/math/mathEncloseStrokes.test.js +118 -0
- package/dist/__tests__/math/mathEncloseStrokes.test.js.map +1 -0
- package/dist/__tests__/math/mathRules.test.d.ts +2 -0
- package/dist/__tests__/math/mathRules.test.d.ts.map +1 -0
- package/dist/__tests__/math/mathRules.test.js +114 -0
- package/dist/__tests__/math/mathRules.test.js.map +1 -0
- package/dist/__tests__/music/musicEngine.test.js +11 -0
- package/dist/__tests__/music/musicEngine.test.js.map +1 -1
- package/dist/__tests__/pipeline/bands/closingBandChapterEndNotes.test.d.ts +2 -0
- package/dist/__tests__/pipeline/bands/closingBandChapterEndNotes.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/bands/closingBandChapterEndNotes.test.js +67 -0
- package/dist/__tests__/pipeline/bands/closingBandChapterEndNotes.test.js.map +1 -0
- package/dist/__tests__/pipeline/columns/afterFloatUnderSpan.test.d.ts +2 -0
- package/dist/__tests__/pipeline/columns/afterFloatUnderSpan.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/columns/afterFloatUnderSpan.test.js +74 -0
- package/dist/__tests__/pipeline/columns/afterFloatUnderSpan.test.js.map +1 -0
- package/dist/__tests__/pipeline/floats/floatCitingPageUnderBox.test.d.ts +2 -0
- package/dist/__tests__/pipeline/floats/floatCitingPageUnderBox.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/floats/floatCitingPageUnderBox.test.js +70 -0
- package/dist/__tests__/pipeline/floats/floatCitingPageUnderBox.test.js.map +1 -0
- package/dist/__tests__/pipeline/references/linkNotesPlacement.test.d.ts +2 -0
- package/dist/__tests__/pipeline/references/linkNotesPlacement.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/references/linkNotesPlacement.test.js +93 -0
- package/dist/__tests__/pipeline/references/linkNotesPlacement.test.js.map +1 -0
- package/dist/__tests__/pipeline/resources/hereNotEmbedded.test.d.ts +2 -0
- package/dist/__tests__/pipeline/resources/hereNotEmbedded.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/resources/hereNotEmbedded.test.js +60 -0
- package/dist/__tests__/pipeline/resources/hereNotEmbedded.test.js.map +1 -0
- package/dist/__tests__/pipeline/resources/spanEmbedSafeArea.test.d.ts +2 -0
- package/dist/__tests__/pipeline/resources/spanEmbedSafeArea.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/resources/spanEmbedSafeArea.test.js +65 -0
- package/dist/__tests__/pipeline/resources/spanEmbedSafeArea.test.js.map +1 -0
- package/dist/canvas-backend/blockRender/segments.d.ts.map +1 -1
- package/dist/canvas-backend/blockRender/segments.js +4 -0
- package/dist/canvas-backend/blockRender/segments.js.map +1 -1
- package/dist/exercises/designs.d.ts.map +1 -1
- package/dist/exercises/designs.js +48 -1
- package/dist/exercises/designs.js.map +1 -1
- package/dist/exercises/grids/arithmetic.d.ts.map +1 -1
- package/dist/exercises/grids/arithmetic.js +10 -3
- package/dist/exercises/grids/arithmetic.js.map +1 -1
- package/dist/math/engine.d.ts.map +1 -1
- package/dist/math/engine.js +13 -17
- package/dist/math/engine.js.map +1 -1
- package/dist/math/rasterCache.d.ts.map +1 -1
- package/dist/math/rasterCache.js +2 -0
- package/dist/math/rasterCache.js.map +1 -1
- package/dist/math/strokePath.d.ts +21 -0
- package/dist/math/strokePath.d.ts.map +1 -0
- package/dist/math/strokePath.js +224 -0
- package/dist/math/strokePath.js.map +1 -0
- package/dist/math/strokes.d.ts +20 -0
- package/dist/math/strokes.d.ts.map +1 -0
- package/dist/math/strokes.js +238 -0
- package/dist/math/strokes.js.map +1 -0
- package/dist/music/engine.d.ts.map +1 -1
- package/dist/music/engine.js +29 -21
- package/dist/music/engine.js.map +1 -1
- package/dist/pipeline/build/pass/breaks.d.ts +2 -0
- package/dist/pipeline/build/pass/breaks.d.ts.map +1 -1
- package/dist/pipeline/build/pass/breaks.js +17 -2
- package/dist/pipeline/build/pass/breaks.js.map +1 -1
- package/dist/pipeline/build/pass/callouts/calloutInline.d.ts.map +1 -1
- package/dist/pipeline/build/pass/callouts/calloutInline.js +7 -1
- package/dist/pipeline/build/pass/callouts/calloutInline.js.map +1 -1
- package/dist/pipeline/build/pass/callouts/calloutSpan.d.ts.map +1 -1
- package/dist/pipeline/build/pass/callouts/calloutSpan.js +18 -2
- package/dist/pipeline/build/pass/callouts/calloutSpan.js.map +1 -1
- package/dist/pipeline/build/pass/callouts/embedCrop.d.ts +13 -0
- package/dist/pipeline/build/pass/callouts/embedCrop.d.ts.map +1 -0
- package/dist/pipeline/build/pass/callouts/embedCrop.js +25 -0
- package/dist/pipeline/build/pass/callouts/embedCrop.js.map +1 -0
- package/dist/pipeline/build/pass/floats/floatFlush.d.ts.map +1 -1
- package/dist/pipeline/build/pass/floats/floatFlush.js +20 -5
- package/dist/pipeline/build/pass/floats/floatFlush.js.map +1 -1
- package/dist/pipeline/build/pass/notes.d.ts +2 -0
- package/dist/pipeline/build/pass/notes.d.ts.map +1 -1
- package/dist/pipeline/build/pass/notes.js +70 -4
- package/dist/pipeline/build/pass/notes.js.map +1 -1
- package/dist/pipeline/build/pass/setup/passFinish.d.ts.map +1 -1
- package/dist/pipeline/build/pass/setup/passFinish.js +8 -0
- package/dist/pipeline/build/pass/setup/passFinish.js.map +1 -1
- package/dist/pipeline/build/pass.js +2 -2
- package/dist/pipeline/build/pass.js.map +1 -1
- package/dist/pipeline/callouts/calloutLayout/childPlace.d.ts.map +1 -1
- package/dist/pipeline/callouts/calloutLayout/childPlace.js +7 -0
- package/dist/pipeline/callouts/calloutLayout/childPlace.js.map +1 -1
- package/dist/pipeline/callouts/calloutLayout/inputs.d.ts +5 -0
- package/dist/pipeline/callouts/calloutLayout/inputs.d.ts.map +1 -1
- package/dist/pipeline/callouts/calloutLayout/inputs.js.map +1 -1
- package/dist/pipeline/callouts/frameLayout.d.ts +1 -1
- package/dist/pipeline/callouts/frameLayout.d.ts.map +1 -1
- package/dist/pipeline/columns/columnBalancing/columnGaps.d.ts.map +1 -1
- package/dist/pipeline/columns/columnBalancing/columnGaps.js +17 -13
- package/dist/pipeline/columns/columnBalancing/columnGaps.js.map +1 -1
- package/dist/pipeline/contentWarnings/formatWarning.d.ts.map +1 -1
- package/dist/pipeline/contentWarnings/formatWarning.js +3 -0
- package/dist/pipeline/contentWarnings/formatWarning.js.map +1 -1
- package/dist/pipeline/floats/hereNotEmbedded.d.ts +28 -0
- package/dist/pipeline/floats/hereNotEmbedded.d.ts.map +1 -0
- package/dist/pipeline/floats/hereNotEmbedded.js +54 -0
- package/dist/pipeline/floats/hereNotEmbedded.js.map +1 -0
- package/dist/vdt/contentWarnings/layout.d.ts +10 -0
- package/dist/vdt/contentWarnings/layout.d.ts.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -104,6 +104,8 @@ The resolvers (`resolve*Config`), strippers (`strip*Defaults`), `DEFAULT_*` cons
|
|
|
104
104
|
|
|
105
105
|
Footnotes are written in the markdown: a `[^id]` marker where the note is cited and a paragraph that opens with `[^id]:` for its text. Each note is set at the foot of the column that cites it; `footnotes.placement: 'chapterEnd'` gathers them after the chapter instead. See [Footnotes](https://postext.dev/en/docs/document-format-notes-references#footnotes).
|
|
106
106
|
|
|
107
|
+
External links (`[text](https://…)`) stay links in every output. On a printed page `links.print` shows where they lead: `'inline'` sets the address in parentheses after the link text, and `'notes'` adds a note, numbered and placed with the footnotes, that prints the address, a QR code that opens it, or both (`links.show`). See [Links in print](https://postext.dev/en/docs/configuration-notes-references#links-in-print).
|
|
108
|
+
|
|
107
109
|
## Fonts
|
|
108
110
|
|
|
109
111
|
postext measures text with the browser's canvas, so the document's web fonts must be loaded before layout. `await buildDocumentWithFonts(content, config)` does both: it loads every face the configuration and the text ask for, lays the document out, and lays it out again when the pages used a face that was missing. `await prepareFonts(content, config)` only loads them, before a `buildDocument` of your own. Both load the faces the page declares (an `@font-face` rule, a `FontFace` you added) and take a `resolve(family, weight, style)` option that hands over the files of the rest.
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remainderAndWords.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/exercises/remainderAndWords.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { parseMarkdown } from '../../parse/index.js';
|
|
3
|
+
import { readExercises } from '../../exercises/model.js';
|
|
4
|
+
import { gridBox } from '../../exercises/grids.js';
|
|
5
|
+
import { areaElements } from '../../exercises/designs.js';
|
|
6
|
+
import { exerciseSettingsOf } from '../../defaults/boxes/exercises.js';
|
|
7
|
+
// A bracket division's remainder (#1311) and model answers on squared paper
|
|
8
|
+
// kept in words (#1312).
|
|
9
|
+
describe('a bracket long division with a remainder', () => {
|
|
10
|
+
const lay = (md, extra, teacher = false) => {
|
|
11
|
+
const blocks = parseMarkdown(md);
|
|
12
|
+
const ex = readExercises(blocks).exercises[0];
|
|
13
|
+
const style = exerciseSettingsOf(extra, extra.locale).styles[0];
|
|
14
|
+
return gridBox({ kind: 'arithmetic', id: 'g', style, exercise: ex, blocks, bodySizePt: 10, lineHeightPt: 12, measurePt: 400, ...(teacher ? { teacher: true } : {}) });
|
|
15
|
+
};
|
|
16
|
+
const md = ':::exercise{type=arithmetic}\nDivide.\n\n- 638 ÷ 3\n:::\n';
|
|
17
|
+
const cfg = { locale: 'en', exerciseStyles: [{ id: 'calc', arithmetic: { division: 'bracket' } }] };
|
|
18
|
+
it('gives the remainder its cells after an `r`, past the quotient', () => {
|
|
19
|
+
const box = lay(md, cfg);
|
|
20
|
+
const cellOf = (key) => box.slots.find((s) => s.key === key);
|
|
21
|
+
expect(cellOf('a1_r0').accept).toEqual(['2']);
|
|
22
|
+
const q = ['a1_0', 'a1_1', 'a1_2'].map((k) => cellOf(k));
|
|
23
|
+
expect(q.map((s) => s.accept[0]).join('')).toBe('212');
|
|
24
|
+
// On the quotient's row, a cell apart and after the `r`, as `inline`
|
|
25
|
+
// sets its `R` (`212 r2`).
|
|
26
|
+
expect(cellOf('a1_r0').cell).toEqual([q[2].cell[0], q[2].cell[1] + 3]);
|
|
27
|
+
const texts = (box.design.slot.elements ?? []).filter((e) => e.kind === 'text');
|
|
28
|
+
expect(texts.map((t) => t.content)).toContain('r');
|
|
29
|
+
});
|
|
30
|
+
it('writes the remainder in the teacher\'s copy', () => {
|
|
31
|
+
const texts = (lay(md, cfg, true).design.slot.elements ?? []).filter((e) => e.kind === 'text');
|
|
32
|
+
const top = Math.min(...texts.map((t) => t.placement.offset.y.value));
|
|
33
|
+
const row = texts.filter((t) => t.placement.offset.y.value === top)
|
|
34
|
+
.sort((a, b) => a.placement.offset.x.value - b.placement.offset.x.value);
|
|
35
|
+
expect(row.map((t) => t.content).join('')).toBe('212r2');
|
|
36
|
+
});
|
|
37
|
+
it('keeps an exact division as it was', () => {
|
|
38
|
+
const box = lay(':::exercise{type=arithmetic}\nDivide.\n\n- 864 ÷ 4\n:::\n', cfg);
|
|
39
|
+
expect(box.slots.some((s) => s.key.includes('_r'))).toBe(false);
|
|
40
|
+
expect(box.info.cols).toBe(5);
|
|
41
|
+
});
|
|
42
|
+
});
|
|
43
|
+
describe('a model answer on squared paper', () => {
|
|
44
|
+
const RED = { hex: '#c0392b', model: 'hex' };
|
|
45
|
+
const rows = (kind, answer, cols, cells) => {
|
|
46
|
+
const { elements } = areaElements({ kind, lines: 6, spacingPt: 10, widthPt: cols * 10, color: RED, weightPt: 0.5, answers: [answer], answerColor: RED, ...(cells ? { cells } : {}) });
|
|
47
|
+
const out = [];
|
|
48
|
+
for (const t of elements.filter((e) => e.kind === 'text')) {
|
|
49
|
+
const r = Math.round(t.placement.offset.y.value / 10);
|
|
50
|
+
const c = Math.round(t.placement.offset.x.value / 10);
|
|
51
|
+
out[r] = (out[r] ?? '').padEnd(c, ' ') + t.content;
|
|
52
|
+
}
|
|
53
|
+
return out;
|
|
54
|
+
};
|
|
55
|
+
it('starts a word that does not fit the rest of a row on the next', () => {
|
|
56
|
+
const text = 'Four boxes cost £3.75 × 4 = £15. Your change is £20 − £15 = £5.';
|
|
57
|
+
const got = rows('grid', text, 34);
|
|
58
|
+
expect(got[0]).toBe('Four boxes cost £3.75 × 4 = £15.');
|
|
59
|
+
expect(got[1]).toBe('Your change is £20 − £15 = £5.');
|
|
60
|
+
});
|
|
61
|
+
it('keeps a number with its unit joined by a no-break space', () => {
|
|
62
|
+
const got = rows('grid', 'The change is 5 €.', 15);
|
|
63
|
+
expect(got[0]).toBe('The change is');
|
|
64
|
+
expect(got[1]).toBe('5 €.');
|
|
65
|
+
});
|
|
66
|
+
it('cuts a word longer than a row character by character', () => {
|
|
67
|
+
expect(rows('grid', 'ab Donaudampfschiff', 6)).toEqual(['ab', 'Donaud', 'ampfsc', 'hiff']);
|
|
68
|
+
});
|
|
69
|
+
it('keeps the answer\'s lines a space apart', () => {
|
|
70
|
+
expect(rows('grid', '', 10)).toEqual([]);
|
|
71
|
+
const { elements } = areaElements({ kind: 'grid', lines: 3, spacingPt: 10, widthPt: 100, color: RED, weightPt: 0.5, answers: ['one', 'two'], answerColor: RED });
|
|
72
|
+
const t = elements.filter((e) => e.kind === 'text').find((e) => e.content === 't');
|
|
73
|
+
expect(t.placement.offset.x.value).toBe(40);
|
|
74
|
+
});
|
|
75
|
+
it('fills Chinese text a character to a square, on a grid and on 田字格', () => {
|
|
76
|
+
const zh = '春天来了,小草绿了,花儿开了。';
|
|
77
|
+
for (const kind of ['grid', 'tianzige']) {
|
|
78
|
+
expect(rows(kind, zh, 6)).toEqual(['春天来了,小', '草绿了,花儿', '开了。']);
|
|
79
|
+
}
|
|
80
|
+
// 田字格 keeps every character in order, spaces as empty squares.
|
|
81
|
+
expect(rows('tianzige', 'ab cd', 4)).toEqual(['ab c', 'd']);
|
|
82
|
+
});
|
|
83
|
+
});
|
|
84
|
+
//# sourceMappingURL=remainderAndWords.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remainderAndWords.test.js","sourceRoot":"","sources":["../../../src/__tests__/exercises/remainderAndWords.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mathEncloseStrokes.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/math/mathEncloseStrokes.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
import { describe, it, expect, beforeAll } from 'vitest';
|
|
2
|
+
import { initMathEngine, renderMath, clearMathCache } from '../../math/index.js';
|
|
3
|
+
import { flattenPath, strokePolylines } from '../../math/strokePath.js';
|
|
4
|
+
import { getMathRaster } from '../../math/rasterCache.js';
|
|
5
|
+
beforeAll(async () => {
|
|
6
|
+
await initMathEngine();
|
|
7
|
+
clearMathCache();
|
|
8
|
+
});
|
|
9
|
+
/** Nonzero winding of a fill path around a point. */
|
|
10
|
+
function winding(d, x, y) {
|
|
11
|
+
let w = 0;
|
|
12
|
+
for (const sub of flattenPath(d)) {
|
|
13
|
+
const pts = sub.pts;
|
|
14
|
+
for (let i = 0; i < pts.length; i++) {
|
|
15
|
+
const a = pts[i], b = pts[(i + 1) % pts.length];
|
|
16
|
+
const side = (b[0] - a[0]) * (y - a[1]) - (x - a[0]) * (b[1] - a[1]);
|
|
17
|
+
if (a[1] <= y && b[1] > y && side > 0)
|
|
18
|
+
w++;
|
|
19
|
+
else if (a[1] > y && b[1] <= y && side < 0)
|
|
20
|
+
w--;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
return w;
|
|
24
|
+
}
|
|
25
|
+
const covers = (paths, x, y) => paths.some((p) => p.fill !== 'none' && winding(p.d, x, y) !== 0);
|
|
26
|
+
/** The paths of `tex` beyond its glyphs (MathJax appends the notation). */
|
|
27
|
+
function notation(tex, glyphs) {
|
|
28
|
+
const r = renderMath(tex, true, 16);
|
|
29
|
+
const plain = renderMath(glyphs, true, 16);
|
|
30
|
+
expect(r.error).toBeUndefined();
|
|
31
|
+
expect(r.paths.every((p) => p.fill !== 'none')).toBe(true);
|
|
32
|
+
return r.paths.slice(plain.paths.length);
|
|
33
|
+
}
|
|
34
|
+
// The markup's local coordinates are mirrored by the root's scale(1,-1):
|
|
35
|
+
// a point (x, y) in MathJax's notation code is (x, -y) in the paths.
|
|
36
|
+
describe('\\enclose notations MathJax strokes as paths (#1371)', () => {
|
|
37
|
+
it('strokes the longdiv bracket and bar instead of filling the shape they close', () => {
|
|
38
|
+
// M 33.5 -188.5 a 183.3 443.5 0 0,1 0 1088 L 2100 899.5, 67 wide, round.
|
|
39
|
+
const marks = notation(String.raw `\enclose{longdiv}{638}`, '638');
|
|
40
|
+
expect(marks).toHaveLength(1);
|
|
41
|
+
expect(covers(marks, 1000, -899.5)).toBe(true); // the bar
|
|
42
|
+
expect(covers(marks, 2100 + 20, -899.5)).toBe(true); // its round cap
|
|
43
|
+
expect(covers(marks, 1000, -500)).toBe(false); // under the bar: the digits
|
|
44
|
+
expect(covers(marks, 100, -355.5)).toBe(false); // inside the bracket's bow
|
|
45
|
+
});
|
|
46
|
+
it('strokes the phasor angle with a miter corner', () => {
|
|
47
|
+
// M 1467 -155.5 L 44 -155.5 L 365.7 832.5, 67 wide, joined `mitre`.
|
|
48
|
+
const marks = notation(String.raw `\enclose{phasorangle}{30}`, '30');
|
|
49
|
+
expect(covers(marks, 700, 155.5)).toBe(true);
|
|
50
|
+
expect(covers(marks, (44 + 365.7) / 2, -(832.5 - 155.5) / 2)).toBe(true);
|
|
51
|
+
expect(covers(marks, 900, -400)).toBe(false);
|
|
52
|
+
// The miter fills the outer corner beyond the bevel.
|
|
53
|
+
expect(covers(marks, 44 - 30, 155.5 + 30)).toBe(true);
|
|
54
|
+
});
|
|
55
|
+
it('rounds the corners of a roundedbox', () => {
|
|
56
|
+
// rect x=33.5 y=-244.5 width=1039 height=920 rx=267, 67 wide.
|
|
57
|
+
const marks = notation(String.raw `\enclose{roundedbox}{x}`, 'x');
|
|
58
|
+
expect(covers(marks, 553, 244.5)).toBe(true); // the bottom edge
|
|
59
|
+
expect(covers(marks, 33.5, 244.5)).toBe(false); // a square corner's place
|
|
60
|
+
expect(covers(marks, 33.5 + 267 * 0.293, 244.5 - 267 * 0.293)).toBe(true); // the arc
|
|
61
|
+
expect(covers(marks, 553, -215)).toBe(false); // inside the box
|
|
62
|
+
});
|
|
63
|
+
});
|
|
64
|
+
describe('strokePolylines', () => {
|
|
65
|
+
const corner = [{ pts: [[0, 0], [100, 0], [100, 100]], closed: false }];
|
|
66
|
+
it('fills a miter corner and leaves a bevel above the limit', () => {
|
|
67
|
+
expect(winding(strokePolylines(corner, { width: 10, linejoin: 'miter' }), 104, -4)).not.toBe(0);
|
|
68
|
+
expect(winding(strokePolylines(corner, { width: 10, linejoin: 'bevel' }), 104, -4)).toBe(0);
|
|
69
|
+
expect(winding(strokePolylines(corner, { width: 10, linejoin: 'miter', miterlimit: 1.2 }), 104, -4)).toBe(0);
|
|
70
|
+
});
|
|
71
|
+
it('adds up overlapping pieces instead of cancelling them', () => {
|
|
72
|
+
const d = strokePolylines(corner, { width: 10, linejoin: 'round', linecap: 'round' });
|
|
73
|
+
for (const [x, y] of [[100, 0], [99, 1], [0, 0], [-4, 0], [100, 104]]) {
|
|
74
|
+
expect(winding(d, x, y)).not.toBe(0);
|
|
75
|
+
}
|
|
76
|
+
expect(winding(d, 50, 50)).toBe(0);
|
|
77
|
+
});
|
|
78
|
+
});
|
|
79
|
+
describe('canvas paint of an unpainted path (#1371)', () => {
|
|
80
|
+
it('skips a fill: none path instead of filling it with the previous colour', () => {
|
|
81
|
+
const fills = [];
|
|
82
|
+
const g = globalThis;
|
|
83
|
+
const saved = { OffscreenCanvas: g['OffscreenCanvas'], Path2D: g['Path2D'] };
|
|
84
|
+
g['Path2D'] = class {
|
|
85
|
+
d;
|
|
86
|
+
constructor(d) {
|
|
87
|
+
this.d = d;
|
|
88
|
+
}
|
|
89
|
+
};
|
|
90
|
+
g['OffscreenCanvas'] = class {
|
|
91
|
+
getContext() {
|
|
92
|
+
return {
|
|
93
|
+
fillStyle: '', scale() { }, translate() { },
|
|
94
|
+
fill() { fills.push(this.fillStyle); },
|
|
95
|
+
};
|
|
96
|
+
}
|
|
97
|
+
};
|
|
98
|
+
try {
|
|
99
|
+
const render = {
|
|
100
|
+
tex: 'probe-1371', displayMode: false, svg: '',
|
|
101
|
+
paths: [
|
|
102
|
+
{ d: 'M0 0L1 0L1 1Z', fill: '#ff0000' },
|
|
103
|
+
{ d: 'M0 0L1 0L1 1Z', fill: 'none' },
|
|
104
|
+
{ d: 'M0 0L1 0L1 1Z', fill: 'currentColor' },
|
|
105
|
+
],
|
|
106
|
+
viewBox: { minX: 0, minY: 0, width: 1, height: 1 },
|
|
107
|
+
widthPx: 1, heightPx: 1, ascentPx: 1, depthPx: 0, scale: 1,
|
|
108
|
+
};
|
|
109
|
+
expect(getMathRaster(render, '#000000')).not.toBeNull();
|
|
110
|
+
expect(fills).toEqual(['#ff0000', '#000000']);
|
|
111
|
+
}
|
|
112
|
+
finally {
|
|
113
|
+
g['OffscreenCanvas'] = saved.OffscreenCanvas;
|
|
114
|
+
g['Path2D'] = saved.Path2D;
|
|
115
|
+
}
|
|
116
|
+
});
|
|
117
|
+
});
|
|
118
|
+
//# sourceMappingURL=mathEncloseStrokes.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mathEncloseStrokes.test.js","sourceRoot":"","sources":["../../../src/__tests__/math/mathEncloseStrokes.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEjF,OAAO,EAAE,WAAW,EAAE,eAAe,EAAW,MAAM,0BAA0B,CAAC;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,SAAS,CAAC,KAAK,IAAI,EAAE;IACnB,MAAM,cAAc,EAAE,CAAC;IACvB,cAAc,EAAE,CAAC;AACnB,CAAC,CAAC,CAAC;AAEH,qDAAqD;AACrD,SAAS,OAAO,CAAC,CAAS,EAAE,CAAS,EAAE,CAAS;IAC9C,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,MAAM,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QACjC,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;QACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACpC,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,MAAM,CAAE,CAAC;YAClD,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACrE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC;gBAAE,CAAC,EAAE,CAAC;iBACtC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC;gBAAE,CAAC,EAAE,CAAC;QAClD,CAAC;IACH,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,MAAM,MAAM,GAAG,CAAC,KAA0B,EAAE,CAAS,EAAE,CAAS,EAAW,EAAE,CAC3E,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;AAEnE,2EAA2E;AAC3E,SAAS,QAAQ,CAAC,GAAW,EAAE,MAAc;IAC3C,MAAM,CAAC,GAAG,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IACpC,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IAC3C,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,CAAC;IAChC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3D,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AAC3C,CAAC;AAED,yEAAyE;AACzE,qEAAqE;AACrE,QAAQ,CAAC,sDAAsD,EAAE,GAAG,EAAE;IACpE,EAAE,CAAC,6EAA6E,EAAE,GAAG,EAAE;QACrF,yEAAyE;QACzE,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAA,wBAAwB,EAAE,KAAK,CAAC,CAAC;QAClE,MAAM,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC9B,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU;QAC1D,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB;QACrE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,4BAA4B;QAC3E,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,2BAA2B;IAC7E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,oEAAoE;QACpE,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAA,2BAA2B,EAAE,IAAI,CAAC,CAAC;QACpE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7C,qDAAqD;QACrD,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,8DAA8D;QAC9D,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAA,yBAAyB,EAAE,GAAG,CAAC,CAAC;QACjE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB;QAChE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,0BAA0B;QAC1E,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,GAAG,GAAG,KAAK,EAAE,KAAK,GAAG,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU;QACrF,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAiB;IACjE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,MAAM,MAAM,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAS,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAEhF,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAChG,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5F,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/G,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC/D,MAAM,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QACtF,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAS,EAAE,CAAC;YAC9E,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;QACD,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,2CAA2C,EAAE,GAAG,EAAE;IACzD,EAAE,CAAC,wEAAwE,EAAE,GAAG,EAAE;QAChF,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,MAAM,CAAC,GAAG,UAAgD,CAAC;QAC3D,MAAM,KAAK,GAAG,EAAE,eAAe,EAAE,CAAC,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7E,CAAC,CAAC,QAAQ,CAAC,GAAG;YAA2B;YAAnB,YAAmB,CAAS;gBAAT,MAAC,GAAD,CAAC,CAAQ;YAAG,CAAC;SAAE,CAAC;QACzD,CAAC,CAAC,iBAAiB,CAAC,GAAG;YACrB,UAAU;gBACR,OAAO;oBACL,SAAS,EAAE,EAAE,EAAE,KAAK,KAAI,CAAC,EAAE,SAAS,KAAI,CAAC;oBACzC,IAAI,KAAgC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;iBAClE,CAAC;YACJ,CAAC;SACF,CAAC;QACF,IAAI,CAAC;YACH,MAAM,MAAM,GAAe;gBACzB,GAAG,EAAE,YAAY,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;gBAC9C,KAAK,EAAE;oBACL,EAAE,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE;oBACvC,EAAE,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,EAAE;oBACpC,EAAE,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,EAAE;iBAC7C;gBACD,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;gBAClD,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC;aAC3D,CAAC;YACF,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YACxD,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;QAChD,CAAC;gBAAS,CAAC;YACT,CAAC,CAAC,iBAAiB,CAAC,GAAG,KAAK,CAAC,eAAe,CAAC;YAC7C,CAAC,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mathRules.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/math/mathRules.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
import { describe, it, expect, beforeAll } from 'vitest';
|
|
2
|
+
import { initMathEngine, renderMath, clearMathCache } from '../../math/index.js';
|
|
3
|
+
import { normalizeTableRules, strokeSegment, strokeRect } from '../../math/strokes.js';
|
|
4
|
+
beforeAll(async () => {
|
|
5
|
+
await initMathEngine();
|
|
6
|
+
clearMathCache();
|
|
7
|
+
});
|
|
8
|
+
/** The absolute points of a flattened path (M/L/C commands only). */
|
|
9
|
+
function points(d) {
|
|
10
|
+
const out = [];
|
|
11
|
+
for (const cmd of d.match(/[A-Za-z][^A-Za-z]*/g) ?? []) {
|
|
12
|
+
const nums = (cmd.slice(1).match(/-?\d*\.?\d+(?:e[-+]?\d+)?/gi) ?? []).map(Number);
|
|
13
|
+
for (let i = 0; i + 1 < nums.length; i += 2)
|
|
14
|
+
out.push([nums[i], nums[i + 1]]);
|
|
15
|
+
}
|
|
16
|
+
return out;
|
|
17
|
+
}
|
|
18
|
+
function box(d) {
|
|
19
|
+
const pts = points(d);
|
|
20
|
+
return {
|
|
21
|
+
minX: Math.min(...pts.map((p) => p[0])), maxX: Math.max(...pts.map((p) => p[0])),
|
|
22
|
+
minY: Math.min(...pts.map((p) => p[1])), maxY: Math.max(...pts.map((p) => p[1])),
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
/** Paths wider than `minWidthShare` of the formula and thinner than
|
|
26
|
+
* `maxThick` units: the horizontal rules. */
|
|
27
|
+
function horizontalRules(r, maxThick = 120) {
|
|
28
|
+
return r.paths
|
|
29
|
+
.map((p) => box(p.d))
|
|
30
|
+
.filter((b) => b.maxX - b.minX > r.viewBox.width * 0.9 && b.maxY - b.minY < maxThick);
|
|
31
|
+
}
|
|
32
|
+
const SUM = String.raw `\begin{array}{rl} 7{,}56 & \text{kg} \\ -6{,}052 & \text{kg} \\ +13{,}7 & \text{kg} \\ \hline 15{,}208 & \text{kg} \end{array}`;
|
|
33
|
+
describe('math rules MathJax strokes (#1362)', () => {
|
|
34
|
+
it("paints an array's \\hline as a filled rule between the rows", () => {
|
|
35
|
+
const r = renderMath(SUM, true, 16);
|
|
36
|
+
expect(r.error).toBeUndefined();
|
|
37
|
+
const rules = horizontalRules(r);
|
|
38
|
+
expect(rules).toHaveLength(1);
|
|
39
|
+
const rule = rules[0];
|
|
40
|
+
// 0.07 em thick (70 units), spanning the array.
|
|
41
|
+
expect(rule.maxY - rule.minY).toBeCloseTo(70, 0);
|
|
42
|
+
expect(rule.minX).toBeCloseTo(r.viewBox.minX, 0);
|
|
43
|
+
expect(rule.maxX).toBeCloseTo(r.viewBox.minX + r.viewBox.width, 0);
|
|
44
|
+
// Between the third and the fourth row: below most glyphs, above some.
|
|
45
|
+
const glyphs = r.paths.filter((p) => box(p.d).maxY - box(p.d).minY >= 120).map((p) => box(p.d));
|
|
46
|
+
const below = glyphs.filter((g) => g.minY > rule.maxY);
|
|
47
|
+
const above = glyphs.filter((g) => g.maxY < rule.minY);
|
|
48
|
+
expect(below.length).toBeGreaterThan(0);
|
|
49
|
+
expect(above.length).toBeGreaterThan(below.length);
|
|
50
|
+
});
|
|
51
|
+
it('keeps the rule in the HTML markup with its stroke as attributes', () => {
|
|
52
|
+
const r = renderMath(SUM, true, 16);
|
|
53
|
+
expect(r.svg).toMatch(/<line data-line="h"[^>]*stroke-width="70"/);
|
|
54
|
+
});
|
|
55
|
+
it('paints column bars and a frame as outlines, not a filled block', () => {
|
|
56
|
+
const r = renderMath(String.raw `\begin{array}{|c|c|}\hline a & b \\ \hline c & d \\ \hline\end{array}`, true, 16);
|
|
57
|
+
const area = r.viewBox.width * r.viewBox.height;
|
|
58
|
+
for (const p of r.paths) {
|
|
59
|
+
const b = box(p.d);
|
|
60
|
+
// Nothing covers the formula: the frame is a ring, not a rect.
|
|
61
|
+
const pts = points(p.d).length;
|
|
62
|
+
if (pts <= 4)
|
|
63
|
+
expect((b.maxX - b.minX) * (b.maxY - b.minY)).toBeLessThan(area * 0.5);
|
|
64
|
+
}
|
|
65
|
+
// The middle \hline is a line; the outer ones are the frame's ring.
|
|
66
|
+
expect(horizontalRules(r)).toHaveLength(1);
|
|
67
|
+
expect(r.paths.some((p) => (p.d.match(/M/g) ?? []).length === 2)).toBe(true);
|
|
68
|
+
expect(r.svg).toMatch(/<rect data-frame="true"[^>]*stroke-width="70" fill="none"/);
|
|
69
|
+
});
|
|
70
|
+
it('draws a dashed rule as separate dashes', () => {
|
|
71
|
+
const r = renderMath(String.raw `\begin{array}{c:c} a & b \\ \hdashline c & d \end{array}`, true, 16);
|
|
72
|
+
const line = r.paths.find((p) => (p.d.match(/M/g) ?? []).length > 3);
|
|
73
|
+
expect(line).toBeDefined();
|
|
74
|
+
expect(r.svg).toMatch(/stroke-dasharray="140"/);
|
|
75
|
+
});
|
|
76
|
+
it('outlines \\boxed instead of filling its box over the formula', () => {
|
|
77
|
+
const r = renderMath(String.raw `\boxed{x}`, true, 16);
|
|
78
|
+
const frame = r.paths.find((p) => (p.d.match(/M/g) ?? []).length === 2);
|
|
79
|
+
expect(frame).toBeDefined();
|
|
80
|
+
});
|
|
81
|
+
it('strokes \\cancel and \\enclose{circle}', () => {
|
|
82
|
+
const cancel = renderMath(String.raw `\cancel{x}`, true, 16);
|
|
83
|
+
const plain = renderMath('x', true, 16);
|
|
84
|
+
expect(cancel.paths.length).toBe(plain.paths.length + 1);
|
|
85
|
+
const circle = renderMath(String.raw `\enclose{circle}{x}`, true, 16);
|
|
86
|
+
expect(circle.paths.length).toBe(plain.paths.length + 1);
|
|
87
|
+
expect(circle.paths.at(-1).d).toMatch(/C/);
|
|
88
|
+
});
|
|
89
|
+
});
|
|
90
|
+
describe('stroke outlines', () => {
|
|
91
|
+
it('turns a segment into a quad of its width', () => {
|
|
92
|
+
expect(box(strokeSegment(0, 10, 100, 10, 4))).toEqual({ minX: 0, maxX: 100, minY: 8, maxY: 12 });
|
|
93
|
+
});
|
|
94
|
+
it('extends square caps and dots a round-capped zero dash', () => {
|
|
95
|
+
expect(box(strokeSegment(0, 0, 10, 0, 2, undefined, 'square')).minX).toBe(-1);
|
|
96
|
+
const dots = strokeSegment(0, 0, 280, 0, 70, '0,140', 'round');
|
|
97
|
+
expect((dots.match(/M/g) ?? []).length).toBe(3);
|
|
98
|
+
});
|
|
99
|
+
it('leaves a zero-gap pattern solid', () => {
|
|
100
|
+
expect((strokeSegment(0, 0, 100, 0, 2, '10,0').match(/M/g) ?? []).length).toBe(1);
|
|
101
|
+
});
|
|
102
|
+
it('frames a rect with an outer and an inner edge', () => {
|
|
103
|
+
const d = strokeRect(0, 0, 100, 50, 10);
|
|
104
|
+
expect((d.match(/M/g) ?? []).length).toBe(2);
|
|
105
|
+
expect(box(d)).toEqual({ minX: -5, maxX: 105, minY: -5, maxY: 55 });
|
|
106
|
+
});
|
|
107
|
+
it('reads a non-default thickness given in em', () => {
|
|
108
|
+
const out = normalizeTableRules('<line data-line="h" class="mjx-dashed" x1="0" y1="0" x2="1" y2="0" stroke-thickness="0.1" stroke-dasharray="0.2"></line>');
|
|
109
|
+
expect(out).toContain('stroke-width="100"');
|
|
110
|
+
expect(out).toContain('stroke-dasharray="200"');
|
|
111
|
+
expect(out).not.toContain('stroke-thickness');
|
|
112
|
+
});
|
|
113
|
+
});
|
|
114
|
+
//# sourceMappingURL=mathRules.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mathRules.test.js","sourceRoot":"","sources":["../../../src/__tests__/math/mathRules.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -82,6 +82,17 @@ describe('music engine', () => {
|
|
|
82
82
|
expect(words('every').flat().length).toBeGreaterThan(system.flat().length);
|
|
83
83
|
expect(words('none').flat()).toEqual([]);
|
|
84
84
|
});
|
|
85
|
+
it('keeps a two-digit bar number at a system start inside the slice (#1310)', () => {
|
|
86
|
+
const tune = `X:1\nM:6/8\nL:1/8\nK:Am\n${'A | c2 d e>fe | d2 B G>AB | c2 A A>^GA | B2 ^G E2 A |\n'.repeat(4)}]\n`;
|
|
87
|
+
const r = renderScore(tune, 'abc', 472, { ...OPTS, staffSizePx: 20.8, spacing: 1.6 });
|
|
88
|
+
const numbers = r.systems.flatMap((s) => s.items.filter((i) => i.type === 'text'));
|
|
89
|
+
expect(numbers.some((n) => n.text.length >= 2)).toBe(true);
|
|
90
|
+
for (const n of numbers) {
|
|
91
|
+
// Centred on x: half its width (about half an em a digit) left of it.
|
|
92
|
+
const half = n.anchor === 'middle' ? (n.text.length * n.sizePx * 0.5) / 2 : 0;
|
|
93
|
+
expect(n.x - half).toBeGreaterThanOrEqual(0);
|
|
94
|
+
}
|
|
95
|
+
});
|
|
85
96
|
it('keeps a chord symbol\'s raised figure smaller and on its own baseline (**harm)', () => {
|
|
86
97
|
const kern = ['**kern\t**harm', '*clefF4\t*', '*M4/4\t*', '4G\tI', '4D\tV7', '4C\tIV', '4G\tI', '==\t==', '*-\t*-'].join('\n');
|
|
87
98
|
const words = renderScore(kern, 'humdrum', 600, OPTS).systems.flatMap((s) => s.items.filter((i) => i.type === 'text'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"musicEngine.test.js","sourceRoot":"","sources":["../../../src/__tests__/music/musicEngine.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,WAAW,EAA2B,MAAM,sBAAsB,CAAC;AAE7F,MAAM,GAAG,GAAG;;;;;;;;CAQX,CAAC;AAEF,MAAM,IAAI,GAAuB;IAC/B,WAAW,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC;CACrF,CAAC;AAEF,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,SAAS,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IAE5D,EAAE,CAAC,+EAA+E,EAAE,GAAG,EAAE;QACvF,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QAClD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,CAAC;QACnC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACnE,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YAC/B,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC5B,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;YACvC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACpE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACrE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC;QAC1D,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,CAAC,GAAG,WAAW,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QAC7C,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;YAC1B,KAAK,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;gBACzB,IAAI,EAAE,CAAC,IAAI,KAAK,MAAM;oBAAE,SAAS;gBACjC,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAChE,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC9C,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5C,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,IAAI,GAAG;YACX,gCAAgC;YAChC,qCAAqC;YACrC,gCAAgC;YAChC,4BAA4B;YAC5B,iBAAiB;YACjB,iBAAiB;YACjB,gBAAgB;YAChB,iBAAiB;YACjB,YAAY;YACZ,iBAAiB;YACjB,gBAAgB;YAChB,gBAAgB;SACjB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,MAAM,CAAC,GAAG,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QAClD,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,CAAC;QAChC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QAC5C,oDAAoD;QACpD,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAE,CAAC,QAAQ,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC;QACrE,yDAAyD;QACzD,KAAK,MAAM,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAE,CAAC,KAAK,EAAE,CAAC;YACrC,IAAI,EAAE,CAAC,IAAI,KAAK,MAAM;gBAAE,SAAS;YACjC,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC;gBACpD,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;gBAClF,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC;YACxD,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACxE,MAAM,IAAI,GAAG,2BAA2B,sBAAsB,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;QAC9E,MAAM,KAAK,GAAG,CAAC,UAA4C,EAAE,EAAE,CAC7D,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAE,CAAsB,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/J,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC/B,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC9B,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvF,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC;QAC3E,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gFAAgF,EAAE,GAAG,EAAE;QACxF,MAAM,IAAI,GAAG,CAAC,gBAAgB,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/H,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAkE,CAAC;QACxL,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC;QAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC;QAChD,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;QAC5B,MAAM,CAAC,KAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAE,CAAC,MAAM,CAAC,CAAC;QAC9C,MAAM,CAAC,KAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1C,MAAM,CAAC,KAAM,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAE,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,CAAC,GAAG,WAAW,CAAC,cAAc,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QACxD,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"musicEngine.test.js","sourceRoot":"","sources":["../../../src/__tests__/music/musicEngine.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"closingBandChapterEndNotes.test.d.ts","sourceRoot":"","sources":["../../../../src/__tests__/pipeline/bands/closingBandChapterEndNotes.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { buildDocument } from '../../../pipeline/build.js';
|
|
3
|
+
import { createMeasurementCache } from '../../../measure/index.js';
|
|
4
|
+
import { columnClipRect } from '../../../paint/columnClip.js';
|
|
5
|
+
// Deterministic text measurement stub (no DOM in the node test env).
|
|
6
|
+
class StubCtx {
|
|
7
|
+
font = '';
|
|
8
|
+
measureText(s) {
|
|
9
|
+
return { width: s.length * 7 };
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
globalThis.OffscreenCanvas = class {
|
|
13
|
+
getContext() {
|
|
14
|
+
return new StubCtx();
|
|
15
|
+
}
|
|
16
|
+
};
|
|
17
|
+
const mm = (value) => ({ value, unit: 'mm' });
|
|
18
|
+
const SENT = 'The lantern of the lighthouse must stay lit all night to guide the ships that cross the bay. ';
|
|
19
|
+
const filler = (n) => SENT.repeat(n).trim();
|
|
20
|
+
const config = (align) => ({
|
|
21
|
+
page: { width: mm(160), height: mm(120), margins: { top: mm(10), bottom: mm(10), left: mm(10), right: mm(10) } },
|
|
22
|
+
layout: { layoutType: 'double' },
|
|
23
|
+
links: { print: 'notes' },
|
|
24
|
+
footnotes: { placement: 'chapterEnd', chapterEndAlign: align },
|
|
25
|
+
});
|
|
26
|
+
/** A chapter whose closing page holds some text and a keep-together box of
|
|
27
|
+
* two links, the links' notes set after the chapter, the next chapter
|
|
28
|
+
* opening on a page of its own. */
|
|
29
|
+
const md = (before) => [
|
|
30
|
+
'# One', '', filler(52), '', filler(before), '',
|
|
31
|
+
':::callout', '- [Alpha](https://example.org/a)', '- [Beta](https://example.org/b)', ':::', '',
|
|
32
|
+
'# Two {span=page}', '', filler(3),
|
|
33
|
+
].join('\n');
|
|
34
|
+
const build = (before, align) => buildDocument({ markdown: md(before) }, config(align), createMeasurementCache());
|
|
35
|
+
const closingPage = (doc) => doc.pages.find((p) => p.columns.some((c) => c.blocks.some((b) => b.footnoteNote !== undefined)));
|
|
36
|
+
const textFoot = (page, col) => {
|
|
37
|
+
const blocks = page.columns[col].blocks.filter((b) => b.footnoteNote === undefined && !b.hidden);
|
|
38
|
+
const last = blocks[blocks.length - 1];
|
|
39
|
+
return last ? last.bbox.y + last.bbox.height : -1;
|
|
40
|
+
};
|
|
41
|
+
describe('a closing band with chapter-end notes at the column foot (#1363)', () => {
|
|
42
|
+
it('is cut level as with the notes under the text, the notes at the foot', () => {
|
|
43
|
+
for (const before of [12, 14, 16]) {
|
|
44
|
+
const footDoc = build(before, 'foot');
|
|
45
|
+
const foot = closingPage(footDoc);
|
|
46
|
+
const text = closingPage(build(before, 'text'));
|
|
47
|
+
// The text and the box split across both columns, as they do with the
|
|
48
|
+
// notes set under the text: the second column is not left empty.
|
|
49
|
+
expect(foot.columns[1].blocks.some((b) => b.type === 'callout'), `before=${before}`).toBe(true);
|
|
50
|
+
expect(textFoot(foot, 0), `before=${before}`).toBe(textFoot(text, 0));
|
|
51
|
+
expect(textFoot(foot, 1), `before=${before}`).toBe(textFoot(text, 1));
|
|
52
|
+
// The notes stand at the true foot of the column, and the column's
|
|
53
|
+
// box (what the renderers clip it to) still holds them.
|
|
54
|
+
const col = foot.columns.find((c) => c.blocks.some((b) => b.footnoteNote !== undefined));
|
|
55
|
+
const note = col.blocks[col.blocks.length - 1];
|
|
56
|
+
const line = note.lines[note.lines.length - 1];
|
|
57
|
+
const pageFoot = foot.contentArea.y + foot.contentArea.height;
|
|
58
|
+
expect(Math.abs(line.bbox.y + line.bbox.height - pageFoot)).toBeLessThan(footDoc.baselineGrid);
|
|
59
|
+
const clip = columnClipRect(col, 300);
|
|
60
|
+
for (const b of col.blocks) {
|
|
61
|
+
for (const l of b.lines)
|
|
62
|
+
expect(l.bbox.y + l.bbox.height).toBeLessThanOrEqual(clip.y + clip.height + 0.5);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}, 60_000);
|
|
66
|
+
});
|
|
67
|
+
//# sourceMappingURL=closingBandChapterEndNotes.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"closingBandChapterEndNotes.test.js","sourceRoot":"","sources":["../../../../src/__tests__/pipeline/bands/closingBandChapterEndNotes.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAG9D,qEAAqE;AACrE,MAAM,OAAO;IACX,IAAI,GAAG,EAAE,CAAC;IACV,WAAW,CAAC,CAAS;QACnB,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;IACjC,CAAC;CACF;AACA,UAAsD,CAAC,eAAe,GAAG;IACxE,UAAU;QACR,OAAO,IAAI,OAAO,EAAE,CAAC;IACvB,CAAC;CACF,CAAC;AAEF,MAAM,EAAE,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAa,EAAE,CAAC,CAAC;AAC/D,MAAM,IAAI,GAAG,+FAA+F,CAAC;AAC7G,MAAM,MAAM,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAE5D,MAAM,MAAM,GAAG,CAAC,KAAsB,EAAiB,EAAE,CAAC,CAAC;IACzD,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;IAChH,MAAM,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE;IAChC,KAAK,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE;IACzB,SAAS,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,eAAe,EAAE,KAAK,EAAE;CAC/D,CAAC,CAAC;AAEH;;oCAEoC;AACpC,MAAM,EAAE,GAAG,CAAC,MAAc,EAAU,EAAE,CAAC;IACrC,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE;IAC/C,YAAY,EAAE,kCAAkC,EAAE,iCAAiC,EAAE,KAAK,EAAE,EAAE;IAC9F,mBAAmB,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;CACnC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,MAAM,KAAK,GAAG,CAAC,MAAc,EAAE,KAAsB,EAAe,EAAE,CACpE,aAAa,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,sBAAsB,EAAE,CAAC,CAAC;AAEnF,MAAM,WAAW,GAAG,CAAC,GAAgB,EAAW,EAAE,CAChD,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAE,CAAC;AAEpG,MAAM,QAAQ,GAAG,CAAC,IAAa,EAAE,GAAW,EAAU,EAAE;IACtD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAClG,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACvC,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACpD,CAAC,CAAC;AAEF,QAAQ,CAAC,kEAAkE,EAAE,GAAG,EAAE;IAChF,EAAE,CAAC,sEAAsE,EAAE,GAAG,EAAE;QAC9E,KAAK,MAAM,MAAM,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;YAClC,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACtC,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;YAClC,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;YAChD,sEAAsE;YACtE,iEAAiE;YACjE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,EAAE,UAAU,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjG,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,UAAU,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACtE,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,UAAU,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACtE,mEAAmE;YACnE,wDAAwD;YACxD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,SAAS,CAAC,CAAE,CAAC;YAC1F,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC;YAChD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC;YAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;YAC9D,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YAC/F,MAAM,IAAI,GAAG,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACtC,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;gBAC3B,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK;oBAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC;YAC5G,CAAC;QACH,CAAC;IACH,CAAC,EAAE,MAAM,CAAC,CAAC;AACb,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"afterFloatUnderSpan.test.d.ts","sourceRoot":"","sources":["../../../../src/__tests__/pipeline/columns/afterFloatUnderSpan.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { buildDocument } from '../../../pipeline/index.js';
|
|
3
|
+
import { createMeasurementCache } from '../../../measure/index.js';
|
|
4
|
+
import { collectColumnGaps } from '../../../pipeline/columns/columnBalancing/columnGaps.js';
|
|
5
|
+
// Deterministic text measurement stub (no DOM in the node test env).
|
|
6
|
+
class StubCtx {
|
|
7
|
+
font = '';
|
|
8
|
+
measureText(s) {
|
|
9
|
+
return { width: s.length * 7 };
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
globalThis.OffscreenCanvas = class {
|
|
13
|
+
getContext() {
|
|
14
|
+
return new StubCtx();
|
|
15
|
+
}
|
|
16
|
+
};
|
|
17
|
+
const SENTENCE = 'La linterna del faro debe permanecer encendida toda la noche para guiar a los barcos que cruzan la bahía.';
|
|
18
|
+
const paras = (n, per) => Array.from({ length: n }, () => Array.from({ length: per }, () => SENTENCE).join(' ')).join('\n\n');
|
|
19
|
+
const mm = (value) => ({ value, unit: 'mm' });
|
|
20
|
+
/** Two-column page, 23 lines a column. */
|
|
21
|
+
const TWO_COL = {
|
|
22
|
+
page: { width: mm(160), height: mm(120), margins: { top: mm(10), bottom: mm(10), left: mm(10), right: mm(10) } },
|
|
23
|
+
layout: { layoutType: 'double' },
|
|
24
|
+
};
|
|
25
|
+
const picture = (id, height, span) => ({
|
|
26
|
+
id,
|
|
27
|
+
typeId: 'figure',
|
|
28
|
+
kind: 'bitmap',
|
|
29
|
+
caption: `Figura ${id}.`,
|
|
30
|
+
createdAt: 0,
|
|
31
|
+
updatedAt: 0,
|
|
32
|
+
bitmap: { fileId: `${id}.png`, format: 'png', width: 1000, height },
|
|
33
|
+
placement: { position: 'here', span },
|
|
34
|
+
});
|
|
35
|
+
/** A box floated to the head of the first column, a page-wide picture set
|
|
36
|
+
* in the text under it (a span block cutting the page in two bands), and
|
|
37
|
+
* a column picture too tall for the room left in the lower band: that
|
|
38
|
+
* band's first column ends short. */
|
|
39
|
+
const MD = [
|
|
40
|
+
[':::callout{placement="top" title="Ficha"}', SENTENCE, SENTENCE, ':::'].join('\n'),
|
|
41
|
+
paras(1, 1),
|
|
42
|
+
'::resource{id="wide"}',
|
|
43
|
+
paras(1, 1),
|
|
44
|
+
'::resource{id="col"}',
|
|
45
|
+
paras(4, 3),
|
|
46
|
+
].join('\n\n');
|
|
47
|
+
const build = () => buildDocument({ markdown: MD, resources: [picture('wide', 300, 'page'), picture('col', 500, 'column')] }, TWO_COL, createMeasurementCache());
|
|
48
|
+
describe('balancing under a page-span block below a column-head float (#1368)', () => {
|
|
49
|
+
it('offers no after-float room to the columns under the span block', () => {
|
|
50
|
+
const doc = build();
|
|
51
|
+
const page = doc.pages[0];
|
|
52
|
+
// The setup: the box heads the first column, the picture spans the
|
|
53
|
+
// page under it, and a band of columns follows.
|
|
54
|
+
const box = (page.floats ?? []).find((f) => f.type === 'callout');
|
|
55
|
+
const span = page.columns.find((c) => c.kind === 'span' && c.bbox.height > 0.5);
|
|
56
|
+
expect(box).toBeDefined();
|
|
57
|
+
expect(span).toBeDefined();
|
|
58
|
+
expect(span.bbox.y).toBeGreaterThanOrEqual(box.bbox.y + box.bbox.height - 0.5);
|
|
59
|
+
const lower = page.columns.filter((c) => c.kind !== 'span' && (c.band ?? 0) > 0);
|
|
60
|
+
expect(lower.length).toBeGreaterThan(0);
|
|
61
|
+
// The box stands over the band above the span block, not over the
|
|
62
|
+
// columns under it: no room goes between them and the box.
|
|
63
|
+
for (const g of collectColumnGaps(doc, new Set())) {
|
|
64
|
+
const col = doc.pages[g.pageIndex].columns[g.columnIndex];
|
|
65
|
+
if ((col.band ?? 0) === 0)
|
|
66
|
+
continue;
|
|
67
|
+
expect(g.candidates.filter((c) => c.kind === 'afterFloat'), `page ${g.pageIndex} column ${g.columnIndex}`).toHaveLength(0);
|
|
68
|
+
}
|
|
69
|
+
}, 60_000);
|
|
70
|
+
it('converges: no lever the pass cannot apply keeps the balancing going', () => {
|
|
71
|
+
expect(build().converged).toBe(true);
|
|
72
|
+
}, 60_000);
|
|
73
|
+
});
|
|
74
|
+
//# sourceMappingURL=afterFloatUnderSpan.test.js.map
|