caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-19 03:25:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reduce redundant ops when computing sup/sub shifts (#1190)

Browse Source
This commit is contained in:
Leedehai 2023-05-19 10:48:57 -04:00 committed by GitHub
parent 42f1586880
commit 74b818fe40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
library/src/math/attach.rs
View File

@ -143,6 +143,12 @@ impl LayoutMath for LimitsElem {
} }
} }
macro_rules! measure {
($e: ident, $attr: ident) => {
$e.as_ref().map(|e| e.$attr()).unwrap_or_default()
};
}
/// Layout the attachments. /// Layout the attachments.
fn layout_attachments( fn layout_attachments(
ctx: &mut MathContext, ctx: &mut MathContext,
@ -158,12 +164,6 @@ fn layout_attachments(
(base.width(), base.ascent(), base.descent()); (base.width(), base.ascent(), base.descent());
let base_class = base.class().unwrap_or(MathClass::Normal); let base_class = base.class().unwrap_or(MathClass::Normal);
macro_rules! measure {
($e: ident, $attr: ident) => {
$e.as_ref().map(|e| e.$attr()).unwrap_or_default()
};
}
let ascent = base_ascent let ascent = base_ascent
.max(shift_up + measure!(tr, ascent)) .max(shift_up + measure!(tr, ascent))
.max(shift_up + measure!(tl, ascent)) .max(shift_up + measure!(tl, ascent))
@ -301,22 +301,24 @@ fn compute_shifts_up_and_down(
let mut shift_down = Abs::zero(); let mut shift_down = Abs::zero();
let is_char_box = is_character_box(base); let is_char_box = is_character_box(base);
for e in [tl, tr].into_iter().flatten() { if tl.is_some() || tr.is_some() {
let ascent = match &base { let ascent = match &base {
MathFragment::Frame(frame) => frame.base_ascent, MathFragment::Frame(frame) => frame.base_ascent,
_ => base.ascent(), _ => base.ascent(),
}; };
shift_up = shift_up shift_up = shift_up
.max(sup_shift_up) .max(sup_shift_up)
.max(if is_char_box { Abs::zero() } else { ascent - sup_drop_max }) .max(if is_char_box { Abs::zero() } else { ascent - sup_drop_max })
.max(sup_bottom_min + e.descent()); .max(sup_bottom_min + measure!(tl, descent))
.max(sup_bottom_min + measure!(tr, descent));
} }
for e in [bl, br].into_iter().flatten() {
if bl.is_some() || br.is_some() {
shift_down = shift_down shift_down = shift_down
.max(sub_shift_down) .max(sub_shift_down)
.max(if is_char_box { Abs::zero() } else { base.descent() + sub_drop_min }) .max(if is_char_box { Abs::zero() } else { base.descent() + sub_drop_min })
.max(e.ascent() - sub_top_max); .max(measure!(bl, ascent) - sub_top_max)
.max(measure!(br, ascent) - sub_top_max);
} }
for (sup, sub) in [(tl, bl), (tr, br)] { for (sup, sub) in [(tl, bl), (tr, br)] {