jeffemmett
/
typst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow augment line at the beginning and end of a matrix (#5806) 

Co-authored-by: Laurenz <laurmaedje@gmail.com>
This commit is contained in:
Siddhant Agarwal 2025-09-01 14:22:06 +05:30 committed by GitHub
parent 0a86b5ba47
commit 45ad06453b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 57 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
crates/typst-layout/src/math/mat.rs
View File

@ -82,28 +82,27 @@ pub fn layout_mat(
) -> SourceResult<()> {
let span = elem.span();
let rows = &elem.rows;
let nrows = rows.len();
let ncols = rows.first().map_or(0, |row| row.len());
let augment = elem.augment.resolve(styles);
if let Some(aug) = &augment {
for &offset in &aug.hline.0 {
if offset == 0 || offset.unsigned_abs() >= rows.len() {
if offset > nrows as isize || offset.unsigned_abs() > nrows {
bail!(
span,
"cannot draw a horizontal line after row {} of a matrix with {} rows",
if offset < 0 { rows.len() as isize + offset } else { offset },
rows.len()
"cannot draw a horizontal line at offset {offset} \
in a matrix with {nrows} rows",
);
}
}
for &offset in &aug.vline.0 {
if offset == 0 || offset.unsigned_abs() >= ncols {
if offset > ncols as isize || offset.unsigned_abs() > ncols {
bail!(
span,
"cannot draw a vertical line after column {} of a matrix with {} columns",
if offset < 0 { ncols as isize + offset } else { offset },
ncols
"cannot draw a vertical line at offset {offset} \
in a matrix with {ncols} columns",
);
}
}
@ -165,7 +164,7 @@ fn layout_body(
..Default::default()
};
let (hline, vline, stroke) = match augment {
let (mut hline, mut vline, stroke) = match augment {
Some(augment) => {
// We need to get stroke here for ownership.
let stroke = augment.stroke.unwrap_or_default().unwrap_or(default_stroke);
@ -214,20 +213,48 @@ fn layout_body(
}
}
for line in hline.0.iter_mut() {
if *line < 0 {
*line += nrows as isize;
}
}
for line in vline.0.iter_mut() {
if *line < 0 {
*line += ncols as isize;
}
}
// For each row, combine maximum ascent and descent into a row height.
// Sum the row heights, then add the total height of the gaps between rows.
let total_height =
let mut total_height =
heights.iter().map(|&(a, b)| a + b).sum::<Abs>() + gap.y * (nrows - 1) as f64;
if hline.0.contains(&0) {
total_height += gap.y;
}
if hline.0.contains(&(nrows as isize)) {
total_height += gap.y;
}
// Width starts at zero because it can't be calculated until later
let mut frame = Frame::soft(Size::new(Abs::zero(), total_height));
let mut x = Abs::zero();
if vline.0.contains(&0) {
frame.push(
Point::with_x(x + half_gap.x),
line_item(total_height, true, stroke.clone(), span),
);
x += gap.x;
}
for (index, col) in cols.into_iter().enumerate() {
let AlignmentResult { points, width: rcol } = alignments(&col);
let mut y = Abs::zero();
let mut y = if hline.0.contains(&0) { gap.y } else { Abs::zero() };
for (cell, &(ascent, descent)) in col.into_iter().zip(&heights) {
let cell = cell.into_line_frame(&points, alternator);
@ -249,9 +276,7 @@ fn layout_body(
x += rcol;
// If a vertical line should be inserted after this column
if vline.0.contains(&(index as isize + 1))
|| vline.0.contains(&(1 - ((ncols - index) as isize)))
{
if vline.0.contains(&(index as isize + 1)) {
frame.push(
Point::with_x(x + half_gap.x),
line_item(total_height, true, stroke.clone(), span),
@ -262,16 +287,17 @@ fn layout_body(
x += gap.x;
}
// Once all the columns are laid out, the total width can be calculated
let total_width = x - gap.x;
let total_width = if !(vline.0.contains(&(ncols as isize))) { x - gap.x } else { x };
// This allows the horizontal lines to be laid out
for line in hline.0 {
let real_line =
if line < 0 { nrows - line.unsigned_abs() } else { line as usize };
let offset = (heights[0..real_line].iter().map(|&(a, b)| a + b).sum::<Abs>()
+ gap.y * (real_line - 1) as f64)
+ half_gap.y;
let offset = if line == 0 {
gap.y
} else {
(heights[0..line as usize].iter().map(|&(a, b)| a + b).sum::<Abs>()
+ gap.y * (line - 1) as f64)
+ half_gap.y
};
frame.push(
Point::with_y(offset),

BIN
tests/ref/math-mat-augment.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 10 KiB

17
tests/suite/math/mat.typ
View File

@ -93,15 +93,18 @@ $ mat(column-gap: #1em, 1, 2; 3, 4)
#grid(
columns: 2,
gutter: 10pt,
$ mat(10, 2, 3, 4; 5, 6, 7, 8; augment: #3) $,
$ mat(10, 2, 3, 4; 5, 6, 7, 8; augment: #(-1)) $,
$ mat(10, 2, 3, 4; 5, 6, 7, 8; augment: #4) $,
$ mat(100, 2, 3; 4, 5, 6; 7, 8, 9; augment: #(hline: 0)) $,
$ mat(100, 2, 3; 4, 5, 6; 7, 8, 9; augment: #(hline: 2)) $,
$ mat(100, 2, 3; 4, 5, 6; 7, 8, 9; augment: #(hline: -1)) $,
$ mat(100, 2, 3; 4, 5, 6; 7, 8, 9; augment: #(hline: 3)) $,
$ mat(100, 2, 3; 4, 5, 6; 7, 8, 9; augment: #(hline: 1, vline: 1)) $,
$ mat(100, 2, 3; 4, 5, 6; 7, 8, 9; augment: #(hline: -2, vline: -2)) $,
$ mat(100, 2, 3; 4, 5, 6; 7, 8, 9; augment: #(hline: -1, vline: -1)) $,
$ mat(100, 2, 3; 4, 5, 6; 7, 8, 9; augment: #(vline: 2, stroke: 1pt + blue)) $,
$ mat(100, 2, 3; 4, 5, 6; 7, 8, 9; augment: #(vline: -1, stroke: 1pt + blue)) $,
$ mat(100, 2, 3; 4, 5, 6; 7, 8, 9; augment: #(vline: 3, stroke: 1pt + blue)) $,
$ mat(100, 2, 3; 4, 5, 6; 7, 8, 9; augment: #(vline: 3, stroke: 1pt + blue)) $,
$ mat(100, 2, 3; 4, 5, 6; 7, 8, 9; augment: #(vline: 0, stroke: 1pt + blue)) $,
$ mat(10, 2, 3, 4; 5, 6, 7, 8; augment: #(vline: -4, stroke: 1pt + blue)) $,
)
--- math-mat-augment-set ---
@ -115,8 +118,8 @@ $ mat(1, 0, 0, 0; 0, 1, 0, 0; 0, 0, 1, 1) $
#set math.mat(augment: none)
--- math-mat-augment-line-out-of-bounds ---
// Error: 3-37 cannot draw a vertical line after column 3 of a matrix with 3 columns
$ mat(1, 0, 0; 0, 1, 1; augment: #3) $,
// Error: 3-37 cannot draw a vertical line at offset 4 in a matrix with 3 columns
$ mat(1, 0, 0; 0, 1, 1; augment: #4) $,
--- math-mat-align ---
$ mat(-1, 1, 1; 1, -1, 1; 1, 1, -1; align: #left) $