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

refactor: make TableCell::kind #[parse] instead of #[synthesized]

Browse Source
This commit is contained in:
Tobias Schmitz 2025-07-11 14:45:45 +02:00
parent e8af101a79
commit e0074d6e39
No known key found for this signature in database
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,7 +226,7 @@ impl ResolvableCell for Packed<TableCell> {
let breakable = cell.breakable.get(styles).unwrap_or(breakable); let breakable = cell.breakable.get(styles).unwrap_or(breakable);
let fill = cell.fill.get_cloned(styles).unwrap_or_else(|| fill.clone()); let fill = cell.fill.get_cloned(styles).unwrap_or_else(|| fill.clone());
let kind = cell.kind.unwrap_or_default().or(kind); let kind = cell.kind.get(styles).or(kind);
let cell_stroke = cell.stroke.resolve(styles); let cell_stroke = cell.stroke.resolve(styles);
let stroke_overridden = let stroke_overridden =
@ -271,7 +271,7 @@ impl ResolvableCell for Packed<TableCell> {
}), }),
); );
cell.breakable.set(Smart::Custom(breakable)); cell.breakable.set(Smart::Custom(breakable));
cell.kind = Some(kind); cell.kind.set(kind);
Cell { Cell {
body: self.pack(), body: self.pack(),
locator, locator,

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

@ -688,7 +688,7 @@ pub struct TableCell {
pub stroke: Sides<Option<Option<Arc<Stroke>>>>, pub stroke: Sides<Option<Option<Arc<Stroke>>>>,
#[internal] #[internal]
#[synthesized] #[parse(Some(Smart::Auto))]
pub kind: Smart<TableCellKind>, pub kind: Smart<TableCellKind>,
/// Whether rows spanned by this cell can be placed in different pages. /// Whether rows spanned by this cell can be placed in different pages.

2
crates/typst-pdf/src/tags/table.rs
View File

@ -60,7 +60,7 @@ impl TableCtx {
let y = cell.y.get(StyleChain::default()).unwrap_or_else(|| unreachable!()); let y = cell.y.get(StyleChain::default()).unwrap_or_else(|| unreachable!());
let rowspan = cell.rowspan.get(StyleChain::default()); let rowspan = cell.rowspan.get(StyleChain::default());
let colspan = cell.colspan.get(StyleChain::default()); let colspan = cell.colspan.get(StyleChain::default());
let kind = cell.kind.expect("kind to be set after layouting"); let kind = cell.kind.get(StyleChain::default());
// Extend the table grid to fit this cell. // Extend the table grid to fit this cell.
let required_height = y + rowspan.get(); let required_height = y + rowspan.get();