From 2f81089995c87efdbce6c94bb29647cd1f213cfd Mon Sep 17 00:00:00 2001 From: sitandr <60141933+sitandr@users.noreply.github.com> Date: Thu, 10 Aug 2023 22:36:05 +0300 Subject: [PATCH] Fix single prime in subscript (#1909) * Fix single prime in subscript (a_' producing wrong result) * Clippy --- crates/typst-syntax/src/ast.rs | 4 ++-- tests/ref/math/opticalsize.png | Bin 11317 -> 12126 bytes tests/typ/math/opticalsize.typ | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/crates/typst-syntax/src/ast.rs b/crates/typst-syntax/src/ast.rs index 2ea318a7f..65a91629f 100644 --- a/crates/typst-syntax/src/ast.rs +++ b/crates/typst-syntax/src/ast.rs @@ -848,9 +848,9 @@ impl MathAttach { .find_map(SyntaxNode::cast) } - /// Extract primes if present. + /// Extract attached primes if present. pub fn primes(&self) -> Option { - self.0.cast_first_match() + self.0.children().nth(1).and_then(|n| n.cast()) } } diff --git a/tests/ref/math/opticalsize.png b/tests/ref/math/opticalsize.png index 905d3389f9f0246814fd2f2c708f051a6d9e3961..bd67542bc43ddc16a2a94de19e06d16de4c34578 100644 GIT binary patch delta 1783 zcmZ9Ni8q^x0>wX(@>Q$y5o@fm#8}2wZBpBat(KsuqLkDq#cM~jw&KG}?K_XOmX=xu z71U10&}}?~8C89j#5RIff>MIgd2{BR_s*Gne&^o%2i$XRy9eu9uH+dm2>e&W%ElM~ z&{1ts^;CxycGr*E*}7-ud2bDFlynDBObYTt{O!n{Qt8GhVUA}$y=~lNws7=vWq&8u-DWV< z@2&LHiPTM7Qvtl3eb_ERii@VHoWakRyoi7}wzS9> zB&T@iJPM3Px+uT+cFG#$ge|J=qSKnO`MDaE0`RLMEOY}8aw=)eL^&($>9YG-hFD>v zV9TI9`{v)!821EWL#*2ndi{H=Vtxh&OW{ z?v{A8WY0ui(ly117-D6MU-M=#@xsqPsTpnUPXY4#%A#8?O2mhuuNH?0&o$)4d4w&g zrZ-kmbttlhmPA0B<7Uu<2oW>Y>@%A`+=@vm7J?*j{&`bKd8Vew;?f1tZt13!fT+*= z;FRYb0_EgFKh>sNK9XMUAfpn%mv{ijQ}?&LGb6=j4{2m~F(&fEA#_beRj1M78(4v_ zXFqU6del-EazKg={1tp+e7X?ucUuryC+R|^mwHLm)+c=>VAy+xL(~I50p*fm5|Ty3 zjjx|nOWK8o3Pk_uwLGp)e1}qEdmnR%Z{UTt+c~cRiMte38I&J@trBrerGmy_0 zG9C`M-(dpiju7Qw?sYu@wxLQbO{x=bw)vNg6&1Fpg^??NiQh?cHgiX+ngyXNI5*>+ z#~7EVOW7pk{N08=DBX3h3U-&L9;D)?t-D&7_d^yg4AOGw(6r4R#EJnqc#cnUsd*hbKla);;cc_SVQ5M@h&IqsY$7&91D8j4*kzHL+Z{voo@3g#`~R)xQ6D z#A4Ygw$*ecib>W*<~4&O<+;84*!d6ke$*crFaEto^2==o7fcoLw}o@Nz!VX_(58z) z)b=KR3qm>7dXTmG#YW-x^ZCDmWjv?y^g*uTsX|3C>Hj1s0!aXfPz3*1gy34+e3d^L zCl$1KMhKdtkbfr?NBuR^+8mG9Rs;#{KW5AuHv7zgdXhI!2We4TNSPO^8F8Hjq7!ja!Yh2vyTJ8ig#4+H|T(UO?E*}#`AnIbx}%lxGe@N~ze z^OPa9d*imJSE~Rq)0b098slguHz(G;jc%Ca#O@*{1v0if``WlyrIJv=ShoP)s^cg* zbUCAv@RRN|x7TaU=^i>nJ5nJb8jdk4LbR4`R&>}bGb;#d{!+FxBmZ$cl4#T$3}Vf6 z@b49pztK04RF4KiFs}D19E}?FU$}M(&R4M#veNU72A;eluNiQF&3TH}zDrqxrr3Qb z8K(uX9DhpBsu|%6&W~w!EB!qs;wW4zt`R;t;$5kqbfpO)+x_J=jeWxsE}2FECes3s z{UjK);TS2N+s5h#0E^-XAIW-8?)`>9Nt>iAovv9=$)2z)%`DN|l3OivdxND%_VEEi zl!V%imCGWVmIPhr^N4<23@T!cJ2xlD8a{hm;_XyquZ=9NzN1s#Gd7vq{0s#z#LZM% zAhtjI0=#%T+LdR|QeX){*h|~Fu~G1`!4lr=!p`yKKr%kuv;pUH;CV>Yqx!wh_;~br zxE`D7`y-{hq4(xg5$e6s^C%1;t931I*4Kq4q{TQ9q^W^OD9RrX?x6Gd@P!d{_`2b# z?Zx#N&fF30gKZ@LchYROdkb!OlNqKqii+sbYkz_OjE!^+m&+h_%g@oR`8?vPMC*?h$ XmgDeIpP*v;=fl}rIa<<*eo21-q^>Qg delta 984 zcmV;}11J36UbR?|7Y?on00000#CtY(001leu_ak3f1md3_NC4;4&eC34ro_C1cRoS5JD;o#6rM_{cWnQEelh`2%6UJxFSeD^HVb z?*@kqb+2eAo<9)w+CEa-m3sgZb*>DP?C-M>uWMN)iTr>NwBxwizmG)2fgw_Q?l6hQ z*OAB%2%C#>HBcFbc#}7MNJ_^8F^Cu5dW1xNKv-XktCk6fH+#=+l0~1+-$tTC100Ez%80-y+hA^?gohjx`KLbzauBD}Kv z4@D?>OV5O3<$5r(ZBP;TRL|2=pv4_Ke^ zf$hdLh)0+#ylqB2!sZoYNJnT|@*UC<+HyOQj?i1sf^>wRuh@ZfgviZzIb7UWSQNtf z^{b~ytKzIEgomyiA+2X+eXqT+sE>;q*5roiR7<@wvra$eoa&&gk0ZI`RK0y%_K@k)| z5fniYKoI~%02BdG1V9l0MF125P=x<+M$