From d1c7d08893ef293e74ac0763005e1dd3f46e6495 Mon Sep 17 00:00:00 2001
From: Leedehai <18319900+Leedehai@users.noreply.github.com>
Date: Mon, 8 Jul 2024 15:32:58 -0400
Subject: [PATCH] Primes should not further raise next superscript's position
 (#4492)

Co-authored-by: Ian Wrzesinski <133046678+wrzian@users.noreply.github.com>
---
 crates/typst-syntax/src/parser.rs          |   7 +--
 crates/typst/src/eval/math.rs              |   6 ++-
 crates/typst/src/math/attach.rs            |  50 ++++++++++++++-------
 tests/ref/math-primes-complex.png          | Bin 1274 -> 1652 bytes
 tests/ref/math-primes-with-superscript.png | Bin 0 -> 956 bytes
 tests/suite/math/primes.typ                |  15 ++++++-
 6 files changed, 53 insertions(+), 25 deletions(-)
 create mode 100644 tests/ref/math-primes-with-superscript.png

diff --git a/crates/typst-syntax/src/parser.rs b/crates/typst-syntax/src/parser.rs
index 7e7eeea5f..ff01bacfd 100644
--- a/crates/typst-syntax/src/parser.rs
+++ b/crates/typst-syntax/src/parser.rs
@@ -393,11 +393,6 @@ fn math_expr_prec(p: &mut Parser, min_prec: usize, stop: SyntaxKind) {
             continue;
         }
 
-        // Separate primes and superscripts to different attachments.
-        if primed && p.current() == SyntaxKind::Hat {
-            p.wrap(m, SyntaxKind::MathAttach);
-        }
-
         let Some((kind, stop, assoc, mut prec)) = math_op(p.current()) else {
             // No attachments, so we need to wrap primes as attachment.
             if primed {
@@ -429,7 +424,7 @@ fn math_expr_prec(p: &mut Parser, min_prec: usize, stop: SyntaxKind) {
         math_expr_prec(p, prec, stop);
         math_unparen(p, m2);
 
-        if p.eat_if(SyntaxKind::Underscore) || (!primed && p.eat_if(SyntaxKind::Hat)) {
+        if p.eat_if(SyntaxKind::Underscore) || p.eat_if(SyntaxKind::Hat) {
             let m3 = p.marker();
             math_expr_prec(p, prec, SyntaxKind::End);
             math_unparen(p, m3);
diff --git a/crates/typst/src/eval/math.rs b/crates/typst/src/eval/math.rs
index 0e5e0eef0..548c935dc 100644
--- a/crates/typst/src/eval/math.rs
+++ b/crates/typst/src/eval/math.rs
@@ -54,7 +54,11 @@ 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() {
+        }
+
+        // Always attach primes in scripts style (not limits style),
+        // i.e. at the top-right corner.
+        if let Some(primes) = self.primes() {
             elem.push_tr(Some(primes.eval(vm)?));
         }
 
diff --git a/crates/typst/src/math/attach.rs b/crates/typst/src/math/attach.rs
index 7cc03bbab..8d85f8c41 100644
--- a/crates/typst/src/math/attach.rs
+++ b/crates/typst/src/math/attach.rs
@@ -52,31 +52,47 @@ pub struct AttachElem {
 impl LayoutMath for Packed<AttachElem> {
     #[typst_macros::time(name = "math.attach", span = self.span())]
     fn layout_math(&self, ctx: &mut MathContext, styles: StyleChain) -> SourceResult<()> {
-        type GetAttachment = fn(&AttachElem, styles: StyleChain) -> Option<Content>;
-
-        let layout_attachment =
-            |ctx: &mut MathContext, styles: StyleChain, getter: GetAttachment| {
-                getter(self, styles)
-                    .map(|elem| ctx.layout_into_fragment(&elem, styles))
-                    .transpose()
-            };
-
         let base = ctx.layout_into_fragment(self.base(), styles)?;
 
         let sup_style = style_for_superscript(styles);
-        let tl = layout_attachment(ctx, styles.chain(&sup_style), AttachElem::tl)?;
-        let tr = layout_attachment(ctx, styles.chain(&sup_style), AttachElem::tr)?;
-        let t = layout_attachment(ctx, styles.chain(&sup_style), AttachElem::t)?;
+        let sup_style_chain = styles.chain(&sup_style);
+        let tl = self.tl(sup_style_chain);
+        let tr = self.tr(sup_style_chain);
+        let primed = tr.as_ref().is_some_and(|content| content.is::<PrimesElem>());
+        let t = self.t(sup_style_chain);
 
         let sub_style = style_for_subscript(styles);
-        let bl = layout_attachment(ctx, styles.chain(&sub_style), AttachElem::bl)?;
-        let br = layout_attachment(ctx, styles.chain(&sub_style), AttachElem::br)?;
-        let b = layout_attachment(ctx, styles.chain(&sub_style), AttachElem::b)?;
+        let sub_style_chain = styles.chain(&sub_style);
+        let bl = self.bl(sub_style_chain);
+        let br = self.br(sub_style_chain);
+        let b = self.b(sub_style_chain);
 
         let limits = base.limits().active(styles);
-        let (t, tr) = if limits || tr.is_some() { (t, tr) } else { (None, t) };
+        let (t, tr) = match (t, tr) {
+            (Some(t), Some(tr)) if primed && !limits => (None, Some(tr + t)),
+            (Some(t), None) if !limits => (None, Some(t)),
+            (t, tr) => (t, tr),
+        };
         let (b, br) = if limits || br.is_some() { (b, br) } else { (None, b) };
-        layout_attachments(ctx, styles, base, [tl, t, tr, bl, b, br])
+
+        macro_rules! layout {
+            ($content:ident, $style_chain:ident) => {
+                $content
+                    .map(|elem| ctx.layout_into_fragment(&elem, $style_chain))
+                    .transpose()
+            };
+        }
+
+        let fragments = [
+            layout!(tl, sup_style_chain)?,
+            layout!(t, sup_style_chain)?,
+            layout!(tr, sup_style_chain)?,
+            layout!(bl, sub_style_chain)?,
+            layout!(b, sub_style_chain)?,
+            layout!(br, sub_style_chain)?,
+        ];
+
+        layout_attachments(ctx, styles, base, fragments)
     }
 }
 
diff --git a/tests/ref/math-primes-complex.png b/tests/ref/math-primes-complex.png
index 5f5558eb214d68ffe35bf8455ffc4ea857c4540d..0e85d08d36563c74ed8a41070bdcc02f6289c71b 100644
GIT binary patch
delta 1648
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

delta 1267
zcmV<P1PuH14EhO>7k_3500000CDRJ!000ERNkl<Zc-rmOTTD}T9Kdn2OMKcMmc8uB
z2Va($EHTTnn9R(VO%pTYvMe|=%!bo3Z=0ZtV`J*(9R)7~m5V?{#0!cF3`7)5%caPr
zI4vrbfkaxYrO*oW`rXcH>21lfdF(k4_Vf5VC;2{{|H=P14S$79i-+Uk|EX4?aC5OD
z;nSLYVjXr8Wymve=^N*G%)_f4L|QXeX5L{&TKG;$1OM)EE|JWoST*%l31QvOj3;0q
z#GG4B1jlKe!AqFI{0oDUf2UM4rfu{R^0B*@2nmiRA}sRtA~if#2(&es30X%E;U-sO
zCY<j(43feHMStlvE+1h!wjbPwQPa<qtC@TAXw=?figr&{Hg~myQo`+Dut`Ta=NwPN
zFNAqKkJ5a?*x&PAH~=6eoL0{KaXvQ_q+Y?6MpwNWHaiiNZD!?NPhm4tDmReQ<*w2}
zn(wK@M>P8RXGrcxR5T8KKaI|=8#<xEz8jACpebi)c7Nr>Ruh7JH|Y0R-l`eR>1OyK
zPaSq&?yA1;UeunAAh!c(t<$SXK7X!x0>qqJ-PA!sO(8&r5zt<1YbCMjVxwE)sqQS&
zst{B&C7G`PZw&$Nb<R})Rbg+e0EyuzIq4Hb+E%L~!p@x?QE!~Bh{b(uipntQAktuW
zeD#TkpMNSmS)x$5w2kPAJmC{WvHwVbrLy|jgzbntHh?j}d#Knzw2DyzHhPyM*dj4}
z@(H56LIB4p$hqY30H}=kHI$}|dI|8Yx2^3l)G)kXTDVPvU$W01>Ey7ne-JWBBVdj2
zFsSiHwWTJv@0wd$I0fLLhub>*QlZ1haQzOWk$-?+bt|tDA;Ys5q=gf~yRKoGHhchN
z^{WVRx`@<z`GM5%*KjO@Pe&L6n#6&ivZ9zNy(&=^BE2feE+xDimUjC-u=qamqRSHp
z(HsMUE)yc#K#*HX_)FM#vn=r>OB+48K5-DHvPLW~f%+mSY$uYGaP|naJiam6_ibm1
z4S#ralrUra0X(a%WCH!g2<#&uJv>>A=%Tuy1EA1Fm_J4VTG!^??gMT(0ZtVhMxd1z
z=AH?`NXcP<herPCz`cyS1T6$G-5E=b{k7O~d>0`Fn%}{A@{Co1``CT-`ym?&gnP=@
zccMg?;R$zq=Zc5_V>pRu-a9c5*VWR#D}PXP`njNDcdWx#F6?(_xe%q#%FN8%^TWL9
zCQ@9n4zD!ABmA6iUq;Y!)Yd?(!|#t1(lgVHzz8u9ze%`b3*<W0-kC&LvQMV)(7Qya
zRLK<XUX18|D}sUT1l3w&8NQZ+$g~k)BGrT7I>4pVu?!zCLS(!NkY)jJW)uL_+kayh
zzS5FnC!}C*Qc}{g4`;k;jrBLSpEJa-#dtU#j)!FqSIQN(>qC0s=32SJ`suS&e=E-3
zn)LcBHn!R13X}1|S^Qi_4$+8gVHUhLKtLVH7#@COu2-2;UH9T<Wx{NFS*=XiGiSyV
zMZ%m<M3L}=1g9cl$0rt)2zwKI2yEz*HN4>}0o|!`hJQ={Q*irw+2WU)WeoSfGdpPE
zbF>KDvOBDL`NJa_1FHtJ4DyGyYfSgZL;f&lJ}dN0DiAJaYzxRAw(KZB?}#t-@o+pG
d4?kz&zW_}cx|`89^XmWr002ovPDHLkV1i`PYT5t*

diff --git a/tests/ref/math-primes-with-superscript.png b/tests/ref/math-primes-with-superscript.png
new file mode 100644
index 0000000000000000000000000000000000000000..88a892b9772223f3b18a8468ec09666ccc2c2ee9
GIT binary patch
literal 956
zcmV;t14I0YP)<h;3K|Lk000e1NJLTq004LZ001rs00000#@K@7000AnNkl<Zc-rmP
zZBJWe7{Kv;2S0(nlo%I%YqE%oks0UIVF;kXJ=B$i5EO@7-GqQT=jH<AVM~T%6|j!M
z5Vu+BmTW6bY6cUS4<)TU*pAX#MCb!;&pCfRO?ujMa^_mIWP8!y7x?GC?p(QZZ{Pvh
zkPqj>`EWjb-@`xkTK;7x?LwDAKrw%!D}x_J?2JVvl4W?mOSXt2)aX%2DC!qH8Dc0-
zjk#2W?7}}>1Oi_NQMCGizel*<XC`f~6Ocw%fm=h(5(=Rn;G0{-V`~f#)IoOP4*)7U
zM@U(30;n*0d)Z7{V+?3(YQ^C1rqYR`=T~6xSOW)bn}k8Ou4fmX>;oty?bIA_ryN+=
zi(;`2;Q0i>Dv0htAsqnN?LshI>4w`!$S!<P0$K_k>d8fFN?drmenas|2)I~a!yF{q
zac7B?feFA-U}1Rn1UQGr?|I_HO<=|h(BFZ~I|XznYmL{CO3U8_5Ql-~&jDtP5Q2SW
zFaHH_L%Ay91xTuW<8AI0{%Rx8kN`Mv10dYIEj2k_TOq~z<T4yhmd>6e!`P+?u-XBp
zYjW9R!zC6@BHI=s>6uyjC(vGc^I_HwA=~dDlkF`qAv2!=fq0hT=^~n<$X-efp%xRe
zl`_&+pAe5PA$ui;%2NTm6<Ljo(H-aOqS=Lc?s^NrIrC{qN)+^u0Q6ag$xzkX1mL{(
zE@~YgnE)1#?gMc*#`P@2=O0@I`1wmwS=KGcPPdcE`N%xL^oJhQ!jBFB#N-W3?8RWu
zGAw?NM!<<4JLt2LNhFJK!mZ{b<klhayIWTjulp{9{|tvMYIZyp9Rg=9y8gswxr@ld
z{vNv})WlhS?6aaZmjHel>OspFLN+lllvB8&`dieD#ojL{M5Cwr7$$!wduC9Zs@jF+
z${wMUqV-(D&&E*;ydHy~0ga-tuvP(LsfgNpH)E7ey$_)ZatL=l?LZ|`_o|DPHaBXQ
z9=Fl+2V(nt5EaKpGvl`AFyZ5~@f^aoPtiDZ8EI?zcGTu}fgj!}-V#7<Gc2(LC8aNt
zL-;c*8YKaA47Q?gekY1t!eu@*3ei(<N8ez}{|gtP5h_N{_AvVD9n2j0u3gG4e0$P_
z+SLo^04>jCCAuP4t3-S|qcxG-!u_?&s2%<o9b?r_boq^!L8_#3^g(=KL^tE{{HHA+
e&WH2i`|ls7I-Xp=b$`_W0000<MNUMnLSTa9Xuebc

literal 0
HcmV?d00001

diff --git a/tests/suite/math/primes.typ b/tests/suite/math/primes.typ
index e10f8876c..78bb915aa 100644
--- a/tests/suite/math/primes.typ
+++ b/tests/suite/math/primes.typ
@@ -12,7 +12,11 @@ $a'_b^c$, $a_b'^c$, $a_b^c'$, $a_b'^c'^d'$
 
 $(a'_b')^(c'_d')$, $a'/b'$, $a_b'/c_d'$
 
-$∫'$, $∑'$, $ ∑'_S' $
+$∫'$, $∑'$, $a'^2^2$, $a'_2_2$
+
+$f_n'^a'$, $f^a'_n'$
+
+$ ∑'_S' $
 
 --- math-primes-attach ---
 // Test attaching primes only
@@ -48,3 +52,12 @@ $
   #g''''''''''''''''' \
   gg'
 $
+
+--- math-primes-with-superscript ---
+// Test prime symbols don't raise the superscript position
+$
+  sqrt(f)/f
+  sqrt(f^2)/f^2
+  sqrt(f'^2)/f'^2
+  sqrt(f''_n^2)/f''^2_n
+$