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

fix: ignore repeated table headers/footers in tag tree

Browse Source
This commit is contained in:
Tobias Schmitz 2025-07-01 17:47:18 +02:00
parent 773efb5572
commit 746926c7da
No known key found for this signature in database
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
crates/typst-pdf/src/tags.rs
View File

@ -169,6 +169,15 @@ impl TableCtx {
Self { table: table.clone(), rows: Vec::new() } Self { table: table.clone(), rows: Vec::new() }
} }
fn contains(&self, cell: &Packed<TableCell>) -> bool {
let x = cell.x(StyleChain::default()).unwrap_or_else(|| unreachable!());
let y = cell.y(StyleChain::default()).unwrap_or_else(|| unreachable!());
let Some(row) = self.rows.get(y) else { return false };
let Some(cell) = row.get(x) else { return false };
!matches!(cell, GridCell::Missing)
}
fn insert(&mut self, cell: Packed<TableCell>, nodes: Vec<TagNode>) { fn insert(&mut self, cell: Packed<TableCell>, nodes: Vec<TagNode>) {
let x = cell.x(StyleChain::default()).unwrap_or_else(|| unreachable!()); let x = cell.x(StyleChain::default()).unwrap_or_else(|| unreachable!());
let y = cell.y(StyleChain::default()).unwrap_or_else(|| unreachable!()); let y = cell.y(StyleChain::default()).unwrap_or_else(|| unreachable!());
@ -230,7 +239,7 @@ impl TableCtx {
} }
a a
}) })
.expect("tables must have at least one column") .unwrap_or(TableCellKind::Data)
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
@ -524,7 +533,20 @@ pub(crate) fn handle_start(gc: &mut GlobalContext, elem: &Content) {
push_stack(gc, loc, StackEntryKind::Table(TableCtx::new(table.clone()))); push_stack(gc, loc, StackEntryKind::Table(TableCtx::new(table.clone())));
return; return;
} else if let Some(cell) = elem.to_packed::<TableCell>() { } else if let Some(cell) = elem.to_packed::<TableCell>() {
push_stack(gc, loc, StackEntryKind::TableCell(cell.clone())); let parent = gc.tags.stack.last_mut().expect("table");
let StackEntryKind::Table(table_ctx) = &mut parent.kind else {
unreachable!("expected table")
};
// Only repeated table headers and footer cells are layed out multiple
// times. Mark duplicate headers as artifacts, since they have no
// semantic meaning in the tag tree, which doesn't use page breaks for
// it's semantic structure.
if table_ctx.contains(cell) {
start_artifact(gc, loc, ArtifactKind::Other);
} else {
push_stack(gc, loc, StackEntryKind::TableCell(cell.clone()));
}
return; return;
} else if let Some(link) = elem.to_packed::<LinkMarker>() { } else if let Some(link) = elem.to_packed::<LinkMarker>() {
let link_id = gc.tags.next_link_id(); let link_id = gc.tags.next_link_id();