postext 1.80.0 → 1.82.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__/exports.test.js +13 -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__/hyphenation/passageLanguage.test.d.ts +2 -0
- package/dist/__tests__/hyphenation/passageLanguage.test.d.ts.map +1 -0
- package/dist/__tests__/hyphenation/passageLanguage.test.js +140 -0
- package/dist/__tests__/hyphenation/passageLanguage.test.js.map +1 -0
- package/dist/__tests__/hyphenation/wordBreaks.test.js +10 -5
- package/dist/__tests__/hyphenation/wordBreaks.test.js.map +1 -1
- package/dist/__tests__/measure/numbersWhole.test.d.ts +2 -0
- package/dist/__tests__/measure/numbersWhole.test.d.ts.map +1 -0
- package/dist/__tests__/measure/numbersWhole.test.js +116 -0
- package/dist/__tests__/measure/numbersWhole.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/checks/snippetEdges.d.ts +14 -0
- package/dist/checks/snippetEdges.d.ts.map +1 -1
- package/dist/checks/snippetEdges.js +47 -18
- package/dist/checks/snippetEdges.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/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/dictionary.d.ts +30 -0
- package/dist/hyphenation/dictionary.d.ts.map +1 -0
- package/dist/hyphenation/dictionary.js +84 -0
- package/dist/hyphenation/dictionary.js.map +1 -0
- 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 +11 -8
- package/dist/hyphenation/hyphenate.d.ts.map +1 -1
- package/dist/hyphenation/hyphenate.js +39 -27
- 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/cache.js +2 -2
- package/dist/measure/cache.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/measure.d.ts.map +1 -1
- package/dist/measure/rich/measure.js +8 -6
- package/dist/measure/rich/measure.js.map +1 -1
- package/dist/measure/rich/numbers.d.ts +19 -0
- package/dist/measure/rich/numbers.d.ts.map +1 -0
- package/dist/measure/rich/numbers.js +55 -0
- package/dist/measure/rich/numbers.js.map +1 -0
- package/dist/measure/rich/syllables.d.ts +42 -0
- package/dist/measure/rich/syllables.d.ts.map +1 -0
- package/dist/measure/rich/syllables.js +103 -0
- package/dist/measure/rich/syllables.js.map +1 -0
- package/dist/measure/rich/tokenize.d.ts.map +1 -1
- package/dist/measure/rich/tokenize.js +11 -2
- package/dist/measure/rich/tokenize.js.map +1 -1
- package/dist/measure/rich/tokens.d.ts +6 -1
- package/dist/measure/rich/tokens.d.ts.map +1 -1
- package/dist/measure/rich/tokens.js +2 -0
- package/dist/measure/rich/tokens.js.map +1 -1
- package/dist/measure/rich/wordBreaks.d.ts +2 -45
- package/dist/measure/rich/wordBreaks.d.ts.map +1 -1
- package/dist/measure/rich/wordBreaks.js +18 -106
- package/dist/measure/rich/wordBreaks.js.map +1 -1
- package/dist/measure/spanLanguage.d.ts +7 -0
- package/dist/measure/spanLanguage.d.ts.map +1 -1
- package/dist/measure/spanLanguage.js +12 -0
- package/dist/measure/spanLanguage.js.map +1 -1
- package/dist/pipeline/blocks/measureContentBlock.d.ts.map +1 -1
- package/dist/pipeline/blocks/measureContentBlock.js +8 -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 +8 -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/config.d.ts.map +1 -1
- package/dist/pipeline/config.js +18 -2
- package/dist/pipeline/config.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/contentWarnings/layoutWarnings.d.ts +10 -1
- package/dist/pipeline/contentWarnings/layoutWarnings.d.ts.map +1 -1
- package/dist/pipeline/contentWarnings/layoutWarnings.js +24 -4
- 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/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 +20 -3
- package/dist/pipeline/resources/resourceLayout/snippets.d.ts.map +1 -1
- package/dist/pipeline/resources/resourceLayout/snippets.js +35 -4
- 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/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 +10 -0
- package/dist/vdt/contentWarnings/text.d.ts.map +1 -1
- package/dist/vdt/document.d.ts +6 -0
- package/dist/vdt/document.d.ts.map +1 -1
- package/dist/vdt/document.js.map +1 -1
- package/dist/vdt/lines.d.ts +7 -1
- package/dist/vdt/lines.d.ts.map +1 -1
- package/dist/word/semantic/media/captionHyphens.test.d.ts +2 -0
- package/dist/word/semantic/media/captionHyphens.test.d.ts.map +1 -0
- package/dist/word/semantic/media/captionHyphens.test.js +69 -0
- package/dist/word/semantic/media/captionHyphens.test.js.map +1 -0
- package/dist/word/semantic/media/captions.d.ts.map +1 -1
- package/dist/word/semantic/media/captions.js +3 -1
- package/dist/word/semantic/media/captions.js.map +1 -1
- package/dist/word/semantic/prose/caption.d.ts +6 -2
- package/dist/word/semantic/prose/caption.d.ts.map +1 -1
- package/dist/word/semantic/prose/caption.js +19 -6
- package/dist/word/semantic/prose/caption.js.map +1 -1
- package/dist/word/semantic/styles.js +1 -1
- package/dist/word/semantic/styles.js.map +1 -1
- package/dist/word/semantic/table/styles.js +2 -2
- package/dist/word/semantic/table/styles.js.map +1 -1
- package/dist/word/semantic/wml.d.ts +2 -1
- package/dist/word/semantic/wml.d.ts.map +1 -1
- package/dist/word/semantic/wml.js +2 -2
- package/dist/word/semantic/wml.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,252 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { layoutResourceBlock } from '../../../pipeline/resources/resourceLayout.js';
|
|
3
|
+
import { snippetRuleBreaking } from '../../../pipeline/resources/resourceLayout/snippets.js';
|
|
4
|
+
import { hyphenBreaking } from '../../../pipeline/text/hyphenRules.js';
|
|
5
|
+
import { resolveAllConfig } from '../../../pipeline/config.js';
|
|
6
|
+
import { defaultResourceTypes } from '../../../defaults/resources/resourceTypes.js';
|
|
7
|
+
import { mergeCaptionStyle, resolveCaptionStyleConfig, stripCaptionStyleDefaults } from '../../../defaults/resources/captionStyle.js';
|
|
8
|
+
import { resolveTableStyleConfig, resolveTableStylesConfig, stripTableStyleDefaults } from '../../../defaults/resources/tableStyle.js';
|
|
9
|
+
import { resolveBodyTextConfig } from '../../../defaults/text/bodyText.js';
|
|
10
|
+
// `hyphenation` on a caption, its note and a table (#1528): the text is set
|
|
11
|
+
// as running text, broken whole on the optimal breaker within the body's
|
|
12
|
+
// word-spacing limits, its words divided where a paragraph style with
|
|
13
|
+
// `hyphenation: true` divides them, under the body's hyphen and stack
|
|
14
|
+
// rules. A note and a caption take their own leading (`lineHeight`).
|
|
15
|
+
// Unset, every caption, note and cell is set as before.
|
|
16
|
+
class StubCtx {
|
|
17
|
+
font = '';
|
|
18
|
+
measureText(s) {
|
|
19
|
+
return { width: s.length * 7 };
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
globalThis.OffscreenCanvas = class {
|
|
23
|
+
getContext() {
|
|
24
|
+
return new StubCtx();
|
|
25
|
+
}
|
|
26
|
+
};
|
|
27
|
+
const LONG = 'Typographers balance justification against hyphenation when narrow measures leave conspicuous rivers between extraordinarily long words in captions underneath illustrations.';
|
|
28
|
+
const figure = {
|
|
29
|
+
id: 'fig',
|
|
30
|
+
typeId: 'figure',
|
|
31
|
+
kind: 'bitmap',
|
|
32
|
+
caption: LONG,
|
|
33
|
+
note: LONG,
|
|
34
|
+
createdAt: 0,
|
|
35
|
+
updatedAt: 0,
|
|
36
|
+
bitmap: { fileId: 'fig.png', format: 'png', width: 400, height: 200 },
|
|
37
|
+
};
|
|
38
|
+
const table = (styleId) => ({
|
|
39
|
+
id: 'tab',
|
|
40
|
+
typeId: 'table',
|
|
41
|
+
kind: 'table',
|
|
42
|
+
caption: 'Cells.',
|
|
43
|
+
createdAt: 0,
|
|
44
|
+
updatedAt: 0,
|
|
45
|
+
table: {
|
|
46
|
+
model: { rows: [[{ content: 'Characteristics' }, { content: 'Explanation' }], [{ content: LONG }, { content: LONG }]] },
|
|
47
|
+
...(styleId ? { styleId } : {}),
|
|
48
|
+
},
|
|
49
|
+
});
|
|
50
|
+
function layoutOf(resource, config, width, types = defaultResourceTypes()) {
|
|
51
|
+
const resolved = resolveAllConfig(config);
|
|
52
|
+
const { block, totalHeight } = layoutResourceBlock({
|
|
53
|
+
resource,
|
|
54
|
+
resourceType: types.find((t) => t.id === resource.typeId),
|
|
55
|
+
number: '1',
|
|
56
|
+
resolved,
|
|
57
|
+
columnWidth: width,
|
|
58
|
+
resourceNumbering: { [resource.id]: { number: '1', typeId: resource.typeId, heading: { h1: 0, h2: 0, h3: 0, h4: 0, h5: 0, h6: 0 } } },
|
|
59
|
+
resourceTypes: types,
|
|
60
|
+
resources: [resource],
|
|
61
|
+
});
|
|
62
|
+
return { ...block, totalHeight };
|
|
63
|
+
}
|
|
64
|
+
function layout(captionStyle, width = 300, extra = {}) {
|
|
65
|
+
return layoutOf(figure, { ...extra, ...(captionStyle ? { captionStyle } : {}) }, width);
|
|
66
|
+
}
|
|
67
|
+
const RAGGED = { bodyText: { hyphenation: { ragged: true } } };
|
|
68
|
+
const painted = (line) => (line.segments ?? []).reduce((w, s) => w + s.width, 0);
|
|
69
|
+
const shape = (lines) => lines.map((l) => [l.text, l.bbox.x, l.bbox.y, l.bbox.width, l.hyphenated ?? false]);
|
|
70
|
+
const cellShapes = (block) => block.table.cells.map((c) => shape(c.lines));
|
|
71
|
+
const cellsHyphenated = (block) => block.table.cells.some((c) => c.lines.some((l) => l.hyphenated));
|
|
72
|
+
/** How many dictionary syllables the optimal breaker is offered while `run`
|
|
73
|
+
* lays out (ragged text seldom takes one: its right-hand glue is loose). */
|
|
74
|
+
function offeredHyphens(run) {
|
|
75
|
+
let count = 0;
|
|
76
|
+
globalThis.__postextKpTap = (items) => {
|
|
77
|
+
count += items.filter((it) => it.type === 'penalty' && it.flagged).length;
|
|
78
|
+
};
|
|
79
|
+
try {
|
|
80
|
+
run();
|
|
81
|
+
}
|
|
82
|
+
finally {
|
|
83
|
+
delete globalThis.__postextKpTap;
|
|
84
|
+
}
|
|
85
|
+
return count;
|
|
86
|
+
}
|
|
87
|
+
describe('captions and notes set as running text', () => {
|
|
88
|
+
it('leaves every caption and note as it was by default', () => {
|
|
89
|
+
for (const align of ['justify', 'left', 'center']) {
|
|
90
|
+
for (const extra of [{}, RAGGED, { bodyText: { stacks: 'avoid' } }]) {
|
|
91
|
+
const before = layout({ align, note: { align } }, 180, extra);
|
|
92
|
+
const off = layout({ align, hyphenation: false, note: { align, hyphenation: false } }, 180, extra);
|
|
93
|
+
expect(shape(off.captionLines), align).toEqual(shape(before.captionLines));
|
|
94
|
+
expect(shape(off.noteLines), align).toEqual(shape(before.noteLines));
|
|
95
|
+
expect(before.captionLines.some((l) => l.hyphenated), align).toBe(false);
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
// The breaking of 1.79: line by line, or whole while stacks are avoided.
|
|
99
|
+
expect(snippetRuleBreaking('justify', resolveAllConfig({}))).toEqual({});
|
|
100
|
+
expect(snippetRuleBreaking('left', resolveAllConfig(RAGGED))).toEqual({});
|
|
101
|
+
const stacks = resolveAllConfig({ bodyText: { stacks: 'avoid' } });
|
|
102
|
+
expect(snippetRuleBreaking('left', stacks)).toEqual({ optimal: true, optimalRagged: true, stacks: expect.any(Object) });
|
|
103
|
+
});
|
|
104
|
+
it('divides words where a paragraph style with hyphenation divides them', () => {
|
|
105
|
+
const hyphenated = (style, extra) => layout(style, 180, extra).captionLines.some((l) => l.hyphenated);
|
|
106
|
+
expect(hyphenated({ align: 'justify', hyphenation: true })).toBe(true);
|
|
107
|
+
// Ragged, only with the body's ragged hyphenation, within its zone.
|
|
108
|
+
expect(hyphenated({ align: 'left', hyphenation: true })).toBe(false);
|
|
109
|
+
expect(offeredHyphens(() => layout({ align: 'left', hyphenation: true }, 180))).toBe(0);
|
|
110
|
+
expect(offeredHyphens(() => layout({ align: 'left', hyphenation: true }, 180, RAGGED))).toBeGreaterThan(0);
|
|
111
|
+
const fontSizePx = 16;
|
|
112
|
+
expect(snippetRuleBreaking('left', resolveAllConfig({}), { fontSizePx })).toEqual({ optimal: true, optimalRagged: true });
|
|
113
|
+
expect(snippetRuleBreaking('left', resolveAllConfig(RAGGED), { fontSizePx })).toEqual({ optimal: true, optimalRagged: true, hyphenate: true, hyphenationZonePx: 48 });
|
|
114
|
+
// As a paragraph style that sets `hyphenation: true`, with the body's
|
|
115
|
+
// hyphenation off too.
|
|
116
|
+
expect(hyphenated({ align: 'justify', hyphenation: true }, { bodyText: { hyphenation: { enabled: false } } })).toBe(true);
|
|
117
|
+
// Without the optimal breaker: line by line, words divided all the same.
|
|
118
|
+
const greedy = { bodyText: { optimalLineBreaking: false } };
|
|
119
|
+
expect(snippetRuleBreaking('justify', resolveAllConfig(greedy), { fontSizePx })).toEqual({ hyphenate: true });
|
|
120
|
+
expect(hyphenated({ align: 'justify', hyphenation: true }, greedy)).toBe(true);
|
|
121
|
+
});
|
|
122
|
+
it('sets a justified caption flush with both edges, the last line natural', () => {
|
|
123
|
+
const lines = layout({ align: 'justify', hyphenation: true }).captionLines;
|
|
124
|
+
expect(lines.length).toBeGreaterThan(2);
|
|
125
|
+
for (const line of lines.slice(0, -1))
|
|
126
|
+
expect(line.bbox.x + painted(line)).toBeCloseTo(300, 6);
|
|
127
|
+
expect(painted(lines[lines.length - 1])).toBeLessThan(300);
|
|
128
|
+
});
|
|
129
|
+
it('hands the line breaker the rules the body text gets', () => {
|
|
130
|
+
const rules = { bodyText: { stacks: 'avoid', hyphenation: { ladders: 'avoid', lastWord: 'avoid', fewerHyphens: 2 } } };
|
|
131
|
+
const seen = [];
|
|
132
|
+
globalThis.__postextKpTap = (_items, options) => { seen.push(options); };
|
|
133
|
+
try {
|
|
134
|
+
layout({ align: 'justify', hyphenation: true }, 180, rules);
|
|
135
|
+
}
|
|
136
|
+
finally {
|
|
137
|
+
delete globalThis.__postextKpTap;
|
|
138
|
+
}
|
|
139
|
+
// The WebAssembly breaker reads these options (`wasm/abi.ts`) as the
|
|
140
|
+
// TypeScript one does.
|
|
141
|
+
const resolved = resolveAllConfig(rules);
|
|
142
|
+
const expected = hyphenBreaking(resolved.bodyText.hyphenation);
|
|
143
|
+
expect(seen.length).toBeGreaterThan(0);
|
|
144
|
+
expect(seen[0]).toMatchObject({ ladders: expected.ladders, lastWordDemerits: expected.lastWordDemerits, extraHyphenPenalty: expected.extraHyphenPenalty, stacks: expect.any(Object) });
|
|
145
|
+
expect(seen[0].maxStretchRatio).toBe(resolved.bodyText.maxWordSpacing);
|
|
146
|
+
});
|
|
147
|
+
it('sets the note as running text too, in its own leading', () => {
|
|
148
|
+
const lines = layout({ note: { align: 'justify', hyphenation: true } }, 180).noteLines;
|
|
149
|
+
expect(lines.some((l) => l.hyphenated)).toBe(true);
|
|
150
|
+
for (const line of lines.slice(0, -1))
|
|
151
|
+
expect(line.bbox.x + painted(line)).toBeCloseTo(180, 6);
|
|
152
|
+
const pitch = (lineHeight) => {
|
|
153
|
+
const ls = layout({ note: { fontSize: { value: 8, unit: 'pt' }, ...(lineHeight ? { lineHeight } : {}) } }, 180).noteLines;
|
|
154
|
+
return ls[1].bbox.y - ls[0].bbox.y;
|
|
155
|
+
};
|
|
156
|
+
const natural = pitch();
|
|
157
|
+
expect(pitch({ value: 20, unit: 'px' })).toBeCloseTo(20, 6);
|
|
158
|
+
expect(pitch({ value: 2, unit: 'em' })).toBeCloseTo(pitch({ value: 1, unit: 'em' }) * 2, 6);
|
|
159
|
+
expect(pitch({ value: 2, unit: 'em' })).toBeGreaterThan(natural);
|
|
160
|
+
// The block grows with the note's leading.
|
|
161
|
+
expect(layout({ note: { lineHeight: { value: 3, unit: 'em' } } }, 180).totalHeight).toBeGreaterThan(layout(undefined, 180).totalHeight);
|
|
162
|
+
});
|
|
163
|
+
it('keeps the numbered label whole and marked on the optimal breaker', () => {
|
|
164
|
+
// The label is painted in its own colour from `captionLabel`, which the
|
|
165
|
+
// Knuth–Plass lines must carry: with hyphenation, and with stacks
|
|
166
|
+
// avoided, which also breaks captions whole.
|
|
167
|
+
const stacks = { bodyText: { stacks: 'avoid' } };
|
|
168
|
+
for (const [style, extra] of [[{ align: 'justify', hyphenation: true }, {}], [{ align: 'left' }, stacks]]) {
|
|
169
|
+
const segs = layout(style, 180, extra).captionLines[0].segments;
|
|
170
|
+
const label = segs.filter((s) => s.captionLabel && s.kind === 'text').map((s) => s.text).join('').replace(/ /g, ' ');
|
|
171
|
+
expect(label).toBe('Figure 1.');
|
|
172
|
+
}
|
|
173
|
+
});
|
|
174
|
+
it('takes its own leading', () => {
|
|
175
|
+
const pitch = (lineHeight) => {
|
|
176
|
+
const lines = layout({ fontSize: { value: 8, unit: 'pt' }, ...(lineHeight ? { lineHeight } : {}) }, 180).captionLines;
|
|
177
|
+
return lines[1].bbox.y - lines[0].bbox.y;
|
|
178
|
+
};
|
|
179
|
+
const natural = pitch();
|
|
180
|
+
expect(pitch({ value: 20, unit: 'px' })).toBeCloseTo(20, 6);
|
|
181
|
+
expect(pitch({ value: 2, unit: 'em' })).toBeGreaterThan(natural);
|
|
182
|
+
});
|
|
183
|
+
it('follows a resource type that sets it on its own captions', () => {
|
|
184
|
+
const types = defaultResourceTypes().map((t) => (t.id === 'figure' ? { ...t, captionStyle: { align: 'justify', hyphenation: true, note: { align: 'justify', hyphenation: true } } } : t));
|
|
185
|
+
const block = layoutOf(figure, {}, 180, types);
|
|
186
|
+
expect(block.captionLines.some((l) => l.hyphenated)).toBe(true);
|
|
187
|
+
expect(block.noteLines.some((l) => l.hyphenated)).toBe(true);
|
|
188
|
+
// The document's other types keep their captions as before.
|
|
189
|
+
const plain = layoutOf(table(), { captionStyle: { align: 'justify' } }, 180, types);
|
|
190
|
+
expect(plain.captionLines.some((l) => l.hyphenated)).toBe(false);
|
|
191
|
+
});
|
|
192
|
+
});
|
|
193
|
+
describe('table cells set as running text', () => {
|
|
194
|
+
it('leaves every cell as it was by default', () => {
|
|
195
|
+
for (const extra of [{}, RAGGED, { bodyText: { stacks: 'avoid' } }]) {
|
|
196
|
+
const before = layoutOf(table(), extra, 260);
|
|
197
|
+
const off = layoutOf(table(), { ...extra, tableStyle: { hyphenation: false } }, 260);
|
|
198
|
+
expect(cellShapes(off)).toEqual(cellShapes(before));
|
|
199
|
+
expect(cellsHyphenated(before)).toBe(false);
|
|
200
|
+
}
|
|
201
|
+
});
|
|
202
|
+
it('divides the words of a cell with the body ragged hyphenation', () => {
|
|
203
|
+
// Cells are ragged: their words are offered for division with ragged
|
|
204
|
+
// hyphenation on, the lines broken whole on the optimal breaker.
|
|
205
|
+
expect(offeredHyphens(() => layoutOf(table(), { ...RAGGED, tableStyle: { hyphenation: true } }, 260))).toBeGreaterThan(0);
|
|
206
|
+
expect(offeredHyphens(() => layoutOf(table(), { tableStyle: { hyphenation: true } }, 260))).toBe(0);
|
|
207
|
+
expect(offeredHyphens(() => layoutOf(table(), RAGGED, 260))).toBe(0);
|
|
208
|
+
// In a narrow column a long word is divided at a syllable.
|
|
209
|
+
const narrow = { bodyText: { hyphenation: { ragged: true, zone: { value: 0, unit: 'em' } } }, tableStyle: { hyphenation: true } };
|
|
210
|
+
expect(cellsHyphenated(layoutOf(table(), narrow, 200))).toBe(true);
|
|
211
|
+
});
|
|
212
|
+
it('follows the named table style a table picks', () => {
|
|
213
|
+
const config = { ...RAGGED, tableStyles: [{ id: 'narrow', hyphenation: true }, { id: 'plain' }] };
|
|
214
|
+
expect(offeredHyphens(() => layoutOf(table('narrow'), config, 260))).toBeGreaterThan(0);
|
|
215
|
+
expect(offeredHyphens(() => layoutOf(table('plain'), config, 260))).toBe(0);
|
|
216
|
+
expect(offeredHyphens(() => layoutOf(table(), config, 260))).toBe(0);
|
|
217
|
+
// A named style inherits the document's table style, and may undo it.
|
|
218
|
+
const global = { ...RAGGED, tableStyle: { hyphenation: true }, tableStyles: [{ id: 'plain', hyphenation: false }] };
|
|
219
|
+
expect(offeredHyphens(() => layoutOf(table(), global, 260))).toBeGreaterThan(0);
|
|
220
|
+
expect(offeredHyphens(() => layoutOf(table('plain'), global, 260))).toBe(0);
|
|
221
|
+
});
|
|
222
|
+
});
|
|
223
|
+
describe('hyphenation and lineHeight in the config', () => {
|
|
224
|
+
const body = resolveBodyTextConfig(undefined);
|
|
225
|
+
it('resolve to the behaviour before when unset', () => {
|
|
226
|
+
const cs = resolveCaptionStyleConfig({}, body);
|
|
227
|
+
expect(cs.hyphenation).toBe(false);
|
|
228
|
+
expect(cs.note.hyphenation).toBe(false);
|
|
229
|
+
expect('lineHeight' in cs).toBe(false);
|
|
230
|
+
expect('lineHeight' in cs.note).toBe(false);
|
|
231
|
+
expect(resolveTableStyleConfig({}, body).hyphenation).toBe(false);
|
|
232
|
+
});
|
|
233
|
+
it('are stripped at their defaults and kept otherwise', () => {
|
|
234
|
+
expect(stripCaptionStyleDefaults({ hyphenation: false, note: { hyphenation: false } })).toBeUndefined();
|
|
235
|
+
expect(stripCaptionStyleDefaults({ hyphenation: true, lineHeight: { value: 11, unit: 'pt' }, note: { hyphenation: true, lineHeight: { value: 1.2, unit: 'em' } } }))
|
|
236
|
+
.toEqual({ hyphenation: true, lineHeight: { value: 11, unit: 'pt' }, note: { hyphenation: true, lineHeight: { value: 1.2, unit: 'em' } } });
|
|
237
|
+
expect(stripTableStyleDefaults({ hyphenation: false })).toBeUndefined();
|
|
238
|
+
expect(stripTableStyleDefaults({ hyphenation: true })).toEqual({ hyphenation: true });
|
|
239
|
+
});
|
|
240
|
+
it('a named table style inherits the document table style', () => {
|
|
241
|
+
const [inherits, own] = resolveTableStylesConfig([{ id: 'a' }, { id: 'b', hyphenation: false }], { hyphenation: true }, body);
|
|
242
|
+
expect(inherits.hyphenation).toBe(true);
|
|
243
|
+
expect(own.hyphenation).toBe(false);
|
|
244
|
+
});
|
|
245
|
+
it('a resource type overrides them, and inherits them otherwise', () => {
|
|
246
|
+
const base = resolveCaptionStyleConfig({ hyphenation: true, lineHeight: { value: 11, unit: 'pt' }, note: { lineHeight: { value: 1.1, unit: 'em' } } }, body);
|
|
247
|
+
expect(mergeCaptionStyle(base, { align: 'justify' })).toMatchObject({ hyphenation: true, lineHeight: { value: 11, unit: 'pt' }, note: { lineHeight: { value: 1.1, unit: 'em' } } });
|
|
248
|
+
expect(mergeCaptionStyle(base, { hyphenation: false, note: { hyphenation: true, lineHeight: { value: 9, unit: 'pt' } } }))
|
|
249
|
+
.toMatchObject({ hyphenation: false, note: { hyphenation: true, lineHeight: { value: 9, unit: 'pt' } } });
|
|
250
|
+
});
|
|
251
|
+
});
|
|
252
|
+
//# sourceMappingURL=captionHyphenation.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"captionHyphenation.test.js","sourceRoot":"","sources":["../../../../src/__tests__/pipeline/resources/captionHyphenation.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,4 +29,18 @@ export interface SnippetEdgeFault extends SnippetPlace {
|
|
|
29
29
|
* table's caption over each slice) is read once.
|
|
30
30
|
*/
|
|
31
31
|
export declare function findSnippetEdgeFaults(doc: VDTDocument): SnippetEdgeFault[];
|
|
32
|
+
/** A number wider than its line in a resource's caption, note or table
|
|
33
|
+
* cell (`VDTLine.numberOverflow`, #1549): the number, where it lies. */
|
|
34
|
+
export interface SnippetNumberOverflow extends SnippetPlace {
|
|
35
|
+
block: VDTBlock;
|
|
36
|
+
pageIndex: number;
|
|
37
|
+
text: string;
|
|
38
|
+
}
|
|
39
|
+
/** The numbers that run past their measure in the captions, notes and
|
|
40
|
+
* table cells of the resources placed in `doc`, in page order, each text
|
|
41
|
+
* read once (see {@link findSnippetEdgeFaults}). */
|
|
42
|
+
export declare function findSnippetNumberOverflows(doc: VDTDocument): SnippetNumberOverflow[];
|
|
43
|
+
/** The number a line flagged `numberOverflow` runs past its measure with:
|
|
44
|
+
* its first word that is one, else the whole line. */
|
|
45
|
+
export declare function overflowingNumber(text: string): string;
|
|
32
46
|
//# sourceMappingURL=snippetEdges.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snippetEdges.d.ts","sourceRoot":"","sources":["../../src/checks/snippetEdges.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"snippetEdges.d.ts","sourceRoot":"","sources":["../../src/checks/snippetEdges.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAoB,MAAM,WAAW,CAAC;AAMzE,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,CAuB1E;AAED;yEACyE;AACzE,MAAM,WAAW,qBAAsB,SAAQ,YAAY;IACzD,KAAK,EAAE,QAAQ,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;qDAEqD;AACrD,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,WAAW,GAAG,qBAAqB,EAAE,CAQpF;AAED;uDACuD;AACvD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEtD"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isNumberWord } from '../measure/rich/numbers.js';
|
|
1
2
|
import { pageIsVertical } from '../vdt/flowFrames.js';
|
|
2
3
|
import { lineStacks } from './stacks.js';
|
|
3
4
|
import { spaceBreakBetween } from './spaceBreaks.js';
|
|
@@ -15,35 +16,64 @@ export function findSnippetEdgeFaults(doc) {
|
|
|
15
16
|
if (!stacks && !rules.citations && !rules.operators)
|
|
16
17
|
return out;
|
|
17
18
|
const minChars = Math.max(1, body.stackMinCharacters);
|
|
19
|
+
eachSnippet(doc, (lines, place, block, page) => {
|
|
20
|
+
if (lines.length < 2)
|
|
21
|
+
return;
|
|
22
|
+
const at = { ...place, block, pageIndex: page.index };
|
|
23
|
+
if (stacks) {
|
|
24
|
+
for (const s of lineStacks(lines, minChars, true)) {
|
|
25
|
+
out.push({ ...at, kind: 'stack', edge: s.edge, text: s.text, lines: [lines[s.line].text, lines[s.line + 1].text] });
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
if (pageIsVertical(page) || (!rules.citations && !rules.operators))
|
|
29
|
+
return;
|
|
30
|
+
for (let i = 0; i + 1 < lines.length; i++) {
|
|
31
|
+
if (lines[i].isLastLine)
|
|
32
|
+
continue;
|
|
33
|
+
const hit = spaceBreakBetween(lines[i].text, lines[i + 1].text, rules);
|
|
34
|
+
if (hit)
|
|
35
|
+
out.push({ ...at, kind: hit.rule === 'citation' ? 'citationBreak' : 'operatorBreak', edge: hit.edge, text: hit.text, lines: [lines[i].text, lines[i + 1].text] });
|
|
36
|
+
}
|
|
37
|
+
});
|
|
38
|
+
return out;
|
|
39
|
+
}
|
|
40
|
+
/** The numbers that run past their measure in the captions, notes and
|
|
41
|
+
* table cells of the resources placed in `doc`, in page order, each text
|
|
42
|
+
* read once (see {@link findSnippetEdgeFaults}). */
|
|
43
|
+
export function findSnippetNumberOverflows(doc) {
|
|
44
|
+
const out = [];
|
|
45
|
+
eachSnippet(doc, (lines, place, block, page) => {
|
|
46
|
+
for (const line of lines) {
|
|
47
|
+
if (line.numberOverflow)
|
|
48
|
+
out.push({ ...place, block, pageIndex: page.index, text: overflowingNumber(line.text) });
|
|
49
|
+
}
|
|
50
|
+
});
|
|
51
|
+
return out;
|
|
52
|
+
}
|
|
53
|
+
/** The number a line flagged `numberOverflow` runs past its measure with:
|
|
54
|
+
* its first word that is one, else the whole line. */
|
|
55
|
+
export function overflowingNumber(text) {
|
|
56
|
+
return text.split(/[ \t\n\u2009]+/u).find((word) => isNumberWord(word)) ?? text.trim();
|
|
57
|
+
}
|
|
58
|
+
/** Each caption, note and table cell of the resources placed in `doc` (a
|
|
59
|
+
* page's columns, then its floats), in page order, with the resource and
|
|
60
|
+
* the part it lies in. A text a resource prints again (a table's caption
|
|
61
|
+
* over each slice) is visited once. */
|
|
62
|
+
function eachSnippet(doc, visit) {
|
|
18
63
|
const seen = new Set();
|
|
19
64
|
for (const page of doc.pages) {
|
|
20
|
-
const vertical = pageIsVertical(page);
|
|
21
65
|
for (const block of [...page.columns.flatMap((c) => c.blocks), ...(page.floats ?? [])]) {
|
|
22
66
|
const rb = block.resourceBlock;
|
|
23
67
|
if (!rb || block.hidden || block.comic)
|
|
24
68
|
continue;
|
|
25
69
|
const read = (lines, place) => {
|
|
26
|
-
if (lines.length
|
|
70
|
+
if (lines.length === 0)
|
|
27
71
|
return;
|
|
28
72
|
const key = `${place.resourceId}\u0000${place.part}\u0000${place.cell?.row ?? ''},${place.cell?.col ?? ''}\u0000${lines.map((l) => l.text).join('\u0001')}`;
|
|
29
73
|
if (seen.has(key))
|
|
30
74
|
return;
|
|
31
75
|
seen.add(key);
|
|
32
|
-
|
|
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
|
-
}
|
|
76
|
+
visit(lines, place, block, page);
|
|
47
77
|
};
|
|
48
78
|
const id = rb.resource.id;
|
|
49
79
|
read(rb.captionLines, { resourceId: id, part: 'caption' });
|
|
@@ -52,6 +82,5 @@ export function findSnippetEdgeFaults(doc) {
|
|
|
52
82
|
read(cell.lines, { resourceId: id, part: 'cell', cell: { row: cell.row, col: cell.col } });
|
|
53
83
|
}
|
|
54
84
|
}
|
|
55
|
-
return out;
|
|
56
85
|
}
|
|
57
86
|
//# sourceMappingURL=snippetEdges.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snippetEdges.js","sourceRoot":"","sources":["../../src/checks/snippetEdges.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"snippetEdges.js","sourceRoot":"","sources":["../../src/checks/snippetEdges.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captionStyle.d.ts","sourceRoot":"","sources":["../../../src/defaults/resources/captionStyle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAElB,iBAAiB,EAEjB,0BAA0B,EAE1B,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAuF,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"captionStyle.d.ts","sourceRoot":"","sources":["../../../src/defaults/resources/captionStyle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAElB,iBAAiB,EAEjB,0BAA0B,EAE1B,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAuF,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAwBnI;;;;;wEAKwE;AACxE,wBAAgB,oBAAoB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG;IAAE,cAAc,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,CAIxG;AAgCD;;;;sCAIsC;AACtC,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,kBAAkB,GAAG,SAAS,EACvC,QAAQ,EAAE,sBAAsB,EAChC,MAAM,CAAC,EAAE,MAAM,GACd,0BAA0B,CAyB5B;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,0BAA0B,EAChC,QAAQ,EAAE,kBAAkB,GAAG,SAAS,EACxC,OAAO,CAAC,EAAE,iBAAiB,EAAE,EAC7B,KAAK,CAAC,EAAE,SAAS,GAChB,0BAA0B,CAsC5B;AAkBD;;;;8EAI8E;AAC9E,wBAAgB,yBAAyB,CACvC,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,CAAC,EAAE,MAAM,GACd,kBAAkB,GAAG,SAAS,CA4BhC"}
|
|
@@ -17,6 +17,7 @@ const STATIC_DEFAULTS = {
|
|
|
17
17
|
padding: { value: 0.35, unit: 'em' },
|
|
18
18
|
labelNumberGap: '\u00a0',
|
|
19
19
|
labelSeparator: '. ',
|
|
20
|
+
hyphenation: false,
|
|
20
21
|
};
|
|
21
22
|
/** What stands around a caption's number when the config sets nothing:
|
|
22
23
|
* "Figure 1.7. " (a no-break space, then a stop and a space) in most
|
|
@@ -34,6 +35,7 @@ const NOTE_STATIC_DEFAULTS = {
|
|
|
34
35
|
italic: false,
|
|
35
36
|
gap: { value: 0.35, unit: 'em' },
|
|
36
37
|
align: 'left',
|
|
38
|
+
hyphenation: false,
|
|
37
39
|
};
|
|
38
40
|
/** The default note size for a caption size: 0.85 × in the same unit. */
|
|
39
41
|
function defaultNoteFontSize(captionFontSize) {
|
|
@@ -47,6 +49,8 @@ function resolveNote(partial, captionFontSize, captionColor) {
|
|
|
47
49
|
italic: n.italic ?? NOTE_STATIC_DEFAULTS.italic,
|
|
48
50
|
gap: n.gap ?? NOTE_STATIC_DEFAULTS.gap,
|
|
49
51
|
align: startEndAsLeftRight(n.align ?? NOTE_STATIC_DEFAULTS.align),
|
|
52
|
+
hyphenation: n.hyphenation ?? NOTE_STATIC_DEFAULTS.hyphenation,
|
|
53
|
+
...(n.lineHeight ? { lineHeight: n.lineHeight } : {}),
|
|
50
54
|
};
|
|
51
55
|
}
|
|
52
56
|
/** Resolve a partial caption-style config. Font family, size, and colour (and
|
|
@@ -64,6 +68,8 @@ export function resolveCaptionStyleConfig(partial, bodyText, locale) {
|
|
|
64
68
|
fontSize,
|
|
65
69
|
color,
|
|
66
70
|
align: startEndAsLeftRight(p.align ?? STATIC_DEFAULTS.align),
|
|
71
|
+
hyphenation: p.hyphenation ?? STATIC_DEFAULTS.hyphenation,
|
|
72
|
+
...(p.lineHeight ? { lineHeight: p.lineHeight } : {}),
|
|
67
73
|
gap: p.gap ?? STATIC_DEFAULTS.gap,
|
|
68
74
|
labelBold: p.labelBold ?? STATIC_DEFAULTS.labelBold,
|
|
69
75
|
labelItalic: p.labelItalic ?? STATIC_DEFAULTS.labelItalic,
|
|
@@ -103,6 +109,8 @@ export function mergeCaptionStyle(base, override, palette, paper) {
|
|
|
103
109
|
fontSize,
|
|
104
110
|
color,
|
|
105
111
|
align: startEndAsLeftRight(o.align ?? base.align),
|
|
112
|
+
hyphenation: o.hyphenation ?? base.hyphenation,
|
|
113
|
+
...((o.lineHeight ?? base.lineHeight) ? { lineHeight: o.lineHeight ?? base.lineHeight } : {}),
|
|
106
114
|
gap: o.gap ?? base.gap,
|
|
107
115
|
labelBold: o.labelBold ?? base.labelBold,
|
|
108
116
|
labelItalic: o.labelItalic ?? base.labelItalic,
|
|
@@ -118,6 +126,8 @@ export function mergeCaptionStyle(base, override, palette, paper) {
|
|
|
118
126
|
italic: n.italic ?? base.note.italic,
|
|
119
127
|
gap: n.gap ?? base.note.gap,
|
|
120
128
|
align: startEndAsLeftRight(n.align ?? base.note.align),
|
|
129
|
+
hyphenation: n.hyphenation ?? base.note.hyphenation,
|
|
130
|
+
...((n.lineHeight ?? base.note.lineHeight) ? { lineHeight: n.lineHeight ?? base.note.lineHeight } : {}),
|
|
121
131
|
},
|
|
122
132
|
labelNumberGap: typeof o.labelNumberGap === 'string' ? o.labelNumberGap : base.labelNumberGap,
|
|
123
133
|
labelSeparator: typeof o.labelSeparator === 'string' ? o.labelSeparator : base.labelSeparator,
|
|
@@ -150,6 +160,14 @@ function stripNoteDefaults(note) {
|
|
|
150
160
|
r.align = note.align;
|
|
151
161
|
has = true;
|
|
152
162
|
}
|
|
163
|
+
if (note.hyphenation !== undefined && note.hyphenation !== NOTE_STATIC_DEFAULTS.hyphenation) {
|
|
164
|
+
r.hyphenation = note.hyphenation;
|
|
165
|
+
has = true;
|
|
166
|
+
}
|
|
167
|
+
if (note.lineHeight !== undefined) {
|
|
168
|
+
r.lineHeight = note.lineHeight;
|
|
169
|
+
has = true;
|
|
170
|
+
}
|
|
153
171
|
return has ? r : undefined;
|
|
154
172
|
}
|
|
155
173
|
/** Drop fields equal to their static default; inherited font/colour fields are
|
|
@@ -175,6 +193,10 @@ export function stripCaptionStyleDefaults(captionStyle, locale) {
|
|
|
175
193
|
r.fontSize = captionStyle.fontSize;
|
|
176
194
|
has = true;
|
|
177
195
|
}
|
|
196
|
+
if (captionStyle.lineHeight !== undefined) {
|
|
197
|
+
r.lineHeight = captionStyle.lineHeight;
|
|
198
|
+
has = true;
|
|
199
|
+
}
|
|
178
200
|
if (captionStyle.color !== undefined) {
|
|
179
201
|
r.color = captionStyle.color;
|
|
180
202
|
has = true;
|
|
@@ -187,6 +209,10 @@ export function stripCaptionStyleDefaults(captionStyle, locale) {
|
|
|
187
209
|
r.align = captionStyle.align;
|
|
188
210
|
has = true;
|
|
189
211
|
}
|
|
212
|
+
if (captionStyle.hyphenation !== undefined && captionStyle.hyphenation !== STATIC_DEFAULTS.hyphenation) {
|
|
213
|
+
r.hyphenation = captionStyle.hyphenation;
|
|
214
|
+
has = true;
|
|
215
|
+
}
|
|
190
216
|
if (captionStyle.gap !== undefined && !dimensionsEqual(captionStyle.gap, STATIC_DEFAULTS.gap)) {
|
|
191
217
|
r.gap = captionStyle.gap;
|
|
192
218
|
has = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captionStyle.js","sourceRoot":"","sources":["../../../src/defaults/resources/captionStyle.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"captionStyle.js","sourceRoot":"","sources":["../../../src/defaults/resources/captionStyle.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tableStyle.d.ts","sourceRoot":"","sources":["../../../src/defaults/resources/tableStyle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,wBAAwB,EACxB,qBAAqB,EACrB,6BAA6B,EAC7B,sBAAsB,EAEvB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"tableStyle.d.ts","sourceRoot":"","sources":["../../../src/defaults/resources/tableStyle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,wBAAwB,EACxB,qBAAqB,EACrB,6BAA6B,EAC7B,sBAAsB,EAEvB,MAAM,gBAAgB,CAAC;AA0ExB;sDACsD;AACtD,wBAAgB,+BAA+B,CAAC,MAAM,SAAO,GAAG;IAAE,eAAe,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,CAEnH;AAED;;+DAE+D;AAC/D,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,gBAAgB,GAAG,SAAS,EACrC,QAAQ,EAAE,sBAAsB,EAChC,MAAM,CAAC,EAAE,MAAM,GACd,wBAAwB,CA4C1B;AAED;;;uBAGuB;AACvB,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,gBAAgB,GAAG,SAAS,GACvC,gBAAgB,GAAG,SAAS,CAqD9B;AAUD;;6DAE6D;AAC7D,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,qBAAqB,EAAE,GAAG,SAAS,EAC3C,IAAI,EAAE,gBAAgB,GAAG,SAAS,EAClC,QAAQ,EAAE,sBAAsB,EAChC,MAAM,CAAC,EAAE,MAAM,GACd,6BAA6B,EAAE,CAMjC;AAED;;;;yCAIyC;AACzC,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,qBAAqB,EAAE,GAAG,SAAS,GAC1C,qBAAqB,EAAE,GAAG,SAAS,CAOrC;AAED;iEACiE;AACjE,wBAAgB,cAAc,CAC5B,QAAQ,EAAE;IAAE,UAAU,EAAE,wBAAwB,CAAC;IAAC,WAAW,CAAC,EAAE,SAAS,6BAA6B,EAAE,CAAA;CAAE,EAC1G,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,wBAAwB,CAG1B"}
|
|
@@ -41,6 +41,7 @@ const STATIC_DEFAULTS = {
|
|
|
41
41
|
overflow: 'split',
|
|
42
42
|
splitInline: true,
|
|
43
43
|
continuesMarkerEnabled: true,
|
|
44
|
+
hyphenation: false,
|
|
44
45
|
};
|
|
45
46
|
/** Localised continuation strings: the caption suffix of a continued slice
|
|
46
47
|
* and the marker under a slice that continues, one per bundled hyphenation
|
|
@@ -116,6 +117,7 @@ export function resolveTableStyleConfig(partial, bodyText, locale) {
|
|
|
116
117
|
continuedSuffix: p.continuedSuffix ?? strings.continuedSuffix,
|
|
117
118
|
continuesMarkerEnabled: p.continuesMarkerEnabled ?? STATIC_DEFAULTS.continuesMarkerEnabled,
|
|
118
119
|
continuesMarker: p.continuesMarker ?? strings.continuesMarker,
|
|
120
|
+
hyphenation: p.hyphenation ?? STATIC_DEFAULTS.hyphenation,
|
|
119
121
|
};
|
|
120
122
|
}
|
|
121
123
|
/** Drop fields equal to their static default. Font/colour fields inherit the
|
|
@@ -252,6 +254,10 @@ export function stripTableStyleDefaults(tableStyle) {
|
|
|
252
254
|
r.continuesMarkerEnabled = tableStyle.continuesMarkerEnabled;
|
|
253
255
|
has = true;
|
|
254
256
|
}
|
|
257
|
+
if (tableStyle.hyphenation !== undefined && tableStyle.hyphenation !== STATIC_DEFAULTS.hyphenation) {
|
|
258
|
+
r.hyphenation = tableStyle.hyphenation;
|
|
259
|
+
has = true;
|
|
260
|
+
}
|
|
255
261
|
return has ? r : undefined;
|
|
256
262
|
}
|
|
257
263
|
/** The fields of a partial style that are actually set (an explicit
|