mirror
/
typst
mirror of https://github.com/stelzo/typst.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix emptyness check in `into_par_items`

This commit is contained in:
Laurenz 2024-01-17 16:43:26 +01:00
parent cb69648e2f
commit fe56fb29fa
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/typst/src/math/row.rs
View File

@ -262,6 +262,7 @@ impl MathRow {
let mut ascent = Abs::zero(); let mut ascent = Abs::zero();
let mut descent = Abs::zero(); let mut descent = Abs::zero();
let mut frame = Frame::new(Size::zero(), FrameKind::Soft); let mut frame = Frame::new(Size::zero(), FrameKind::Soft);
let mut empty = true;
let finalize_frame = |frame: &mut Frame, x, ascent, descent| { let finalize_frame = |frame: &mut Frame, x, ascent, descent| {
frame.set_size(Size::new(x, ascent + descent)); frame.set_size(Size::new(x, ascent + descent));
@ -299,6 +300,7 @@ impl MathRow {
let pos = Point::new(x, -y); let pos = Point::new(x, -y);
x += fragment.width(); x += fragment.width();
frame.push_frame(pos, fragment.into_frame()); frame.push_frame(pos, fragment.into_frame());
empty = false;
if class == Some(MathClass::Binary) if class == Some(MathClass::Binary)
|| (class == Some(MathClass::Relation) || (class == Some(MathClass::Relation)
@ -311,6 +313,7 @@ impl MathRow {
finalize_frame(&mut frame_prev, x, ascent, descent); finalize_frame(&mut frame_prev, x, ascent, descent);
items.push(MathParItem::Frame(frame_prev)); items.push(MathParItem::Frame(frame_prev));
empty = true;
x = Abs::zero(); x = Abs::zero();
ascent = Abs::zero(); ascent = Abs::zero();
@ -327,7 +330,9 @@ impl MathRow {
} }
} }
if !frame.is_empty() { // Don't use `frame.is_empty()` because even an empty frame can
// contribute width (if it had hidden content).
if !empty {
finalize_frame(&mut frame, x, ascent, descent); finalize_frame(&mut frame, x, ascent, descent);
items.push(MathParItem::Frame(frame)); items.push(MathParItem::Frame(frame));
} }