From 6402bdacc7534ec9d893a84a2c4fd9c753d4a649 Mon Sep 17 00:00:00 2001 From: Malo <57839069+MDLC01@users.noreply.github.com> Date: Tue, 20 Feb 2024 13:59:29 +0100 Subject: [PATCH] Always attach primes as scripts by default (#3437) --- crates/typst/src/eval/math.rs | 2 +- tests/ref/math/opticalsize.png | Bin 11912 -> 14078 bytes tests/typ/math/opticalsize.typ | 24 ++++++++++++++++++++++-- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/crates/typst/src/eval/math.rs b/crates/typst/src/eval/math.rs index 62314fc23..0e5e0eef0 100644 --- a/crates/typst/src/eval/math.rs +++ b/crates/typst/src/eval/math.rs @@ -55,7 +55,7 @@ impl Eval for ast::MathAttach<'_> { if let Some(expr) = self.top() { elem.push_t(Some(expr.eval_display(vm)?)); } else if let Some(primes) = self.primes() { - elem.push_t(Some(primes.eval(vm)?)); + elem.push_tr(Some(primes.eval(vm)?)); } if let Some(expr) = self.bottom() { diff --git a/tests/ref/math/opticalsize.png b/tests/ref/math/opticalsize.png index 4f2197105caa43dba1cfea0321f90ddda8eb313d..303f7bee7d2fee8015907fb6a9fc15366d0304db 100644 GIT binary patch delta 3870 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