postext 1.79.0 → 1.81.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/__tests__/defaults/captionStyle.test.js +1 -1
- package/dist/__tests__/defaults/captionStyle.test.js.map +1 -1
- package/dist/__tests__/defaults/designComposition.test.d.ts +2 -0
- package/dist/__tests__/defaults/designComposition.test.d.ts.map +1 -0
- package/dist/__tests__/defaults/designComposition.test.js +100 -0
- package/dist/__tests__/defaults/designComposition.test.js.map +1 -0
- package/dist/__tests__/exports.test.js +18 -0
- package/dist/__tests__/exports.test.js.map +1 -1
- package/dist/__tests__/html-backend/htmlBook.test.d.ts +2 -0
- package/dist/__tests__/html-backend/htmlBook.test.d.ts.map +1 -0
- package/dist/__tests__/html-backend/htmlBook.test.js +130 -0
- package/dist/__tests__/html-backend/htmlBook.test.js.map +1 -0
- package/dist/__tests__/hyphenation/exceptionsByLanguage.test.d.ts +2 -0
- package/dist/__tests__/hyphenation/exceptionsByLanguage.test.d.ts.map +1 -0
- package/dist/__tests__/hyphenation/exceptionsByLanguage.test.js +60 -0
- package/dist/__tests__/hyphenation/exceptionsByLanguage.test.js.map +1 -0
- package/dist/__tests__/hyphenation/exceptionsByLanguageBook.test.d.ts +2 -0
- package/dist/__tests__/hyphenation/exceptionsByLanguageBook.test.d.ts.map +1 -0
- package/dist/__tests__/hyphenation/exceptionsByLanguageBook.test.js +87 -0
- package/dist/__tests__/hyphenation/exceptionsByLanguageBook.test.js.map +1 -0
- package/dist/__tests__/hyphenation/exceptionsFile.test.d.ts +2 -0
- package/dist/__tests__/hyphenation/exceptionsFile.test.d.ts.map +1 -0
- package/dist/__tests__/hyphenation/exceptionsFile.test.js +95 -0
- package/dist/__tests__/hyphenation/exceptionsFile.test.js.map +1 -0
- package/dist/__tests__/pipeline/resources/captionHyphenation.test.d.ts +2 -0
- package/dist/__tests__/pipeline/resources/captionHyphenation.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/resources/captionHyphenation.test.js +252 -0
- package/dist/__tests__/pipeline/resources/captionHyphenation.test.js.map +1 -0
- package/dist/__tests__/pipeline/text/lineEdgeRulesElsewhere.test.d.ts +2 -0
- package/dist/__tests__/pipeline/text/lineEdgeRulesElsewhere.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/text/lineEdgeRulesElsewhere.test.js +217 -0
- package/dist/__tests__/pipeline/text/lineEdgeRulesElsewhere.test.js.map +1 -0
- package/dist/bundle/design.d.ts.map +1 -1
- package/dist/bundle/design.js +4 -3
- package/dist/bundle/design.js.map +1 -1
- package/dist/checks/snippetEdges.d.ts +32 -0
- package/dist/checks/snippetEdges.d.ts.map +1 -0
- package/dist/checks/snippetEdges.js +57 -0
- package/dist/checks/snippetEdges.js.map +1 -0
- package/dist/checks/spaceBreaks.d.ts +7 -0
- package/dist/checks/spaceBreaks.d.ts.map +1 -1
- package/dist/checks/spaceBreaks.js +21 -13
- package/dist/checks/spaceBreaks.js.map +1 -1
- package/dist/checks/stacks.d.ts +6 -1
- package/dist/checks/stacks.d.ts.map +1 -1
- package/dist/checks/stacks.js +33 -24
- package/dist/checks/stacks.js.map +1 -1
- package/dist/defaults/resources/captionStyle.d.ts.map +1 -1
- package/dist/defaults/resources/captionStyle.js +26 -0
- package/dist/defaults/resources/captionStyle.js.map +1 -1
- package/dist/defaults/resources/tableStyle.d.ts.map +1 -1
- package/dist/defaults/resources/tableStyle.js +6 -0
- package/dist/defaults/resources/tableStyle.js.map +1 -1
- package/dist/defaults/text/bodyText/defaults.d.ts.map +1 -1
- package/dist/defaults/text/bodyText/defaults.js +7 -2
- package/dist/defaults/text/bodyText/defaults.js.map +1 -1
- package/dist/defaults/text/bodyText/resolve.d.ts.map +1 -1
- package/dist/defaults/text/bodyText/resolve.js +3 -1
- package/dist/defaults/text/bodyText/resolve.js.map +1 -1
- package/dist/designs/conventions.d.ts +34 -0
- package/dist/designs/conventions.d.ts.map +1 -0
- package/dist/designs/conventions.js +85 -0
- package/dist/designs/conventions.js.map +1 -0
- package/dist/designs/design.d.ts +6 -0
- package/dist/designs/design.d.ts.map +1 -1
- package/dist/designs/design.js +11 -0
- package/dist/designs/design.js.map +1 -1
- package/dist/designs/index.d.ts +3 -1
- package/dist/designs/index.d.ts.map +1 -1
- package/dist/designs/index.js +2 -1
- package/dist/designs/index.js.map +1 -1
- package/dist/designs/parts.d.ts +18 -7
- package/dist/designs/parts.d.ts.map +1 -1
- package/dist/designs/parts.js +65 -34
- package/dist/designs/parts.js.map +1 -1
- package/dist/html-backend/book.d.ts +93 -0
- package/dist/html-backend/book.d.ts.map +1 -0
- package/dist/html-backend/book.js +150 -0
- package/dist/html-backend/book.js.map +1 -0
- package/dist/html-backend/html-backend.d.ts +2 -0
- package/dist/html-backend/html-backend.d.ts.map +1 -1
- package/dist/html-backend/html-backend.js +3 -0
- package/dist/html-backend/html-backend.js.map +1 -1
- package/dist/hyphenation/exceptionsFile.d.ts +76 -0
- package/dist/hyphenation/exceptionsFile.d.ts.map +1 -0
- package/dist/hyphenation/exceptionsFile.js +247 -0
- package/dist/hyphenation/exceptionsFile.js.map +1 -0
- package/dist/hyphenation/hyphenate.d.ts +8 -1
- package/dist/hyphenation/hyphenate.d.ts.map +1 -1
- package/dist/hyphenation/hyphenate.js +28 -13
- package/dist/hyphenation/hyphenate.js.map +1 -1
- package/dist/hyphenation/hyphenationExceptions.d.ts +10 -0
- package/dist/hyphenation/hyphenationExceptions.d.ts.map +1 -1
- package/dist/hyphenation/hyphenationExceptions.js +30 -0
- package/dist/hyphenation/hyphenationExceptions.js.map +1 -1
- package/dist/index.d.ts +4 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/knuthPlass/richAdapter.d.ts +3 -0
- package/dist/knuthPlass/richAdapter.d.ts.map +1 -1
- package/dist/knuthPlass/richAdapter.js +2 -0
- package/dist/knuthPlass/richAdapter.js.map +1 -1
- package/dist/measure/plain.d.ts.map +1 -1
- package/dist/measure/plain.js +6 -0
- package/dist/measure/plain.js.map +1 -1
- package/dist/measure/rich/greedyRules.d.ts +28 -0
- package/dist/measure/rich/greedyRules.d.ts.map +1 -0
- package/dist/measure/rich/greedyRules.js +77 -0
- package/dist/measure/rich/greedyRules.js.map +1 -0
- package/dist/measure/rich/measure.d.ts.map +1 -1
- package/dist/measure/rich/measure.js +12 -0
- package/dist/measure/rich/measure.js.map +1 -1
- package/dist/measure/rich/tokenize.js +1 -1
- package/dist/measure/rich/tokenize.js.map +1 -1
- package/dist/pipeline/blocks/measureContentBlock/measureOptions.d.ts.map +1 -1
- package/dist/pipeline/blocks/measureContentBlock/measureOptions.js +6 -5
- package/dist/pipeline/blocks/measureContentBlock/measureOptions.js.map +1 -1
- package/dist/pipeline/blocks/measureContentBlock.d.ts.map +1 -1
- package/dist/pipeline/blocks/measureContentBlock.js +3 -0
- package/dist/pipeline/blocks/measureContentBlock.js.map +1 -1
- package/dist/pipeline/build/pass/setup/contentSetup.d.ts +1 -0
- package/dist/pipeline/build/pass/setup/contentSetup.d.ts.map +1 -1
- package/dist/pipeline/build/pass/setup/passFinish.d.ts.map +1 -1
- package/dist/pipeline/build/pass/setup/passFinish.js +9 -3
- package/dist/pipeline/build/pass/setup/passFinish.js.map +1 -1
- package/dist/pipeline/build/pass.js +2 -1
- package/dist/pipeline/build/pass.js.map +1 -1
- package/dist/pipeline/contentWarnings/formatWarning.js +11 -3
- package/dist/pipeline/contentWarnings/formatWarning.js.map +1 -1
- package/dist/pipeline/contentWarnings/layoutWarnings.d.ts +10 -0
- package/dist/pipeline/contentWarnings/layoutWarnings.d.ts.map +1 -1
- package/dist/pipeline/contentWarnings/layoutWarnings.js +22 -0
- package/dist/pipeline/contentWarnings/layoutWarnings.js.map +1 -1
- package/dist/pipeline/contentWarnings.d.ts +1 -1
- package/dist/pipeline/contentWarnings.d.ts.map +1 -1
- package/dist/pipeline/contentWarnings.js +1 -1
- package/dist/pipeline/contentWarnings.js.map +1 -1
- package/dist/pipeline/contents/indexDirective.d.ts.map +1 -1
- package/dist/pipeline/contents/indexDirective.js +4 -1
- package/dist/pipeline/contents/indexDirective.js.map +1 -1
- package/dist/pipeline/contents/toc.d.ts.map +1 -1
- package/dist/pipeline/contents/toc.js +5 -2
- package/dist/pipeline/contents/toc.js.map +1 -1
- package/dist/pipeline/resources/resourceLayout/captions.d.ts.map +1 -1
- package/dist/pipeline/resources/resourceLayout/captions.js +3 -2
- package/dist/pipeline/resources/resourceLayout/captions.js.map +1 -1
- package/dist/pipeline/resources/resourceLayout/resourceBlock/captionNotes.d.ts.map +1 -1
- package/dist/pipeline/resources/resourceLayout/resourceBlock/captionNotes.js +3 -2
- package/dist/pipeline/resources/resourceLayout/resourceBlock/captionNotes.js.map +1 -1
- package/dist/pipeline/resources/resourceLayout/resourceBlock.js +1 -1
- package/dist/pipeline/resources/resourceLayout/resourceBlock.js.map +1 -1
- package/dist/pipeline/resources/resourceLayout/snippets.d.ts +18 -10
- package/dist/pipeline/resources/resourceLayout/snippets.d.ts.map +1 -1
- package/dist/pipeline/resources/resourceLayout/snippets.js +33 -20
- package/dist/pipeline/resources/resourceLayout/snippets.js.map +1 -1
- package/dist/pipeline/styles.d.ts +4 -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/pipeline/text/lineEdgeRules.d.ts +17 -0
- package/dist/pipeline/text/lineEdgeRules.d.ts.map +1 -0
- package/dist/pipeline/text/lineEdgeRules.js +28 -0
- package/dist/pipeline/text/lineEdgeRules.js.map +1 -0
- package/dist/pipeline/text/verse.d.ts +4 -1
- package/dist/pipeline/text/verse.d.ts.map +1 -1
- package/dist/pipeline/text/verse.js +4 -4
- package/dist/pipeline/text/verse.js.map +1 -1
- package/dist/pipeline/text/verseLines.d.ts +4 -1
- package/dist/pipeline/text/verseLines.d.ts.map +1 -1
- package/dist/pipeline/text/verseLines.js +1 -1
- package/dist/pipeline/text/verseLines.js.map +1 -1
- package/dist/types/resources/tableStyles.d.ts +28 -0
- package/dist/types/resources/tableStyles.d.ts.map +1 -1
- package/dist/types/text/locale.d.ts +16 -0
- package/dist/types/text/locale.d.ts.map +1 -1
- package/dist/vdt/contentWarnings/text.d.ts +22 -9
- package/dist/vdt/contentWarnings/text.d.ts.map +1 -1
- package/dist/word/semantic/media/captions.js +1 -1
- package/dist/word/semantic/media/captions.js.map +1 -1
- package/dist/word/semantic/prose/caption.d.ts.map +1 -1
- package/dist/word/semantic/prose/caption.js +4 -3
- package/dist/word/semantic/prose/caption.js.map +1 -1
- package/dist/word/semantic/table/styles.js +2 -2
- package/dist/word/semantic/table/styles.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,217 @@
|
|
|
1
|
+
import { describe, it, expect, afterEach } from 'vitest';
|
|
2
|
+
import { buildDocument } from '../../../pipeline/build.js';
|
|
3
|
+
import { findStacks } from '../../../checks/stacks.js';
|
|
4
|
+
import { useWasmLineBreaker } from '../../../knuthPlass/index.js';
|
|
5
|
+
import { formatWarning } from '../../../pipeline/contentWarnings.js';
|
|
6
|
+
// #1542: the line-edge rules (stacks, citation and operator breaks) in the
|
|
7
|
+
// line breakers outside the running text's Knuth–Plass: the greedy
|
|
8
|
+
// fallback, verse turnovers, contents and index entries, ragged text; and
|
|
9
|
+
// the faults of captions and table cells reported under 'warn'.
|
|
10
|
+
// Every character, the space included, is 7 px wide.
|
|
11
|
+
class StubCtx {
|
|
12
|
+
font = '';
|
|
13
|
+
measureText(s) {
|
|
14
|
+
return { width: s.length * 7 };
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
globalThis.OffscreenCanvas = class {
|
|
18
|
+
getContext() {
|
|
19
|
+
return new StubCtx();
|
|
20
|
+
}
|
|
21
|
+
};
|
|
22
|
+
const pt = (value) => ({ value, unit: 'pt' });
|
|
23
|
+
const config = (width, bodyText = {}, extra = {}) => ({
|
|
24
|
+
locale: 'es',
|
|
25
|
+
page: { dpi: 72, width: pt(width), height: pt(6000), margins: { top: pt(0), bottom: pt(0), left: pt(0), right: pt(0) } },
|
|
26
|
+
layout: { layoutType: 'single' },
|
|
27
|
+
header: { elements: [] },
|
|
28
|
+
footer: { elements: [] },
|
|
29
|
+
...extra,
|
|
30
|
+
bodyText: { firstLineIndent: pt(0), textAlign: 'justify', hyphenation: { enabled: true }, ...bodyText },
|
|
31
|
+
});
|
|
32
|
+
const textOf = (lines) => lines.map((l) => l.text);
|
|
33
|
+
const bodyLines = (doc) => doc.pages.flatMap((p) => p.columns.flatMap((c) => c.blocks.flatMap((b) => textOf(b.lines))));
|
|
34
|
+
/** Both space rules avoided at a cost no line outweighs. */
|
|
35
|
+
const DEAR = { citationBreaks: 'avoid', citationBreakPenalty: 1e10, operatorBreaks: 'avoid', operatorBreakPenalty: 1e10 };
|
|
36
|
+
const STACKS = { stacks: 'avoid', stackPenalty: 1e10 };
|
|
37
|
+
/** Breaks that leave a line starting with a citation or a piece of one, or
|
|
38
|
+
* starting or ending on a lone sign. */
|
|
39
|
+
const faults = (lines) => lines.reduce((n, l, i) => {
|
|
40
|
+
const t = l.trim();
|
|
41
|
+
const starts = i > 0 && (/^[[(]\d/u.test(t) || /^\d+[a-z]?[\])]/u.test(t) || /^[=<±×]\s/u.test(t));
|
|
42
|
+
const ends = i + 1 < lines.length && /\s[=<±×]$/u.test(t);
|
|
43
|
+
return n + (starts ? 1 : 0) + (ends ? 1 : 0);
|
|
44
|
+
}, 0);
|
|
45
|
+
const CITED = 'Otros autores [12] no lo confirmaron, y algunos estudios [14, 16] tampoco, con p < 0,05 en todos los grupos y un LR+ = 18,29 en la serie corregida [3] de los estudios [21–24].';
|
|
46
|
+
afterEach(() => useWasmLineBreaker(true));
|
|
47
|
+
describe('the greedy fallback', () => {
|
|
48
|
+
// A token with no break wider than the measure: Knuth–Plass finds no
|
|
49
|
+
// setting within it, and the word-by-word breaker sets the paragraph.
|
|
50
|
+
const LONG = 'BCDFGHJKLMNPQRSTVWXZBCDFGHJKLMNP';
|
|
51
|
+
for (const [name, md] of [['plain', `${LONG} ${CITED}`], ['formatted', `*${LONG}* ${CITED}`]]) {
|
|
52
|
+
it(`keeps citations and signs with their words where it can (${name} text)`, () => {
|
|
53
|
+
let off = 0;
|
|
54
|
+
let on = 0;
|
|
55
|
+
let greedy = 0;
|
|
56
|
+
for (const textAlign of ['justify', 'left']) {
|
|
57
|
+
for (let width = 112; width <= 210; width += 7) {
|
|
58
|
+
const plain = buildDocument({ markdown: md }, config(width, { textAlign }));
|
|
59
|
+
const ruled = buildDocument({ markdown: md }, config(width, { textAlign, ...DEAR }));
|
|
60
|
+
// Only where the token was divided: the paragraph went to the
|
|
61
|
+
// greedy pass.
|
|
62
|
+
if (!ruled.blocks.some((b) => b.lines.some((l) => l.wordDivided !== undefined)))
|
|
63
|
+
continue;
|
|
64
|
+
greedy++;
|
|
65
|
+
off += faults(bodyLines(plain));
|
|
66
|
+
on += faults(bodyLines(ruled));
|
|
67
|
+
// No line runs past the measure for it.
|
|
68
|
+
for (const b of ruled.blocks)
|
|
69
|
+
for (const l of b.lines)
|
|
70
|
+
expect(l.bbox.width).toBeLessThanOrEqual(width + 0.01);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
expect(greedy).toBeGreaterThan(5);
|
|
74
|
+
expect(off).toBeGreaterThan(0);
|
|
75
|
+
expect(on).toBeLessThan(off);
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
it('ends a line elsewhere when it would end on the word the line above ends on', () => {
|
|
79
|
+
const md = `${LONG} ${'de la casa de la sierra y de la mar de la luna, de la noche y del día de la fiesta de la vida '.repeat(3)}`;
|
|
80
|
+
let off = 0;
|
|
81
|
+
let on = 0;
|
|
82
|
+
for (let width = 98; width <= 210; width += 7) {
|
|
83
|
+
off += findStacks(buildDocument({ markdown: md }, config(width, { textAlign: 'left', stacks: 'warn' }))).filter((s) => s.edge === 'end').length;
|
|
84
|
+
on += findStacks(buildDocument({ markdown: md }, config(width, { textAlign: 'left', ...STACKS }))).filter((s) => s.edge === 'end').length;
|
|
85
|
+
}
|
|
86
|
+
expect(off).toBeGreaterThan(0);
|
|
87
|
+
expect(on).toBeLessThan(off);
|
|
88
|
+
});
|
|
89
|
+
});
|
|
90
|
+
describe('verse turnovers', () => {
|
|
91
|
+
const md = (line) => `:::verse{align=start}\n${line}\nUna línea corta.\n:::`;
|
|
92
|
+
it('break under the rules', () => {
|
|
93
|
+
let off = 0;
|
|
94
|
+
for (let width = 140; width <= 280; width += 7) {
|
|
95
|
+
const verse = (doc) => doc.blocks.flatMap((b) => textOf(b.lines.filter((l) => l.verseLine)));
|
|
96
|
+
const plain = verse(buildDocument({ markdown: md(CITED) }, config(width, { textAlign: 'left' })));
|
|
97
|
+
const ruled = verse(buildDocument({ markdown: md(CITED) }, config(width, { textAlign: 'left', ...DEAR })));
|
|
98
|
+
off += faults(plain);
|
|
99
|
+
expect(faults(ruled), `${width}: ${ruled.join(' | ')}`).toBe(0);
|
|
100
|
+
expect(ruled.length).toBeGreaterThan(2);
|
|
101
|
+
}
|
|
102
|
+
expect(off).toBeGreaterThan(0);
|
|
103
|
+
});
|
|
104
|
+
});
|
|
105
|
+
describe('contents and index entries', () => {
|
|
106
|
+
const TITLE = 'Resultados con p < 0,05 en el grupo de control y LR+ = 18,29 en la serie de los autores [12] y [14]';
|
|
107
|
+
it('a contents entry that wraps is broken under the rules', () => {
|
|
108
|
+
const md = `:::toc\n:::\n\n# ${TITLE}\n\nTexto.`;
|
|
109
|
+
let off = 0;
|
|
110
|
+
for (let width = 140; width <= 320; width += 7) {
|
|
111
|
+
const toc = (doc) => doc.blocks.filter((b) => b.tocEntry).flatMap((b) => textOf(b.lines));
|
|
112
|
+
const plain = toc(buildDocument({ markdown: md }, config(width)));
|
|
113
|
+
const ruled = toc(buildDocument({ markdown: md }, config(width, DEAR)));
|
|
114
|
+
expect(ruled.length, `${width}`).toBeGreaterThan(1);
|
|
115
|
+
off += faults(plain);
|
|
116
|
+
expect(faults(ruled), `${width}: ${ruled.join(' | ')}`).toBe(0);
|
|
117
|
+
}
|
|
118
|
+
expect(off).toBeGreaterThan(0);
|
|
119
|
+
});
|
|
120
|
+
it('an index entry that turns over is broken under the rules', () => {
|
|
121
|
+
// No brackets in a term: they would close the mark.
|
|
122
|
+
const md = 'Texto :index[Resultados con p < 0,05 en el grupo de control y LR+ = 18,29 en la serie corregida con p < 0,01 en los grupos] y más.\n\n:::index\n:::';
|
|
123
|
+
let off = 0;
|
|
124
|
+
for (let width = 140; width <= 320; width += 7) {
|
|
125
|
+
const index = (doc) => doc.blocks.filter((b) => b.lines.some((l) => l.indexLevel !== undefined)).flatMap((b) => textOf(b.lines));
|
|
126
|
+
const plain = index(buildDocument({ markdown: md }, config(width)));
|
|
127
|
+
const ruled = index(buildDocument({ markdown: md }, config(width, DEAR)));
|
|
128
|
+
expect(ruled.length, `${width}`).toBeGreaterThan(1);
|
|
129
|
+
off += faults(plain);
|
|
130
|
+
expect(faults(ruled), `${width}: ${ruled.join(' | ')}`).toBe(0);
|
|
131
|
+
}
|
|
132
|
+
expect(off).toBeGreaterThan(0);
|
|
133
|
+
});
|
|
134
|
+
});
|
|
135
|
+
describe('captions and table cells under warn', () => {
|
|
136
|
+
const build = (width, bodyText) => buildDocument({
|
|
137
|
+
markdown: 'Texto.\n\n::resource{id="fig"}\n\n::resource{id="tab"}',
|
|
138
|
+
resources: [
|
|
139
|
+
{
|
|
140
|
+
id: 'fig', typeId: 'figure', kind: 'bitmap', caption: CITED, createdAt: 0, updatedAt: 0,
|
|
141
|
+
bitmap: { fileId: 'f.png', format: 'png', width: 400, height: 100 },
|
|
142
|
+
placement: { position: 'here' },
|
|
143
|
+
},
|
|
144
|
+
{
|
|
145
|
+
id: 'tab', typeId: 'table', kind: 'table', caption: 'Tabla', createdAt: 0, updatedAt: 0,
|
|
146
|
+
table: { model: { rows: [[{ content: 'Celda' }, { content: CITED }]] } },
|
|
147
|
+
placement: { position: 'here' },
|
|
148
|
+
},
|
|
149
|
+
],
|
|
150
|
+
}, config(width, bodyText));
|
|
151
|
+
const resourceLines = (doc, kind) => {
|
|
152
|
+
const rb = [...doc.blocks, ...doc.pages.flatMap((p) => p.floats ?? [])].find((b) => b.resourceBlock?.kind === kind).resourceBlock;
|
|
153
|
+
return kind === 'table' ? rb.table.cells.find((c) => c.col === 1).lines : rb.captionLines;
|
|
154
|
+
};
|
|
155
|
+
it('report each citation and operator break with the caption or cell it lies in', () => {
|
|
156
|
+
let seen = 0;
|
|
157
|
+
for (let width = 160; width <= 300; width += 14) {
|
|
158
|
+
const doc = build(width, { citationBreaks: 'warn', operatorBreaks: 'warn' });
|
|
159
|
+
const warned = (doc.contentWarnings ?? []).filter((w) => (w.kind === 'citationBreak' || w.kind === 'operatorBreak') && w.resourceId !== undefined);
|
|
160
|
+
const caption = warned.filter((w) => 'part' in w && w.part === 'caption' && w.resourceId === 'fig');
|
|
161
|
+
const cell = warned.filter((w) => 'part' in w && w.part === 'cell' && w.resourceId === 'tab');
|
|
162
|
+
expect(caption.length, `caption ${width}`).toBe(faults(textOf(resourceLines(doc, 'bitmap'))));
|
|
163
|
+
expect(cell.length, `cell ${width}`).toBe(faults(textOf(resourceLines(doc, 'table'))));
|
|
164
|
+
for (const w of cell)
|
|
165
|
+
expect('cell' in w && w.cell).toEqual({ row: 0, col: 1 });
|
|
166
|
+
for (const w of warned) {
|
|
167
|
+
expect(w.pageIndex).toBe(0);
|
|
168
|
+
expect(formatWarning(w)).toMatch(/^In (the caption of|cell 1, 2 of the table) "(fig|tab)": /);
|
|
169
|
+
}
|
|
170
|
+
seen += warned.length;
|
|
171
|
+
// Under 'allow', none.
|
|
172
|
+
expect((build(width, {}).contentWarnings ?? []).filter((w) => w.kind === 'citationBreak' || w.kind === 'operatorBreak')).toEqual([]);
|
|
173
|
+
}
|
|
174
|
+
expect(seen).toBeGreaterThan(0);
|
|
175
|
+
});
|
|
176
|
+
it('report stacks there too, and under avoid only those the breaker kept', () => {
|
|
177
|
+
const repeated = 'de la casa de la sierra y de la mar de la luna, de la noche y del día de la fiesta de la vida de la casa de la sierra';
|
|
178
|
+
let warned = 0;
|
|
179
|
+
let kept = 0;
|
|
180
|
+
for (let width = 98; width <= 210; width += 7) {
|
|
181
|
+
const doc = buildDocument({
|
|
182
|
+
markdown: 'Texto.\n\n::resource{id="fig"}',
|
|
183
|
+
resources: [{ id: 'fig', typeId: 'figure', kind: 'bitmap', caption: repeated, createdAt: 0, updatedAt: 0, bitmap: { fileId: 'f.png', format: 'png', width: 400, height: 100 }, placement: { position: 'here' } }],
|
|
184
|
+
}, config(width, { stacks: 'warn' }));
|
|
185
|
+
warned += (doc.contentWarnings ?? []).filter((w) => w.kind === 'stack' && w.resourceId === 'fig').length;
|
|
186
|
+
const avoided = buildDocument({
|
|
187
|
+
markdown: 'Texto.\n\n::resource{id="fig"}',
|
|
188
|
+
resources: [{ id: 'fig', typeId: 'figure', kind: 'bitmap', caption: repeated, createdAt: 0, updatedAt: 0, bitmap: { fileId: 'f.png', format: 'png', width: 400, height: 100 }, placement: { position: 'here' } }],
|
|
189
|
+
}, config(width, STACKS));
|
|
190
|
+
kept += (avoided.contentWarnings ?? []).filter((w) => w.kind === 'stack' && w.resourceId === 'fig').length;
|
|
191
|
+
}
|
|
192
|
+
expect(warned).toBeGreaterThan(0);
|
|
193
|
+
expect(kept).toBeLessThan(warned);
|
|
194
|
+
});
|
|
195
|
+
});
|
|
196
|
+
describe('ragged text and stacks', () => {
|
|
197
|
+
const md = 'de la casa de la sierra y de la mar de la luna, de la noche y del día de la fiesta de la vida, de la casa y de la sierra de la mar, de la luna y de la noche del día.';
|
|
198
|
+
it("is broken whole on Knuth–Plass under stacks: 'avoid' without optimalRagged, as under the space rules, in both breakers", () => {
|
|
199
|
+
let off = 0;
|
|
200
|
+
let on = 0;
|
|
201
|
+
for (let width = 98; width <= 210; width += 7) {
|
|
202
|
+
const ragged = { textAlign: 'left', optimalRagged: false, ...STACKS };
|
|
203
|
+
const lines = bodyLines(buildDocument({ markdown: md }, config(width, ragged)));
|
|
204
|
+
// The same lines as with optimalRagged asked for.
|
|
205
|
+
expect(lines, `${width}`).toEqual(bodyLines(buildDocument({ markdown: md }, config(width, { ...ragged, optimalRagged: true }))));
|
|
206
|
+
// The TypeScript breaker sets them alike.
|
|
207
|
+
useWasmLineBreaker(false);
|
|
208
|
+
expect(bodyLines(buildDocument({ markdown: md }, config(width, ragged))), `ts ${width}`).toEqual(lines);
|
|
209
|
+
useWasmLineBreaker(true);
|
|
210
|
+
off += findStacks(buildDocument({ markdown: md }, config(width, { textAlign: 'left', optimalRagged: false, stacks: 'warn' }))).length;
|
|
211
|
+
on += findStacks(buildDocument({ markdown: md }, config(width, ragged))).length;
|
|
212
|
+
}
|
|
213
|
+
expect(off).toBeGreaterThan(0);
|
|
214
|
+
expect(on).toBeLessThan(off);
|
|
215
|
+
});
|
|
216
|
+
});
|
|
217
|
+
//# sourceMappingURL=lineEdgeRulesElsewhere.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lineEdgeRulesElsewhere.test.js","sourceRoot":"","sources":["../../../../src/__tests__/pipeline/text/lineEdgeRulesElsewhere.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"design.d.ts","sourceRoot":"","sources":["../../src/bundle/design.ts"],"names":[],"mappings":"AAUA,OAAO,
|
|
1
|
+
{"version":3,"file":"design.d.ts","sourceRoot":"","sources":["../../src/bundle/design.ts"],"names":[],"mappings":"AAUA,OAAO,EAA6E,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9H,OAAO,EAAgB,KAAK,cAAc,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAGjF,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG7E,sEAAsE;AACtE,eAAO,MAAM,uBAAuB,QAAmB,CAAC;AAExD,yCAAyC;AACzC,MAAM,WAAW,iBAAiB;IAChC,kDAAkD;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,uDAAuD;IACvD,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,4DAA4D;IAC5D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf;iCAC6B;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACrE,iEAAiE;IACjE,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpE,6DAA6D;IAC7D,SAAS,CAAC,EAAE;QAAE,IAAI,EAAE,cAAc,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACnD,uEAAuE;IACvE,KAAK,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC;CAChC;AAED,6BAA6B;AAC7B,wBAAsB,kBAAkB,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAC,CAmBzF;AAED,6BAA6B;AAC7B,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,gEAAgE;IAChE,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;mCAC+B;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf;+CAC2C;IAC3C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9D,2DAA2D;IAC3D,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC/B,uDAAuD;IACvD,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,oCAAoC;IACpC,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,iEAAiE;IACjE,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,qCAAqC;AACrC,MAAM,WAAW,iBAAiB;IAChC,0CAA0C;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;qCACiC;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;mBACe;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;gDAC4C;IAC5C,GAAG,CAAC,EAAE,cAAc,CAAC;CACtB;AAKD;;oEAEoE;AACpE,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,YAAY,CAAC,CA4DhH"}
|
package/dist/bundle/design.js
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
// book bundle opens as the design of its whole configuration.
|
|
7
7
|
import { BOOK_OWN_KEYS } from '../defaults/bookKeys.js';
|
|
8
8
|
import { DESIGN_PARTS } from '../designs/parts.js';
|
|
9
|
-
import { designFileIds, extractDesign, readDesignParts } from '../designs/design.js';
|
|
9
|
+
import { designFileIds, designPartsWithComposition, extractDesign, readDesignParts } from '../designs/design.js';
|
|
10
10
|
import { createBundle } from './api.js';
|
|
11
11
|
import { readBundle } from './codec.js';
|
|
12
12
|
import { pickBundleMeta } from './manifest.js';
|
|
@@ -69,14 +69,15 @@ export async function openDesignBundle(bytes, options = {}) {
|
|
|
69
69
|
onWarning: (w) => warnings.push(w),
|
|
70
70
|
});
|
|
71
71
|
const { manifest } = read;
|
|
72
|
-
const
|
|
73
|
-
if (
|
|
72
|
+
const named = isDesign ? readDesignParts(manifest.design?.parts) : [...DESIGN_PARTS];
|
|
73
|
+
if (named.length === 0)
|
|
74
74
|
throw new Error('The design file names no part');
|
|
75
75
|
// A book's configuration (or a design's, read with the book's rules):
|
|
76
76
|
// the book's own settings are left out, as in any design.
|
|
77
77
|
const source = { ...(read.sharedConfig ?? read.config) };
|
|
78
78
|
for (const key of BOOK_OWN_KEYS)
|
|
79
79
|
delete source[key];
|
|
80
|
+
const parts = designPartsWithComposition(named, source);
|
|
80
81
|
const locale = manifest.locale ?? read.config.locale;
|
|
81
82
|
const design = extractDesign(locale !== undefined ? { ...source, locale } : source, parts);
|
|
82
83
|
const meta = pickBundleMeta(manifest, options.locale ?? manifest.locale ?? read.locale);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"design.js","sourceRoot":"","sources":["../../src/bundle/design.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,wEAAwE;AACxE,yEAAyE;AACzE,4EAA4E;AAC5E,0EAA0E;AAC1E,8DAA8D;AAG9D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAmB,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,eAAe,EAAe,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"design.js","sourceRoot":"","sources":["../../src/bundle/design.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,wEAAwE;AACxE,yEAAyE;AACzE,4EAA4E;AAC5E,0EAA0E;AAC1E,8DAA8D;AAG9D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAmB,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,0BAA0B,EAAE,aAAa,EAAE,eAAe,EAAe,MAAM,sBAAsB,CAAC;AAC9H,OAAO,EAAE,YAAY,EAA2C,MAAM,UAAU,CAAC;AACjF,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAExD,sEAAsE;AACtE,MAAM,CAAC,MAAM,uBAAuB,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;AAuBxD,6BAA6B;AAC7B,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,KAAwB;IAC/D,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,MAAM;QAC/C,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE;gBAC3G,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACzD,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,SAAS,CAAC;IACd,OAAO,YAAY,CAAC;QAClB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjD,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM;QAC3B,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;QAC1C,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9C,GAAG,CAAC,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxE,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1D,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC7D,CAAC,CAAC;AACL,CAAC;AAwCD,8DAA8D;AAC9D,MAAM,cAAc,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;AAE/C;;oEAEoE;AACpE,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,KAAiB,EAAE,UAA6B,EAAE;IACvF,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,IAAI,uBAAuB,CAAC;IACxD,IAAI,KAAK,CAAC,UAAU,GAAG,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC;IACpH,MAAM,GAAG,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACjC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE;QAAE,KAAK,IAAI,IAAI,CAAC,UAAU,CAAC;IAChE,IAAI,KAAK,GAAG,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,wCAAwC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC;IAC/G,MAAM,MAAM,GAAI,GAAG,CAAC,QAAwC,EAAE,MAAM,CAAC;IACrE,MAAM,QAAQ,GAAG,MAAM,KAAK,SAAS,CAAC;IACtC,IAAI,CAAC,QAAQ,IAAI,OAAO,CAAC,WAAW,KAAK,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACrF,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,SAAS,GAAI,GAAG,CAAC,QAAoC,CAAC,SAAS,CAAC;QACtE,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YACpC,IAAI,IAAI,KAAK,aAAa,IAAI,IAAI,KAAK,SAAS,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;gBAAE,SAAS;YAC7G,MAAM,IAAI,KAAK,CAAC,qDAAqD,IAAI,GAAG,CAAC,CAAC;QAChF,CAAC;IACH,CAAC;IACD,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE;QACxD,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrD,UAAU,EAAE,EAAE;QACd,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5C,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;KACnC,CAAC,CAAC;IACH,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IAC1B,MAAM,KAAK,GAAiB,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC;IACnG,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACzE,sEAAsE;IACtE,0DAA0D;IAC1D,MAAM,MAAM,GAAkB,EAAE,GAAG,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;IACxE,KAAK,MAAM,GAAG,IAAI,aAAa;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;IACpD,MAAM,KAAK,GAAG,0BAA0B,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IACrD,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC3F,MAAM,IAAI,GAAG,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC;IACxF,MAAM,KAAK,GAA0B,EAAE,CAAC;IACxC,KAAK,CAAC,QAAQ,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IACxI,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,CAAC;QAC9D,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,WAAW;YAAE,SAAS;QACxC,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,WAAW,IAAI,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,WAAW,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IACzJ,CAAC;IACD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IACjD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7D,MAAM,KAAK,GAAG,IAAI,GAAG,EAAsB,CAAC;IAC5C,KAAK,MAAM,CAAC,IAAI,KAAK;QAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IACpE,KAAK,MAAM,CAAC,IAAI,KAAK;QAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IACpE,OAAO;QACL,EAAE,EAAE,QAAQ,CAAC,EAAE;QACf,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,MAAM;QACN,KAAK;QACL,KAAK;QACL,KAAK;QACL,KAAK;QACL,QAAQ,EAAE,CAAC,QAAQ;QACnB,QAAQ;KACT,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import type { VDTBlock, VDTDocument } from '../vdt.js';
|
|
2
|
+
/** Where in a resource a fault lies. */
|
|
3
|
+
export interface SnippetPlace {
|
|
4
|
+
resourceId: string;
|
|
5
|
+
part: 'caption' | 'note' | 'cell';
|
|
6
|
+
/** The table cell's row and column, from 0, for `part: 'cell'`. */
|
|
7
|
+
cell?: {
|
|
8
|
+
row: number;
|
|
9
|
+
col: number;
|
|
10
|
+
};
|
|
11
|
+
}
|
|
12
|
+
/** A fault of the line-edge rules between lines `line` and `line + 1` of
|
|
13
|
+
* a resource's caption, note or table cell. */
|
|
14
|
+
export interface SnippetEdgeFault extends SnippetPlace {
|
|
15
|
+
/** The resource block it was found in (the first placed, for a text a
|
|
16
|
+
* resource repeats on several pages). */
|
|
17
|
+
block: VDTBlock;
|
|
18
|
+
pageIndex: number;
|
|
19
|
+
kind: 'stack' | 'citationBreak' | 'operatorBreak';
|
|
20
|
+
edge: 'end' | 'start';
|
|
21
|
+
/** What the lines repeat, the citation or the operator. */
|
|
22
|
+
text: string;
|
|
23
|
+
lines: [string, string];
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* The faults of the line-edge rules not at `'allow'` in the captions,
|
|
27
|
+
* notes and table cells of the resources placed in `doc` (a page's columns,
|
|
28
|
+
* then its floats), in page order. A text a resource prints again (a
|
|
29
|
+
* table's caption over each slice) is read once.
|
|
30
|
+
*/
|
|
31
|
+
export declare function findSnippetEdgeFaults(doc: VDTDocument): SnippetEdgeFault[];
|
|
32
|
+
//# sourceMappingURL=snippetEdges.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"snippetEdges.d.ts","sourceRoot":"","sources":["../../src/checks/snippetEdges.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAW,MAAM,WAAW,CAAC;AAKhE,wCAAwC;AACxC,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC;IAClC,mEAAmE;IACnE,IAAI,CAAC,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;CACrC;AAED;gDACgD;AAChD,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACpD;8CAC0C;IAC1C,KAAK,EAAE,QAAQ,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,OAAO,GAAG,eAAe,GAAG,eAAe,CAAC;IAClD,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC;IACtB,2DAA2D;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACzB;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,WAAW,GAAG,gBAAgB,EAAE,CAsC1E"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { pageIsVertical } from '../vdt/flowFrames.js';
|
|
2
|
+
import { lineStacks } from './stacks.js';
|
|
3
|
+
import { spaceBreakBetween } from './spaceBreaks.js';
|
|
4
|
+
/**
|
|
5
|
+
* The faults of the line-edge rules not at `'allow'` in the captions,
|
|
6
|
+
* notes and table cells of the resources placed in `doc` (a page's columns,
|
|
7
|
+
* then its floats), in page order. A text a resource prints again (a
|
|
8
|
+
* table's caption over each slice) is read once.
|
|
9
|
+
*/
|
|
10
|
+
export function findSnippetEdgeFaults(doc) {
|
|
11
|
+
const body = doc.config.bodyText;
|
|
12
|
+
const stacks = body.stacks !== 'allow';
|
|
13
|
+
const rules = { citations: body.citationBreaks !== 'allow', operators: body.operatorBreaks !== 'allow' };
|
|
14
|
+
const out = [];
|
|
15
|
+
if (!stacks && !rules.citations && !rules.operators)
|
|
16
|
+
return out;
|
|
17
|
+
const minChars = Math.max(1, body.stackMinCharacters);
|
|
18
|
+
const seen = new Set();
|
|
19
|
+
for (const page of doc.pages) {
|
|
20
|
+
const vertical = pageIsVertical(page);
|
|
21
|
+
for (const block of [...page.columns.flatMap((c) => c.blocks), ...(page.floats ?? [])]) {
|
|
22
|
+
const rb = block.resourceBlock;
|
|
23
|
+
if (!rb || block.hidden || block.comic)
|
|
24
|
+
continue;
|
|
25
|
+
const read = (lines, place) => {
|
|
26
|
+
if (lines.length < 2)
|
|
27
|
+
return;
|
|
28
|
+
const key = `${place.resourceId}\u0000${place.part}\u0000${place.cell?.row ?? ''},${place.cell?.col ?? ''}\u0000${lines.map((l) => l.text).join('\u0001')}`;
|
|
29
|
+
if (seen.has(key))
|
|
30
|
+
return;
|
|
31
|
+
seen.add(key);
|
|
32
|
+
const at = { ...place, block, pageIndex: page.index };
|
|
33
|
+
if (stacks) {
|
|
34
|
+
for (const s of lineStacks(lines, minChars, true)) {
|
|
35
|
+
out.push({ ...at, kind: 'stack', edge: s.edge, text: s.text, lines: [lines[s.line].text, lines[s.line + 1].text] });
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
if (vertical || (!rules.citations && !rules.operators))
|
|
39
|
+
return;
|
|
40
|
+
for (let i = 0; i + 1 < lines.length; i++) {
|
|
41
|
+
if (lines[i].isLastLine)
|
|
42
|
+
continue;
|
|
43
|
+
const hit = spaceBreakBetween(lines[i].text, lines[i + 1].text, rules);
|
|
44
|
+
if (hit)
|
|
45
|
+
out.push({ ...at, kind: hit.rule === 'citation' ? 'citationBreak' : 'operatorBreak', edge: hit.edge, text: hit.text, lines: [lines[i].text, lines[i + 1].text] });
|
|
46
|
+
}
|
|
47
|
+
};
|
|
48
|
+
const id = rb.resource.id;
|
|
49
|
+
read(rb.captionLines, { resourceId: id, part: 'caption' });
|
|
50
|
+
read(rb.noteLines, { resourceId: id, part: 'note' });
|
|
51
|
+
for (const cell of rb.table?.cells ?? [])
|
|
52
|
+
read(cell.lines, { resourceId: id, part: 'cell', cell: { row: cell.row, col: cell.col } });
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
return out;
|
|
56
|
+
}
|
|
57
|
+
//# sourceMappingURL=snippetEdges.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"snippetEdges.js","sourceRoot":"","sources":["../../src/checks/snippetEdges.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,4 +36,11 @@ export interface FindSpaceBreaksOptions {
|
|
|
36
36
|
* its own text is no such break.
|
|
37
37
|
*/
|
|
38
38
|
export declare function findSpaceBreaks(doc: VDTDocument, options?: FindSpaceBreaksOptions): SpaceBreakFault[];
|
|
39
|
+
/** The fault of the break between two consecutive lines of one text whose
|
|
40
|
+
* texts are `before` and `after`, if they were broken at a ruled space
|
|
41
|
+
* (#1519): also those of a caption, a note or a table cell (#1542). */
|
|
42
|
+
export declare function spaceBreakBetween(before: string, after: string, rules: {
|
|
43
|
+
citations: boolean;
|
|
44
|
+
operators: boolean;
|
|
45
|
+
}): Pick<SpaceBreakFault, 'rule' | 'edge' | 'text'> | undefined;
|
|
39
46
|
//# sourceMappingURL=spaceBreaks.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spaceBreaks.d.ts","sourceRoot":"","sources":["../../src/checks/spaceBreaks.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAKvD;;;cAGc;AACd,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,QAAQ,CAAC;IAChB,2DAA2D;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,QAAQ,CAAC;IACpB,8DAA8D;IAC9D,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,UAAU,GAAG,UAAU,CAAC;IAC9B;;sBAEkB;IAClB,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC;IACtB,2DAA2D;IAC3D,IAAI,EAAE,MAAM,CAAC;CACd;AAED,2CAA2C;AAC3C,MAAM,WAAW,sBAAsB;IACrC,0EAA0E;IAC1E,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;sBACkB;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,GAAE,sBAA2B,GAAG,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"spaceBreaks.d.ts","sourceRoot":"","sources":["../../src/checks/spaceBreaks.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAKvD;;;cAGc;AACd,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,QAAQ,CAAC;IAChB,2DAA2D;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,QAAQ,CAAC;IACpB,8DAA8D;IAC9D,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,UAAU,GAAG,UAAU,CAAC;IAC9B;;sBAEkB;IAClB,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC;IACtB,2DAA2D;IAC3D,IAAI,EAAE,MAAM,CAAC;CACd;AAED,2CAA2C;AAC3C,MAAM,WAAW,sBAAsB;IACrC,0EAA0E;IAC1E,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;sBACkB;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,GAAE,sBAA2B,GAAG,eAAe,EAAE,CAuBzG;AAED;;wEAEwE;AACxE,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;IAAE,SAAS,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC,GAAG,SAAS,CAY/K"}
|
|
@@ -30,21 +30,29 @@ export function findSpaceBreaks(doc, options = {}) {
|
|
|
30
30
|
continue;
|
|
31
31
|
if (vertical(a.block) || vertical(b.block))
|
|
32
32
|
continue;
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
const tail = b.at.text.trimStart();
|
|
37
|
-
if (head === '' || tail === '' || /[-\u00AD\u2010]$/u.test(head))
|
|
38
|
-
continue;
|
|
39
|
-
const joined = `${head} ${tail}`;
|
|
40
|
-
const at = head.length;
|
|
41
|
-
const hit = ruledSpaces(joined, rules).find((s) => s.at === at);
|
|
42
|
-
if (!hit)
|
|
43
|
-
continue;
|
|
44
|
-
const edge = hit.rule === 'citation' || joined.startsWith(hit.text, at + 1) ? 'start' : 'end';
|
|
45
|
-
out.push({ block: a.block, line: a.line, nextBlock: b.block, nextLine: b.line, rule: hit.rule, edge, text: hit.text });
|
|
33
|
+
const hit = spaceBreakBetween(a.at.text, b.at.text, rules);
|
|
34
|
+
if (hit)
|
|
35
|
+
out.push({ block: a.block, line: a.line, nextBlock: b.block, nextLine: b.line, ...hit });
|
|
46
36
|
}
|
|
47
37
|
}
|
|
48
38
|
return out;
|
|
49
39
|
}
|
|
40
|
+
/** The fault of the break between two consecutive lines of one text whose
|
|
41
|
+
* texts are `before` and `after`, if they were broken at a ruled space
|
|
42
|
+
* (#1519): also those of a caption, a note or a table cell (#1542). */
|
|
43
|
+
export function spaceBreakBetween(before, after, rules) {
|
|
44
|
+
// Broken at a word space: the line before keeps no hyphen, and both
|
|
45
|
+
// lines have text at the break.
|
|
46
|
+
const head = before.trimEnd();
|
|
47
|
+
const tail = after.trimStart();
|
|
48
|
+
if (head === '' || tail === '' || /[-\u00AD\u2010]$/u.test(head))
|
|
49
|
+
return undefined;
|
|
50
|
+
const joined = `${head} ${tail}`;
|
|
51
|
+
const at = head.length;
|
|
52
|
+
const hit = ruledSpaces(joined, rules).find((s) => s.at === at);
|
|
53
|
+
if (!hit)
|
|
54
|
+
return undefined;
|
|
55
|
+
const edge = hit.rule === 'citation' || joined.startsWith(hit.text, at + 1) ? 'start' : 'end';
|
|
56
|
+
return { rule: hit.rule, edge, text: hit.text };
|
|
57
|
+
}
|
|
50
58
|
//# sourceMappingURL=spaceBreaks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spaceBreaks.js","sourceRoot":"","sources":["../../src/checks/spaceBreaks.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAgCrD;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAAC,GAAgB,EAAE,UAAkC,EAAE;IACpF,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC;IACjC,MAAM,KAAK,GAAG;QACZ,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,cAAc,KAAK,OAAO;QAC/D,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,cAAc,KAAK,OAAO;KAChE,CAAC;IACF,MAAM,GAAG,GAAsB,EAAE,CAAC;IAClC,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,KAAK,CAAC,SAAS;QAAE,OAAO,GAAG,CAAC;IACrD,MAAM,QAAQ,GAAG,CAAC,CAAW,EAAE,EAAE;QAC/B,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACpC,OAAO,IAAI,KAAK,SAAS,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;IACpD,CAAC,CAAC;IACF,KAAK,MAAM,KAAK,IAAI,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;QACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC1C,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;YACpB,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAE,CAAC;YACxB,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,CAAC,CAAC,KAAK,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS;gBAAE,SAAS;YACzF,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC;gBAAE,SAAS;YACrD,
|
|
1
|
+
{"version":3,"file":"spaceBreaks.js","sourceRoot":"","sources":["../../src/checks/spaceBreaks.ts"],"names":[],"mappings":"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"}
|
package/dist/checks/stacks.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { VDTBlock, VDTDocument } from '../vdt.js';
|
|
1
|
+
import type { VDTBlock, VDTDocument, VDTLine } from '../vdt.js';
|
|
2
2
|
/** The characters of one segment of a line a stack's mark covers. */
|
|
3
3
|
export interface StackRange {
|
|
4
4
|
/** Index in `line.segments`. */
|
|
@@ -36,4 +36,9 @@ export interface FindStacksOptions {
|
|
|
36
36
|
* Accents and case do not count; scripts without word spaces have none.
|
|
37
37
|
*/
|
|
38
38
|
export declare function findStacks(doc: VDTDocument, options?: FindStacksOptions): Stack[];
|
|
39
|
+
/** The stacks of consecutive `lines` of one text (#1463), as
|
|
40
|
+
* {@link findStacks} reads them in a block: also those of a caption, a
|
|
41
|
+
* note or a table cell (#1542), where (`byParagraph`) a line that ends
|
|
42
|
+
* one of its paragraphs (`isLastLine`) stacks with none after it. */
|
|
43
|
+
export declare function lineStacks(lines: readonly VDTLine[], minChars: number, byParagraph?: boolean): Omit<Stack, 'block'>[];
|
|
39
44
|
//# sourceMappingURL=stacks.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stacks.d.ts","sourceRoot":"","sources":["../../src/checks/stacks.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"stacks.d.ts","sourceRoot":"","sources":["../../src/checks/stacks.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGhE,qEAAqE;AACrE,MAAM,WAAW,UAAU;IACzB,gCAAgC;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,iDAAiD;IACjD,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ;AAED;yBACyB;AACzB,MAAM,WAAW,KAAK;IACpB,KAAK,EAAE,QAAQ,CAAC;IAChB,4DAA4D;IAC5D,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC;IACtB,yDAAyD;IACzD,IAAI,EAAE,MAAM,CAAC;IACb;qBACiB;IACjB,MAAM,EAAE,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;CACtC;AAED,sCAAsC;AACtC,MAAM,WAAW,iBAAiB;IAChC;mCAC+B;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yDAAyD;IACzD,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAwED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,GAAE,iBAAsB,GAAG,KAAK,EAAE,CASrF;AAED;;;sEAGsE;AACtE,wBAAgB,UAAU,CAAC,KAAK,EAAE,SAAS,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,UAAQ,GAAG,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,CAyBnH"}
|
package/dist/checks/stacks.js
CHANGED
|
@@ -92,31 +92,40 @@ export function findStacks(doc, options = {}) {
|
|
|
92
92
|
continue;
|
|
93
93
|
if (!TEXT_BLOCKS.has(block.type) || block.lines.length < 2)
|
|
94
94
|
continue;
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
const t = lineText(line);
|
|
98
|
-
const cur = { ...t, end: textEdges(t.text, minChars, true), start: textEdges(t.text, minChars, false) };
|
|
99
|
-
if (prev) {
|
|
100
|
-
for (const edge of ['end', 'start']) {
|
|
101
|
-
const a = prev[edge];
|
|
102
|
-
const b = cur[edge];
|
|
103
|
-
if (!edgesStack(a, b))
|
|
104
|
-
continue;
|
|
105
|
-
const byWord = a.word !== '' && a.word === b.word;
|
|
106
|
-
const [af, at] = edgeSpan(prev.text, a, byWord, edge === 'end');
|
|
107
|
-
const [bf, bt] = edgeSpan(cur.text, b, byWord, edge === 'end');
|
|
108
|
-
out.push({
|
|
109
|
-
block,
|
|
110
|
-
line: i - 1,
|
|
111
|
-
edge,
|
|
112
|
-
text: prev.text.slice(af, at).replace(/[]/g, ''),
|
|
113
|
-
ranges: [rangesOf(prev.owner, af, at), rangesOf(cur.owner, bf, bt)],
|
|
114
|
-
});
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
prev = cur;
|
|
118
|
-
});
|
|
95
|
+
for (const s of lineStacks(block.lines, minChars))
|
|
96
|
+
out.push({ block, ...s });
|
|
119
97
|
}
|
|
120
98
|
return out;
|
|
121
99
|
}
|
|
100
|
+
/** The stacks of consecutive `lines` of one text (#1463), as
|
|
101
|
+
* {@link findStacks} reads them in a block: also those of a caption, a
|
|
102
|
+
* note or a table cell (#1542), where (`byParagraph`) a line that ends
|
|
103
|
+
* one of its paragraphs (`isLastLine`) stacks with none after it. */
|
|
104
|
+
export function lineStacks(lines, minChars, byParagraph = false) {
|
|
105
|
+
const out = [];
|
|
106
|
+
let prev;
|
|
107
|
+
lines.forEach((line, i) => {
|
|
108
|
+
const t = lineText(line);
|
|
109
|
+
const cur = { ...t, end: textEdges(t.text, minChars, true), start: textEdges(t.text, minChars, false), last: byParagraph && line.isLastLine === true };
|
|
110
|
+
if (prev && !prev.last) {
|
|
111
|
+
for (const edge of ['end', 'start']) {
|
|
112
|
+
const a = prev[edge];
|
|
113
|
+
const b = cur[edge];
|
|
114
|
+
if (!edgesStack(a, b))
|
|
115
|
+
continue;
|
|
116
|
+
const byWord = a.word !== '' && a.word === b.word;
|
|
117
|
+
const [af, at] = edgeSpan(prev.text, a, byWord, edge === 'end');
|
|
118
|
+
const [bf, bt] = edgeSpan(cur.text, b, byWord, edge === 'end');
|
|
119
|
+
out.push({
|
|
120
|
+
line: i - 1,
|
|
121
|
+
edge,
|
|
122
|
+
text: prev.text.slice(af, at).replace(/[]/g, ''),
|
|
123
|
+
ranges: [rangesOf(prev.owner, af, at), rangesOf(cur.owner, bf, bt)],
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
prev = cur;
|
|
128
|
+
});
|
|
129
|
+
return out;
|
|
130
|
+
}
|
|
122
131
|
//# sourceMappingURL=stacks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stacks.js","sourceRoot":"","sources":["../../src/checks/stacks.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAa,UAAU,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAkC9F,uEAAuE;AACvE,MAAM,WAAW,GAAwB,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC;AAEzG;;;oCAGoC;AACpC,SAAS,QAAQ,CAAC,IAAa;IAC7B,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IACxF,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,KAAK,GAA0C,EAAE,CAAC;IACxD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;QACrC,MAAM,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC;QACnB,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,IAAI,GAAG,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACxD,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE;gBAAE,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QACxE,CAAC;aAAM,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAChC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAChB,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QACrC,CAAC;aAAM,CAAC;YACN,MAAM,EAAE,GAAG,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;YAC9C,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;YAChC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBAAE,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QACjE,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC;AACzC,CAAC;AAED,MAAM,OAAO,GAAG,CAAC,EAAU,EAAW,EAAE,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACnE,MAAM,SAAS,GAAG,aAAa,CAAC;AAEhC;;kBAEkB;AAClB,SAAS,QAAQ,CAAC,IAAY,EAAE,IAAU,EAAE,MAAe,EAAE,GAAY;IACvE,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC;IACxD,IAAI,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACzC,IAAI,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;IACnC,IAAI,MAAM,EAAE,CAAC;QACX,qEAAqE;QACrE,gEAAgE;QAChE,IAAI,GAAG,EAAE,CAAC;YACR,IAAI,CAAC,GAAG,IAAI,CAAC;YACb,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC;gBAAE,CAAC,EAAE,CAAC;YAChD,EAAE,GAAG,CAAC,CAAC;QACT,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAE,CAAC;gBAAE,CAAC,EAAE,CAAC;YACtD,IAAI,GAAG,CAAC,CAAC;QACX,CAAC;IACH,CAAC;IACD,OAAO,IAAI,GAAG,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC;QAAE,IAAI,EAAE,CAAC;IACjD,OAAO,EAAE,GAAG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAE,CAAC;QAAE,EAAE,EAAE,CAAC;IACjD,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AACpB,CAAC;AAED,kEAAkE;AAClE,SAAS,QAAQ,CAAC,KAA4C,EAAE,IAAY,EAAE,EAAU;IACtF,MAAM,GAAG,GAAiB,EAAE,CAAC;IAC7B,KAAK,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;QAC/B,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACnB,IAAI,CAAC,CAAC;YAAE,SAAS;QACjB,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACjC,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM;YAAE,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;;YAClF,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC;IAC1E,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,UAAU,CAAC,GAAgB,EAAE,UAA6B,EAAE;IAC1E,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,QAAQ,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;IACzF,MAAM,GAAG,GAAY,EAAE,CAAC;IACxB,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;QAC/B,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,KAAK,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS;YAAE,SAAS;QACvF,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,SAAS;QACrE,IAAI,
|
|
1
|
+
{"version":3,"file":"stacks.js","sourceRoot":"","sources":["../../src/checks/stacks.ts"],"names":[],"mappings":"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"}
|