Repository navigation
Commit d8c4c00
committed
R4: real keep-with-next, fixing a genuine pre-existing gap
Found while implementing this stage: keep-with-next never actually
worked for the ordinary case. The old mechanism only ran as a side
effect of RelocateIfNeeded moving a child that was ITSELF break-inside:
avoid or monolithic - so it only ever fired when the box AFTER a
break-after:avoid heading also happened to be avoid/monolithic. The
common case (an unremarkable paragraph that simply doesn't fit after a
keep-with-next-chained heading) never triggered it: the heading was
left stranded alone at the bottom of its page while the paragraph moved
on by itself. Confirmed via a calibrated reproduction: heading provably
fit alone on page 0 in isolation, but adding the paragraph back left the
heading on page 0 anyway with the paragraph alone on page 1.
The existing KeepWithNext_HeadingStaysWithFollowingParagraph PDF test
didn't catch this because it only asserts a page COUNT of 2, which is
identical whether the pair moves together or splits - both outcomes
total 2 pages either way. New tests
(StageR4KeepWithNextTest) check the fragment tree directly for which
page actually holds the heading, and would have failed against the old
behavior.
BlockFragmentation.EnforceKeepWithNext is the fix: checked unconditionally
after a child finishes laying out (and after any R3 relocation), not
only as R3's side effect - if a page break actually falls between a
child and a preceding sibling chained to it by break-after/before:avoid,
the whole chained run is pulled down to the child's page and the child
is relaid out fresh. RelocateIfNeeded's own keep-with-next handling was
removed as redundant: after it moves a child, the preceding sibling is
exactly as stranded as in the ordinary case, and EnforceKeepWithNext
(called right after in the same loop iteration) now covers both
uniformly.
Also corrected course on two of the plan's own framing details, both
discovered only by implementing them: BlockFragmentation.cs is not
being retired (margin truncation is pre-placement arithmetic with
nowhere else to naturally live, same timing as the forced-break check);
the "R2" stage was folded into R3 last commit since it had no distinct
work of its own in this architecture.
Full regression suite (40 IntegrationTest + 16 PdfSharp tests) passes.1 parent 8903205 commit d8c4c00
3 files changed
Lines changed: 181 additions & 18 deletions
File tree
- Source
- HtmlRenderer/Core
- Dom
- Fragmentation
- Test/HtmlRenderer.IntegrationTest
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
944 | 944 | | |
945 | 945 | | |
946 | 946 | | |
| 947 | + | |
| 948 | + | |
| 949 | + | |
| 950 | + | |
| 951 | + | |
| 952 | + | |
| 953 | + | |
947 | 954 | | |
948 | 955 | | |
949 | 956 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
19 | 20 | | |
20 | 21 | | |
21 | 22 | | |
| |||
91 | 92 | | |
92 | 93 | | |
93 | 94 | | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
98 | 98 | | |
99 | 99 | | |
100 | 100 | | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
107 | 107 | | |
108 | 108 | | |
109 | 109 | | |
| |||
130 | 130 | | |
131 | 131 | | |
132 | 132 | | |
133 | | - | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
134 | 179 | | |
135 | | - | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
136 | 188 | | |
137 | 189 | | |
138 | 190 | | |
139 | 191 | | |
140 | | - | |
| 192 | + | |
141 | 193 | | |
142 | 194 | | |
143 | 195 | | |
| |||
| 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 | + | |
0 commit comments