caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-14 17:15:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

restore orphan snapshot after pending header relayout

Browse Source
This commit is contained in:
PgBiel 2025-04-11 14:18:29 -03:00
parent fc6a0074d8
commit e0bfe90e12
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/typst-layout/src/grid/layouter.rs
View File

@ -1542,12 +1542,6 @@ impl<'a> GridLayouter<'a> {
let mut laid_out_footer_start = None; let mut laid_out_footer_start = None;
if !footer_would_be_widow { if !footer_would_be_widow {
// Did not trigger automatic header orphan / footer widow check.
// This means pending headers have successfully been placed once
// without hitting orphan prevention, so they may now be moved into
// repeating headers.
self.flush_pending_headers();
if let Some(Repeatable::Repeated(footer)) = &self.grid.footer { if let Some(Repeatable::Repeated(footer)) = &self.grid.footer {
// Don't layout the footer if it would be alone with the header in // Don't layout the footer if it would be alone with the header in
// the page (hence the widow check), and don't layout it twice. // the page (hence the widow check), and don't layout it twice.

6
crates/typst-layout/src/grid/repeated.rs
View File

@ -289,6 +289,12 @@ impl<'a> GridLayouter<'a> {
self.current_repeating_header_rows = self.lrows.len(); self.current_repeating_header_rows = self.lrows.len();
if !self.pending_headers.is_empty() {
// Restore snapshot: if pending headers placed again turn out to be
// orphans, remove their rows again.
self.lrows_orphan_snapshot = Some(self.lrows.len());
}
for header in self.pending_headers { for header in self.pending_headers {
let header_height = let header_height =
self.layout_header_rows(header.unwrap(), engine, disambiguator)?; self.layout_header_rows(header.unwrap(), engine, disambiguator)?;