caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-14 17:15:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Default to Relation instead of Fence

Browse Source
This commit is contained in:
Malo 2025-03-05 19:00:54 +01:00
parent 1025419b5a
commit 337080445f
3 changed files with 54 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
crates/typst-layout/src/math/lr.rs
View File

@ -45,12 +45,26 @@ pub fn layout_lr(
// Scale up fragments at both ends.
match inner_fragments {
[one] => scale(ctx, styles, one, relative_to, height, None),
[one] => scale_if_delimiter(ctx, styles, one, relative_to, height, None),
[first, .., last] => {
scale(ctx, styles, first, relative_to, height, Some(MathClass::Opening));
scale(ctx, styles, last, relative_to, height, Some(MathClass::Closing));
scale_if_delimiter(
ctx,
styles,
first,
relative_to,
height,
Some(MathClass::Opening),
);
scale_if_delimiter(
ctx,
styles,
last,
relative_to,
height,
Some(MathClass::Closing),
);
}
_ => {}
[] => {}
}
// Handle MathFragment::Variant fragments that should be scaled up.
@ -58,7 +72,7 @@ pub fn layout_lr(
if let MathFragment::Variant(ref mut variant) = fragment {
if variant.mid_stretched == Some(false) {
variant.mid_stretched = Some(true);
scale(ctx, styles, fragment, relative_to, height, None);
scale(ctx, styles, fragment, relative_to, height);
}
}
}
@ -99,12 +113,12 @@ pub fn layout_mid(
MathFragment::Glyph(glyph) => {
let mut new = glyph.clone().into_variant();
new.mid_stretched = Some(false);
new.class = MathClass::Fence;
new.class = MathClass::Relation;
*fragment = MathFragment::Variant(new);
}
MathFragment::Variant(variant) => {
variant.mid_stretched = Some(false);
variant.class = MathClass::Fence;
variant.class = MathClass::Relation;
}
_ => {}
}
@ -114,8 +128,12 @@ pub fn layout_mid(
Ok(())
}
/// Scale a math fragment to a height.
fn scale(
/// Scales a math fragment to a height if it has the class Opening, Closing, or
/// Fence.
///
/// In case `apply` is `Some(class)`, `class` will be applied to the fragment if
/// it is a delimiter, in a way that cannot be overridden by the user.
fn scale_if_delimiter(
ctx: &mut MathContext,
styles: StyleChain,
fragment: &mut MathFragment,
@ -127,21 +145,32 @@ fn scale(
fragment.class(),
MathClass::Opening | MathClass::Closing | MathClass::Fence
) {
// This unwrap doesn't really matter. If it is None, then the fragment
// won't be stretchable anyways.
let short_fall = DELIM_SHORT_FALL.at(fragment.font_size().unwrap_or_default());
stretch_fragment(
ctx,
styles,
fragment,
Some(Axis::Y),
Some(relative_to),
height,
short_fall,
);
scale(ctx, styles, fragment, relative_to, height);
if let Some(class) = apply {
fragment.set_class(class);
}
}
}
/// Scales a math fragment to a height.
fn scale(
ctx: &mut MathContext,
styles: StyleChain,
fragment: &mut MathFragment,
relative_to: Abs,
height: Rel<Abs>,
) {
// This unwrap doesn't really matter. If it is None, then the fragment
// won't be stretchable anyways.
let short_fall = DELIM_SHORT_FALL.at(fragment.font_size().unwrap_or_default());
stretch_fragment(
ctx,
styles,
fragment,
Some(Axis::Y),
Some(relative_to),
height,
short_fall,
);
}

BIN
tests/ref/math-lr-mid-class.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 839 B

After

Width:  |  Height:  |  Size: 406 B

15
tests/suite/math/delimited.typ
View File

@ -78,17 +78,10 @@ $ lr(body) quad
lr(size: #(1em+20%), body) $
--- math-lr-mid-class ---
// Test that `mid` keeps the original class.
$ (a |b) $
$ (a mid(|)b) $
--
$ (a class("fence", |)b) $
$ (a mid(class("fence", |))b) $
$ (a class("fence", mid(|))b) $
--
$ (a class("binary", |)b) $
$ (a mid(class("binary", |))b) $
$ (a class("binary", mid(|))b) $
// Test that `mid` creates a Relation, but that can be overridden.
$ (a | b) $
$ (a mid(|) b) $
$ (a class("unary", |) b) $
--- math-lr-unbalanced ---
// Test unbalanced delimiters.