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

Support table headers/footers.

Browse Source
This commit is contained in:
Michael Färber 2025-01-07 17:39:27 +01:00
parent dc12c30434
commit bb950275cd
3 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
crates/typst-library/src/model/table.rs
View File

@ -268,14 +268,37 @@ impl Show for Packed<TableElem> {
// TODO: This is a hack, it is not clear whether the locator is actually used by HTML.
// How can we find out whether locator is actually used?
let locator = Locator::root();
let elem = |tag, body| HtmlElem::new(tag).with_body(Some(body)).pack();
let grid = table_to_cellgrid(self, engine, locator, styles)?;
let rows = grid.entries.chunks(grid.cols.len()).map(|row| {
let row =
row.iter().flat_map(|entry| Some(entry.as_cell()?.body.clone()));
HtmlElem::new(tag::tr).with_body(Some(Content::sequence(row))).pack()
let row = row.iter().flat_map(|entry| entry.as_cell());
elem(tag::tr, Content::sequence(row.map(|cell| cell.body.clone())))
});
let content = Content::sequence(rows);
HtmlElem::new(tag::table).with_body(Some(content)).pack()
let mut rows: Vec<_> = rows.collect();
let footer_start =
grid.footer.map_or(rows.len(), |footer| footer.unwrap().start);
let header_end = grid.header.map_or(0, |footer| footer.unwrap().end);
let footer: Vec<_> = rows.drain(footer_start..).collect();
let body: Vec<_> = rows.drain(header_end..).collect();
let header = rows;
let mut content = Vec::new();
let only_body = header.is_empty() && footer.is_empty();
if !header.is_empty() {
content.push(elem(tag::thead, Content::sequence(header)));
}
if only_body {
content = body;
} else {
content.push(elem(tag::tbody, Content::sequence(body)));
}
if !footer.is_empty() {
content.push(elem(tag::tfoot, Content::sequence(footer)));
}
elem(tag::table, Content::sequence(content))
} else {
BlockElem::multi_layouter(self.clone(), engine.routines.layout_table).pack()
}

2
tests/ref/html/basic-table.html
View File

@ -5,6 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>
<body>
<table><tr><td>The</td><td>first</td><td>row</td></tr><tr><td>Foo</td><td rowspan="2">Baz</td><td>Bar</td></tr><tr><td>1</td><td>2</td></tr><tr><td colspan="2">3</td><td>4</td></tr></table>
<table><thead><tr><td>The</td><td>first</td><td>and</td></tr><tr><td>the</td><td>second</td><td>row</td></tr></thead><tbody><tr><td>Foo</td><td rowspan="2">Baz</td><td>Bar</td></tr><tr><td>1</td><td>2</td></tr><tr><td colspan="2">3</td><td>4</td></tr></tbody><tfoot><tr><td>The</td><td>last</td><td>row</td></tr></tfoot></table>
</body>
</html>

17
tests/suite/layout/grid/html.typ
View File

@ -4,10 +4,13 @@
rows: 3,
table.header(
[The],
[first],
[row],
table.hline(stroke: red)
[The],
[first],
[and],
[the],
[second],
[row],
table.hline(stroke: red)
),
table.cell(x: 1, rowspan: 2)[Baz],
@ -20,4 +23,10 @@
table.cell(colspan: 2)[3],
[4],
table.footer(
[The],
[last],
[row],
),
)