postext 0.3.19 → 0.3.20
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/calloutStyles.test.d.ts +2 -0
- package/dist/__tests__/defaults/calloutStyles.test.d.ts.map +1 -0
- package/dist/__tests__/defaults/calloutStyles.test.js +201 -0
- package/dist/__tests__/defaults/calloutStyles.test.js.map +1 -0
- package/dist/__tests__/defaults/captionStyle.test.d.ts +2 -0
- package/dist/__tests__/defaults/captionStyle.test.d.ts.map +1 -0
- package/dist/__tests__/defaults/captionStyle.test.js +87 -0
- package/dist/__tests__/defaults/captionStyle.test.js.map +1 -0
- package/dist/__tests__/defaults/pageSizePreset.test.d.ts +2 -0
- package/dist/__tests__/defaults/pageSizePreset.test.d.ts.map +1 -0
- package/dist/__tests__/defaults/pageSizePreset.test.js +24 -0
- package/dist/__tests__/defaults/pageSizePreset.test.js.map +1 -0
- package/dist/__tests__/defaults/paragraphStyles.test.d.ts +2 -0
- package/dist/__tests__/defaults/paragraphStyles.test.d.ts.map +1 -0
- package/dist/__tests__/defaults/paragraphStyles.test.js +93 -0
- package/dist/__tests__/defaults/paragraphStyles.test.js.map +1 -0
- package/dist/__tests__/design/pageAnchors.test.d.ts +2 -0
- package/dist/__tests__/design/pageAnchors.test.d.ts.map +1 -0
- package/dist/__tests__/design/pageAnchors.test.js +140 -0
- package/dist/__tests__/design/pageAnchors.test.js.map +1 -0
- package/dist/__tests__/directives.test.js +58 -0
- package/dist/__tests__/directives.test.js.map +1 -1
- package/dist/__tests__/exports.test.js +19 -0
- package/dist/__tests__/exports.test.js.map +1 -1
- package/dist/__tests__/mirroredMargins.test.d.ts +2 -0
- package/dist/__tests__/mirroredMargins.test.d.ts.map +1 -0
- package/dist/__tests__/mirroredMargins.test.js +136 -0
- package/dist/__tests__/mirroredMargins.test.js.map +1 -0
- package/dist/__tests__/numbering.test.js +54 -0
- package/dist/__tests__/numbering.test.js.map +1 -1
- package/dist/__tests__/openerTitleSource.test.d.ts +2 -0
- package/dist/__tests__/openerTitleSource.test.d.ts.map +1 -0
- package/dist/__tests__/openerTitleSource.test.js +108 -0
- package/dist/__tests__/openerTitleSource.test.js.map +1 -0
- package/dist/__tests__/pageRoles.test.d.ts +2 -0
- package/dist/__tests__/pageRoles.test.d.ts.map +1 -0
- package/dist/__tests__/pageRoles.test.js +95 -0
- package/dist/__tests__/pageRoles.test.js.map +1 -0
- package/dist/__tests__/parse/containers.test.d.ts +2 -0
- package/dist/__tests__/parse/containers.test.d.ts.map +1 -0
- package/dist/__tests__/parse/containers.test.js +204 -0
- package/dist/__tests__/parse/containers.test.js.map +1 -0
- package/dist/__tests__/parse/headingAttrs.test.d.ts +2 -0
- package/dist/__tests__/parse/headingAttrs.test.d.ts.map +1 -0
- package/dist/__tests__/parse/headingAttrs.test.js +62 -0
- package/dist/__tests__/parse/headingAttrs.test.js.map +1 -0
- package/dist/__tests__/parse/inlineRef.test.js +26 -0
- package/dist/__tests__/parse/inlineRef.test.js.map +1 -1
- package/dist/__tests__/parts.test.d.ts +2 -0
- package/dist/__tests__/parts.test.d.ts.map +1 -0
- package/dist/__tests__/parts.test.js +405 -0
- package/dist/__tests__/parts.test.js.map +1 -0
- package/dist/__tests__/pipeline/calloutLayout.test.d.ts +2 -0
- package/dist/__tests__/pipeline/calloutLayout.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/calloutLayout.test.js +273 -0
- package/dist/__tests__/pipeline/calloutLayout.test.js.map +1 -0
- package/dist/__tests__/pipeline/calloutPlacement.test.d.ts +2 -0
- package/dist/__tests__/pipeline/calloutPlacement.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/calloutPlacement.test.js +239 -0
- package/dist/__tests__/pipeline/calloutPlacement.test.js.map +1 -0
- package/dist/__tests__/pipeline/captionLayout.test.d.ts +2 -0
- package/dist/__tests__/pipeline/captionLayout.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/captionLayout.test.js +269 -0
- package/dist/__tests__/pipeline/captionLayout.test.js.map +1 -0
- package/dist/__tests__/pipeline/inlineRefRender.test.js +53 -0
- package/dist/__tests__/pipeline/inlineRefRender.test.js.map +1 -1
- package/dist/__tests__/pipeline/orderedSeparator.test.d.ts +2 -0
- package/dist/__tests__/pipeline/orderedSeparator.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/orderedSeparator.test.js +196 -0
- package/dist/__tests__/pipeline/orderedSeparator.test.js.map +1 -0
- package/dist/__tests__/pipeline/paragraphStyles.test.d.ts +2 -0
- package/dist/__tests__/pipeline/paragraphStyles.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/paragraphStyles.test.js +172 -0
- package/dist/__tests__/pipeline/paragraphStyles.test.js.map +1 -0
- package/dist/__tests__/pipeline/spanBands.test.d.ts +2 -0
- package/dist/__tests__/pipeline/spanBands.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/spanBands.test.js +303 -0
- package/dist/__tests__/pipeline/spanBands.test.js.map +1 -0
- package/dist/__tests__/pipeline/spanBlocks.test.d.ts +2 -0
- package/dist/__tests__/pipeline/spanBlocks.test.d.ts.map +1 -0
- package/dist/__tests__/pipeline/spanBlocks.test.js +407 -0
- package/dist/__tests__/pipeline/spanBlocks.test.js.map +1 -0
- package/dist/__tests__/placeholders.test.d.ts +2 -0
- package/dist/__tests__/placeholders.test.d.ts.map +1 -0
- package/dist/__tests__/placeholders.test.js +130 -0
- package/dist/__tests__/placeholders.test.js.map +1 -0
- package/dist/__tests__/table/model.test.js +24 -0
- package/dist/__tests__/table/model.test.js.map +1 -1
- package/dist/canvas-backend/blockRender.d.ts.map +1 -1
- package/dist/canvas-backend/blockRender.js +13 -1
- package/dist/canvas-backend/blockRender.js.map +1 -1
- package/dist/canvas-backend/decorations.d.ts +3 -0
- package/dist/canvas-backend/decorations.d.ts.map +1 -1
- package/dist/canvas-backend/decorations.js +14 -8
- package/dist/canvas-backend/decorations.js.map +1 -1
- package/dist/canvas-backend/headerFooter.d.ts.map +1 -1
- package/dist/canvas-backend/headerFooter.js +23 -0
- package/dist/canvas-backend/headerFooter.js.map +1 -1
- package/dist/canvas-backend/index.d.ts.map +1 -1
- package/dist/canvas-backend/index.js +4 -2
- package/dist/canvas-backend/index.js.map +1 -1
- package/dist/canvas-backend/renderResourceBlock.d.ts.map +1 -1
- package/dist/canvas-backend/renderResourceBlock.js +33 -5
- package/dist/canvas-backend/renderResourceBlock.js.map +1 -1
- package/dist/columnRule.d.ts +19 -0
- package/dist/columnRule.d.ts.map +1 -0
- package/dist/columnRule.js +36 -0
- package/dist/columnRule.js.map +1 -0
- package/dist/defaults/calloutStyles.d.ts +61 -0
- package/dist/defaults/calloutStyles.d.ts.map +1 -0
- package/dist/defaults/calloutStyles.js +292 -0
- package/dist/defaults/calloutStyles.js.map +1 -0
- package/dist/defaults/captionStyle.d.ts +11 -1
- package/dist/defaults/captionStyle.d.ts.map +1 -1
- package/dist/defaults/captionStyle.js +127 -2
- package/dist/defaults/captionStyle.js.map +1 -1
- package/dist/defaults/headerFooter.d.ts.map +1 -1
- package/dist/defaults/headerFooter.js +3 -0
- package/dist/defaults/headerFooter.js.map +1 -1
- package/dist/defaults/headings.d.ts.map +1 -1
- package/dist/defaults/headings.js +12 -6
- package/dist/defaults/headings.js.map +1 -1
- package/dist/defaults/index.d.ts +4 -1
- package/dist/defaults/index.d.ts.map +1 -1
- package/dist/defaults/index.js +28 -1
- package/dist/defaults/index.js.map +1 -1
- package/dist/defaults/orderedLists.d.ts +9 -8
- package/dist/defaults/orderedLists.d.ts.map +1 -1
- package/dist/defaults/orderedLists.js +66 -4
- package/dist/defaults/orderedLists.js.map +1 -1
- package/dist/defaults/page.d.ts.map +1 -1
- package/dist/defaults/page.js +14 -3
- package/dist/defaults/page.js.map +1 -1
- package/dist/defaults/paragraphStyles.d.ts +10 -0
- package/dist/defaults/paragraphStyles.d.ts.map +1 -0
- package/dist/defaults/paragraphStyles.js +67 -0
- package/dist/defaults/paragraphStyles.js.map +1 -0
- package/dist/defaults/parts.d.ts +22 -0
- package/dist/defaults/parts.d.ts.map +1 -0
- package/dist/defaults/parts.js +139 -0
- package/dist/defaults/parts.js.map +1 -0
- package/dist/defaults/shared.d.ts.map +1 -1
- package/dist/defaults/shared.js +110 -17
- package/dist/defaults/shared.js.map +1 -1
- package/dist/defaults/tableStyle.d.ts.map +1 -1
- package/dist/defaults/tableStyle.js +6 -0
- package/dist/defaults/tableStyle.js.map +1 -1
- package/dist/design/layout.d.ts +27 -1
- package/dist/design/layout.d.ts.map +1 -1
- package/dist/design/layout.js +39 -8
- package/dist/design/layout.js.map +1 -1
- package/dist/design/placeholders.d.ts +21 -4
- package/dist/design/placeholders.d.ts.map +1 -1
- package/dist/design/placeholders.js +38 -7
- package/dist/design/placeholders.js.map +1 -1
- package/dist/html-backend.d.ts.map +1 -1
- package/dist/html-backend.js +71 -16
- package/dist/html-backend.js.map +1 -1
- package/dist/index.d.ts +13 -9
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7 -4
- package/dist/index.js.map +1 -1
- package/dist/parse/attrs.d.ts +10 -0
- package/dist/parse/attrs.d.ts.map +1 -0
- package/dist/parse/attrs.js +20 -0
- package/dist/parse/attrs.js.map +1 -0
- package/dist/parse/blockParser.d.ts +8 -4
- package/dist/parse/blockParser.d.ts.map +1 -1
- package/dist/parse/blockParser.js +134 -20
- package/dist/parse/blockParser.js.map +1 -1
- package/dist/parse/index.d.ts +2 -2
- package/dist/parse/index.d.ts.map +1 -1
- package/dist/parse/index.js +1 -1
- package/dist/parse/index.js.map +1 -1
- package/dist/parse/inlineFormatting.d.ts +17 -1
- package/dist/parse/inlineFormatting.d.ts.map +1 -1
- package/dist/parse/inlineFormatting.js +56 -7
- package/dist/parse/inlineFormatting.js.map +1 -1
- package/dist/parse/sourceMapping.d.ts.map +1 -1
- package/dist/parse/sourceMapping.js +13 -1
- package/dist/parse/sourceMapping.js.map +1 -1
- package/dist/parse/types.d.ts +55 -5
- package/dist/parse/types.d.ts.map +1 -1
- package/dist/pipeline/bandCaps.d.ts +86 -0
- package/dist/pipeline/bandCaps.d.ts.map +1 -0
- package/dist/pipeline/bandCaps.js +142 -0
- package/dist/pipeline/bandCaps.js.map +1 -0
- package/dist/pipeline/build.d.ts +32 -0
- package/dist/pipeline/build.d.ts.map +1 -1
- package/dist/pipeline/build.js +589 -159
- package/dist/pipeline/build.js.map +1 -1
- package/dist/pipeline/buildBlockKind.d.ts +8 -0
- package/dist/pipeline/buildBlockKind.d.ts.map +1 -1
- package/dist/pipeline/buildBlockKind.js +40 -11
- package/dist/pipeline/buildBlockKind.js.map +1 -1
- package/dist/pipeline/buildHelpers.d.ts +23 -1
- package/dist/pipeline/buildHelpers.d.ts.map +1 -1
- package/dist/pipeline/buildHelpers.js +50 -6
- package/dist/pipeline/buildHelpers.js.map +1 -1
- package/dist/pipeline/calloutLayout.d.ts +107 -0
- package/dist/pipeline/calloutLayout.d.ts.map +1 -0
- package/dist/pipeline/calloutLayout.js +498 -0
- package/dist/pipeline/calloutLayout.js.map +1 -0
- package/dist/pipeline/columnBalancing.d.ts.map +1 -1
- package/dist/pipeline/columnBalancing.js +22 -2
- package/dist/pipeline/columnBalancing.js.map +1 -1
- package/dist/pipeline/config.d.ts.map +1 -1
- package/dist/pipeline/config.js +17 -5
- package/dist/pipeline/config.js.map +1 -1
- package/dist/pipeline/headerFooter.d.ts +37 -2
- package/dist/pipeline/headerFooter.d.ts.map +1 -1
- package/dist/pipeline/headerFooter.js +231 -15
- package/dist/pipeline/headerFooter.js.map +1 -1
- package/dist/pipeline/lists.d.ts +15 -0
- package/dist/pipeline/lists.d.ts.map +1 -1
- package/dist/pipeline/lists.js +73 -16
- package/dist/pipeline/lists.js.map +1 -1
- package/dist/pipeline/measureContentBlock.d.ts +59 -0
- package/dist/pipeline/measureContentBlock.d.ts.map +1 -0
- package/dist/pipeline/measureContentBlock.js +124 -0
- package/dist/pipeline/measureContentBlock.js.map +1 -0
- package/dist/pipeline/pageRoles.d.ts +23 -0
- package/dist/pipeline/pageRoles.d.ts.map +1 -0
- package/dist/pipeline/pageRoles.js +54 -0
- package/dist/pipeline/pageRoles.js.map +1 -0
- package/dist/pipeline/paragraphContainers.d.ts +32 -0
- package/dist/pipeline/paragraphContainers.d.ts.map +1 -0
- package/dist/pipeline/paragraphContainers.js +61 -0
- package/dist/pipeline/paragraphContainers.js.map +1 -0
- package/dist/pipeline/parts.d.ts +47 -0
- package/dist/pipeline/parts.d.ts.map +1 -0
- package/dist/pipeline/parts.js +230 -0
- package/dist/pipeline/parts.js.map +1 -0
- package/dist/pipeline/placeholders.d.ts +46 -1
- package/dist/pipeline/placeholders.d.ts.map +1 -1
- package/dist/pipeline/placeholders.js +93 -11
- package/dist/pipeline/placeholders.js.map +1 -1
- package/dist/pipeline/placement.d.ts +61 -7
- package/dist/pipeline/placement.d.ts.map +1 -1
- package/dist/pipeline/placement.js +151 -12
- package/dist/pipeline/placement.js.map +1 -1
- package/dist/pipeline/resourceLayout.d.ts +18 -5
- package/dist/pipeline/resourceLayout.d.ts.map +1 -1
- package/dist/pipeline/resourceLayout.js +145 -23
- package/dist/pipeline/resourceLayout.js.map +1 -1
- package/dist/pipeline/styles.d.ts +9 -1
- package/dist/pipeline/styles.d.ts.map +1 -1
- package/dist/pipeline/styles.js +50 -0
- package/dist/pipeline/styles.js.map +1 -1
- package/dist/table/model.d.ts.map +1 -1
- package/dist/table/model.js +16 -2
- package/dist/table/model.js.map +1 -1
- package/dist/types.d.ts +454 -2
- package/dist/types.d.ts.map +1 -1
- package/dist/vdt.d.ts +128 -4
- package/dist/vdt.d.ts.map +1 -1
- package/dist/vdt.js +2 -1
- package/dist/vdt.js.map +1 -1
- package/package.json +8 -8
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { TITLE_BREAK_RE } from '../parse/inlineFormatting';
|
|
1
2
|
const PLACEHOLDER_NAMES = new Set([
|
|
2
3
|
'pageNumber',
|
|
3
4
|
'totalPages',
|
|
@@ -6,8 +7,23 @@ const PLACEHOLDER_NAMES = new Set([
|
|
|
6
7
|
'author',
|
|
7
8
|
'publishDate',
|
|
8
9
|
'chapterTitle',
|
|
10
|
+
'chapterNumber',
|
|
11
|
+
'partTitle',
|
|
12
|
+
'partNumber',
|
|
9
13
|
]);
|
|
10
14
|
const METADATA_PLACEHOLDERS = new Set(['title', 'subtitle', 'author', 'publishDate']);
|
|
15
|
+
/** Placeholder grammar: `name` or `name.key` — the dotted form is reserved
|
|
16
|
+
* for namespaced lookups such as `{attr.author}` (heading attributes). */
|
|
17
|
+
export const PLACEHOLDER_NAME_RE = /^[a-zA-Z][a-zA-Z0-9]*(?:\.[a-zA-Z_][a-zA-Z0-9_-]*)?$/;
|
|
18
|
+
/** Namespace of the heading-attribute placeholders (`{attr.<key>}`). */
|
|
19
|
+
export const ATTR_PLACEHOLDER_PREFIX = 'attr.';
|
|
20
|
+
/** When `name` is an `attr.<key>` placeholder, returns `<key>`. */
|
|
21
|
+
export function attrPlaceholderKey(name) {
|
|
22
|
+
if (!name.startsWith(ATTR_PLACEHOLDER_PREFIX))
|
|
23
|
+
return undefined;
|
|
24
|
+
const key = name.slice(ATTR_PLACEHOLDER_PREFIX.length);
|
|
25
|
+
return key.length > 0 ? key : undefined;
|
|
26
|
+
}
|
|
11
27
|
/**
|
|
12
28
|
* Precompute chapter titles (most recent H1 text) for each page index by
|
|
13
29
|
* walking blocks once. Returns an array where `result[pageIndex]` is the plain
|
|
@@ -21,7 +37,7 @@ const METADATA_PLACEHOLDERS = new Set(['title', 'subtitle', 'author', 'publishDa
|
|
|
21
37
|
* in its header, not the previous chapter's.
|
|
22
38
|
*/
|
|
23
39
|
export function computeChapterTitles(blocks, totalPages, pages) {
|
|
24
|
-
return computeChapterValues(blocks, totalPages, pages, plainTextOfBlock);
|
|
40
|
+
return computeChapterValues(blocks, totalPages, pages, plainTextOfBlock, '');
|
|
25
41
|
}
|
|
26
42
|
/**
|
|
27
43
|
* Precompute chapter numbers (most recent H1 `numberPrefix`) per page. Mirrors
|
|
@@ -29,14 +45,35 @@ export function computeChapterTitles(blocks, totalPages, pages) {
|
|
|
29
45
|
* `{chapterNumber}` in heading-context slots resolves to the current chapter.
|
|
30
46
|
*/
|
|
31
47
|
export function computeChapterNumbers(blocks, totalPages, pages) {
|
|
32
|
-
|
|
48
|
+
// Without a level-1 numbering template the prefix is empty; fall back to
|
|
49
|
+
// the chapter's ordinal so `{chapterNumber}` still counts chapters.
|
|
50
|
+
let ordinal = 0;
|
|
51
|
+
let lastContentIndex;
|
|
52
|
+
return computeChapterValues(blocks, totalPages, pages, (b) => {
|
|
53
|
+
// A heading split across columns yields several blocks with the same
|
|
54
|
+
// content index; count the chapter once.
|
|
55
|
+
if (b.contentIndex === undefined || b.contentIndex !== lastContentIndex)
|
|
56
|
+
ordinal++;
|
|
57
|
+
lastContentIndex = b.contentIndex;
|
|
58
|
+
const prefix = b.numberPrefix?.trim() ?? '';
|
|
59
|
+
return prefix.length > 0 ? prefix : String(ordinal);
|
|
60
|
+
}, '');
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Precompute the heading attributes (`# Title {key="value"}`) of the most
|
|
64
|
+
* recent H1 per page. Backs `{attr.<key>}` in header/footer slots; pages
|
|
65
|
+
* before the first H1 get an empty record.
|
|
66
|
+
*/
|
|
67
|
+
export function computeChapterAttrs(blocks, totalPages, pages) {
|
|
68
|
+
return computeChapterValues(blocks, totalPages, pages, (b) => b.attrs ?? {}, {});
|
|
33
69
|
}
|
|
34
|
-
/** Shared walker behind `computeChapterTitles` / `computeChapterNumbers
|
|
35
|
-
* tracks the most recent H1's extracted value per
|
|
36
|
-
|
|
37
|
-
|
|
70
|
+
/** Shared walker behind `computeChapterTitles` / `computeChapterNumbers` /
|
|
71
|
+
* `computeChapterAttrs`: tracks the most recent H1's extracted value per
|
|
72
|
+
* page, starting from `empty` before the first H1. */
|
|
73
|
+
function computeChapterValues(blocks, totalPages, pages, extract, empty) {
|
|
74
|
+
const out = new Array(totalPages).fill(empty);
|
|
38
75
|
const byPage = new Map();
|
|
39
|
-
let current =
|
|
76
|
+
let current = empty;
|
|
40
77
|
// Walk blocks in page/column order. The VDT `doc.blocks` array is already
|
|
41
78
|
// insertion-ordered by placement, so pages are in increasing index.
|
|
42
79
|
let lastPageIndex = -1;
|
|
@@ -87,6 +124,37 @@ function computeChapterValues(blocks, totalPages, pages, extract) {
|
|
|
87
124
|
}
|
|
88
125
|
return out;
|
|
89
126
|
}
|
|
127
|
+
/**
|
|
128
|
+
* Precompute the current part title and number per page index. A page with
|
|
129
|
+
* `partInfo` (a `:::part` divider page) starts a new part that runs until
|
|
130
|
+
* the next one; pages before the first part get `''`. Blank parity pages
|
|
131
|
+
* immediately preceding a part page belong to the upcoming part (they exist
|
|
132
|
+
* only to push it onto the right parity); a `blankForForce` page stops the
|
|
133
|
+
* walk — it belongs to the previous part, the same rule as chapters.
|
|
134
|
+
*/
|
|
135
|
+
export function computePartValues(pages) {
|
|
136
|
+
const partTitleByPageIndex = new Array(pages.length).fill('');
|
|
137
|
+
const partNumberByPageIndex = new Array(pages.length).fill('');
|
|
138
|
+
let title = '';
|
|
139
|
+
let number = '';
|
|
140
|
+
for (let p = 0; p < pages.length; p++) {
|
|
141
|
+
const info = pages[p].partInfo;
|
|
142
|
+
if (info) {
|
|
143
|
+
title = info.title.replace(TITLE_BREAK_RE, ' ');
|
|
144
|
+
number = info.number;
|
|
145
|
+
for (let q = p - 1; q >= 0; q--) {
|
|
146
|
+
const prev = pages[q];
|
|
147
|
+
if (prev.blankForForce || !prev.blankForParity)
|
|
148
|
+
break;
|
|
149
|
+
partTitleByPageIndex[q] = title;
|
|
150
|
+
partNumberByPageIndex[q] = number;
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
partTitleByPageIndex[p] = title;
|
|
154
|
+
partNumberByPageIndex[p] = number;
|
|
155
|
+
}
|
|
156
|
+
return { partTitleByPageIndex, partNumberByPageIndex };
|
|
157
|
+
}
|
|
90
158
|
function plainTextOfBlock(block) {
|
|
91
159
|
// Strip any numbering prefix that was prepended during build.
|
|
92
160
|
const lines = block.lines.map((l) => l.text).join(' ');
|
|
@@ -97,7 +165,9 @@ function plainTextOfBlock(block) {
|
|
|
97
165
|
}
|
|
98
166
|
/**
|
|
99
167
|
* Resolve placeholder templates. Grammar:
|
|
100
|
-
* - `{name}` with name matching `[a-zA-Z][a-zA-Z0-9]*` is a placeholder
|
|
168
|
+
* - `{name}` with name matching `[a-zA-Z][a-zA-Z0-9]*` is a placeholder;
|
|
169
|
+
* - `{name.key}` is a namespaced placeholder — `{attr.<key>}` reads the
|
|
170
|
+
* current chapter's heading attributes (missing → `''`, no warning);
|
|
101
171
|
* - `{{` and `}}` are literal braces.
|
|
102
172
|
*/
|
|
103
173
|
export function resolvePlaceholders(template, ctx) {
|
|
@@ -126,11 +196,17 @@ export function resolvePlaceholders(template, ctx) {
|
|
|
126
196
|
continue;
|
|
127
197
|
}
|
|
128
198
|
const name = template.slice(i + 1, end);
|
|
129
|
-
if (
|
|
199
|
+
if (!PLACEHOLDER_NAME_RE.test(name)) {
|
|
130
200
|
out += template.slice(i, end + 1);
|
|
131
201
|
i = end + 1;
|
|
132
202
|
continue;
|
|
133
203
|
}
|
|
204
|
+
const attrKey = attrPlaceholderKey(name);
|
|
205
|
+
if (attrKey !== undefined) {
|
|
206
|
+
out += ctx.chapterAttrsByPageIndex?.[ctx.page.index]?.[attrKey] ?? '';
|
|
207
|
+
i = end + 1;
|
|
208
|
+
continue;
|
|
209
|
+
}
|
|
134
210
|
if (!PLACEHOLDER_NAMES.has(name)) {
|
|
135
211
|
unknown.push(name);
|
|
136
212
|
i = end + 1;
|
|
@@ -165,6 +241,12 @@ function resolveName(name, ctx) {
|
|
|
165
241
|
return typeof ctx.metadata.publishDate === 'string' ? ctx.metadata.publishDate : '';
|
|
166
242
|
case 'chapterTitle':
|
|
167
243
|
return ctx.chapterTitleByPageIndex[ctx.page.index] ?? '';
|
|
244
|
+
case 'partTitle':
|
|
245
|
+
return ctx.partTitleByPageIndex?.[ctx.page.index] ?? '';
|
|
246
|
+
case 'partNumber':
|
|
247
|
+
return ctx.partNumberByPageIndex?.[ctx.page.index] ?? '';
|
|
248
|
+
case 'chapterNumber':
|
|
249
|
+
return ctx.chapterNumberByPageIndex?.[ctx.page.index] ?? '';
|
|
168
250
|
default:
|
|
169
251
|
return '';
|
|
170
252
|
}
|
|
@@ -191,7 +273,7 @@ export function collectPlaceholderNames(template) {
|
|
|
191
273
|
if (end === -1)
|
|
192
274
|
break;
|
|
193
275
|
const name = template.slice(i + 1, end);
|
|
194
|
-
if (
|
|
276
|
+
if (PLACEHOLDER_NAME_RE.test(name))
|
|
195
277
|
names.add(name);
|
|
196
278
|
i = end + 1;
|
|
197
279
|
continue;
|
|
@@ -201,7 +283,7 @@ export function collectPlaceholderNames(template) {
|
|
|
201
283
|
return [...names];
|
|
202
284
|
}
|
|
203
285
|
export function isKnownPlaceholder(name) {
|
|
204
|
-
return PLACEHOLDER_NAMES.has(name);
|
|
286
|
+
return PLACEHOLDER_NAMES.has(name) || attrPlaceholderKey(name) !== undefined;
|
|
205
287
|
}
|
|
206
288
|
export function isMetadataPlaceholder(name) {
|
|
207
289
|
return METADATA_PLACEHOLDERS.has(name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"placeholders.js","sourceRoot":"","sources":["../../src/pipeline/placeholders.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"placeholders.js","sourceRoot":"","sources":["../../src/pipeline/placeholders.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,63 @@
|
|
|
1
1
|
import { type BoundingBox, type ResolvedConfig, type VDTDocument, type VDTBlock, type VDTLine, type VDTPage, type VDTColumn } from '../vdt';
|
|
2
2
|
import type { HeadingBreakParity } from '../types';
|
|
3
|
+
import { type PageMetrics } from './buildHelpers';
|
|
3
4
|
export interface PlacementCursor {
|
|
4
5
|
pageIndex: number;
|
|
5
6
|
columnIndex: number;
|
|
6
7
|
}
|
|
7
8
|
export declare function resetLinePositions(lines: VDTLine[], lineHeightPx: number): VDTLine[];
|
|
8
9
|
export declare function createPageWithColumns(pageIndex: number, resolved: ResolvedConfig, contentArea: BoundingBox, pageWidthPx: number, pageHeightPx: number): VDTPage;
|
|
10
|
+
/** Turn a freshly opened (empty) page into a part-divider page: a single
|
|
11
|
+
* body column inset from the trim box by `parts.margins` (mirrored on even
|
|
12
|
+
* pages when `parts.margins.mirror` is on), `page.contentArea` set to that
|
|
13
|
+
* area, `partInfo` stamped and the role fixed to `'part'`. The opener
|
|
14
|
+
* design is laid out later by `buildHeadersAndFooters` against the full
|
|
15
|
+
* trim box and never reserves body space. */
|
|
16
|
+
export declare function createPartPage(page: VDTPage, metrics: Pick<PageMetrics, 'trimBox' | 'pageWidthPx'>, resolved: ResolvedConfig, info: {
|
|
17
|
+
number: string;
|
|
18
|
+
title: string;
|
|
19
|
+
titleSourceStart?: number;
|
|
20
|
+
titleSourceEnd?: number;
|
|
21
|
+
}): VDTPage;
|
|
9
22
|
export declare function currentColumn(doc: VDTDocument, cursor: PlacementCursor): VDTColumn;
|
|
23
|
+
/** Whether any column of the page — text or span — holds a placed block.
|
|
24
|
+
* Floats live outside the columns and do not count. */
|
|
25
|
+
export declare function pageHasContent(page: VDTPage): boolean;
|
|
26
|
+
/** Text columns of `band` in reading order (span columns excluded). */
|
|
27
|
+
export declare function bandColumns(page: VDTPage, band: number): VDTColumn[];
|
|
28
|
+
/** Band the cursor's column belongs to (`0` for the plain single-band page). */
|
|
29
|
+
export declare function currentBand(page: VDTPage, cursor: PlacementCursor): number;
|
|
30
|
+
/** True when every column of the band has consumed the same height (within
|
|
31
|
+
* 0.5px) — the page top, right after an opener heading (which reserves its
|
|
32
|
+
* band in every column), right after another span block, or right after a
|
|
33
|
+
* top float band. Used height = `bbox.height − availableHeight`. */
|
|
34
|
+
export declare function isBandLevel(cols: readonly VDTColumn[]): boolean;
|
|
35
|
+
/** Lowest used bottom (absolute y) across the band's columns — where a
|
|
36
|
+
* full-width block can start without covering placed content. */
|
|
37
|
+
export declare function bandUsedBottom(cols: readonly VDTColumn[]): number;
|
|
38
|
+
/**
|
|
39
|
+
* Close the band formed by `cols` at `cutY`, insert a full-width span column
|
|
40
|
+
* holding `block` right below the cut, and open a fresh band of text columns
|
|
41
|
+
* under it. The band's columns are clamped to `cutY` — a column whose top
|
|
42
|
+
* already sits at the cut becomes zero-height — and keep only the slack
|
|
43
|
+
* between their used bottom and the cut in `availableHeight` (zero when the
|
|
44
|
+
* band is level on the grid; whole lines when a band cap cut the band with
|
|
45
|
+
* its last column short, so column balancing can still fill them). The span
|
|
46
|
+
* column is `{ kind: 'span', band }` at `contentArea.x / width`, `needPx`
|
|
47
|
+
* tall (the block plus its spacing, already rounded to the grid by the
|
|
48
|
+
* caller); `block` is placed inside it at `spacingBefore` below the cut with
|
|
49
|
+
* height `blockHeight` (default: the rest of the band), so `block.pageIndex`
|
|
50
|
+
* / `columnIndex` address the span column.
|
|
51
|
+
*
|
|
52
|
+
* The new text columns (`band + 1`) copy each closed column's x / width and
|
|
53
|
+
* keep its original bottom (so a bottom float band reserved on one column
|
|
54
|
+
* still constrains its successor). A column with no room left (bottom
|
|
55
|
+
* within 0.5px of the new band's top) is not created; when none is, the
|
|
56
|
+
* cursor stays on the span column — which is full — so the next placement
|
|
57
|
+
* advances to a new page. Otherwise the cursor moves to the first new
|
|
58
|
+
* column. Returns the span column.
|
|
59
|
+
*/
|
|
60
|
+
export declare function closeBandAndInsertSpan(page: VDTPage, cols: readonly VDTColumn[], cutY: number, block: VDTBlock, needPx: number, cursor: PlacementCursor, spacingBefore?: number, blockHeight?: number): VDTColumn;
|
|
10
61
|
export declare function advanceToNextColumn(doc: VDTDocument, cursor: PlacementCursor, resolved: ResolvedConfig, contentArea: BoundingBox, pageWidthPx: number, pageHeightPx: number, onNewPage?: (page: VDTPage) => void): void;
|
|
11
62
|
/** Advance `cursor` forward until it points to the first column of a new
|
|
12
63
|
* page. No-op when the current page is empty (nothing placed yet) — avoids
|
|
@@ -26,17 +77,20 @@ export declare function advanceToNextPageBoundary(doc: VDTDocument, cursor: Plac
|
|
|
26
77
|
* whether the natural next page already matched the requested parity. */
|
|
27
78
|
export declare function enforcePageParity(doc: VDTDocument, cursor: PlacementCursor, resolved: ResolvedConfig, contentArea: BoundingBox, pageWidthPx: number, pageHeightPx: number, parity: HeadingBreakParity): void;
|
|
28
79
|
/**
|
|
29
|
-
* Place a resource
|
|
30
|
-
*
|
|
31
|
-
* for v1: if the group's combined height fits
|
|
32
|
-
* placed there; otherwise the cursor advances
|
|
33
|
-
* emitting a leading blank page when the
|
|
34
|
-
*
|
|
80
|
+
* Place an atomic block — a resource group (image / svg / table + caption,
|
|
81
|
+
* issue #49 §7) or a callout frame — keeping it together as one unit. Atomic
|
|
82
|
+
* blocks never split mid-content for v1: if the group's combined height fits
|
|
83
|
+
* the remaining column space it is placed there; otherwise the cursor advances
|
|
84
|
+
* to the next column/page (without emitting a leading blank page when the
|
|
85
|
+
* current column is empty), and the block is force-placed there even when it
|
|
86
|
+
* exceeds a single column's height.
|
|
35
87
|
*
|
|
36
88
|
* `spacingBefore` is consumed from the target column's available height before
|
|
37
89
|
* placement (collapsed against the previous block's bottom margin by the
|
|
38
90
|
* caller). Returns the height actually reserved for the block.
|
|
39
91
|
*/
|
|
40
|
-
export declare function
|
|
92
|
+
export declare function placeAtomicBlock(block: VDTBlock, groupHeight: number, spacingBefore: number, cursor: PlacementCursor, doc: VDTDocument, resolved: ResolvedConfig, contentArea: BoundingBox, pageWidthPx: number, pageHeightPx: number): number;
|
|
93
|
+
/** @deprecated Use {@link placeAtomicBlock}. */
|
|
94
|
+
export declare const placeResourceBlock: typeof placeAtomicBlock;
|
|
41
95
|
export declare function placeBlockInColumn(block: VDTBlock, blockHeight: number, col: VDTColumn, cursor: PlacementCursor): void;
|
|
42
96
|
//# sourceMappingURL=placement.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"placement.d.ts","sourceRoot":"","sources":["../../src/pipeline/placement.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,WAAW,EAChB,KAAK,QAAQ,EACb,KAAK,OAAO,EACZ,KAAK,OAAO,EACZ,KAAK,SAAS,EACf,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"placement.d.ts","sourceRoot":"","sources":["../../src/pipeline/placement.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { createBoundingBox, createVDTPage, createVDTColumn, } from '../vdt';
|
|
2
2
|
import { computeColumnBboxes } from './config';
|
|
3
|
+
import { contentAreaForPage, mirrorContentArea } from './buildHelpers';
|
|
4
|
+
import { dimensionToPx } from '../units';
|
|
3
5
|
export function resetLinePositions(lines, lineHeightPx) {
|
|
4
6
|
return lines.map((line, i) => ({
|
|
5
7
|
...line,
|
|
@@ -8,16 +10,150 @@ export function resetLinePositions(lines, lineHeightPx) {
|
|
|
8
10
|
}));
|
|
9
11
|
}
|
|
10
12
|
export function createPageWithColumns(pageIndex, resolved, contentArea, pageWidthPx, pageHeightPx) {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
+
// `contentArea` is the recto (odd-page) area; mirrored margins swap the
|
|
14
|
+
// inner/outer margins on even pages. `pageIndex` is the page's position in
|
|
15
|
+
// `doc.pages`, so page number = index + 1.
|
|
16
|
+
const pageArea = contentAreaForPage({ contentArea, pageWidthPx }, resolved, pageIndex);
|
|
17
|
+
const page = createVDTPage(pageIndex, pageWidthPx, pageHeightPx, pageArea);
|
|
18
|
+
const colBboxes = computeColumnBboxes(pageArea, resolved);
|
|
13
19
|
for (let i = 0; i < colBboxes.length; i++) {
|
|
14
20
|
page.columns.push(createVDTColumn(i, colBboxes[i]));
|
|
15
21
|
}
|
|
16
22
|
return page;
|
|
17
23
|
}
|
|
24
|
+
/** Turn a freshly opened (empty) page into a part-divider page: a single
|
|
25
|
+
* body column inset from the trim box by `parts.margins` (mirrored on even
|
|
26
|
+
* pages when `parts.margins.mirror` is on), `page.contentArea` set to that
|
|
27
|
+
* area, `partInfo` stamped and the role fixed to `'part'`. The opener
|
|
28
|
+
* design is laid out later by `buildHeadersAndFooters` against the full
|
|
29
|
+
* trim box and never reserves body space. */
|
|
30
|
+
export function createPartPage(page, metrics, resolved, info) {
|
|
31
|
+
const dpi = resolved.page.dpi;
|
|
32
|
+
const m = resolved.parts.margins;
|
|
33
|
+
const trim = metrics.trimBox;
|
|
34
|
+
const top = dimensionToPx(m.top, dpi);
|
|
35
|
+
const bottom = dimensionToPx(m.bottom, dpi);
|
|
36
|
+
const left = dimensionToPx(m.left, dpi);
|
|
37
|
+
const right = dimensionToPx(m.right, dpi);
|
|
38
|
+
let area = createBoundingBox(trim.x + left, trim.y + top, Math.max(0, trim.width - left - right), Math.max(0, trim.height - top - bottom));
|
|
39
|
+
const isEvenPage = (page.index + 1) % 2 === 0;
|
|
40
|
+
if (m.mirror && isEvenPage)
|
|
41
|
+
area = mirrorContentArea(area, metrics.pageWidthPx);
|
|
42
|
+
page.contentArea = area;
|
|
43
|
+
page.columns = [createVDTColumn(0, area)];
|
|
44
|
+
page.partInfo = {
|
|
45
|
+
number: info.number,
|
|
46
|
+
title: info.title,
|
|
47
|
+
titleSourceStart: info.titleSourceStart,
|
|
48
|
+
titleSourceEnd: info.titleSourceEnd,
|
|
49
|
+
};
|
|
50
|
+
page.role = 'part';
|
|
51
|
+
return page;
|
|
52
|
+
}
|
|
18
53
|
export function currentColumn(doc, cursor) {
|
|
19
54
|
return doc.pages[cursor.pageIndex].columns[cursor.columnIndex];
|
|
20
55
|
}
|
|
56
|
+
/** Whether any column of the page — text or span — holds a placed block.
|
|
57
|
+
* Floats live outside the columns and do not count. */
|
|
58
|
+
export function pageHasContent(page) {
|
|
59
|
+
return page.columns.some((c) => c.blocks.length > 0);
|
|
60
|
+
}
|
|
61
|
+
// ---------------------------------------------------------------------------
|
|
62
|
+
// Column bands (page-span blocks, stage 1)
|
|
63
|
+
//
|
|
64
|
+
// `page.columns` stays a flat array in reading order. A page-span inline
|
|
65
|
+
// block occupies its own full-width column (`kind: 'span'`); the text
|
|
66
|
+
// columns of the band it interrupts are closed at the cut line and a fresh
|
|
67
|
+
// band of text columns (`band + 1`) is appended below it with the same
|
|
68
|
+
// x / width and the same bottom as the closed band. Column indices are
|
|
69
|
+
// monotonic — columns are only ever appended — so `block.columnIndex` keeps
|
|
70
|
+
// addressing `page.columns[i]` and renderers need no drawing changes: each
|
|
71
|
+
// column clips to its own bbox.
|
|
72
|
+
// ---------------------------------------------------------------------------
|
|
73
|
+
/** Text columns of `band` in reading order (span columns excluded). */
|
|
74
|
+
export function bandColumns(page, band) {
|
|
75
|
+
return page.columns.filter((c) => c.kind !== 'span' && (c.band ?? 0) === band);
|
|
76
|
+
}
|
|
77
|
+
/** Band the cursor's column belongs to (`0` for the plain single-band page). */
|
|
78
|
+
export function currentBand(page, cursor) {
|
|
79
|
+
return page.columns[cursor.columnIndex]?.band ?? 0;
|
|
80
|
+
}
|
|
81
|
+
/** True when every column of the band has consumed the same height (within
|
|
82
|
+
* 0.5px) — the page top, right after an opener heading (which reserves its
|
|
83
|
+
* band in every column), right after another span block, or right after a
|
|
84
|
+
* top float band. Used height = `bbox.height − availableHeight`. */
|
|
85
|
+
export function isBandLevel(cols) {
|
|
86
|
+
if (cols.length === 0)
|
|
87
|
+
return false;
|
|
88
|
+
const used0 = cols[0].bbox.height - cols[0].availableHeight;
|
|
89
|
+
return cols.every((c) => Math.abs((c.bbox.height - c.availableHeight) - used0) <= 0.5);
|
|
90
|
+
}
|
|
91
|
+
/** Lowest used bottom (absolute y) across the band's columns — where a
|
|
92
|
+
* full-width block can start without covering placed content. */
|
|
93
|
+
export function bandUsedBottom(cols) {
|
|
94
|
+
let bottom = -Infinity;
|
|
95
|
+
for (const c of cols) {
|
|
96
|
+
bottom = Math.max(bottom, c.bbox.y + (c.bbox.height - c.availableHeight));
|
|
97
|
+
}
|
|
98
|
+
return bottom;
|
|
99
|
+
}
|
|
100
|
+
/**
|
|
101
|
+
* Close the band formed by `cols` at `cutY`, insert a full-width span column
|
|
102
|
+
* holding `block` right below the cut, and open a fresh band of text columns
|
|
103
|
+
* under it. The band's columns are clamped to `cutY` — a column whose top
|
|
104
|
+
* already sits at the cut becomes zero-height — and keep only the slack
|
|
105
|
+
* between their used bottom and the cut in `availableHeight` (zero when the
|
|
106
|
+
* band is level on the grid; whole lines when a band cap cut the band with
|
|
107
|
+
* its last column short, so column balancing can still fill them). The span
|
|
108
|
+
* column is `{ kind: 'span', band }` at `contentArea.x / width`, `needPx`
|
|
109
|
+
* tall (the block plus its spacing, already rounded to the grid by the
|
|
110
|
+
* caller); `block` is placed inside it at `spacingBefore` below the cut with
|
|
111
|
+
* height `blockHeight` (default: the rest of the band), so `block.pageIndex`
|
|
112
|
+
* / `columnIndex` address the span column.
|
|
113
|
+
*
|
|
114
|
+
* The new text columns (`band + 1`) copy each closed column's x / width and
|
|
115
|
+
* keep its original bottom (so a bottom float band reserved on one column
|
|
116
|
+
* still constrains its successor). A column with no room left (bottom
|
|
117
|
+
* within 0.5px of the new band's top) is not created; when none is, the
|
|
118
|
+
* cursor stays on the span column — which is full — so the next placement
|
|
119
|
+
* advances to a new page. Otherwise the cursor moves to the first new
|
|
120
|
+
* column. Returns the span column.
|
|
121
|
+
*/
|
|
122
|
+
export function closeBandAndInsertSpan(page, cols, cutY, block, needPx, cursor, spacingBefore = 0, blockHeight = needPx - spacingBefore) {
|
|
123
|
+
const band = cols[0]?.band ?? 0;
|
|
124
|
+
const bottoms = cols.map((c) => c.bbox.y + c.bbox.height);
|
|
125
|
+
for (const c of cols) {
|
|
126
|
+
const used = c.bbox.height - c.availableHeight;
|
|
127
|
+
c.band = band;
|
|
128
|
+
c.bbox.height = Math.max(0, cutY - c.bbox.y);
|
|
129
|
+
c.availableHeight = Math.max(0, c.bbox.height - used);
|
|
130
|
+
}
|
|
131
|
+
const spanCol = createVDTColumn(page.columns.length, createBoundingBox(page.contentArea.x, cutY, page.contentArea.width, needPx));
|
|
132
|
+
spanCol.kind = 'span';
|
|
133
|
+
spanCol.band = band;
|
|
134
|
+
page.columns.push(spanCol);
|
|
135
|
+
cursor.pageIndex = page.index;
|
|
136
|
+
cursor.columnIndex = spanCol.index;
|
|
137
|
+
if (spacingBefore > 0)
|
|
138
|
+
spanCol.availableHeight -= spacingBefore;
|
|
139
|
+
placeBlockInColumn(block, blockHeight, spanCol, cursor);
|
|
140
|
+
spanCol.availableHeight = 0;
|
|
141
|
+
const newTop = cutY + needPx;
|
|
142
|
+
let firstNew;
|
|
143
|
+
cols.forEach((c, i) => {
|
|
144
|
+
const height = bottoms[i] - newTop;
|
|
145
|
+
if (height < 0.5)
|
|
146
|
+
return;
|
|
147
|
+
const next = createVDTColumn(page.columns.length, createBoundingBox(c.bbox.x, newTop, c.bbox.width, height));
|
|
148
|
+
next.band = band + 1;
|
|
149
|
+
page.columns.push(next);
|
|
150
|
+
if (!firstNew)
|
|
151
|
+
firstNew = next;
|
|
152
|
+
});
|
|
153
|
+
if (firstNew)
|
|
154
|
+
cursor.columnIndex = firstNew.index;
|
|
155
|
+
return spanCol;
|
|
156
|
+
}
|
|
21
157
|
export function advanceToNextColumn(doc, cursor, resolved, contentArea, pageWidthPx, pageHeightPx, onNewPage) {
|
|
22
158
|
const page = doc.pages[cursor.pageIndex];
|
|
23
159
|
if (cursor.columnIndex < page.columns.length - 1) {
|
|
@@ -41,9 +177,9 @@ export function advanceToNextColumn(doc, cursor, resolved, contentArea, pageWidt
|
|
|
41
177
|
* emitting a blank leading page when a `:::pagebreak` directive lands
|
|
42
178
|
* before any content. */
|
|
43
179
|
export function advanceToNextPageBoundary(doc, cursor, resolved, contentArea, pageWidthPx, pageHeightPx, onNewPage) {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
if (
|
|
180
|
+
// Span columns hold their block like any other column, so a page whose
|
|
181
|
+
// only content is a page-span block counts as non-empty here.
|
|
182
|
+
if (!pageHasContent(doc.pages[cursor.pageIndex]))
|
|
47
183
|
return;
|
|
48
184
|
const startPageIndex = cursor.pageIndex;
|
|
49
185
|
do {
|
|
@@ -101,18 +237,19 @@ export function enforcePageParity(doc, cursor, resolved, contentArea, pageWidthP
|
|
|
101
237
|
}
|
|
102
238
|
}
|
|
103
239
|
/**
|
|
104
|
-
* Place a resource
|
|
105
|
-
*
|
|
106
|
-
* for v1: if the group's combined height fits
|
|
107
|
-
* placed there; otherwise the cursor advances
|
|
108
|
-
* emitting a leading blank page when the
|
|
109
|
-
*
|
|
240
|
+
* Place an atomic block — a resource group (image / svg / table + caption,
|
|
241
|
+
* issue #49 §7) or a callout frame — keeping it together as one unit. Atomic
|
|
242
|
+
* blocks never split mid-content for v1: if the group's combined height fits
|
|
243
|
+
* the remaining column space it is placed there; otherwise the cursor advances
|
|
244
|
+
* to the next column/page (without emitting a leading blank page when the
|
|
245
|
+
* current column is empty), and the block is force-placed there even when it
|
|
246
|
+
* exceeds a single column's height.
|
|
110
247
|
*
|
|
111
248
|
* `spacingBefore` is consumed from the target column's available height before
|
|
112
249
|
* placement (collapsed against the previous block's bottom margin by the
|
|
113
250
|
* caller). Returns the height actually reserved for the block.
|
|
114
251
|
*/
|
|
115
|
-
export function
|
|
252
|
+
export function placeAtomicBlock(block, groupHeight, spacingBefore, cursor, doc, resolved, contentArea, pageWidthPx, pageHeightPx) {
|
|
116
253
|
let col = currentColumn(doc, cursor);
|
|
117
254
|
const isFirstInColumn = col.blocks.length === 0;
|
|
118
255
|
const effectiveSpacing = isFirstInColumn ? 0 : spacingBefore;
|
|
@@ -130,6 +267,8 @@ export function placeResourceBlock(block, groupHeight, spacingBefore, cursor, do
|
|
|
130
267
|
placeBlockInColumn(block, groupHeight, col, cursor);
|
|
131
268
|
return groupHeight;
|
|
132
269
|
}
|
|
270
|
+
/** @deprecated Use {@link placeAtomicBlock}. */
|
|
271
|
+
export const placeResourceBlock = placeAtomicBlock;
|
|
133
272
|
export function placeBlockInColumn(block, blockHeight, col, cursor) {
|
|
134
273
|
const y = col.bbox.y + (col.bbox.height - col.availableHeight);
|
|
135
274
|
block.bbox = createBoundingBox(col.bbox.x, y, col.bbox.width, blockHeight);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"placement.js","sourceRoot":"","sources":["../../src/pipeline/placement.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"placement.js","sourceRoot":"","sources":["../../src/pipeline/placement.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,17 +10,23 @@
|
|
|
10
10
|
* - bitmap / svg: scale to the column width, preserving aspect ratio. The
|
|
11
11
|
* height follows from the intrinsic dimensions; svgs without intrinsic
|
|
12
12
|
* dimensions fall back to a 4:3 box at column width.
|
|
13
|
-
* - table:
|
|
14
|
-
*
|
|
13
|
+
* - table: columns split by `TableModel.columnWidths` weights (equal split
|
|
14
|
+
* when unset); each cell measured via the shared rich-text measurer; row
|
|
15
|
+
* height = max cell height (rowspans distribute across rows).
|
|
15
16
|
* - caption: measured via the rich-text measurer with the caption font, with
|
|
16
17
|
* the type's caption prefix + number prepended. Inline `:ref` spans resolve
|
|
17
18
|
* to their computed label and are tagged so renderers can colour / link them.
|
|
19
|
+
* Sits below the body by default or above it (`captionStyle.position`),
|
|
20
|
+
* optionally on a background bar spanning the block width. A resource type
|
|
21
|
+
* may override the caption style partially (`ResourceType.captionStyle`).
|
|
22
|
+
* - note: an optional smaller run (`Resource.note`) placed under the body when
|
|
23
|
+
* the caption is above, otherwise under the caption.
|
|
18
24
|
*
|
|
19
|
-
* Resource + caption are measured as one group; `totalHeight` is what
|
|
20
|
-
* placement (resources paginate atomically — no mid-split for v1).
|
|
25
|
+
* Resource + caption + note are measured as one group; `totalHeight` is what
|
|
26
|
+
* goes to placement (resources paginate atomically — no mid-split for v1).
|
|
21
27
|
*/
|
|
22
28
|
import type { InlineSpan } from '../parse';
|
|
23
|
-
import type { Resource, ResourceType } from '../types';
|
|
29
|
+
import type { Resource, ResourceType, TableModel } from '../types';
|
|
24
30
|
import type { ResolvedConfig, ResolvedResourceBlock } from '../vdt';
|
|
25
31
|
import type { ResourceNumberingMap } from './resourceNumbering';
|
|
26
32
|
export interface ResourceLayoutInput {
|
|
@@ -45,6 +51,13 @@ export declare function resolveRefSpans(spans: InlineSpan[], resourceNumbering:
|
|
|
45
51
|
bold: boolean;
|
|
46
52
|
italic: boolean;
|
|
47
53
|
}): InlineSpan[];
|
|
54
|
+
/**
|
|
55
|
+
* Column x-edges (length = columnCount + 1) for a table model laid out at
|
|
56
|
+
* `columnWidth`. `TableModel.columnWidths` are relative weights, normalised so
|
|
57
|
+
* they always fill the width exactly; a missing array, a wrong length, or any
|
|
58
|
+
* non-positive / non-finite weight falls back to an equal split.
|
|
59
|
+
*/
|
|
60
|
+
export declare function computeColumnEdges(model: TableModel, columnWidth: number): number[];
|
|
48
61
|
/**
|
|
49
62
|
* Measure a resource block (image / svg / table) plus its caption into a
|
|
50
63
|
* placement-ready {@link ResolvedResourceBlock}. Returns the block and its
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resourceLayout.d.ts","sourceRoot":"","sources":["../../src/pipeline/resourceLayout.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"resourceLayout.d.ts","sourceRoot":"","sources":["../../src/pipeline/resourceLayout.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAW,MAAM,UAAU,CAAC;AACpD,OAAO,KAAK,EAEV,QAAQ,EACR,YAAY,EACZ,UAAU,EAIX,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EACV,cAAc,EACd,qBAAqB,EAItB,MAAM,QAAQ,CAAC;AAOhB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAMhE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,QAAQ,CAAC;IACnB,YAAY,EAAE,YAAY,GAAG,SAAS,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,cAAc,CAAC;IACzB,oCAAoC;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,2EAA2E;IAC3E,iBAAiB,EAAE,oBAAoB,CAAC;IACxC,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,SAAS,EAAE,QAAQ,EAAE,CAAC;CACvB;AAED;wEACwE;AACxE,wBAAgB,eAAe,CAC7B,GAAG,EAAE,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EACnC,iBAAiB,EAAE,oBAAoB,EACvC,aAAa,EAAE,YAAY,EAAE,EAC7B,SAAS,EAAE,QAAQ,EAAE,GACpB,MAAM,CAcR;AA4BD;;6EAE6E;AAC7E,wBAAgB,eAAe,CAC7B,KAAK,EAAE,UAAU,EAAE,EACnB,iBAAiB,EAAE,oBAAoB,EACvC,aAAa,EAAE,YAAY,EAAE,EAC7B,SAAS,EAAE,QAAQ,EAAE,EACrB,QAAQ,CAAC,EAAE;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,GAC5C,UAAU,EAAE,CAcd;AAuDD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,CAsBnF;AAkJD;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,mBAAmB,GAAG;IAC/D,KAAK,EAAE,qBAAqB,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;CACrB,CA6PA"}
|