caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-07-01 17:52:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

make footer short-lived when there are no regular cells

Browse Source
This commit is contained in:
PgBiel 2025-04-20 19:14:56 -03:00
parent 71ae276071
commit 63b34cfe0a
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1063,6 +1063,10 @@ impl<'x> CellGridResolver<'_, '_, 'x> {
let mut footer: Option<(usize, Span, Footer)> = None; let mut footer: Option<(usize, Span, Footer)> = None;
let mut repeat_footer = false; let mut repeat_footer = false;
// If true, there has been at least one cell besides headers and
// footers. When false, footers at the end are forced to not repeat.
let mut at_least_one_cell = false;
// We can't just use the cell's index in the 'cells' vector to // We can't just use the cell's index in the 'cells' vector to
// determine its automatic position, since cells could have arbitrary // determine its automatic position, since cells could have arbitrary
// positions, so the position of a cell in 'cells' can differ from its // positions, so the position of a cell in 'cells' can differ from its
@ -1104,6 +1108,7 @@ impl<'x> CellGridResolver<'_, '_, 'x> {
&mut repeat_footer, &mut repeat_footer,
&mut auto_index, &mut auto_index,
&mut resolved_cells, &mut resolved_cells,
&mut at_least_one_cell,
child, child,
)?; )?;
} }
@ -1125,6 +1130,7 @@ impl<'x> CellGridResolver<'_, '_, 'x> {
footer, footer,
repeat_footer, repeat_footer,
row_amount, row_amount,
at_least_one_cell,
)?; )?;
Ok(CellGrid::new_internal( Ok(CellGrid::new_internal(
@ -1157,6 +1163,7 @@ impl<'x> CellGridResolver<'_, '_, 'x> {
repeat_footer: &mut bool, repeat_footer: &mut bool,
auto_index: &mut usize, auto_index: &mut usize,
resolved_cells: &mut Vec<Option<Entry<'x>>>, resolved_cells: &mut Vec<Option<Entry<'x>>>,
at_least_one_cell: &mut bool,
child: ResolvableGridChild<T, I>, child: ResolvableGridChild<T, I>,
) -> SourceResult<()> ) -> SourceResult<()>
where where
@ -1240,7 +1247,13 @@ impl<'x> CellGridResolver<'_, '_, 'x> {
(Some(items), None) (Some(items), None)
} }
ResolvableGridChild::Item(item) => (None, Some(item)), ResolvableGridChild::Item(item) => {
if matches!(item, ResolvableGridItem::Cell(_)) {
*at_least_one_cell = true;
}
(None, Some(item))
}
}; };
let items = header_footer_items.into_iter().flatten().chain(simple_item); let items = header_footer_items.into_iter().flatten().chain(simple_item);
@ -1784,6 +1797,7 @@ impl<'x> CellGridResolver<'_, '_, 'x> {
footer: Option<(usize, Span, Footer)>, footer: Option<(usize, Span, Footer)>,
repeat_footer: bool, repeat_footer: bool,
row_amount: usize, row_amount: usize,
at_least_one_cell: bool,
) -> SourceResult<Option<Repeatable<Footer>>> { ) -> SourceResult<Option<Repeatable<Footer>>> {
// Repeat the gutter below a header (hence why we don't // Repeat the gutter below a header (hence why we don't
// subtract 1 from the gutter case). // subtract 1 from the gutter case).
@ -1856,7 +1870,11 @@ impl<'x> CellGridResolver<'_, '_, 'x> {
}) })
.transpose()? .transpose()?
.map(|footer| { .map(|footer| {
if repeat_footer { // Don't repeat footers when the table only has headers and
// footers.
// TODO(subfooters): Switch this to marking the last N
// consecutive footers as short lived.
if repeat_footer && at_least_one_cell {
Repeatable::Repeated(footer) Repeatable::Repeated(footer)
} else { } else {
Repeatable::NotRepeated(footer) Repeatable::NotRepeated(footer)