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

fix row group indices with gutter in resolve

Browse Source
This commit is contained in:
PgBiel 2025-04-06 15:01:39 -03:00
parent 6b133dca3f
commit fa45bf8b55
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/typst-library/src/layout/grid/resolve.rs
View File

@ -1742,6 +1742,10 @@ impl<'x> CellGridResolver<'_, '_, 'x> {
// subtract 1 from the gutter case). // subtract 1 from the gutter case).
// Don't do this if there are no rows under the header. // Don't do this if there are no rows under the header.
if has_gutter { if has_gutter {
// Index of first y is doubled, as each row before it
// receives a gutter row below.
header.start *= 2;
// - 'header.end' is always 'last y + 1'. The header stops // - 'header.end' is always 'last y + 1'. The header stops
// before that row. // before that row.
// - Therefore, '2 * header.end' will be 2 * (last y + 1), // - Therefore, '2 * header.end' will be 2 * (last y + 1),
@ -1791,6 +1795,18 @@ impl<'x> CellGridResolver<'_, '_, 'x> {
if header_end != Some(footer.start) { if header_end != Some(footer.start) {
footer.start = footer.start.saturating_sub(1); footer.start = footer.start.saturating_sub(1);
} }
// Adapt footer end but DO NOT include the gutter below it,
// if it exists. Calculation:
// - Starts as 'last y + 1'.
// - The result will be
// 2 * (last_y + 1) - 1 = 2 * last_y + 1,
// which is the new index of the last footer row plus one,
// meaning we do exclude any gutter below this way.
//
// It also keeps us within the total amount of rows, so we
// don't need to '.min()' later.
footer.end = (2 * footer.end).saturating_sub(1);
} }
Ok(footer) Ok(footer)