postext 1.23.0 → 1.24.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__/bundle/bitmapInfo.test.d.ts +2 -0
- package/dist/__tests__/bundle/bitmapInfo.test.d.ts.map +1 -0
- package/dist/__tests__/bundle/bitmapInfo.test.js +78 -0
- package/dist/__tests__/bundle/bitmapInfo.test.js.map +1 -0
- package/dist/__tests__/bundle/designOverflowPin.test.d.ts +2 -0
- package/dist/__tests__/bundle/designOverflowPin.test.d.ts.map +1 -0
- package/dist/__tests__/bundle/designOverflowPin.test.js +87 -0
- package/dist/__tests__/bundle/designOverflowPin.test.js.map +1 -0
- package/dist/__tests__/bundle.test.js +1 -1
- package/dist/__tests__/bundle.test.js.map +1 -1
- package/dist/__tests__/codeBlocks.test.js +1 -1
- package/dist/__tests__/codeBlocks.test.js.map +1 -1
- package/dist/__tests__/design/designTextOverflow.test.d.ts +2 -0
- package/dist/__tests__/design/designTextOverflow.test.d.ts.map +1 -0
- package/dist/__tests__/design/designTextOverflow.test.js +102 -0
- package/dist/__tests__/design/designTextOverflow.test.js.map +1 -0
- package/dist/__tests__/exports.test.js +11 -0
- package/dist/__tests__/exports.test.js.map +1 -1
- package/dist/__tests__/frontmatterInvalid.test.d.ts +2 -0
- package/dist/__tests__/frontmatterInvalid.test.d.ts.map +1 -0
- package/dist/__tests__/frontmatterInvalid.test.js +101 -0
- package/dist/__tests__/frontmatterInvalid.test.js.map +1 -0
- package/dist/__tests__/hardBreaks.test.js +1 -1
- package/dist/__tests__/hardBreaks.test.js.map +1 -1
- package/dist/__tests__/headingFirstLineIndent.test.d.ts +2 -0
- package/dist/__tests__/headingFirstLineIndent.test.d.ts.map +1 -0
- package/dist/__tests__/headingFirstLineIndent.test.js +185 -0
- package/dist/__tests__/headingFirstLineIndent.test.js.map +1 -0
- package/dist/__tests__/headingInlineMarks.test.js +1 -1
- package/dist/__tests__/headingInlineMarks.test.js.map +1 -1
- package/dist/__tests__/headingLetterSpacing.test.js +1 -1
- package/dist/__tests__/headingLetterSpacing.test.js.map +1 -1
- package/dist/__tests__/mathSizeMigration.test.js +2 -2
- package/dist/__tests__/mathSizeMigration.test.js.map +1 -1
- package/dist/__tests__/pipeline/bitmapResolution.test.d.ts +2 -0
- package/dist/__tests__/pipeline/bitmapResolution.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/bitmapResolution.test.js +139 -0
- package/dist/__tests__/pipeline/bitmapResolution.test.js.map +1 -0
- package/dist/__tests__/pipeline/calloutInlineResourceGap.test.js +1 -1
- package/dist/__tests__/pipeline/calloutInlineResourceGap.test.js.map +1 -1
- package/dist/__tests__/pipeline/calloutSplitMinLinesChild.test.js +1 -1
- package/dist/__tests__/pipeline/calloutSplitMinLinesChild.test.js.map +1 -1
- package/dist/__tests__/pipeline/colonListRoom.test.js +1 -1
- package/dist/__tests__/pipeline/colonListRoom.test.js.map +1 -1
- package/dist/__tests__/pipeline/compoundBreaks.test.js +1 -1
- package/dist/__tests__/pipeline/compoundBreaks.test.js.map +1 -1
- package/dist/__tests__/pipeline/dashBreaks.test.js +1 -1
- package/dist/__tests__/pipeline/dashBreaks.test.js.map +1 -1
- package/dist/__tests__/pipeline/designTextTruncated.test.d.ts +2 -0
- package/dist/__tests__/pipeline/designTextTruncated.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/designTextTruncated.test.js +116 -0
- package/dist/__tests__/pipeline/designTextTruncated.test.js.map +1 -0
- package/dist/__tests__/pipeline/floatPlacement.test.js +3 -3
- package/dist/__tests__/pipeline/floatPlacement.test.js.map +1 -1
- package/dist/__tests__/pipeline/floatShrink.test.d.ts +2 -0
- package/dist/__tests__/pipeline/floatShrink.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/floatShrink.test.js +298 -0
- package/dist/__tests__/pipeline/floatShrink.test.js.map +1 -0
- package/dist/__tests__/pipeline/headingSplitOrphans.test.js +1 -1
- package/dist/__tests__/pipeline/headingSplitOrphans.test.js.map +1 -1
- package/dist/__tests__/pipeline/inlineFigureSpace.test.js +1 -1
- package/dist/__tests__/pipeline/inlineFigureSpace.test.js.map +1 -1
- package/dist/__tests__/pipeline/paragraphContainerTail.test.js +1 -1
- package/dist/__tests__/pipeline/paragraphContainerTail.test.js.map +1 -1
- package/dist/__tests__/pipeline/raggedOptimal.test.js +1 -1
- package/dist/__tests__/pipeline/raggedOptimal.test.js.map +1 -1
- package/dist/__tests__/pipeline/textWrap.test.d.ts +2 -0
- package/dist/__tests__/pipeline/textWrap.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/textWrap.test.js +453 -0
- package/dist/__tests__/pipeline/textWrap.test.js.map +1 -0
- package/dist/__tests__/preflight.test.js +30 -1
- package/dist/__tests__/preflight.test.js.map +1 -1
- package/dist/__tests__/presets/showcaseDesignOverflow.test.d.ts +2 -0
- package/dist/__tests__/presets/showcaseDesignOverflow.test.d.ts.map +1 -0
- package/dist/__tests__/presets/showcaseDesignOverflow.test.js +58 -0
- package/dist/__tests__/presets/showcaseDesignOverflow.test.js.map +1 -0
- package/dist/__tests__/table/booktabs.test.d.ts +2 -0
- package/dist/__tests__/table/booktabs.test.d.ts.map +1 -0
- package/dist/__tests__/table/booktabs.test.js +290 -0
- package/dist/__tests__/table/booktabs.test.js.map +1 -0
- package/dist/__tests__/textWrapMeasure.test.d.ts +2 -0
- package/dist/__tests__/textWrapMeasure.test.d.ts.map +1 -0
- package/dist/__tests__/textWrapMeasure.test.js +162 -0
- package/dist/__tests__/textWrapMeasure.test.js.map +1 -0
- package/dist/__tests__/verseLines.test.js +134 -4
- package/dist/__tests__/verseLines.test.js.map +1 -1
- package/dist/bitmapResolution.d.ts +42 -0
- package/dist/bitmapResolution.d.ts.map +1 -0
- package/dist/bitmapResolution.js +82 -0
- package/dist/bitmapResolution.js.map +1 -0
- package/dist/bundle/codec.d.ts +9 -2
- package/dist/bundle/codec.d.ts.map +1 -1
- package/dist/bundle/codec.js +24 -2
- package/dist/bundle/codec.js.map +1 -1
- package/dist/bundle/configVersion.d.ts +49 -8
- package/dist/bundle/configVersion.d.ts.map +1 -1
- package/dist/bundle/configVersion.js +161 -6
- package/dist/bundle/configVersion.js.map +1 -1
- package/dist/bundle/index.d.ts +3 -3
- package/dist/bundle/index.d.ts.map +1 -1
- package/dist/bundle/index.js +2 -2
- package/dist/bundle/index.js.map +1 -1
- package/dist/bundle/manifest.d.ts +12 -2
- package/dist/bundle/manifest.d.ts.map +1 -1
- package/dist/bundle/manifest.js +132 -6
- package/dist/bundle/manifest.js.map +1 -1
- package/dist/bundle/types.d.ts +28 -2
- package/dist/bundle/types.d.ts.map +1 -1
- package/dist/canvas-backend/blockRender.d.ts.map +1 -1
- package/dist/canvas-backend/blockRender.js +6 -4
- package/dist/canvas-backend/blockRender.js.map +1 -1
- package/dist/canvas-backend/renderResourceBlock.d.ts.map +1 -1
- package/dist/canvas-backend/renderResourceBlock.js +15 -1
- package/dist/canvas-backend/renderResourceBlock.js.map +1 -1
- package/dist/configWarnings.js +29 -2
- package/dist/configWarnings.js.map +1 -1
- package/dist/defaults/headerFooter.d.ts +21 -6
- package/dist/defaults/headerFooter.d.ts.map +1 -1
- package/dist/defaults/headerFooter.js +37 -14
- package/dist/defaults/headerFooter.js.map +1 -1
- package/dist/defaults/headings.d.ts +5 -4
- package/dist/defaults/headings.d.ts.map +1 -1
- package/dist/defaults/headings.js +15 -4
- package/dist/defaults/headings.js.map +1 -1
- package/dist/defaults/index.d.ts +1 -1
- package/dist/defaults/index.d.ts.map +1 -1
- package/dist/defaults/index.js +1 -1
- package/dist/defaults/index.js.map +1 -1
- package/dist/defaults/layout.d.ts +30 -1
- package/dist/defaults/layout.d.ts.map +1 -1
- package/dist/defaults/layout.js +105 -1
- package/dist/defaults/layout.js.map +1 -1
- package/dist/defaults/parts.js +4 -4
- package/dist/defaults/parts.js.map +1 -1
- package/dist/defaults/tableStyle.d.ts.map +1 -1
- package/dist/defaults/tableStyle.js +44 -0
- package/dist/defaults/tableStyle.js.map +1 -1
- package/dist/defaults/toc.js +2 -2
- package/dist/defaults/verse.d.ts +2 -1
- package/dist/defaults/verse.d.ts.map +1 -1
- package/dist/defaults/verse.js +6 -1
- package/dist/defaults/verse.js.map +1 -1
- package/dist/design/layout.d.ts +15 -1
- package/dist/design/layout.d.ts.map +1 -1
- package/dist/design/layout.js +28 -4
- package/dist/design/layout.js.map +1 -1
- package/dist/frontmatter.d.ts +20 -0
- package/dist/frontmatter.d.ts.map +1 -1
- package/dist/frontmatter.js +69 -3
- package/dist/frontmatter.js.map +1 -1
- package/dist/html-backend.d.ts.map +1 -1
- package/dist/html-backend.js +22 -4
- package/dist/html-backend.js.map +1 -1
- package/dist/index.d.ts +13 -8
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -3
- package/dist/index.js.map +1 -1
- package/dist/measure/bidiLines.d.ts +4 -3
- package/dist/measure/bidiLines.d.ts.map +1 -1
- package/dist/measure/bidiLines.js +12 -7
- package/dist/measure/bidiLines.js.map +1 -1
- package/dist/measure/cjkCompose.d.ts.map +1 -1
- package/dist/measure/cjkCompose.js +7 -3
- package/dist/measure/cjkCompose.js.map +1 -1
- package/dist/measure/hardBreaks.d.ts.map +1 -1
- package/dist/measure/hardBreaks.js +13 -1
- package/dist/measure/hardBreaks.js.map +1 -1
- package/dist/measure/index.d.ts +3 -3
- package/dist/measure/index.d.ts.map +1 -1
- package/dist/measure/index.js +4 -4
- package/dist/measure/index.js.map +1 -1
- package/dist/measure/plain.d.ts.map +1 -1
- package/dist/measure/plain.js +11 -7
- package/dist/measure/plain.js.map +1 -1
- package/dist/measure/rich.d.ts.map +1 -1
- package/dist/measure/rich.js +9 -6
- package/dist/measure/rich.js.map +1 -1
- package/dist/measure/types.d.ts +49 -3
- package/dist/measure/types.d.ts.map +1 -1
- package/dist/measure/types.js +67 -3
- package/dist/measure/types.js.map +1 -1
- package/dist/pipeline/build.d.ts.map +1 -1
- package/dist/pipeline/build.js +488 -31
- package/dist/pipeline/build.js.map +1 -1
- package/dist/pipeline/buildBlockKind.d.ts +5 -0
- package/dist/pipeline/buildBlockKind.d.ts.map +1 -1
- package/dist/pipeline/buildBlockKind.js +14 -1
- package/dist/pipeline/buildBlockKind.js.map +1 -1
- package/dist/pipeline/buildMeasurement.js +1 -1
- package/dist/pipeline/buildMeasurement.js.map +1 -1
- package/dist/pipeline/columnBalancing.d.ts.map +1 -1
- package/dist/pipeline/columnBalancing.js +5 -0
- package/dist/pipeline/columnBalancing.js.map +1 -1
- package/dist/pipeline/contentWarnings.d.ts +16 -0
- package/dist/pipeline/contentWarnings.d.ts.map +1 -1
- package/dist/pipeline/contentWarnings.js +113 -17
- package/dist/pipeline/contentWarnings.js.map +1 -1
- package/dist/pipeline/floatPlacement.d.ts +34 -4
- package/dist/pipeline/floatPlacement.d.ts.map +1 -1
- package/dist/pipeline/floatPlacement.js +35 -5
- package/dist/pipeline/floatPlacement.js.map +1 -1
- package/dist/pipeline/floatSlots.d.ts +7 -0
- package/dist/pipeline/floatSlots.d.ts.map +1 -1
- package/dist/pipeline/floatSlots.js.map +1 -1
- package/dist/pipeline/headerFooter.d.ts +4 -1
- package/dist/pipeline/headerFooter.d.ts.map +1 -1
- package/dist/pipeline/headerFooter.js +19 -5
- package/dist/pipeline/headerFooter.js.map +1 -1
- package/dist/pipeline/measureContentBlock.d.ts +7 -0
- package/dist/pipeline/measureContentBlock.d.ts.map +1 -1
- package/dist/pipeline/measureContentBlock.js +15 -6
- package/dist/pipeline/measureContentBlock.js.map +1 -1
- package/dist/pipeline/placement.d.ts.map +1 -1
- package/dist/pipeline/placement.js +7 -0
- package/dist/pipeline/placement.js.map +1 -1
- package/dist/pipeline/resourceLayout.d.ts +15 -0
- package/dist/pipeline/resourceLayout.d.ts.map +1 -1
- package/dist/pipeline/resourceLayout.js +95 -15
- package/dist/pipeline/resourceLayout.js.map +1 -1
- package/dist/pipeline/styles.d.ts.map +1 -1
- package/dist/pipeline/styles.js +8 -5
- package/dist/pipeline/styles.js.map +1 -1
- package/dist/pipeline/textWrap.d.ts +94 -0
- package/dist/pipeline/textWrap.d.ts.map +1 -0
- package/dist/pipeline/textWrap.js +188 -0
- package/dist/pipeline/textWrap.js.map +1 -0
- package/dist/pipeline/verseLines.d.ts +22 -2
- package/dist/pipeline/verseLines.d.ts.map +1 -1
- package/dist/pipeline/verseLines.js +52 -4
- package/dist/pipeline/verseLines.js.map +1 -1
- package/dist/preflight.d.ts +46 -1
- package/dist/preflight.d.ts.map +1 -1
- package/dist/preflight.js +42 -7
- package/dist/preflight.js.map +1 -1
- package/dist/table/booktabs.d.ts +37 -0
- package/dist/table/booktabs.d.ts.map +1 -0
- package/dist/table/booktabs.js +82 -0
- package/dist/table/booktabs.js.map +1 -0
- package/dist/types.d.ts +227 -8
- package/dist/types.d.ts.map +1 -1
- package/dist/vdt.d.ts +131 -6
- package/dist/vdt.d.ts.map +1 -1
- package/dist/vdt.js +3 -2
- package/dist/vdt.js.map +1 -1
- package/dist/word/index.d.ts +1 -1
- package/dist/word/index.d.ts.map +1 -1
- package/dist/word/index.js +1 -1
- package/dist/word/index.js.map +1 -1
- package/dist/word/toMarkdown.d.ts +10 -0
- package/dist/word/toMarkdown.d.ts.map +1 -1
- package/dist/word/toMarkdown.js +16 -1
- package/dist/word/toMarkdown.js.map +1 -1
- package/package.json +1 -1
package/dist/defaults/layout.js
CHANGED
|
@@ -4,6 +4,69 @@ export const DEFAULT_COLUMN_RULE = {
|
|
|
4
4
|
color: { hex: '#cccccc', model: 'hex' },
|
|
5
5
|
lineWidth: { value: 0.5, unit: 'pt' },
|
|
6
6
|
};
|
|
7
|
+
/** The smallest scale `placement.shrink` sets a picture at, when nothing
|
|
8
|
+
* says otherwise (#626). */
|
|
9
|
+
export const DEFAULT_FLOAT_MIN_SCALE = 0.7;
|
|
10
|
+
/** A `floatShrink.mode` / `placement.shrink` as written: one of the three
|
|
11
|
+
* words, else `undefined`. */
|
|
12
|
+
export function floatShrinkModeOf(value) {
|
|
13
|
+
return value === 'never' || value === 'page' || value === 'slot' ? value : undefined;
|
|
14
|
+
}
|
|
15
|
+
/** A `minScale` as written: a number in (0, 1], else `undefined`. */
|
|
16
|
+
export function floatMinScaleOf(value) {
|
|
17
|
+
return typeof value === 'number' && Number.isFinite(value) && value > 0 && value <= 1 ? value : undefined;
|
|
18
|
+
}
|
|
19
|
+
/** `layout.floatShrink` resolved: a mode and a smallest scale. */
|
|
20
|
+
export function resolveFloatShrink(partial) {
|
|
21
|
+
return {
|
|
22
|
+
mode: floatShrinkModeOf(partial?.mode) ?? 'never',
|
|
23
|
+
minScale: floatMinScaleOf(partial?.minScale) ?? DEFAULT_FLOAT_MIN_SCALE,
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
/** `layout.wrap` defaults (#627): no gap of its own (one body line), text
|
|
27
|
+
* no narrower than 12 em, two lines beside, 45 % of the column. */
|
|
28
|
+
export const DEFAULT_TEXT_WRAP = {
|
|
29
|
+
minTextWidth: { value: 12, unit: 'em' },
|
|
30
|
+
minLinesBeside: 2,
|
|
31
|
+
defaultWidth: 0.45,
|
|
32
|
+
};
|
|
33
|
+
function isDimension(value) {
|
|
34
|
+
return typeof value === 'object' && value !== null && typeof value.value === 'number' && Number.isFinite(value.value)
|
|
35
|
+
&& typeof value.unit === 'string';
|
|
36
|
+
}
|
|
37
|
+
/** A `minTextWidth` as written: a length, or a share of the column in
|
|
38
|
+
* (0, 1]; else `undefined`. */
|
|
39
|
+
export function wrapMinTextWidthOf(value) {
|
|
40
|
+
if (typeof value === 'number')
|
|
41
|
+
return Number.isFinite(value) && value > 0 && value <= 1 ? value : undefined;
|
|
42
|
+
return isDimension(value) && value.value >= 0 ? value : undefined;
|
|
43
|
+
}
|
|
44
|
+
/** A `minLinesBeside` as written: a whole number, at least 1. */
|
|
45
|
+
export function wrapMinLinesOf(value) {
|
|
46
|
+
return typeof value === 'number' && Number.isInteger(value) && value >= 1 ? value : undefined;
|
|
47
|
+
}
|
|
48
|
+
/** A `defaultWidth` (or `placement.width`) as a wrap reads it: a share in
|
|
49
|
+
* (0, 1). */
|
|
50
|
+
export function wrapWidthOf(value) {
|
|
51
|
+
return typeof value === 'number' && Number.isFinite(value) && value > 0 && value < 1 ? value : undefined;
|
|
52
|
+
}
|
|
53
|
+
/** `layout.wrap` resolved; misspelt values fall back to the defaults. */
|
|
54
|
+
export function resolveTextWrap(partial) {
|
|
55
|
+
const gap = isDimension(partial?.gap) && partial.gap.value >= 0 ? partial.gap : undefined;
|
|
56
|
+
return {
|
|
57
|
+
...(gap ? { gap } : {}),
|
|
58
|
+
minTextWidth: wrapMinTextWidthOf(partial?.minTextWidth) ?? DEFAULT_TEXT_WRAP.minTextWidth,
|
|
59
|
+
minLinesBeside: wrapMinLinesOf(partial?.minLinesBeside) ?? DEFAULT_TEXT_WRAP.minLinesBeside,
|
|
60
|
+
defaultWidth: wrapWidthOf(partial?.defaultWidth) ?? DEFAULT_TEXT_WRAP.defaultWidth,
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
/** A `bitmapResolution` as written (#631): `'document'`, `'file'` or a
|
|
64
|
+
* positive ppi; else `undefined`. */
|
|
65
|
+
export function bitmapResolutionOf(value) {
|
|
66
|
+
if (value === 'document' || value === 'file')
|
|
67
|
+
return value;
|
|
68
|
+
return typeof value === 'number' && Number.isFinite(value) && value > 0 ? value : undefined;
|
|
69
|
+
}
|
|
7
70
|
export const DEFAULT_LAYOUT_CONFIG = {
|
|
8
71
|
layoutType: 'double',
|
|
9
72
|
columnCount: 3,
|
|
@@ -13,6 +76,9 @@ export const DEFAULT_LAYOUT_CONFIG = {
|
|
|
13
76
|
sideColumnSide: 'right',
|
|
14
77
|
columnRule: { ...DEFAULT_COLUMN_RULE },
|
|
15
78
|
fitFiguresToPage: false,
|
|
79
|
+
bitmapResolution: 'document',
|
|
80
|
+
floatShrink: { mode: 'never', minScale: DEFAULT_FLOAT_MIN_SCALE },
|
|
81
|
+
wrap: { ...DEFAULT_TEXT_WRAP },
|
|
16
82
|
hugClosingFloats: true,
|
|
17
83
|
inlineResourceGap: 'around',
|
|
18
84
|
inlineResourceGapInBoxes: true,
|
|
@@ -21,7 +87,7 @@ export const DEFAULT_LAYOUT_CONFIG = {
|
|
|
21
87
|
};
|
|
22
88
|
export function resolveLayoutConfig(partial) {
|
|
23
89
|
if (!partial)
|
|
24
|
-
return { ...DEFAULT_LAYOUT_CONFIG };
|
|
90
|
+
return { ...DEFAULT_LAYOUT_CONFIG, floatShrink: { ...DEFAULT_LAYOUT_CONFIG.floatShrink }, wrap: resolveTextWrap() };
|
|
25
91
|
return {
|
|
26
92
|
layoutType: partial.layoutType ?? DEFAULT_LAYOUT_CONFIG.layoutType,
|
|
27
93
|
columnCount: partial.columnCount ?? DEFAULT_LAYOUT_CONFIG.columnCount,
|
|
@@ -37,6 +103,9 @@ export function resolveLayoutConfig(partial) {
|
|
|
37
103
|
}
|
|
38
104
|
: { ...DEFAULT_COLUMN_RULE },
|
|
39
105
|
fitFiguresToPage: partial.fitFiguresToPage ?? DEFAULT_LAYOUT_CONFIG.fitFiguresToPage,
|
|
106
|
+
bitmapResolution: bitmapResolutionOf(partial.bitmapResolution) ?? DEFAULT_LAYOUT_CONFIG.bitmapResolution,
|
|
107
|
+
floatShrink: resolveFloatShrink(partial.floatShrink),
|
|
108
|
+
wrap: resolveTextWrap(partial.wrap),
|
|
40
109
|
hugClosingFloats: partial.hugClosingFloats ?? DEFAULT_LAYOUT_CONFIG.hugClosingFloats,
|
|
41
110
|
inlineResourceGap: partial.inlineResourceGap === 'above' ? 'above' : DEFAULT_LAYOUT_CONFIG.inlineResourceGap,
|
|
42
111
|
inlineResourceGapInBoxes: partial.inlineResourceGapInBoxes ?? DEFAULT_LAYOUT_CONFIG.inlineResourceGapInBoxes,
|
|
@@ -81,6 +150,41 @@ export function stripLayoutDefaults(layout) {
|
|
|
81
150
|
result.fitFiguresToPage = layout.fitFiguresToPage;
|
|
82
151
|
hasOverride = true;
|
|
83
152
|
}
|
|
153
|
+
const bitmapResolution = bitmapResolutionOf(layout.bitmapResolution);
|
|
154
|
+
if (bitmapResolution !== undefined && bitmapResolution !== DEFAULT_LAYOUT_CONFIG.bitmapResolution) {
|
|
155
|
+
result.bitmapResolution = bitmapResolution;
|
|
156
|
+
hasOverride = true;
|
|
157
|
+
}
|
|
158
|
+
if (layout.floatShrink) {
|
|
159
|
+
const fs = {};
|
|
160
|
+
const mode = floatShrinkModeOf(layout.floatShrink.mode);
|
|
161
|
+
const minScale = floatMinScaleOf(layout.floatShrink.minScale);
|
|
162
|
+
if (mode !== undefined && mode !== DEFAULT_LAYOUT_CONFIG.floatShrink.mode)
|
|
163
|
+
fs.mode = mode;
|
|
164
|
+
if (minScale !== undefined && minScale !== DEFAULT_LAYOUT_CONFIG.floatShrink.minScale)
|
|
165
|
+
fs.minScale = minScale;
|
|
166
|
+
if (fs.mode !== undefined || fs.minScale !== undefined) {
|
|
167
|
+
result.floatShrink = fs;
|
|
168
|
+
hasOverride = true;
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
if (layout.wrap) {
|
|
172
|
+
const w = {};
|
|
173
|
+
const r = resolveTextWrap(layout.wrap);
|
|
174
|
+
if (r.gap)
|
|
175
|
+
w.gap = r.gap;
|
|
176
|
+
const minText = wrapMinTextWidthOf(layout.wrap.minTextWidth);
|
|
177
|
+
if (minText !== undefined && (typeof minText === 'number' || typeof DEFAULT_TEXT_WRAP.minTextWidth === 'number' || !dimensionsEqual(minText, DEFAULT_TEXT_WRAP.minTextWidth)))
|
|
178
|
+
w.minTextWidth = minText;
|
|
179
|
+
if (r.minLinesBeside !== DEFAULT_TEXT_WRAP.minLinesBeside)
|
|
180
|
+
w.minLinesBeside = r.minLinesBeside;
|
|
181
|
+
if (r.defaultWidth !== DEFAULT_TEXT_WRAP.defaultWidth)
|
|
182
|
+
w.defaultWidth = r.defaultWidth;
|
|
183
|
+
if (Object.keys(w).length > 0) {
|
|
184
|
+
result.wrap = w;
|
|
185
|
+
hasOverride = true;
|
|
186
|
+
}
|
|
187
|
+
}
|
|
84
188
|
if (layout.hugClosingFloats !== undefined && layout.hugClosingFloats !== DEFAULT_LAYOUT_CONFIG.hugClosingFloats) {
|
|
85
189
|
result.hugClosingFloats = layout.hugClosingFloats;
|
|
86
190
|
hasOverride = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../src/defaults/layout.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../src/defaults/layout.ts"],"names":[],"mappings":"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"}
|
package/dist/defaults/parts.js
CHANGED
|
@@ -27,8 +27,8 @@ export function resolvePartsConfig(partial, page, bodyText, unorderedLists, orde
|
|
|
27
27
|
right: partial?.margins?.right ?? pm.right,
|
|
28
28
|
mirror: partial?.margins?.mirror ?? pm.mirror,
|
|
29
29
|
},
|
|
30
|
-
design: partial?.design ? resolveDesignSlot(partial.design, '
|
|
31
|
-
versoDesign: partial?.versoDesign ? resolveDesignSlot(partial.versoDesign, '
|
|
30
|
+
design: partial?.design ? resolveDesignSlot(partial.design, 'part') : { elements: [] },
|
|
31
|
+
versoDesign: partial?.versoDesign ? resolveDesignSlot(partial.versoDesign, 'part') : { elements: [] },
|
|
32
32
|
bodyStyle: {
|
|
33
33
|
fontFamily: partial?.bodyStyle?.fontFamily ?? bodyText.fontFamily,
|
|
34
34
|
fontSize: partial?.bodyStyle?.fontSize ?? bodyText.fontSize,
|
|
@@ -104,12 +104,12 @@ export function stripPartsDefaults(parts) {
|
|
|
104
104
|
r.margins = kept;
|
|
105
105
|
}
|
|
106
106
|
if (parts.design) {
|
|
107
|
-
const slot = stripDesignSlotDefaults(parts.design, '
|
|
107
|
+
const slot = stripDesignSlotDefaults(parts.design, 'part');
|
|
108
108
|
if (slot && slot.elements && slot.elements.length > 0)
|
|
109
109
|
r.design = slot;
|
|
110
110
|
}
|
|
111
111
|
if (parts.versoDesign) {
|
|
112
|
-
const slot = stripDesignSlotDefaults(parts.versoDesign, '
|
|
112
|
+
const slot = stripDesignSlotDefaults(parts.versoDesign, 'part');
|
|
113
113
|
if (slot && slot.elements && slot.elements.length > 0)
|
|
114
114
|
r.versoDesign = slot;
|
|
115
115
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parts.js","sourceRoot":"","sources":["../../src/defaults/parts.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C;;sDAEsD;AACtD,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,IAAI,EAAE,IAAI;IACV,WAAW,EAAE,EAAE,MAAM,EAAE,KAA2B,EAAE;IACpD,UAAU,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAA2B,EAAE;IAClE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAwB;IAC9C,WAAW,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAwB;CACpD,CAAC;AAEF,MAAM,UAAU,kBAAkB,CAChC,OAAgC,EAChC,IAAwB,EACxB,QAAgC,EAChC,cAA4C,EAC5C,YAAwC;IAExC,MAAM,CAAC,GAAG,oBAAoB,CAAC;IAC/B,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;IACxB,OAAO;QACL,IAAI,EAAE,OAAO,EAAE,IAAI,IAAI,CAAC,CAAC,IAAI;QAC7B,WAAW,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE;QAC7E,UAAU,EAAE;YACV,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,IAAI,CAAC,CAAC,UAAU,CAAC,OAAO;YAC7D,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM;SAC3D;QACD,OAAO,EAAE;YACP,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC,GAAG;YACpC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,EAAE,CAAC,MAAM;YAC7C,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,IAAI;YACvC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK;YAC1C,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,EAAE,CAAC,MAAM;SAC9C;QACD,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"parts.js","sourceRoot":"","sources":["../../src/defaults/parts.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tableStyle.d.ts","sourceRoot":"","sources":["../../src/defaults/tableStyle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,wBAAwB,EACxB,qBAAqB,EACrB,6BAA6B,EAC7B,sBAAsB,EAEvB,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"tableStyle.d.ts","sourceRoot":"","sources":["../../src/defaults/tableStyle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,wBAAwB,EACxB,qBAAqB,EACrB,6BAA6B,EAC7B,sBAAsB,EAEvB,MAAM,UAAU,CAAC;AAuElB;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,CAyC1B;AAED;;;uBAGuB;AACvB,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,gBAAgB,GAAG,SAAS,GACvC,gBAAgB,GAAG,SAAS,CAkD9B;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"}
|
|
@@ -28,6 +28,15 @@ const STATIC_DEFAULTS = {
|
|
|
28
28
|
cellPadding: { value: 0.375, unit: 'em' },
|
|
29
29
|
rules: 'grid',
|
|
30
30
|
borderRadius: { value: 0, unit: 'pt' },
|
|
31
|
+
// Booktabs (#625): LaTeX's \heavyrulewidth, \lightrulewidth,
|
|
32
|
+
// \cmidrulewidth and \cmidrulekern, resolved against the body cell size.
|
|
33
|
+
heavyRuleWidth: { value: 0.08, unit: 'em' },
|
|
34
|
+
lightRuleWidth: { value: 0.05, unit: 'em' },
|
|
35
|
+
spanRuleWidth: { value: 0.03, unit: 'em' },
|
|
36
|
+
spanRules: 'trimmed',
|
|
37
|
+
spanRuleTrim: { value: 0.5, unit: 'em' },
|
|
38
|
+
groupRules: false,
|
|
39
|
+
continuedFootRule: 'light',
|
|
31
40
|
overflow: 'split',
|
|
32
41
|
continuesMarkerEnabled: true,
|
|
33
42
|
};
|
|
@@ -92,6 +101,13 @@ export function resolveTableStyleConfig(partial, bodyText, locale) {
|
|
|
92
101
|
cellPadding: p.cellPadding ?? STATIC_DEFAULTS.cellPadding,
|
|
93
102
|
rules: p.rules ?? STATIC_DEFAULTS.rules,
|
|
94
103
|
borderRadius: p.borderRadius ?? STATIC_DEFAULTS.borderRadius,
|
|
104
|
+
heavyRuleWidth: p.heavyRuleWidth ?? STATIC_DEFAULTS.heavyRuleWidth,
|
|
105
|
+
lightRuleWidth: p.lightRuleWidth ?? STATIC_DEFAULTS.lightRuleWidth,
|
|
106
|
+
spanRuleWidth: p.spanRuleWidth ?? STATIC_DEFAULTS.spanRuleWidth,
|
|
107
|
+
spanRules: p.spanRules ?? STATIC_DEFAULTS.spanRules,
|
|
108
|
+
spanRuleTrim: p.spanRuleTrim ?? STATIC_DEFAULTS.spanRuleTrim,
|
|
109
|
+
groupRules: p.groupRules ?? STATIC_DEFAULTS.groupRules,
|
|
110
|
+
continuedFootRule: p.continuedFootRule ?? STATIC_DEFAULTS.continuedFootRule,
|
|
95
111
|
overflow: p.overflow ?? STATIC_DEFAULTS.overflow,
|
|
96
112
|
continuedSuffix: p.continuedSuffix ?? strings.continuedSuffix,
|
|
97
113
|
continuesMarkerEnabled: p.continuesMarkerEnabled ?? STATIC_DEFAULTS.continuesMarkerEnabled,
|
|
@@ -191,6 +207,34 @@ export function stripTableStyleDefaults(tableStyle) {
|
|
|
191
207
|
r.borderRadius = tableStyle.borderRadius;
|
|
192
208
|
has = true;
|
|
193
209
|
}
|
|
210
|
+
if (tableStyle.heavyRuleWidth !== undefined && !dimensionsEqual(tableStyle.heavyRuleWidth, STATIC_DEFAULTS.heavyRuleWidth)) {
|
|
211
|
+
r.heavyRuleWidth = tableStyle.heavyRuleWidth;
|
|
212
|
+
has = true;
|
|
213
|
+
}
|
|
214
|
+
if (tableStyle.lightRuleWidth !== undefined && !dimensionsEqual(tableStyle.lightRuleWidth, STATIC_DEFAULTS.lightRuleWidth)) {
|
|
215
|
+
r.lightRuleWidth = tableStyle.lightRuleWidth;
|
|
216
|
+
has = true;
|
|
217
|
+
}
|
|
218
|
+
if (tableStyle.spanRuleWidth !== undefined && !dimensionsEqual(tableStyle.spanRuleWidth, STATIC_DEFAULTS.spanRuleWidth)) {
|
|
219
|
+
r.spanRuleWidth = tableStyle.spanRuleWidth;
|
|
220
|
+
has = true;
|
|
221
|
+
}
|
|
222
|
+
if (tableStyle.spanRules !== undefined && tableStyle.spanRules !== STATIC_DEFAULTS.spanRules) {
|
|
223
|
+
r.spanRules = tableStyle.spanRules;
|
|
224
|
+
has = true;
|
|
225
|
+
}
|
|
226
|
+
if (tableStyle.spanRuleTrim !== undefined && !dimensionsEqual(tableStyle.spanRuleTrim, STATIC_DEFAULTS.spanRuleTrim)) {
|
|
227
|
+
r.spanRuleTrim = tableStyle.spanRuleTrim;
|
|
228
|
+
has = true;
|
|
229
|
+
}
|
|
230
|
+
if (tableStyle.groupRules !== undefined && tableStyle.groupRules !== STATIC_DEFAULTS.groupRules) {
|
|
231
|
+
r.groupRules = tableStyle.groupRules;
|
|
232
|
+
has = true;
|
|
233
|
+
}
|
|
234
|
+
if (tableStyle.continuedFootRule !== undefined && tableStyle.continuedFootRule !== STATIC_DEFAULTS.continuedFootRule) {
|
|
235
|
+
r.continuedFootRule = tableStyle.continuedFootRule;
|
|
236
|
+
has = true;
|
|
237
|
+
}
|
|
194
238
|
if (tableStyle.overflow !== undefined && tableStyle.overflow !== STATIC_DEFAULTS.overflow) {
|
|
195
239
|
r.overflow = tableStyle.overflow;
|
|
196
240
|
has = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tableStyle.js","sourceRoot":"","sources":["../../src/defaults/tableStyle.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tableStyle.js","sourceRoot":"","sources":["../../src/defaults/tableStyle.ts"],"names":[],"mappings":"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"}
|
package/dist/defaults/toc.js
CHANGED
|
@@ -85,7 +85,7 @@ export function resolveTocConfig(partial, bodyText) {
|
|
|
85
85
|
parts: {
|
|
86
86
|
enabled: parts?.enabled ?? d.parts.enabled,
|
|
87
87
|
breakBefore: parts?.breakBefore ?? d.parts.breakBefore,
|
|
88
|
-
design: parts?.design ? resolveDesignSlot(parts.design, '
|
|
88
|
+
design: parts?.design ? resolveDesignSlot(parts.design, 'tocRow') : { elements: [] },
|
|
89
89
|
height: parts?.height ?? PART_HEIGHT,
|
|
90
90
|
marginTop: parts?.marginTop ?? ZERO,
|
|
91
91
|
marginBottom: parts?.marginBottom ?? ZERO,
|
|
@@ -152,7 +152,7 @@ export function stripTocDefaults(toc) {
|
|
|
152
152
|
if (toc.parts.breakBefore !== undefined && toc.parts.breakBefore !== d.parts.breakBefore)
|
|
153
153
|
p.breakBefore = toc.parts.breakBefore;
|
|
154
154
|
if (toc.parts.design) {
|
|
155
|
-
const slot = stripDesignSlotDefaults(toc.parts.design, '
|
|
155
|
+
const slot = stripDesignSlotDefaults(toc.parts.design, 'tocRow');
|
|
156
156
|
if (slot && slot.elements && slot.elements.length > 0)
|
|
157
157
|
p.design = slot;
|
|
158
158
|
}
|
package/dist/defaults/verse.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { ResolvedVerseConfig, VerseConfig } from '../types';
|
|
2
2
|
/** Poems in the line layout (#620): two leading spaces indent a line one
|
|
3
|
-
* em, a turnover hangs two ems, a line of space between stanzas
|
|
3
|
+
* em, a turnover hangs two ems, a line of space between stanzas, a line
|
|
4
|
+
* a little too wide tightens its word spaces before it turns over. */
|
|
4
5
|
export declare const DEFAULT_VERSE_CONFIG: ResolvedVerseConfig;
|
|
5
6
|
/** `bodyText.verse` in full (see {@link DEFAULT_VERSE_CONFIG}). */
|
|
6
7
|
export declare function resolveVerseConfig(partial?: VerseConfig): ResolvedVerseConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verse.d.ts","sourceRoot":"","sources":["../../src/defaults/verse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAGjE;
|
|
1
|
+
{"version":3,"file":"verse.d.ts","sourceRoot":"","sources":["../../src/defaults/verse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAGjE;;uEAEuE;AACvE,eAAO,MAAM,oBAAoB,EAAE,mBASlC,CAAC;AAEF,mEAAmE;AACnE,wBAAgB,kBAAkB,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,mBAAmB,CAc7E;AAED;yBACyB;AACzB,wBAAgB,kBAAkB,CAAC,KAAK,CAAC,EAAE,WAAW,GAAG,WAAW,GAAG,SAAS,CAa/E"}
|
package/dist/defaults/verse.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { dimensionsEqual } from './shared';
|
|
2
2
|
/** Poems in the line layout (#620): two leading spaces indent a line one
|
|
3
|
-
* em, a turnover hangs two ems, a line of space between stanzas
|
|
3
|
+
* em, a turnover hangs two ems, a line of space between stanzas, a line
|
|
4
|
+
* a little too wide tightens its word spaces before it turns over. */
|
|
4
5
|
export const DEFAULT_VERSE_CONFIG = {
|
|
5
6
|
layout: 'auto',
|
|
6
7
|
indentStep: { value: 0.5, unit: 'em' },
|
|
@@ -9,6 +10,7 @@ export const DEFAULT_VERSE_CONFIG = {
|
|
|
9
10
|
turnoverMark: '[',
|
|
10
11
|
stanzaSpace: 1,
|
|
11
12
|
keepStanzas: 0,
|
|
13
|
+
tighten: true,
|
|
12
14
|
};
|
|
13
15
|
/** `bodyText.verse` in full (see {@link DEFAULT_VERSE_CONFIG}). */
|
|
14
16
|
export function resolveVerseConfig(partial) {
|
|
@@ -24,6 +26,7 @@ export function resolveVerseConfig(partial) {
|
|
|
24
26
|
turnoverMark: partial.turnoverMark ?? D.turnoverMark,
|
|
25
27
|
stanzaSpace: count(partial.stanzaSpace, D.stanzaSpace),
|
|
26
28
|
keepStanzas: Math.floor(count(partial.keepStanzas, D.keepStanzas)),
|
|
29
|
+
tighten: partial.tighten === false ? false : D.tighten,
|
|
27
30
|
};
|
|
28
31
|
}
|
|
29
32
|
/** `bodyText.verse` without the fields that hold their default; undefined
|
|
@@ -47,6 +50,8 @@ export function stripVerseDefaults(verse) {
|
|
|
47
50
|
out.stanzaSpace = verse.stanzaSpace;
|
|
48
51
|
if (verse.keepStanzas !== undefined && verse.keepStanzas !== D.keepStanzas)
|
|
49
52
|
out.keepStanzas = verse.keepStanzas;
|
|
53
|
+
if (verse.tighten !== undefined && verse.tighten !== D.tighten)
|
|
54
|
+
out.tighten = verse.tighten;
|
|
50
55
|
return Object.keys(out).length > 0 ? out : undefined;
|
|
51
56
|
}
|
|
52
57
|
//# sourceMappingURL=verse.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verse.js","sourceRoot":"","sources":["../../src/defaults/verse.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C;
|
|
1
|
+
{"version":3,"file":"verse.js","sourceRoot":"","sources":["../../src/defaults/verse.ts"],"names":[],"mappings":"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"}
|
package/dist/design/layout.d.ts
CHANGED
|
@@ -87,6 +87,9 @@ export interface ResolvedTextPrimitive extends ResolvedElementGeometry {
|
|
|
87
87
|
contentWidth: number;
|
|
88
88
|
contentHeight: number;
|
|
89
89
|
box?: ResolvedElementBox;
|
|
90
|
+
/** A line was cut to fit: by an ellipsis, or clipped with ink wider than
|
|
91
|
+
* the box (#628). Absent when every line shows whole. */
|
|
92
|
+
truncated?: TextTruncation;
|
|
90
93
|
/** Set vertically (`DesignTextElement.writingMode: 'vertical-rl'`): `x`,
|
|
91
94
|
* `y`, `width`, `height` are the box as it stands, every other number
|
|
92
95
|
* (the lines, the content box) is in the box's own frame turned a
|
|
@@ -146,11 +149,22 @@ export interface DesignSlotLayout {
|
|
|
146
149
|
/** Elements flagged with cyclic anchor graph or dangling references. */
|
|
147
150
|
issues: LayoutIssue[];
|
|
148
151
|
}
|
|
149
|
-
|
|
152
|
+
/** How a design text lost part of a line (#628): cut with an ellipsis, or
|
|
153
|
+
* clipped with ink past its box. */
|
|
154
|
+
export type TextTruncation = 'ellipsis-start' | 'ellipsis-end' | 'ellipsis-middle' | 'clip';
|
|
155
|
+
export type LayoutIssue = {
|
|
150
156
|
kind: 'cyclicAnchor' | 'danglingAnchor';
|
|
151
157
|
elementId: string;
|
|
152
158
|
targetId?: string;
|
|
153
159
|
}
|
|
160
|
+
/** A text element did not fit its width and was cut (`mode`); `text` is
|
|
161
|
+
* the whole text it was given (placeholders filled). */
|
|
162
|
+
| {
|
|
163
|
+
kind: 'textTruncated';
|
|
164
|
+
elementId: string;
|
|
165
|
+
mode: TextTruncation;
|
|
166
|
+
text: string;
|
|
167
|
+
};
|
|
154
168
|
/** Page-level reference frames (absolute page px) that elements may anchor
|
|
155
169
|
* to instead of the slot container: `page` is the trim box, `bleed` the
|
|
156
170
|
* trim box grown by the bleed (equal to `page` when cut lines are off). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../src/design/layout.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../src/design/layout.ts"],"names":[],"mappings":"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"}
|
package/dist/design/layout.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { flowTextWidth, getMeasureWritingMode, lineBaselineOffset, withMeasureWritingMode } from '../measure/vertical';
|
|
2
|
+
import { bitmapLayoutSize } from '../bitmapResolution';
|
|
2
3
|
import { dimensionToPx } from '../units';
|
|
3
4
|
import { resolveDesignLineHeight } from '../defaults/headerFooter';
|
|
4
5
|
import { createBoundingBox, pictureTraits } from '../vdt';
|
|
@@ -12,7 +13,7 @@ import { BREAKING_SPACE_RUNS_SPLIT_RE, NO_BREAK_SPACES, isBreakingSpaceRun } fro
|
|
|
12
13
|
import { resolveDesignResourceId, resolveDesignText, } from './placeholders';
|
|
13
14
|
import { hasJoiningScript, joinsWithNext } from '../bidi';
|
|
14
15
|
import { designBaseDirection, directRuns } from './bidiText';
|
|
15
|
-
import { RichMeasurer, ellipsisEndCut, ellipsisMiddleCut, ellipsisStartCut, parseRichDesignText, singleRichLine, wrapRich, } from './richText';
|
|
16
|
+
import { RichMeasurer, ellipsisEndCut, ellipsisMiddleCut, ellipsisStartCut, parseRichDesignText, plainDesignText, singleRichLine, wrapRich, } from './richText';
|
|
16
17
|
/** Placeholder characters the snippet parser leaves in span text (private
|
|
17
18
|
* use, the object replacement character, the invisible separator and
|
|
18
19
|
* plus of references and swatches): nothing a reader can read. */
|
|
@@ -440,6 +441,9 @@ function wrapToWidth(text, measure, maxWidth, hyphenate) {
|
|
|
440
441
|
}
|
|
441
442
|
return out.length > 0 ? out : [''];
|
|
442
443
|
}
|
|
444
|
+
/** How much wider than its room a clipped line may be before it counts as
|
|
445
|
+
* cut: rounding, not a hidden glyph. */
|
|
446
|
+
const CLIP_SLACK_PX = 0.5;
|
|
443
447
|
/** Lines stacked from the top of the content box, `lineHeightPx` apart. */
|
|
444
448
|
function stackLines(rows, lineHeightPx) {
|
|
445
449
|
return rows.map((r, i) => ({
|
|
@@ -479,14 +483,18 @@ maxContentWidth, hyphenate) {
|
|
|
479
483
|
contentWidth: maxContentWidth === undefined ? natural : Math.min(natural, maxContentWidth),
|
|
480
484
|
contentHeight: lines.length * lineHeightPx,
|
|
481
485
|
needsClip: maxContentWidth !== undefined,
|
|
486
|
+
...(maxContentWidth !== undefined && natural > maxContentWidth + CLIP_SLACK_PX ? { truncated: true } : {}),
|
|
482
487
|
};
|
|
483
488
|
}
|
|
484
489
|
// ellipsis-*
|
|
485
490
|
const mode = overflow === 'ellipsis-start' ? 'start'
|
|
486
491
|
: overflow === 'ellipsis-middle' ? 'middle'
|
|
487
492
|
: 'end';
|
|
493
|
+
let truncated = false;
|
|
488
494
|
const lines = stackLines(rows.map((t) => {
|
|
489
495
|
const visible = ellipsize(t, measure, maxContentWidth, mode);
|
|
496
|
+
if (visible !== t)
|
|
497
|
+
truncated = true;
|
|
490
498
|
return { text: visible, width: measure(visible) };
|
|
491
499
|
}), lineHeightPx);
|
|
492
500
|
return {
|
|
@@ -494,6 +502,7 @@ maxContentWidth, hyphenate) {
|
|
|
494
502
|
contentWidth: lines.reduce((m, l) => Math.max(m, l.width), 0),
|
|
495
503
|
contentHeight: lines.length * lineHeightPx,
|
|
496
504
|
needsClip: false,
|
|
505
|
+
...(truncated ? { truncated: true } : {}),
|
|
497
506
|
};
|
|
498
507
|
}
|
|
499
508
|
/** Lay out a text with inline marks: the same rules as `layoutText`, with
|
|
@@ -501,13 +510,19 @@ maxContentWidth, hyphenate) {
|
|
|
501
510
|
function layoutRichText(m, lineHeightPx, overflow, maxContentWidth, hyphenate) {
|
|
502
511
|
const rows = [];
|
|
503
512
|
let start = 0;
|
|
513
|
+
let truncated = false;
|
|
504
514
|
const text = m.rt.text;
|
|
505
515
|
for (const row of text.split('\n')) {
|
|
506
516
|
const end = start + row.length;
|
|
507
517
|
if (overflow === 'wrap')
|
|
508
518
|
rows.push(...wrapRich(m, start, end, () => maxContentWidth, hyphenate ?? false));
|
|
509
|
-
else
|
|
519
|
+
else {
|
|
520
|
+
// `singleRichLine` cuts exactly when the whole line is wider.
|
|
521
|
+
const whole = m.measure(start, end);
|
|
522
|
+
if (whole > maxContentWidth + (overflow === 'clip' ? CLIP_SLACK_PX : 0))
|
|
523
|
+
truncated = true;
|
|
510
524
|
rows.push(singleRichLine(m, start, end, maxContentWidth, overflow));
|
|
525
|
+
}
|
|
511
526
|
start = end + 1;
|
|
512
527
|
}
|
|
513
528
|
const lines = stackLines(rows, lineHeightPx);
|
|
@@ -517,6 +532,7 @@ function layoutRichText(m, lineHeightPx, overflow, maxContentWidth, hyphenate) {
|
|
|
517
532
|
contentWidth: overflow === 'clip' ? Math.min(natural, maxContentWidth) : natural,
|
|
518
533
|
contentHeight: lines.length * lineHeightPx,
|
|
519
534
|
needsClip: overflow === 'clip',
|
|
535
|
+
...(truncated ? { truncated: true } : {}),
|
|
520
536
|
};
|
|
521
537
|
}
|
|
522
538
|
// ---------------------------------------------------------------------------
|
|
@@ -646,6 +662,11 @@ export function layoutDesignSlot(slot, context, pageIndex) {
|
|
|
646
662
|
: layoutTextElement(el, textContent.get(el.id) ?? '', pin, fillRef, context.dpi, useElementEdge, context);
|
|
647
663
|
resolvedGeo.set(el.id, prims[0]);
|
|
648
664
|
primsByElement.set(el, prims);
|
|
665
|
+
const truncated = prims[0].truncated;
|
|
666
|
+
if (truncated) {
|
|
667
|
+
const text = textContent.get(el.id) ?? '';
|
|
668
|
+
issues.push({ kind: 'textTruncated', elementId: el.id, mode: truncated, text: el.inlineMarks ? plainDesignText(text) : text });
|
|
669
|
+
}
|
|
649
670
|
}
|
|
650
671
|
else if (el.kind === 'rule') {
|
|
651
672
|
const prim = layoutRuleElement(el, {
|
|
@@ -1098,6 +1119,7 @@ frame = {}) {
|
|
|
1098
1119
|
align: effectiveAlign,
|
|
1099
1120
|
verticalAlign: el.verticalAlign,
|
|
1100
1121
|
needsClip: m.needsClip || el.overflow === 'clip',
|
|
1122
|
+
...(m.truncated && el.overflow !== 'wrap' ? { truncated: el.overflow } : {}),
|
|
1101
1123
|
letterSpacingPx,
|
|
1102
1124
|
...(base === 'rtl' ? { direction: 'rtl' } : {}),
|
|
1103
1125
|
...((base === 'rtl') !== mirrored ? { startRight: true } : {}),
|
|
@@ -1247,8 +1269,10 @@ upright = false) {
|
|
|
1247
1269
|
const fileId = payload?.fileId;
|
|
1248
1270
|
if (!fileId)
|
|
1249
1271
|
return undefined;
|
|
1250
|
-
|
|
1251
|
-
const
|
|
1272
|
+
// A bitmap's own size is its pixels at its resolution (#631).
|
|
1273
|
+
const own = resource?.bitmap ? bitmapLayoutSize(resource.bitmap, dpi) : payload;
|
|
1274
|
+
const picW = own?.width && own.width > 0 ? own.width : 1;
|
|
1275
|
+
const picH = own?.height && own.height > 0 ? own.height : 1;
|
|
1252
1276
|
const natW = upright ? picH : picW;
|
|
1253
1277
|
const natH = upright ? picW : picH;
|
|
1254
1278
|
const widthSize = resolveFixedSize(el.placement.size?.width, dpi);
|