Commit 81717eb
authored
feat: honor PAGE/NUMPAGES field format switches (SD-2990) (#3262)
* fix(layout-engine): use section-aware page number for odd/even header parity
OOXML (ECMA-376 §17.10.1) selects even/odd headers based on the printed page
number — which respects per-section numbering restarts and offsets — not the
physical page index. Track the post-restart/offset value as `displayNumber` on
each page and thread it through pagination, header/footer resolution, and the
HeaderFooterSessionManager so a section that starts at page 2 picks the `even`
variant on its first page.
* fix(layout-bridge): handle negative odd header parity
* fix(layout-resolved): expose header footer display numbers
* test(super-editor): cover header footer display parity
* fix(layout-bridge): allow section parity override
* feat(super-editor): honor PAGE/NUMPAGES field format switches
Parse `\*` general-format and `\#` numeric-picture switches when
importing PAGE/NUMPAGES fields and thread the requested format
(roman/alphabetic/zero-padded decimal/etc.) plus the section-aware
numeric page value through the converter, pm-adapter, layout engine,
and DOM painter so page-number fields render in the format Word stored
rather than always decimal. The original instruction is preserved on
the node so export round-trips back to the same field code.
* fix(super-editor): format NUMPAGES cached exports
* fix(super-editor): pass display number to rId header layouts
* fix(layout-bridge): avoid bucketing formatted page tokens
* fix(super-editor): preserve field-run page number styling
* fix(contracts): centralize page number formatting
* refactor(pm-adapter): share page field format extraction
* fix(super-editor): pass page field options explicitly
* refactor(super-editor): use field processor options object
* refactor(contracts): move page number formatting
* fix(super-editor): preserve active header display numbers
* fix(contracts): remove duplicate display number fields
* fix(layout-bridge): bucket zero-padded page numbers
* fix(super-editor): parse numeric page switch casing
* fix(converter): parse field dispatch whitespace
* fix(header-footer): centralize OOXML ref inheritance for first-page headers (SD-2997) (#3264)
* fix(super-editor): honor per-section titlePg when inferring fallback regions
When inferring header/footer region variants without explicit instance metadata,
the fallback path only consulted the document-level titlePg flag. Multi-section
documents that override titlePg per section ended up classifying the first page
as 'default' instead of 'first'. Use the multi-section identifier's
sectionTitlePg map when available so each section's variant is respected.
* refactor(layout-engine): centralize header/footer ref inheritance
Extract the OOXML header/footer ref inheritance logic into a shared
helper (`resolveInheritedHeaderFooterRef`) in `@superdoc/contracts` and
use it from layout-engine, layout-bridge, and HeaderFooterSessionManager.
This replaces three near-duplicate copies of the same resolution rules.
While unifying the logic, fix inheritance through intermediate sections
that omit `first`/`even` refs: previously the resolver only looked at the
immediately prior section, so a `first` ref defined in section 0 was lost
once section 1 (with only a `default` ref) sat between section 0 and a
later section that also lacked an explicit `first` ref. The shared
resolver now walks back to the nearest prior section that defines the
requested variant.
* fix(contracts): preserve header footer fallback refs
* fix(layout-engine): use resolved header footer height slot
* fix(contracts): ignore later refs for fallback resolution
* fix(layout-bridge): render inherited default refs
* fix(super-editor): tolerate missing section titlePg map
* fix(contracts): inherit converter fallback refs
* test(contracts): cover header footer inheritance helper
* fix(layout-bridge): drop unused inheritance re-export
* test(super-editor): cover section titlePg decoration provider
* fix(layout-bridge): skip missing even header refs
* fix(header-footer): preserve negative minY from page-relative behindDoc media
Stop shifting normal footer/header fragments when the layout's minY is
negative purely because of explicit behindDoc anchored drawings/images
(e.g. page-relative background shapes). Decoration normalization now
computes its own minY that ignores those explicit behindDoc media, so
in-flow content stays at its original coordinates while the negative
minY is preserved on the payload for downstream painters.
* fix(header-footer): honor identifier alternate header state
* refactor(layout): centralize header/footer ref resolution in a shared contract (SD-2989) (#3577)
* fix(super-editor): honor per-section titlePg when inferring fallback regions
When inferring header/footer region variants without explicit instance metadata,
the fallback path only consulted the document-level titlePg flag. Multi-section
documents that override titlePg per section ended up classifying the first page
as 'default' instead of 'first'. Use the multi-section identifier's
sectionTitlePg map when available so each section's variant is respected.
* refactor(layout-engine): centralize header/footer ref inheritance
Extract the OOXML header/footer ref inheritance logic into a shared
helper (`resolveInheritedHeaderFooterRef`) in `@superdoc/contracts` and
use it from layout-engine, layout-bridge, and HeaderFooterSessionManager.
This replaces three near-duplicate copies of the same resolution rules.
While unifying the logic, fix inheritance through intermediate sections
that omit `first`/`even` refs: previously the resolver only looked at the
immediately prior section, so a `first` ref defined in section 0 was lost
once section 1 (with only a `default` ref) sat between section 0 and a
later section that also lacked an explicit `first` ref. The shared
resolver now walks back to the nearest prior section that defines the
requested variant.
* fix(contracts): preserve header footer fallback refs
* fix(layout-engine): use resolved header footer height slot
* fix(contracts): ignore later refs for fallback resolution
* fix(layout-bridge): render inherited default refs
* fix(super-editor): tolerate missing section titlePg map
* fix(contracts): inherit converter fallback refs
* test(contracts): cover header footer inheritance helper
* fix(layout-bridge): drop unused inheritance re-export
* test(super-editor): cover section titlePg decoration provider
* fix(layout-bridge): skip missing even header refs
* fix(header-footer): preserve negative minY from page-relative behindDoc media
Stop shifting normal footer/header fragments when the layout's minY is
negative purely because of explicit behindDoc anchored drawings/images
(e.g. page-relative background shapes). Decoration normalization now
computes its own minY that ignores those explicit behindDoc media, so
in-flow content stays at its original coordinates while the negative
minY is preserved on the payload for downstream painters.
* fix(header-footer): honor identifier alternate header state
* refactor(layout): centralize header/footer ref resolution in a shared contract
Introduce `selectHeaderFooterVariantForPage` and `resolveEffectiveHeaderFooterRef`
in `@superdoc/contracts` as the single source of truth for picking a page's
header/footer variant and walking section inheritance to a concrete rId.
Replace the four divergent copies of this logic — in layout-bridge
(`getHeaderFooterTypeForSection` / `getHeaderFooterIdForPage` /
`resolveHeaderFooterForPageAndSection`), the layout-engine margin pass, the
PresentationEditor `HeaderFooterSessionManager`, and the document-api
`resolveEffectiveRef` helper — with calls into the shared resolver.
This corrects the OOXML inheritance model: `first` and `even` variants no
longer fall back to a `default` ref (only `odd` may resolve from `default`
under `w:evenAndOddHeaders`), and inheritance now walks across all prior
sections rather than just the immediately preceding one. Pages with no
matching ref now resolve to null/zero height instead of inferring default
content, keeping layout margins consistent with rendered output.
* fix(layout): preserve converter header refs in section resolver
* fix(layout): resolve sparse section metadata by index
* refactor(layout): trim header footer resolver surface
* chore(editor): remove stale header footer imports
* fix(layout): preserve section header ref resolution
* fix(layout): preserve converter title page refs
* fix(document-api): inherit converter header refs
* fix(editor): resolve per-rId header refs for decorations
* fix(editor): align header footer fallback variant
* fix(layout): stop leaking converter fallback refs into section resolution
buildMultiSectionIdentifier previously merged the converter's legacy
header/footer refs into section 0's resolution entry. This let a
footerless first section inherit a converter-level default that belonged
to a later section, painting a footer where the document declares none.
Section-aware resolution now reads only per-section refs; converter
fallbacks remain on the legacy identifier fields for legacy lookups but
are no longer exposed through resolveEffectiveHeaderFooterRef. Guard
HeaderFooterSessionManager so it only consults legacy refs when section
resolution is unavailable, and skip building resolution sections for an
empty identifier.
* fix(layout): use effective page number for header parity
* feat(page-number): per-field PAGE value-format switches & case-insensitive field dispatch (SD-3006) (#3599)
* feat(super-converter): match field dispatch keywords case-insensitively
OOXML field type names are case-insensitive, but the field-reference
preprocessors dispatched on the raw first token (e.g. only "PAGE",
not "page"). A lowercase PAGE/NUMPAGES field in a repeated footer fell
through to the cached static text and showed the same number on every
page.
Add a shared extractFieldKeyword helper that normalizes the dispatch
token to upper case while leaving the original instruction text intact
for downstream processors, and route fldSimple/fldChar dispatch and the
header/footer page-field scan through it. Make the HYPERLINK target
regex case-insensitive and anchored. Cover the new behavior with unit
tests and a behavior spec asserting a lowercase PAGE footer resolves
per page.
* test(super-converter): cover field keyword dispatch
* fix(super-converter): trust header footer field keyword
* feat(page-number): support PAGE field value-format switches
Parse the `\*` value-format switches on PAGE field instructions (Arabic,
Roman/roman, ALPHABETIC/alphabetic, ArabicDash) into a run-local
pageNumberFormat override, and apply it independently of section numbering
when resolving page-number tokens.
- add parsePageInstruction / pageNumberFormatToInstructionSwitch in a new
page-instruction.js; page-preprocessor stores the original instruction and
parsed format on sd:autoPageNumber
- round-trip instruction + pageNumberFormat through the autoPageNumber
translator and the page-number extension node (preserve imported
instruction text, synthesize a switch for new formatted nodes)
- add pageNumberFormat to TextRun and thread it through layout-bridge,
layout-resolved, painters (resolveRunText), and stamp section-aware
displayNumber on pages so formatting uses the pre-format numeric value
- move formatPageNumber + PageNumberFormat into @superdoc/contracts as the
single source of truth; re-export from pageNumbering
- include pageNumberFormat in block-version, merge, and hash signatures so
format changes invalidate cached layouts
upperLetter/lowerLetter now render as repeated letters (AA, BB, CC) to match
Word instead of the previous Excel-style sequence (AA, AB).
* fix(page-number): render ArabicDash spacing
* fix(layout-bridge): hash page number formats
* fix(page-number): fall back for unknown formats
* test(behavior): cover formatted footer page fields
* fix(page-number): address PAGE field review feedback
* fix(sequence-field): preserve cached numbering for lowercase seq fields
Only dispatch the SEQ pre-processor for uppercase SEQ instructions so
lowercase `seq` fields keep their cached visible result runs instead of
being re-resolved. Also recurse into run-wrapped content when extracting
resolved text so cached numbers nested inside runs are captured.
* fix(painter): rebuild drawing page fields on context changes
* fix: footnote formatter parity test
* fix(layout): remove duplicate displayNumber fields and fix page signature ref
Drop the redundant displayNumber declarations from HeaderFooterPage,
ResolvedHeaderFooterPage, and the layout-bridge page builder, keeping the
section-aware variant. Correct the renderer page context signature to read
displayPageNumber instead of the nonexistent pageNumberDisplayNumber.
* test(layout): update page-number field expectations
Adjust header/footer token and footer rendering expectations to the
spaced "- N -" format, and migrate the renderer page-context test to the
pageNumberFieldFormat shape.
* chore: fix locks
* fix(contracts): remove duplicate header/footer displayNumber fields
* fix(layout-engine): correct section-aware header/footer parity and page-number bucketing1 parent 85802da commit 81717eb
98 files changed
Lines changed: 4869 additions & 1010 deletions
File tree
- packages
- layout-engine
- contracts/src
- layout-bridge
- src
- test
- layout-engine/src
- layout-resolved/src
- painters/dom/src
- paragraph
- runs
- tests/src
- super-editor/src/editors/v1
- core
- layout-adapter
- converters/inline-converters
- presentation-editor
- tests
- super-converter
- field-references
- fld-preprocessors
- v3/handlers/sd
- autoPageNumber
- sequenceField
- totalPageNumber
- document-api-adapters
- helpers
- story-runtime
- extensions
- page-number
- types
- tests/behavior
- helpers
- tests/field-annotations
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 98 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
Lines changed: 66 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
Lines changed: 132 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
Lines changed: 88 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
0 commit comments