caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-19 11:35:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

proper region progress check for headers

Browse Source
This commit is contained in:
PgBiel 2025-04-07 21:34:08 -03:00
parent 62c5b551f1
commit f3ae293042
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@ use typst_library::engine::Engine;
use typst_library::layout::grid::resolve::{Footer, Header, Repeatable}; use typst_library::layout::grid::resolve::{Footer, Header, Repeatable};
use typst_library::layout::{Abs, Axes, Frame, Regions}; use typst_library::layout::{Abs, Axes, Frame, Regions};
use super::layouter::GridLayouter; use super::layouter::{may_progress_with_offset, GridLayouter};
use super::rowspans::UnbreakableRowGroup; use super::rowspans::UnbreakableRowGroup;
pub enum HeadersToLayout<'a> { pub enum HeadersToLayout<'a> {
@ -231,7 +231,16 @@ impl<'a> GridLayouter<'a> {
let mut skipped_region = false; let mut skipped_region = false;
while self.unbreakable_rows_left == 0 while self.unbreakable_rows_left == 0
&& !self.regions.size.y.fits(header_height) && !self.regions.size.y.fits(header_height)
&& self.regions.may_progress() && may_progress_with_offset(
self.regions,
// - Assume footer height already starts subtracted from the
// first region's size;
// - On each iteration, we subtract footer height from the
// available size for consistency with the first region, so we
// need to consider the footer when evaluating if skipping yet
// another region would make a difference.
self.footer_height,
)
{ {
// Advance regions without any output until we can place the // Advance regions without any output until we can place the
// header and the footer. // header and the footer.
@ -262,7 +271,6 @@ impl<'a> GridLayouter<'a> {
skipped_region = true; skipped_region = true;
// Ensure we also take the footer into account for remaining space.
self.regions.size.y -= self.footer_height; self.regions.size.y -= self.footer_height;
} }