From 884c02872ce9d7432c3b67a920011cf385ce70b2 Mon Sep 17 00:00:00 2001
From: PgBiel <9021226+PgBiel@users.noreply.github.com>
Date: Wed, 4 Dec 2024 07:00:04 -0300
Subject: [PATCH] Fix text fill within `clip: true` blocks in PNG export
 (#5502)

---
 crates/typst-render/src/text.rs               |  36 ++++++++++++------
 tests/ref/block-clip-text.png                 | Bin 1268 -> 908 bytes
 tests/ref/block-clipping-multiple-pages.png   | Bin 2047 -> 2029 bytes
 .../issue-5499-text-fill-in-clip-block.png    | Bin 0 -> 1502 bytes
 tests/suite/text/font.typ                     |  31 +++++++++++++++
 5 files changed, 55 insertions(+), 12 deletions(-)
 create mode 100644 tests/ref/issue-5499-text-fill-in-clip-block.png

diff --git a/crates/typst-render/src/text.rs b/crates/typst-render/src/text.rs
index c017b1ce3..b47659cba 100644
--- a/crates/typst-render/src/text.rs
+++ b/crates/typst-render/src/text.rs
@@ -164,30 +164,42 @@ fn write_bitmap<S: PaintSampler>(
     // If we have a clip mask we first render to a pixmap that we then blend
     // with our canvas
     if state.mask.is_some() {
+        let cw = canvas.width() as i32;
+        let ch = canvas.height() as i32;
         let mw = bitmap.width;
         let mh = bitmap.height;
 
+        let left = bitmap.left;
+        let top = bitmap.top;
+
         // Pad the pixmap with 1 pixel in each dimension so that we do
         // not get any problem with floating point errors along their border
         let mut pixmap = sk::Pixmap::new(mw + 2, mh + 2)?;
+        let pixels = bytemuck::cast_slice_mut::<u8, u32>(pixmap.data_mut());
         for x in 0..mw {
             for y in 0..mh {
                 let alpha = bitmap.coverage[(y * mw + x) as usize];
-                let color = sampler.sample((x, y));
-                pixmap.pixels_mut()[((y + 1) * (mw + 2) + (x + 1)) as usize] =
-                    sk::ColorU8::from_rgba(
-                        color.red(),
-                        color.green(),
-                        color.blue(),
-                        alpha,
-                    )
-                    .premultiply();
+
+                // To sample at the correct position, we need to convert each
+                // pixel's position in the bitmap (x and y) to its final
+                // expected position in the canvas. Due to padding, this
+                // pixel's position in the pixmap will be (x + 1, y + 1).
+                // Then, when drawing the pixmap to the canvas, we place its
+                // top-left corner at position (left - 1, top - 1). Therefore,
+                // the final position of this pixel in the canvas is given by
+                // (left - 1 + x + 1, top - 1 + y + 1) = (left + x, top + y).
+                let sample_pos = (
+                    (left + x as i32).clamp(0, cw) as u32,
+                    (top + y as i32).clamp(0, ch) as u32,
+                );
+                let color = sampler.sample(sample_pos);
+                let color = bytemuck::cast(color);
+
+                let applied = alpha_mul(color, alpha as u32);
+                pixels[((y + 1) * (mw + 2) + (x + 1)) as usize] = applied;
             }
         }
 
-        let left = bitmap.left;
-        let top = bitmap.top;
-
         canvas.draw_pixmap(
             left - 1,
             top - 1,
diff --git a/tests/ref/block-clip-text.png b/tests/ref/block-clip-text.png
index 744ce0f26e89c0882275e557028828573b42e9a6..8c82bc30934ebef06296654c08655e8a7d4df64d 100644
GIT binary patch
delta 886
zcmV-+1Bv|f35*AjBYy)^Nkl<Zc-rmR|4-C)0LO9vhJNX{wp?pvfq>=>m7;Zv_ysyR
zF+82LLD6BLz^yLQ_lL$%ceIXDB)&8QJ9mj+QbQOEYfMmR46W9}P9r%Z5Wj(Ud^tW(
z=Rk*g)6IR}yG`HE-#$M*e*5hGe!mtFp%y4u!3utyVC_LUGk;68`!WXBUVJLmY!kCN
z#63l2zgsLmdPdAIQ5XY@=NOG)wx!(Nw3&nDj7Kv+%_#W!p}L*8b_H`!^e+4+05Da#
zwIftf_cezW)#q8;ST6@&*!tP3!0}?l5ljHknR~6jwgG3uxS507p;8X~0u+ANQB2v<
z+we?j{J9TWXn*>64n8df-uyJ=wEw<Z&#ESFGSmq)1@=`n+R=U-S<YeY1|3r1^bJ*e
z`@mhXr&@QrgBBf5RMrIXy1g9Q`0J(oUjjl3ESTTe5yB-O1_eL1@MQNm^Be7Eu8EUD
znea&5S>~D!0bNo2eE@)=m;3+$Nieo^%#|?+V1fw%cz=5cXw{5{lZt%VKmYZi&(^%@
zD@G28%l_EU&jTjh_4MxB{N<RXt)K>{rPW~Ak-&S+Q`OjZvx39_@BaeJe*h+qIZ2|t
z1&dc-!O=1dhQ<2dM8*#z*nGS;d9kXz@DAMWB&9FUf9u;M1MZAJpXvhZpTu8Z`%ilT
zX#+aUynoEGLMpnhLh=AH)6H9SgW*K&O)cwvZDU+o{^He{Z&+U`TD81L)7C`gyuQq_
za#@TyKQ<#T+UAJ0X|p9710x>LrUW5g{Y2ao@{hL@sr8<=$egQnb(1g@o;pkT2F7K=
zI>#3gw&A5c65*jtFcCg`uSD3p#6$c~MSa22Hh;%-=Pu98sV#UKxUk=~^P;`w(;8{;
zU^+Z|@=P|R8+-%n__l;-&aA~cQQL@pYhYzaCT!wLGOi}}XbdJ`qJJIloZi-jy_b|>
zS+G9^7Bg(7d@tR}bmg)n)MI5wOF!hCBH1qs)~$8TZ~gIoYEMqV7>%XdM`<XjP4|`A
zvu|AfH9P)I+bs(YU$6kSU5LP+E0pB*c!>ZEm(_EVf)%V_1uIy=5!)ml9tK^^#lusZ
zgxVw?4UW_%A=D<JV6{o8P2!Q^NNo~AZ4yuPCJ{b$u2!&u6&#Un0z~e*W^uzGB>(^b
M07*qoM6N<$g6LPa;Q#;t

delta 1249
zcmV<71Rnd02lNS$BYy<DNkl<Zc-rlmYfMvT7=Yi_ZWE_VAOnNOg^OWv40eHlHyBP3
z<F>GHSpo_Hxy+%XqSOUZ+9q@AaBe7DHxLzwOtwik2^$KFIOWc&h;wo&&Xt=^%EqOq
zJ#EjsmL9n%lOH>WCgwaj{qy~Kl9TuQ^7TA`RsuLNC+5VDlYdz9DAFS{9$sWdELmn3
z61Y)pK_q?vkA%21@dwXMSql&|BNi{kftS&OH%>(#i1Lqc#1khY`9ESlOu)Y*PlQ8X
zYTv89qCP=@3H^}+myMs~=R$e!@hU~t)2{$y2w(z3OK)qOclq3f>NoA<z)bV+2k)G4
zh~8ZknzPxiJ%12h1;*gR1W&HpyF@Mkc!CEszK-h!3J37I0Tu#S5mSQz!;ZEp?Cb_T
zX{-YPxoAhl%Cm6YkI=vz({G3s@r?-C>8)$rR~!xmjFIWH5Wq2SFmBUp*~>Q6`24z3
z-Aq&gbNttg4wvCfNSNAAI5SLcCo92;0m!CNn2fp!Xn%AKS~kT)Tl#>;U<82ncu>m0
z%-`{9FhQ`joi=tM%{$#_!WU7CW4zsui033sPj!7-SK`I?lrFfrBM0uuC4;>kC4YdK
z>{D>%yUe2_yw>e`P~CE#;aBb1=)%`HySu>M!>6Hcm1n^srzj^d^L!_yhugT#2lb}~
zu*z#4!++v=F4rAT{uBn_2LjUjOq&Ys^OWgn>G1&Y=NZ@-u6L7Sb?wiBjs#M-Yr}FQ
z@JIxpMnR_oe`4Pv(2}4t@JVD?eDVB(0^3e$YFCC(lW2_pqBd<#q(~}_<|Tc6dDr*C
zfFNPNXd4xKp)6Wzp_-YgM)4y^^%INzcR#o~3xC&JZAgA`rFHJr6!%YpQ8C$p({p=-
zO)-TRUchO&>)phnxIYrn7pEs#!J@dts~A`Oyz?p{trY2NWyQvZOe`)$)tRi%dy^~n
z<gzC24nuUVzm|Z~ZOYrxSdf99cx@AgYx9aQdB0}00hxpkQ*iKI(gX7XTrRo7+F!s1
z=6~`)&^E9XAlSxE&DPb2rw7o2UT=Qf8bIX^2ID^jtnLe4POmZwjzfhX`*Hnm--I+J
z3Wu>sdT;;>GxEZeA123U^+e_T8G3Sd4-i6#ctB-^lgkiXQe0x4BU8<NZsNq8m=kki
zPRxm|-y~>QYZ3wCnPI0%xZ=H+(1I6Eg@0U&rTcK$gQX_XFHeLl8L_2Cp+2qw6J+-O
zONK+ozJl`J{3=D|e0H0J%|i8C_M0a)iJ0`l(42U?_8``pL~y26ngk5uSd*a4O+u%y
z9d8myH;GXkVn-Yy`+Do^FPfVKWo{CbrAb7an#3D5KFzb$B!<p%O@eC@OpA4mBY!ZN
zfkvRw))TYTB=iPLljtm++$1z?ZKo(D(nP4xgbyNtV}$e}VuhITsotqfsBU{-2{%)Z
z!e6Cgbx%jhEim)hDNua7_sB4>RhSFaE$5hi)s3#^CgD2XBo;eGIgdAq2phKrbdv~X
zTI|wFHwm6V_fV6#I@Tok>@^AdDOyc}0x;fh5{t*0gq}}QOgD+jX9{hV((SkQq!39|
zf~+o0U~UpI{G_ZJ(GS8kK`Evtfw9$PF)TNUnc?o$oR|}HVyo~kz?G<!8Nv@I00000
LNkvXXu0mjfs!v=f

diff --git a/tests/ref/block-clipping-multiple-pages.png b/tests/ref/block-clipping-multiple-pages.png
index ffe2fd08ade62fc50bdafb63230a8ddfa474455e..0b6e7c85f845e069aea67125212b33eba281eea2 100644
GIT binary patch
delta 1995
zcmV;+2Q>Kq5A6?-B!9F?L_t(|+U?kROjLIQ!14aKe{Qoeo88TJx3QXPTD#t}YQ0)C
zS{skmY*EqGih?YP2P&gj5YdWMK~4cdhg(z*LBNWmfCp#+xkfq0;ZkG(VFm`~{;ph!
zF~eqd73?4Ho0oU|lJ`D;yyU&#dmr$g`apmMSbzoi9l+7!0)O`&QUx(oD{Oi=8ZhG^
z2NOe0hqVtz1^!f<s=07T=Nz$48+9(cXlzu^ftFE${~B+nuCc{;f3JRSPZ1&rG>-~A
z0W%6){1f2fl%EknDWd@!eh<i2@M9$9CC}}csx=jNj|QCJoD7kBOAdRgo_k-Ab2`8n
z`c!y;2(SPPuzvvmn&1Z?jv4W$)mwl)_kCF9Z`(SMPwN{kZn>G*D*MZ8BN0Cg?G+^V
ztydPdo*p<3_|d{8`m@Qh1ba+CwSf9Iqg<o@LSY1;Q>Lf)2{g=6oZbJzv;b&(+9j_u
z%U`6NY;OQVsg3{-C9t8|R0FE&CzWwQtxa@(p)m7iOMfiGA4?Wy^V2TFKT>Na-qHg+
z-5VEI=Wus*)17HjuWjY*2de(ixW~b~`F_f3|M`#G_DP*Mw4<^gzB`^<!GWHwakgh>
z*H=xvZL}7ifKpVI?}~Q@A^=c`a?Ng;gn4({km3U|03K<X^9U!!8^0uzGJOhhf%L<O
z*ppvpPk-ELj`d%{dKk~JJ9{{qK6F-F{j$q@V~O|bgHJ#=K+~!i$Ix<8d<cxI+pd{S
zTmVC`be}{{Tp&Iv{|o$^+^p@-+h<-`VQZc)QP~55H~gee7UgYjx;?frZ$*w~8vv{F
z$`-%@JL8sJ>GtVki?jcE3toyOvJVv@3D@e)E`RpMbz=S&ZL}7CT+s=1$dx)8S~z6}
z^)C%zDDI{~)<T&9IRLHwOQp<ESxKelX|K7|2%WO(rpL|U8OhGqDk}}LO6pp%7UuQ3
zs`x)z)`>*UVAjKLpDZx(Iqw4o5MXQIoSj%qx%~;2d*M)PVYG{(eu}aJPR29^%Y9$O
zFn`&VSs3(Vs7$dH@Nx}*rxmnXHT~Nzx_hBZQ`YTNqS6C8wbrE8(WQkRy;=t}Zz%^g
zXbfsFsWm-nqee|TsEi#z`!z9i80l3TR9&csfkkOdJmz?!cahU3z4PU5MWr7RYD?JF
z^%Av{o7Zfh<|AqM%IeVIlL6{EZeFucx_@SlFIVr**r=N2x&_ory>I-vJ>H>o49Axq
zU0leK3_CGLC2m)K`CZ*6d*hm6;MFi0<w|_R$re-cEh4HnFxwa(fzv&fs(`?N_GH5h
z7^`>B;M<o6bJ<!R>>9nyD839(zQOoOZM+5%mFtNME_XyKZdi_X9Q$r$*$_TFEPtY7
zDZZDvw39{~X7<6pr~K786|-CkbWN8SG~-~Z#yy8s&0DXswd~+|Kr98oCLuu_Ngw<@
zNvChEeFe+Dh6&WHjoFw`Gz>iLn&MBY!bvK74^ziixjt7|^t1P;Pu(6A8?;N3dZy+A
zI30tnXNtBNY(slzNUwc!eU7+zMt?!NZjB!RG4@P;O#2_@mu&Rjj;hJoyG1R_6H|}D
zQtAEq3<KY5mgO~7<kjZp_F}kQ4ZSxtW%x=0meu4HwdFkm2vY)O`KWUX+VV<}mDF@2
zzpn1c%QXP#pP>MGUPWP^DnD2EGN+>k3X6a`Pz(bv@U)b8f~V&q_o1VIFMsoVn?AP$
z<1z9@2orh%7GME>7x4Q^xW@u4zyka(V9$~792RGp9wXl8mgm(jypdSSKoTy504Kt*
zl>?X<Y&zIzu$+Iawcp1}f{z-L-1lB@2={B&#(F<^1xq*7mYv(F1^WiTH}b_ypIUgh
z62)0pC6tbh?6OI73Zy3_w0{`r4hbnEG2}8&!gqD7bGT<E?1)>s^5bs9ip(QBE6Nn>
z5Z^e{iEDO=nY4QPVQduuQ}LBlbps->xyzRv2#=cwxLi2DxINoA7mwr$oqqyW!Y)Lg
z>R5{DljlvUPXEM(i2t=5o~_ylH{o?y#LJB<b%Ss>B19EUZNTK}rhhh5P~sF?zWdH(
zJ?xBA?X&qX?;(vR(wgV8JInnr(bzpB9{`Ut*vWc;@kFz`6qu?r&S_%;E)g^W4ly*Q
zozQ(oG+X6C=QWitt%8pQ=MlT>AyvDA+p0XXT?@qLjjriok}L3o7HBwlxaGzHCFDEj
z#74yd1f43~mHB9gw154;sVYFZ?{sauIMpjR>cT~8T^?lyzNf!F1q$ImmjJ&B8;je4
zq1qoXY_&D-6jpzA2RJ_G9su_zQJV|^Jpj@o2J6Mm<DJ6n=_6H>7)S(K07{$y^kxPM
zjwRFU?cqzuYkFLB4jzX1^V9p_o~d|dv^mQW;U7tLOqkyP>wi?xyJwShE)k5c-UC?&
zeH}ZweK7$bIym#H7bh=0+fukQ(t5bGd^=ul#&0@P!*LjdC4Ou!K}43A#icGG4|f3g
zNpv>GT);nptX1mc87-^I7nVTtYW>~L1*CbhMq>WbdiZSAGJI0lQ0<b%o<TUlAIC?C
zkct~-m6o&(z$(Gf1kETIgpUvrnY696q!&0kyRv6t-_UwFB5UEy-;NpaK9gC1X&w1G
dlhFqm6$5kLH>m<!5Z(X)002ovPDHLkV1igZ!m|JX

delta 2013
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

diff --git a/tests/ref/issue-5499-text-fill-in-clip-block.png b/tests/ref/issue-5499-text-fill-in-clip-block.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f7962d3b1b38af687b2996873bbbcaa201246ff
GIT binary patch
literal 1502
zcmV<41tI#0P)<h;3K|Lk000e1NJLTq004LZ002k`0ssI2vV5i}000H0Nkl<Zc-rmS
zSx*~R7zW_{ir!Z3P5Tcj^``f|sMM<JMWyx^<RVcMrHdM+O-qWhG?0?5Ss-MA62f92
z2D3O2urW&jgN+B<*x1JVGM??s%$algiK$$N<t8PqRDG{TqxZ~!Ej^45XQXq4WB!#K
zK>~zEXbeIlG(uw#8lf@&1@vrOdyyg%VM9T=qFMY^qv<rXT{WmxsFG+-=KmmRD=*ME
z<<`2H%v)9d%CQWV@-ZdL)V!IRe2vf#7OQVJM7x$H=yM6}z2^8={W<zFX2V$VduKt^
ztoN_P*K<1GFRD(T%%vX8Y?WjkhLh|07FT35C-3^1Yh#hBYR2+P>tu`{kSq;6R!+_u
zPoS4s?w)?B)3~W{iPyzXLsykQ0Q#0R;v<p$4LNU%C%+E*!)g_VJ~@3X;e4)a^17Iu
zURR#1(r}SgPAeB)?-Tu2L$uaEX-&by%U{lLNIC5+K>6ZfTF4vxfGo!=<AI#rWn$iP
zZ}L6q@Fpb9)J>~xD#i~^zj9h;WxJ1=Jqz?Xe>ozPt|?tmoZ7-1iSh#yQ`E+As5U&F
z9NOo*h&w>TP%daKuNV5A#;B|_`}nvu<xlHyaa2$`UR0Z=$`;!Px@EfjySLK3bGH_M
zLL6Jm0U{h_S--sl%@~`HmS4omk*vHI8lG-=_I;7kW=`RCai~9tENgJ0bK)|)m#7CW
zW>|WbddE$-%C)`FK6T4gjSiHeie=V5XG_%pnphTL6pj<ygZ6bV5qx^cYpg<d=o10D
z!2y~y!<iVoV_I>pXyfbTkfGoFDROUKv=5j%02;(UxVkkFRzJFvbgap{pa%kS<9HE<
z0R0P;I_M5hVkusR1MF<*xoF89%!RY^W#`6TXqaj=oifI5j7Mc+)<Z8F!+vveiB3J#
zn{DW8`mcf&>Na|v#`rGi9F?vYJunQY#VbjFJ@l!d|5-URDW;~Rtz+ALaB;)T+?Gey
z&G>gxi^8=5eKbe~xPFOThI9L<w6<kHY3Q%6B#py_ez$S6)<0|C255Ig{rtgpN;DG{
z6C8Fy|L7{*@rf{;iD_RxO4mcXgL%6v#I&Kie94WBB&r7Z?uBj|4udijnBNmcwH{h!
zqTMIVK7dxaa*_O8;gt%j=v?0gy`XK~FE7H7FnTKDt%p7z5o*IznSMAAsPiLaq0FSx
z&Q}Z?BS9;)1AP(BXWL4t0)_I}s|+q_hXze8{>GVbZTR7>q$j3Ti3RhCs9D5hd71XE
zN+%sTxcg~aYI&Qu1O<x4_zh15CXm|iE^L-Z{8_uh)B*qZpm;WlqpMjcU=8Q?=kb!P
zD}>&Dwh6;dZvy@dP}-*A#IT^)=~2EBS=R2uX6Gz*Lpe{*7FYpFnTZ8fYEm9S?^kDM
zh)|&Nnd}HC3tIVZdcF2Jf~1_?2-b#2Go6%MK{N52^4Ol}EpGK1juq;M;W=`KgYTHs
zJ1IkH>Z`_b^w6MTB0k!a?Oyq7)p5Kp2h#%R4+i8Dj@<nPkuiR5toZFvem<eWm76=V
zu+F>mtkgOOcmG~dOayW+f7V`g%!Z3YOKDhjn3Ta|J{2mYN@_vUohuobSXL9_)8%wl
zB)Vx$3k8^7w#!=ms$+(<E*VaH)dA2hvq#}lg2j7`?rGDbbKPq$b!n~`&Ge|Aer3_(
zENT=T6=AdzC(Np?I(m}XyNOs>6=681Cfchrv$_D?ZOl9Lu^<&>E)SRkqvlA|3ilX~
z)&#;BAN49vJ<6h>;|mME86q?Wp%EH`&<Kst7=%V>3_>F`LSqmbp)m-J&<Kq|XoSWf
zG(saZ2B8regZra#e>Coo#{JQ_KN|N(<Nj#eAN@bwAH9J4qj4RLFDwX+L1=`=AT&ZF
zGzOs&8iUXXjnEi`MraH|BQ!!|5E`K|2#wGPjXBKx32x9qb74(H@Bjb+07*qoM6N<$
Eg6K)m8UO$Q

literal 0
HcmV?d00001

diff --git a/tests/suite/text/font.typ b/tests/suite/text/font.typ
index 443be6ed1..5c972ff32 100644
--- a/tests/suite/text/font.typ
+++ b/tests/suite/text/font.typ
@@ -81,3 +81,34 @@ I
 // Warning: 17-34 Typst's default font has changed from Linux Libertine to its successor Libertinus Serif
 // Hint: 17-34 please set the font to `"Libertinus Serif"` instead
 #set text(font: "Linux Libertine")
+
+--- issue-5499-text-fill-in-clip-block ---
+
+#let pat = pattern(
+  size: (30pt, 30pt),
+  relative: "parent",
+  square(
+    size: 30pt,
+    fill: gradient
+      .conic(..color.map.rainbow),
+  )
+)
+
+#block(clip: false, height: 2em, {
+  text(fill: blue, "Hello")
+  [ ]
+  text(fill: blue.darken(20%).transparentize(50%), "Hello")
+  [ ]
+  text(fill: gradient.linear(..color.map.rainbow), "Hello")
+  [ ]
+  text(fill: pat, "Hello")
+})
+#block(clip: true, height: 2em, {
+  text(fill: blue, "Hello")
+  [ ]
+  text(fill: blue.darken(20%).transparentize(50%), "Hello")
+  [ ]
+  text(fill: gradient.linear(..color.map.rainbow), "Hello")
+  [ ]
+  text(fill: pat, "Hello")
+})