From 6e2ea14ca772d266538573661eee95e46db0001d Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaled@aliftype.com>
Date: Wed, 13 Mar 2024 00:21:12 +0200
Subject: [PATCH] Use rlig feature instead of calt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This should’ve been the tag used all along since these replacement are
required for the proper rendering of the font, and some Adobe apps
disable calt by default.
---
 fonts/Amiri-Bold.ttf        | Bin 587096 -> 587080 bytes
 fonts/Amiri-BoldItalic.ttf  | Bin 583336 -> 583320 bytes
 fonts/Amiri-Italic.ttf      | Bin 603564 -> 603548 bytes
 fonts/Amiri-Regular.ttf     | Bin 606240 -> 606224 bytes
 fonts/AmiriQuran.ttf        | Bin 164376 -> 164364 bytes
 fonts/AmiriQuranColored.ttf | Bin 198140 -> 198128 bytes
 sources/contextuals.fea     | 180 ++++++++++++++++++------------------
 sources/enclosing.fea       |   4 +-
 sources/lellah.fea          |  18 ++--
 sources/quran.fea           |  12 +--
 10 files changed, 107 insertions(+), 107 deletions(-)

diff --git a/fonts/Amiri-Bold.ttf b/fonts/Amiri-Bold.ttf
index 7c1f75727132e9da45022107ee2b6f3153017dc6..8922ef3c6ea7e54740747f231c3b5d21639bd8d0 100644
GIT binary patch
delta 666
zcmccdO8LYq<p~Bna;xU>GH_%nFfjCJOtd+{!m|CoUNZ+{I|m~OGXXI(5VHU=D-g2*
zG5dB7Mh^Lm`d!SQ7?@q$d_ovR5{nX(7$kBMOY#`K7}OXT7?c=T9fKSd82r40Jro$K
ze0?Gn7*+)PxhODP3k`BnU}Rxn`2U|l7^sqwfr){cfrWvafro*Yfsa9eL6AWRC?mok
z${@xd&LF`ciCt|yP%%Fa#Ue-svl28KSv4Ecs_Q|nW+z%XNHr&3)m#jWAwk{>3>IMj
zB0Gu;o4$IK;6YZ-flWDFwN!F)ZUMu*l)U_0hBaxKd5H|0GV?M^7<S}jrYAD&%gIm9
zVK@RNPl3q`VDcK6yay(q<R%tnGswTnO-;#U_>fncTg33K07x<XDFT|o$OI;frblFR
lSWb`5;Yi^&L&WU#AK4u7f;$-Y0At7$RXBP3*&L4U4geTeayI|~

delta 566
zcmX@{O8Les<p~BnUG7X(3>=vX3=BOM6Kzhg=++ClG;=Vvb1;H16A&{4F$)m00x=s9
zvv22M<dDw@J;lPr!0h7Y6T%>pSd^H=Ad!<;lE)avpvJ(!pv1uH804tH5a1o`p}<h*
z>l3NKurAooMS<a7XpoBnBOe39|Njgk42%pwGZ<JHSQ*$Dcp3N@_@^giafnJvL8Te6
zN=rkeMNxFKBk9MgfP;_%PC^Q}krb#(F>o<3h6H&lFj#>di|QI4B&Aqg!-b@vUW!3F
zIWeb%VF`$2<VsG?Env(`$;;1WtVzqvOJr=y%*!lc?8wPXPh{-N$xqH<oB}3ifyo76
zav7Lh2PU`VCKhEg?#fL~$z(i`SDIVIc&q?OF`g*`8o_v}s3a$s@j-F1fg$5FAZau`
rD4Ro*(Qx{!Y>re$gXvK@9LdwGvpG_@S;3AJU=U;w+P*7?qpt%1E+%>=

diff --git a/fonts/Amiri-BoldItalic.ttf b/fonts/Amiri-BoldItalic.ttf
index 8a750bc181b2955460e941b5f7ac7fa8bf3bd6f3..66ae9401410569906b353dce7460fbdb529e7952 100644
GIT binary patch
delta 556
zcmZ2+R(Zx*<p~Bn3X|sEW8jD~VPNP<nP_u@Md%EtV>1V1I|m~OGXXI(5VHU=D-g2*
zG5dB7Mh@f1&|S=*7?@q$d_ovR5{nX(7$kBMOY#`K7}OXT7?c=T9fKSd82r40Jro$K
ze0?Gn7*+)PxhODP3k`BnU}Rxn`2U|l7^sqwfr){cfrWvafro*Yfp7YRC=O9q9Fh$D
z41x?oKy4xnq6}gT;tUcDl3;^GkPKo)F-j6-6tXlMerb06(wr#L%3KVLAwk{>3>Fx!
z;6hP|;R+69X|c5A<lF*=c`14MxeRO4GV>A{Hf82zmN4wd$xKgV*q4)^oWpPgOr8Rh
z7r^8-FnJG5KFLii%4T?#o0^iz@FA}>w}|0e0gz(&Qv@`EkqJx|P0xwpu$-PB%aOuu
i1`2Bi0Z?#G=ZWQr7u><H2N;H?sKUwHAI5SV?*ITT4|QMw

delta 566
zcmbPnR(Zu)<p~BnJ^C!(3>;A=3=BOb6KzhgSWmVIZ{}cZ=U@b3CLm@8Viq7~1!6WJ
zX5Y@i$YC5AdWwaKf!W2)Cxk&Hu_!T#K_VxyB#$wSL5+cdL5YFYG00JYA;3G>LxG{r
z*C$eeVO_AFivq*F&>$BDMm`3H|Nj|87#JCVW-zcYurjbQ@G|f*@K2u*#UUyw1(jyN
zDlH9>7Dds`j-(%}0uDk7I0-4>MpB?E#lXeD7!u^Iz+eS-EUIgGkd$I|4HuGvdMO6!
z<iwm3h9w}9kt;blw}3G(B`-ghu_i4uFOjh+GcU7*u_GrlJ(005CqFrdaSE861tu4O
z$z@=29hlsbn^=_1xGOg`C6n<$UTJO-<FNuD#dxL&XawV>qLQ3k#s|g428N8!fTYp%
rv=|OeM#Jg<VmMM64W{SCawJdhkKst+W(7M^fI*N!X#2TXj#C`~($jlG

diff --git a/fonts/Amiri-Italic.ttf b/fonts/Amiri-Italic.ttf
index 35d138b3e27ef5f4c8fb1c22b35f8f164ef29088..19540e0d1bbd83ba01f67f0e9d30f4692e60744d 100644
GIT binary patch
delta 556
zcmZ4UT4l~_l?etsYR4wzGjObU!obk8ZKBNymepEY5}P>~+c_9Pm<foPftUq|S%H`h
zh}pMuFmgOz9=eP969co0n@<RXNMcc95`#oeVo4sO7lRrD1A`I+t7DL(0)wA-u!jOe
zm9I~v0>g@6KNkgtYoS3d3XCia4FCT#2m@6zGB7bPGq5mlGw?9*GVo1zSji#kibIlt
zpFxm82&hejL6kv^L7YK?K@x0`2$DgpC`L(wj6#-X!!ON_Uz!s|TA7Q1F(k-afx!a9
z6<jC^F<ilcEG?FnoSa+0FfS!9KbK)mT4r7%!=}u<%o2tjIhpB+4Eu8OlXDo3fXP!}
z@&cH=1}5);$tSsqMcE9ma#K?>89wBd<`yx0D*#dqe~N%cFfxJ3qUkcLIV`8kui;4H
jHUot<g8(Qvr|((K5ihudVGl42O;LrDw@+NdA>9c8le~Gm

delta 566
zcmbR9T4l{^l?etslajvOVc=Ntgn^;w*hHHXESEn%FK^~xZ0BGEVJ0AE24WT<W(8t4
zAZFjr!N~D=dFUw?CI)5~H=hs&k;J0JBnF9`#F9M5Fa|XS1_mVtR>vSm1%?3cU=Ia`
zI$xhi1%`FOel7|O_d<hQ6d3s!82<lf5Mf|s0Gh$T!obSF#=y(K$G|_`VI_yCq!d(|
z0jsn$L|PO@H#?GktO_^?Dc~fefE!7HsuTkk17k>#w*rF|*s-Xt;XzW0)iqp53hJd8
zq>~eKN*I=aNJg&Y<lF+ryp+8BT*jKT%)CU#rp&y|62^|4%=ARYzMTBz9L6bNau%3e
z04A4#$#r0IOKxIOHsh|`)Raud19_#nMU2M^fE44IBA^kBmx@Yqav2{K7aJHdJ_C|Q
t)5TVEXfhg3U$>egmC<0j+!~JL>GrERQn*>cjuc=JWDwe3w}wNm69AS+fSdpT

diff --git a/fonts/Amiri-Regular.ttf b/fonts/Amiri-Regular.ttf
index e07350e7b9b37bdd8ff11f50d29194de09d95bc4..29f1c5cd69c5e08749e8238363a5442738fa0c96 100644
GIT binary patch
delta 666
zcmZ3`pgIAF40u969_V1;*xbRu(9<^2<^)Sm#__CX4#sv4Mi6EKVrC#_0b*7lW&>jO
z?Hr68?VIX%F@IuUc5(9wVGv0yN=#yq$Vn{8WAtKBV_;xVVqkR)a#UdO^A7e<V5su-
ziBw=%5$xxpz;G=z$VGvXg@NJ!e+FToN=61I24)5p25tr(23`g}1_1^^1|gt~2!kkt
z7=t*21cM}Ywe>*7{5TYgAQ{X`&}d}UY(%TB2f3P^XyqW)oOo4pF))S%c`Gnjfc=Z?
zC@yUJ>QRCRSvdzb<#5$f$;r6|4D(X*@^cy1q-EwMGHlAs%Pe8ok&~I8$gnRbKRJit
z2$(ztCNF@=Yhdyon0%6(Sd`5m|0*{%C6nPpUTJO-!?yw;#qg&HXa*w_m@JxpU@M2^
k^uyaYQn<|!F*`kB8%Mn04u(Cz7&1i_PTp?1o#S-}04jWS5C8xG

delta 558
zcmbQxpt_(zb%FuU!9KOG3>=#~7#Mn{O|&_|vQ__ALo)|sI|m~OGXXI(5VHU=D-g2*
zG5dB7MvnGPp{H1w7?@q$d_ovR5{nX(7$kBMOY#`Q7}OXT7?c=T9fKSd7y`V5Jro$~
ze0?Gn7}f>*xhOE)3k`BnVB}+9`2U|lgn^L(Xa)ld11kd?11|#~1OK$G9HNp^P+10S
zveFP)Q53!G2;EraIS9ye5|HOc$g4^*a4|531bHhkSb^P%>JlD=N~|v7Lde%kF-RvT
z=9Dlj0g;Sc$;r6|jCm<}`MHcWX_<M6j7^z&nI()JIhpB+jD0!z$vKQuz~n42xd2Qq
z1C#5(<d)pTqHM-pxv43cj0f^cbBh>{6#yy5Getln7%vr-<m56wC@wZIWPAoBji&F~
q%Av_<I6Y_^M=GPi^h4V?lBYl3%8|m&3U;FagCK*@cBSnc?>Yc4OMXoN

diff --git a/fonts/AmiriQuran.ttf b/fonts/AmiriQuran.ttf
index 23dabc78de9d7be60bc3cdb3d058357db555fc19..4c0f8926cc7cd09d7eb273b184b772c01fb2971a 100644
GIT binary patch
delta 403
zcmbQy!qwBlHNk+V`tS5g1|~Nh1_tW~6Kzhgd{E+;+RVY&&cVpIor94{%e9{23sVmR
zvx}Qg2*atwqQoQyk(|VmJcd&YyBJs<gB%qYl)QsI6d3G$eIgYYVuJl#6d0;PgMj1=
z28RFt8Mql37#JCt7}yy&7&w7E9tK_pJ_dfU91m2E87#|%Rkogqfd!8=69X$=SvCw=
z7NDi*4nwwDAUQd=fFUU@GcS=LCo|6^vxK22CqFrdp#n_Sfyovy*_E4El+7?9H#H@b
xVOmj6W;(+h5Xs0iz093Sak{SulNGli!r#+pxHCm_8=wk=GA`ae$%CoQ5&){rO<({3

delta 416
zcmeBa;hNFHHNk*q;c44;1|~Nh1_tXl6KzhgENR=5+swh(&cVpIor94{%e9`7foTQ<
zvx}Qg2*Z`cqQoQyk(|VmJccU_M;KTggB%qYl)QsI6c`+QeIgYY5`z6)6c`#pgMj1$
z28RFt8F&~N7?>EC8CV!N8Mqj@fqY&DJ_ddU0kAAD1JHP|EGrIqko{l<Y&aCa<k<<x
zb707`0G$SLBFqeQCkiGfy5*EGWF#j7$s@_hxdn`JX_<M6j2fAFnI(*RIr+&sj3!{x
z3QRhHNw?g@qHIQ=+|-mz#-O5{%yh<x=_&3^ii|qb4Lq1ar^|aVu`z0c*x}Qg-I;8-
RSs6gC0|(CbHV>vYO8`~mO%(tD

diff --git a/fonts/AmiriQuranColored.ttf b/fonts/AmiriQuranColored.ttf
index 32bf9d4fc37dd5913beffc9ad4dc90be893e95f7..683e1339ecb546242ee41d989b126cf85211d5bf 100644
GIT binary patch
delta 403
zcmey<&GVs~XF>o^_22203{0m47#OS{OpH0fGP5XXb+ZOzy9OiUb`3_RcPHu@zA*JL
zFuS<<gfN^+EJ{pb5Xng_$zwRhu#17!G00JYLCHJVLxI80*C$eeAtu<*MS-CzGzdt}
zU|{(FpMjf!fq{{MiGiJggMkys<6+=s;A7wi%ke<vn8C7KSY_*(7+CN~GcmB@m1V<_
zWdT}>?l5Gl1(K6<3mB5pGV>A{ax(KwGD{eWa`KaN7%ISI9hhtZlU=!qMcE7!a#K?>
y8KxEGWTrFB0g;SM)1yu^DNZ*$!(_#6i17FHn$t|t+y<xup^S^Smz`m1vjhMWW>V?^

delta 413
zcmey+&GV<5XF>qa!qc|x3{0m47#OVIOpH0f;(MK~xmkm;U4xNvy9OiEyA$<{3`{c^
zm|fg_LKv<j79}Pzh~y-e<S|@fIKsf{804tHpyVCwp}^qa>l3NKkPz(WqQKA)8U!R4
zFfjc8&%ndLz`(@7%)r9H$-u?H4dnAO@G<Z+0Br=y@-hI82g|bJkO$chR=|cs0Zg8q
zfIJ6=JPXii5GTUSKzE{Ga-v&K2}4G5B9J_ioSa+0D3_L*m&mA*nU`6@sF#zUoWp1W
zCau7v1DJHnO)Sc0^vO+4$z%*F%E?S;jF|3mnn{sSXZpI+Owo+mAS#q`@$|IQOt##t
Q3?Qe0LuPx{8KyQ%0HLB%bN~PV

diff --git a/sources/contextuals.fea b/sources/contextuals.fea
index e73b1dd983..7c99aa8d9e 100644
--- a/sources/contextuals.fea
+++ b/sources/contextuals.fea
@@ -5,23 +5,23 @@ lookup SamallTashkil {
     sub @ShaddaTashkil by @ShaddaTashkil.small;
 } SamallTashkil;
 
-feature calt {
+feature rlig {
     sub [shadda-ar dotStopabove-ar] @ShaddaTashkil' lookup SamallTashkil;
     sub @ShaddaTashkil.small @ShaddaTashkil' lookup SamallTashkil;
     sub @ShaddaTashkil' lookup SamallTashkil @ShaddaTashkil' lookup SamallTashkil;
-} calt;
+} rlig;
 
 #ifdef QURAN
-feature calt {
+feature rlig {
     sub [dotvowelbelow-ar] [kasra-ar]' by [kasra-ar.small2];
-} calt;
+} rlig;
 
 #endif
 # replace tashkil following hamza by smaller alternates
-feature calt {
+feature rlig {
     sub [@AlefHamzaAbove hamzaabove-ar] [fatha-ar fatha-ar.small damma-ar sukun-ar]' by [fatha-ar.small2 fatha-ar.small2 damma-ar.small sukun-ar.small2];
     sub [@AlefHamzaBelow hamzabelow-ar] [kasra-ar]' by [kasra-ar.small2];
-} calt;
+} rlig;
 
 # replace hamza mark when following a heh by a glyph that has only a
 # HamzaAbove mark so it will be positioned correctly
@@ -33,11 +33,11 @@ lookup BaaInitWide {
     sub @aBaa.init by @aBaa.init.Wide;
 } BaaInitWide;
 
-feature calt {
+feature rlig {
     sub @aBaa.init' lookup BaaInitWide @Tashkil.above' [@aGaf.medi @aGaf.fina]';
     sub @aBaa.init' lookup BaaInitWide @Tashkil.above' @Tashkil.above' [@aGaf.medi @aGaf.fina]';
     sub @aBaa.init' lookup BaaInitWide @Tashkil.above' @Tashkil.above' @Tashkil.above' [@aGaf.medi @aGaf.fina]';
-} calt;
+} rlig;
 
 lookup AboveHaaInit {
     sub @aBaa.init by @aBaa.init.BaaHaaInit;
@@ -48,40 +48,40 @@ lookup AboveHaaInit {
     sub @aSen.init by @aSen.init.SenHaaInit;
 } AboveHaaInit;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aBaa.init @aHeh.init @aMem.init @aSad.init @aSen.init]' lookup AboveHaaInit [@aHaa.medi]' lookup AboveHaaInit;
-} calt;
+} rlig;
 
 lookup BaaRaaFina {
     sub @aBaa.medi by @aBaa.medi.BaaRaaFina;
     sub @aRaa.fina by @aRaa.fina.BaaRaaFina;
 } BaaRaaFina;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aBaa.medi]' lookup BaaRaaFina [@aRaa.fina]' lookup BaaRaaFina;
-} calt;
+} rlig;
 
 lookup BaaNonFina {
     sub @aBaa.medi by @aBaa.medi.BaaNonFina;
     sub @aNon.fina by @aNon.fina.BaaNonFina;
 } BaaNonFina;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aBaa.medi]' lookup BaaNonFina [@aNon.fina]' lookup BaaNonFina;
-} calt;
+} rlig;
 
 lookup BaaMemFina {
     sub @aBaa.medi by @aBaa.medi.BaaMemFina;
     sub @aMem.fina by @aMem.fina.BaaMemFina;
 } BaaMemFina;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aBaa.medi]' lookup BaaMemFina [@aMem.fina]' lookup BaaMemFina;
-} calt;
+} rlig;
 
 lookup KafBaaAlfIsol {
     sub @aBaa.medi by @aBaa.medi.KafBaaInit;
@@ -93,11 +93,11 @@ lookup KafBaaAlfFina {
     sub @aKaf.medi by @aKaf.medi.KafBaaMedi;
 } KafBaaAlfFina;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aKaf.init]' lookup KafBaaAlfIsol [@aBaa.medi]' lookup KafBaaAlfIsol [@aAlf.fina @aLam.medi @aLam.fina];
     sub [@aKaf.medi]' lookup KafBaaAlfFina [@aBaa.medi]' lookup KafBaaAlfFina [@aAlf.fina @aLam.medi @aLam.fina];
-} calt;
+} rlig;
 
 lookup BaaBaa {
     sub @aBaa.medi by @aBaa.medi.BaaBaaInit;
@@ -110,7 +110,7 @@ lookup HighBaa {
     sub @aBaa.medi by @aBaa.medi.High;
 } HighBaa;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     # hack to prevent double high baa in سببس and likes
     sub [@aSen.init @aSen.medi]' [@aBaa.medi]' [@aBaa.medi]' lookup HighBaa [@aSen.medi @aSen.fina]';
@@ -119,7 +119,7 @@ feature calt {
     sub [@aBaa.medi @aSad.init @aSad.medi @aSen.init @aSen.medi @aBaa.medi.BaaBaaInit] [@aBaa.medi]' lookup HighBaa [@aBaa.fina @aBaa.medi @aSen.fina @aBaa.medi.BaaHehMedi @aSen.medi @aSen.medi.PreYaa];
     sub [@aBaa.medi]' lookup HighBaa [@aSen.fina @aSen.medi @aSen.medi.PreYaa];
     sub [@aBaa.init]' lookup HighBaa [@aBaa.medi]' lookup HighBaa [@aBaa.medi @aBaa.fina @aSen.medi @aSen.fina];
-} calt;
+} rlig;
 
 lookup BaaHeh {
     sub @aBaa.init by @aBaa.init.BaaHehInit;
@@ -128,7 +128,7 @@ lookup BaaHeh {
     sub @aHeh.medi by @aHeh.medi.BaaHehMedi;
 } BaaHeh;
 
-feature calt {
+feature rlig {
     #ifdef QURAN
     # https://github.com/aliftype/quran-data/issues/1
     lookupflag UseMarkFilteringSet [alefabove-ar];
@@ -136,27 +136,27 @@ feature calt {
     lookupflag IgnoreMarks;
     #endif
     sub [@aBaa.init @aBaa.medi @aMem.init.dots]' lookup BaaHeh [@aHeh.medi]' lookup BaaHeh;
-} calt;
+} rlig;
 
 lookup BaaBaaHeh {
     sub @aBaa.init by @aBaa.init.BaaBaaHeh;
 } BaaBaaHeh;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub @aBaa.init' lookup BaaBaaHeh @aBaa.medi.BaaHehMedi;
-} calt;
+} rlig;
 
 lookup LamAlfFina {
     sub @aAlf.fina by @aAlf.fina.LamAlfFina;
     sub @aLam.medi by @aLam.medi.LamAlfFina;
 } LamAlfFina;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aLam.medi]' lookup LamAlfFina [@aAlf.fina]' lookup LamAlfFina;
     sub [@aLam.medi]' lookup LamAlfFina hamza-ar.float' [@aAlf.fina]' lookup LamAlfFina;
-} calt;
+} rlig;
 
 lookup KafLamHeh {
     sub @aLam.medi by @aLam.medi.KafLamHehIsol;
@@ -512,7 +512,7 @@ lookup LamMemFinaExtended {
     sub @aMem.fina by @aMem.fina.LamMemFinaExtended;
 } LamMemFinaExtended;
 
-feature calt {
+feature rlig {
     sub @aLam.medi' lookup LamMemFina @Tashkil.above' @aMem.fina' lookup LamMemFinaExtended @Tashkil.above';
     sub @aLam.medi' lookup LamMemFina @Tashkil.above' @Tashkil.above' @aMem.fina' lookup LamMemFinaExtended @Tashkil.above';
     sub @aLam.medi' lookup LamMemFina @Tashkil.above' @Tashkil.above' @aMem.fina' lookup LamMemFinaExtended @Tashkil.above' @Tashkil.above';
@@ -520,14 +520,14 @@ feature calt {
     sub @aLam.medi' lookup LamMemFina @Tashkil.below' @Tashkil.above' @aMem.fina' lookup LamMemFinaExtended @Tashkil.above';
     sub @aLam.medi' lookup LamMemFina @Tashkil.above' @Tashkil.below' @aMem.fina' lookup LamMemFinaExtended @Tashkil.above';
     sub @aLam.medi' lookup LamMemFina @Tashkil.below' @aMem.fina' lookup LamMemFinaExtended @Tashkil.below';
-} calt;
+} rlig;
 
 # ditto
 lookup MemExtended {
     sub @aMem.fina by @aMem.fina.KafMemIsolExtended;
 } MemExtended;
 
-feature calt {
+feature rlig {
     sub [@aLam.init @aKaf.init]' lookup KafMemIsol @Tashkil.above' @aMem.fina' lookup MemExtended @Tashkil.above';
     sub [@aLam.init @aKaf.init]' lookup KafMemIsol @Tashkil.above' @Tashkil.above' @aMem.fina' lookup MemExtended @Tashkil.above';
     sub [@aLam.init @aKaf.init]' lookup KafMemIsol @Tashkil.above' @Tashkil.above' @aMem.fina' lookup MemExtended @Tashkil.above' @Tashkil.above';
@@ -535,7 +535,7 @@ feature calt {
     sub [@aLam.init @aKaf.init]' lookup KafMemIsol @Tashkil.below' @Tashkil.above' @aMem.fina' lookup MemExtended @Tashkil.above';
     sub [@aLam.init @aKaf.init]' lookup KafMemIsol @Tashkil.above' @Tashkil.below' @aMem.fina' lookup MemExtended @Tashkil.above';
     sub [@aLam.init @aKaf.init]' lookup KafMemIsol @Tashkil.below' @aMem.fina' lookup MemExtended @Tashkil.below';
-} calt;
+} rlig;
 
 #ditto, but we don't have LamMemInit in Quran font
 #ifndef QURAN
@@ -543,7 +543,7 @@ lookup LamMemInitTatweel {
     sub @aMem.medi by @aMem.medi.LamMemInitTatweel;
 } LamMemInitTatweel;
 
-feature calt {
+feature rlig {
     sub @aLam.init' lookup LamMemInit @Tashkil.above' @aMem.medi' lookup LamMemInitTatweel @Tashkil.above';
     sub @aLam.init' lookup LamMemInit @Tashkil.above' @Tashkil.above' @aMem.medi' lookup LamMemInitTatweel @Tashkil.above';
     sub @aLam.init' lookup LamMemInit @Tashkil.above' @Tashkil.above' @aMem.medi' lookup LamMemInitTatweel @Tashkil.above' @Tashkil.above';
@@ -551,7 +551,7 @@ feature calt {
     sub @aLam.init' lookup LamMemInit @Tashkil.below' @Tashkil.above' @aMem.medi' lookup LamMemInitTatweel @Tashkil.above';
     sub @aLam.init' lookup LamMemInit @Tashkil.above' @Tashkil.below' @aMem.medi' lookup LamMemInitTatweel @Tashkil.above';
     sub @aLam.init' lookup LamMemInit @Tashkil.below' @aMem.medi' lookup LamMemInitTatweel @Tashkil.below';
-} calt;
+} rlig;
 
 #endif
 # ditto
@@ -559,7 +559,7 @@ lookup KafMemFinaExtended {
     sub @aMem.fina by @aMem.fina.KafMemFinaExtended;
 } KafMemFinaExtended;
 
-feature calt {
+feature rlig {
     sub @aKaf.medi' lookup KafMemFina @Tashkil.above' @aMem.fina' lookup KafMemFinaExtended @Tashkil.above';
     sub @aKaf.medi' lookup KafMemFina @Tashkil.above' @Tashkil.above' @aMem.fina' lookup KafMemFinaExtended @Tashkil.above';
     sub @aKaf.medi' lookup KafMemFina @Tashkil.above' @Tashkil.above' @aMem.fina' lookup KafMemFinaExtended @Tashkil.above' @Tashkil.above';
@@ -567,14 +567,14 @@ feature calt {
     sub @aKaf.medi' lookup KafMemFina @Tashkil.below' @Tashkil.above' @aMem.fina' lookup KafMemFinaExtended @Tashkil.above;
     sub @aKaf.medi' lookup KafMemFina @Tashkil.above' @Tashkil.below' @aMem.fina' lookup KafMemFinaExtended @Tashkil.above';
     sub @aKaf.medi' lookup KafMemFina @Tashkil.below' @aMem.fina' lookup KafMemFinaExtended @Tashkil.below';
-} calt;
+} rlig;
 
 # No IgnoreMarks here, to narrow to carry vowels
-feature calt {
+feature rlig {
     sub [@aBaa.init]' lookup BaaMemHaaInit [@aMem.medi]' lookup BaaMemHaaInit [@aHaa.medi]' lookup BaaMemHaaInit;
-} calt;
+} rlig;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aKaf.init @aKaf.medi]' lookup KafLam [@aLam.medi]' lookup KafLamHeh [@aHeh.fina @aDal.fina]' lookup LamHehIsol;
     sub [@aKaf.init @aKaf.medi]' lookup KafMemAlf [@aMem.medi]' lookup KafMemAlf [@aLam.medi @aLam.fina @aAlf.fina]' lookup KafMemAlf;
@@ -639,12 +639,12 @@ feature calt {
     sub [@aAyn.init @aBaa.init @aHaa.init @aHeh.init @aMem.init @aSad.init @aSen.init]' lookup AboveHaaIsol [@aHaa.fina]' lookup AboveHaaIsol;
     sub [@aFaa.init @aLam.init @aKaf.init]' lookup AboveHaaIsol [@aHaa.medi @aHaa.fina]' lookup AboveHaaIsol2;
     sub [@aSen.init @aSad.init @aSen.medi @aSad.medi]' lookup SenYaaFina [@aYaa.fina @aRaa.fina]' lookup SenYaaFina;
-} calt;
+} rlig;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aKaf.init @aKaf.medi]' @aHeh.medi by [@aKaf.init.PreHeh @aKaf.medi.PreHeh];
-} calt;
+} rlig;
 
 lookup ToothYaaBari {
     sub @aSen.init by @aSen.init.YaaBari;
@@ -652,10 +652,10 @@ lookup ToothYaaBari {
     sub @aYaaBari.fina by @aYaaBari.fina.PostTooth;
 } ToothYaaBari;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aSen.init @aSad.init]' lookup ToothYaaBari [@aYaaBari.fina]' lookup ToothYaaBari;
-} calt;
+} rlig;
 
 lookup ToothYaaBariFina {
     sub @aBaa.medi by @aBaa.medi.YaaBari;
@@ -665,12 +665,12 @@ lookup ToothYaaBariFina {
     sub @aYaaBari.fina by @aYaaBari.fina.PostToothFina;
 } ToothYaaBariFina;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aHaa.init.DotBelow]' lookup ToothYaaBariFina [@aBaa.medi]' lookup ToothYaaBariFina [@aYaaBari.fina]' lookup ToothYaaBariFina;
     sub [@aBaa.medi]' lookup ToothYaaBariFina [@aYaaBari.fina]' lookup ToothYaaBariFina;
     sub [@aBaa.init.BaaBaaIsol]' lookup ToothYaaBariFina [@aBaa.medi.BaaBaaInit]' lookup ToothYaaBariFina [@aYaaBari.fina]' lookup ToothYaaBariFina;
-} calt;
+} rlig;
 
 lookup AscenderYaaBari {
     sub @aBaa.init by @aBaa.init.YaaBari;
@@ -680,10 +680,10 @@ lookup AscenderYaaBari {
     sub @aYaaBari.fina by @aYaaBari.fina.PostAscender;
 } AscenderYaaBari;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aBaa.init @aFaa.init @aLam.init @aKaf.init]' lookup AscenderYaaBari [@aYaaBari.fina]' lookup AscenderYaaBari;
-} calt;
+} rlig;
 
 lookup AynYaaBari {
     sub @aHaa.init by @aHaa.init.YaaBari;
@@ -695,10 +695,10 @@ lookup AynYaaBari {
     sub @aYaaBari.fina by @aYaaBari.fina.PostAyn;
 } AynYaaBari;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aHaa.init @aHeh.init @aAyn.init @aTaa.init @aMem.init.dots hehDoachashmee-ar.init]' lookup AynYaaBari @aYaaBari.fina' lookup AynYaaBari;
-} calt;
+} rlig;
 
 # default Faa.init+Mem.medi ligature is too narrow leading to mark clash of
 # both glyphs have marks above or both have marks bellow at the same time. So
@@ -708,7 +708,7 @@ lookup FaaMemTatweel {
     sub @aMem.medi by @aMem.medi.KafMemMediTatweel;
 } FaaMemTatweel;
 
-feature calt {
+feature rlig {
     sub @aFaa.init' lookup KafMemInit @Tashkil.above' @aMem.medi' lookup FaaMemTatweel @Tashkil.above';
     sub @aFaa.init' lookup KafMemInit @Tashkil.above' @Tashkil.above' @aMem.medi' lookup FaaMemTatweel @Tashkil.above';
     sub @aFaa.init' lookup KafMemInit @Tashkil.above' @Tashkil.above' @aMem.medi' lookup FaaMemTatweel @Tashkil.above' @Tashkil.above';
@@ -716,18 +716,18 @@ feature calt {
     sub @aFaa.init' lookup KafMemInit @Tashkil.below' @Tashkil.above' @aMem.medi' lookup FaaMemTatweel @Tashkil.above';
     sub @aFaa.init' lookup KafMemInit @Tashkil.above' @Tashkil.below' @aMem.medi' lookup FaaMemTatweel @Tashkil.above';
     sub @aFaa.init' lookup KafMemInit @Tashkil.below' @aMem.medi' lookup FaaMemTatweel @Tashkil.below';
-} calt;
+} rlig;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aKaf.init @aKaf.medi @aAyn.init @aFaa.init @aHaa.init @aHeh.init]' lookup KafMemInit [@aMem.medi]' lookup KafMemInit;
-} calt;
+} rlig;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aLam.init]' lookup LamLamInit [@LamLamFoo @aLam.medi @aKaf.fina @aLam.fina @aLam.medi.LamAlfFina]' lookup LamLamInit;
     sub [@aLam.medi]' lookup LamLamMedi2 [@LamLamFoo @aLam.medi @aKaf.fina @aLam.fina @aLam.medi.LamAlfFina]' lookup LamLamMedi;
-} calt;
+} rlig;
 
 lookup HehMediTooth {
     sub @aHeh.medi by @aHeh.medi.PostTooth;
@@ -737,41 +737,41 @@ lookup HehMediTooth {
     sub @aSen.medi by @aSen.medi.PreYaa;
 } HehMediTooth;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aSad.init @aSad.medi @aSen.init @aSen.medi]' lookup HehMediTooth [@aHeh.medi]' lookup HehMediTooth;
-} calt;
+} rlig;
 
 # replace final alef followed by madda by a wider one
-feature calt {
+feature rlig {
     sub @Tashkil.above [alef-ar.fina]' [madda-ar maddalong-ar] by [alef-ar.fina.Wide];
-} calt;
+} rlig;
 
 # Wider alef wasl and alef with hamza above after faa
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub @aFaa.init [alefWasla-ar.fina alefHamzaabove-ar.fina]' by [alefWasla-ar.fina.Wide alefHamzaabove-ar.fina.Wide];
-} calt;
+} rlig;
 
 # If there are no marks, revert the above substitution
-feature calt {
+feature rlig {
     sub @aFaa.init [alefWasla-ar.fina.Wide alefHamzaabove-ar.fina.Wide]' by [alefWasla-ar.fina alefHamzaabove-ar.fina];
-} calt;
+} rlig;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aAyn.init @aHaa.init @aHaa.medi]' [@aAlf.fina @aDal.fina @aHeh.fina @aLam.fina @aLam.medi @aLam.medi.LamMemFina @aLam.medi.LamWawFina @aLam.medi.LamHeh @aLam.medi.LamYaaFina @aKaf.fina @aLam.medi.LamQafFina @aBaa.medi.BaaRaaFina @aLam.medi.LamAlfFina @aLam.medi.LamMemMedi @aLam.medi.LamLamMedi @aBaa.medi.BaaNonFina @aBaa.medi.High @aKaf.medi @aKaf.medi.KafMemAlf @aKaf.medi.KafMemMedi @aKaf.medi.KafMemFina @aKaf.medi.KafLam @aKaf.medi.KafHeh @aKaf.medi.KafBaaMedi @aKaf.medi.KafRaaFina @aKaf.medi.KafYaaFina @aKaf.medi.PreHeh] by [@aAyn.init.Finjani @aHaa.init.Finjani @aHaa.medi.Finjani];
-} calt;
+} rlig;
 
 lookup BaaYaaFina {
     sub @aBaa.medi by @aBaa.medi.BaaYaaFina;
     sub @aYaa.fina by @aYaa.fina.BaaYaaFina;
 } BaaYaaFina;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aBaa.medi]' lookup BaaYaaFina [@aYaa.fina]' lookup BaaYaaFina;
-} calt;
+} rlig;
 
 lookup ToothMem {
     sub @aMem.fina by @aMem.fina.PostTooth;
@@ -781,19 +781,19 @@ lookup ToothMem {
     sub @aSen.medi by @aSen.medi.PreYaa;
 } ToothMem;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aSen.init @aSen.medi @aSad.init @aSad.medi]' lookup ToothMem [@aMem.fina]' lookup ToothMem;
-} calt;
+} rlig;
 
 lookup KafLamYaa {
     sub @aLam.medi.KafLam by @aLam.medi.KafLamYaa;
 } KafLamYaa;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aLam.medi.KafLam]' lookup KafLamYaa [@aYaa.fina]' lookup LamYaaFina;
-} calt;
+} rlig;
 
 @LamKafInit = [@aLam.init @aLam.medi @aLam.medi.KafLam @aLam.medi.KafMemLam @aLam.medi.LamLamInit];
 lookup LamKafInit {
@@ -801,17 +801,17 @@ lookup LamKafInit {
     sub @aMem.medi.LamMemInit by @aMem.medi.LamMemInitTatweel;
 } LamKafInit;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@LamKafInit @aMem.medi.LamMemInit]' lookup LamKafInit [@aKaf.medi @aKaf.medi.KafHeh @aKaf.medi.KafMemFina @aKaf.medi.KafRaaFina @aKaf.medi.KafYaaFina @aKaf.medi.KafMemAlf @aKaf.medi.PreHeh @aGaf.fina];
-} calt;
+} rlig;
 
 #ifdef QURAN
 # alef lam meem raa (with madda)
 # we don't get plain aLam.init aMem.fina except in Quran font
-feature calt {
+feature rlig {
     sub @aLam.init' lookup LamKafInit [madda-ar maddalong-ar] @aMem.medi [madda-ar maddalong-ar];
-} calt;
+} rlig;
 
 #endif
 lookup HehYaaFina {
@@ -819,25 +819,25 @@ lookup HehYaaFina {
     sub @aHeh.medi.PostTooth by @aHeh.medi.PostToothHehYaa;
 } HehYaaFina;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aHeh.medi.PostTooth @aHeh.medi.BaaHehMedi]' lookup HehYaaFina [@aYaa.fina]' lookup BaaYaaFina;
-} calt;
+} rlig;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub @RaaWaw [alefHamzabelow-ar alefWavyhamzabelow-ar]' by @aAlf.isol.LowHamza;
-} calt;
+} rlig;
 
 # insert tatweel between ح and ك in فحك[ملير]
 lookup FaaHaaKaf {
     sub @aHaa.medi.FaaHaaInit by @aHaa.medi.FaaHaaInit kashida-ar.1;
 } FaaHaaKaf;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub @aFaa.init.FaaHaaInit @aHaa.medi.FaaHaaInit' lookup FaaHaaKaf [@aKaf.medi.KafHeh @aKaf.medi.KafMemFina @aKaf.medi.KafRaaFina @aKaf.medi.KafYaaFina @aKaf.medi.PreHeh];
-} calt;
+} rlig;
 
 # insert tatweel between ح and ت in [بمسصف]حت[رن]
 lookup AboveHaaTatweel {
@@ -845,27 +845,27 @@ lookup AboveHaaTatweel {
     sub @aHaa.medi.SadHaaInit by @aHaa.medi.SadHaaInit kashida-ar.05;
 } AboveHaaTatweel;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aHaa.medi.FaaHaaInit @aHaa.medi.SadHaaInit]' lookup AboveHaaTatweel [@aBaa.medi.BaaNonFina @aBaa.medi.BaaRaaFina];
-} calt;
+} rlig;
 
 # When an initial Baa is followed by Alef, the dot clashes with the Hamza below
 # Alef, Also the marks above the Baa clash with the Alef, so we replace the Baa
 # with a wider variant.
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub @aBaa.init' lookup BaaInitWide @aAlf.fina;
-} calt;
+} rlig;
 
 # If the Alef has no Hamza below, or there is no marks above the Baa, revert to
 # the original, non-wide form (notice there is no IgnoreMarks flag).
-feature calt {
+feature rlig {
     sub [@aBaa.init.Wide]' [alefMadda-ar.fina alefHamzaabove-ar.fina alef-ar.fina alefWasla-ar.fina alefWavyhamzaabove-ar.fina alefTwoabove-ar.fina alefThreeabove-ar.fina] by [@aBaa.init];
-} calt;
+} rlig;
 
 # XXX: use a different glyph for PDF text extraction
-feature calt {
+feature rlig {
     script arab;
     language ARA;
     lookupflag IgnoreMarks;
@@ -875,7 +875,7 @@ feature calt {
     sub teh-ar.init.High' [teh-ar.medi.High theh-ar.medi.High] by tteheh-ar.init.High;
     # Ditto for يبين and co.
     sub [beh-ar.medi.BaaBaaInit yeh-ar.medi.BaaBaaInit] [yeh-ar.medi.BaaNonFina yeh-ar.medi.BaaRaaFina]' by [e-ar.medi.BaaNonFina e-ar.medi.BaaRaaFina];
-} calt;
+} rlig;
 
 # Insert kashida between final ع and the kasra below the preceding letter
 # see https://github.com/aliftype/quran-data/issues/4
@@ -895,7 +895,7 @@ lookup KasraHaaFina {
     sub meembelow-ar by meembelow-ar kashida-ar.2;
 } KasraHaaFina;
 
-feature calt {
+feature rlig {
     sub @Tashkil.below' lookup KasraAynFina @aAyn.fina;
     sub @Tashkil.below' lookup KasraHaaFina @aHaa.fina;
-} calt;
+} rlig;
diff --git a/sources/enclosing.fea b/sources/enclosing.fea
index b26e7fedbd..fcb5197d1c 100644
--- a/sources/enclosing.fea
+++ b/sources/enclosing.fea
@@ -21,7 +21,7 @@ lookup Sign4 {
 
 # first we replace any sequence of digits (up to two, three or four places)
 # following a subtending sign by smaller alternates
-feature calt {
+feature rlig {
     sub [endofayah-ar]                                            @Digits' lookup digit2small @Digits' lookup digit2small @Digits' lookup digit2small;
     sub [endofayah-ar footnotemarker-ar]                          @Digits' lookup digit2small @Digits' lookup digit2small;
     sub [endofayah-ar footnotemarker-ar]                          @Digits' lookup digit2small;
@@ -30,7 +30,7 @@ feature calt {
     sub [number-ar year-ar pagenumber-ar samvat-ar]' lookup Sign3 @Digits' lookup digit2medi  @Digits' lookup digit2medi  @Digits' lookup digit2medi;
     sub [number-ar year-ar pagenumber-ar samvat-ar]               @Digits' lookup digit2medi  @Digits' lookup digit2medi;
     sub [number-ar year-ar pagenumber-ar samvat-ar]               @Digits' lookup digit2medi;
-} calt;
+} rlig;
 
 # Then we contextually kern the sign with the digits so that they get enclosed by it
 #
diff --git a/sources/lellah.fea b/sources/lellah.fea
index 693096e304..e623a82b56 100644
--- a/sources/lellah.fea
+++ b/sources/lellah.fea
@@ -5,7 +5,7 @@
 # including Tashkil marks that can't but be the name of Allah and ignore the
 # special form for any other occurrences, but this is far from being simple.
 #
-# The first calt substitutes any [<Alef>]<Lam><Lam><Heh> preceded by a letter
+# The first feature substitutes any [<Alef>]<Lam><Lam><Heh> preceded by a letter
 # that is known not to be part of any of the allowed words by a regular non
 # special form.  The next block will then substitute the allowed context, given
 # it meets a certain criteria.
@@ -40,13 +40,13 @@ lookup LamMediLellah {
 # This a stripped down version of the above for use in Amiri Quran,
 # because here we can safely assume the [<Faa>]<Lam><Lam><Heh> sequence always
 # mean the name of Allah.
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     # لله
     sub lam-ar.init' lookup LamInitLellah lam-ar.medi' lookup LamMediLellah @Hf' lookup HehFinaLellah;
     # فلله
     sub [feh-ar.init]' lam-ar.medi' lookup LamMediFaLellah lam-ar.medi' lookup LamMediLellah @Hf' lookup HehFinaLellah;
-} calt;
+} rlig;
 
 #else
 lookup LamLamInitX {
@@ -58,7 +58,7 @@ lookup LamLamInitX {
 @aBaa_init = [beh-ar.init teh-ar.init];
 @aBaa_medi = [beh-ar.medi teh-ar.medi];
 @Ignore = [@aAyn.fina @aAyn.isol @aAlf.isol @aAlf.fina @aBaa.fina @aBaa.isol @aDal.fina @aDal.isol @aFaa.fina @aFaa.isol @aHaa.fina @aHaa.isol @aHeh.fina @aHeh.isol @aKaf.fina @aKaf.isol @aLam.fina @aLam.isol @aMem.fina @aMem.isol @aNon.fina @aNon.isol @aQaf.fina @aQaf.isol @aRaa.fina @aRaa.isol @aSad.fina @aSad.isol @aSen.fina @aSen.isol @aTaa.fina @aTaa.isol @aWaw.fina @aWaw.isol @aYaa.fina @aYaa.isol];
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     # Allow الله/ولله/ـالله
     ignore sub [@Ai @Af waw-ar] lam-ar.init' lam-ar.medi' @Hf;
@@ -76,9 +76,9 @@ feature calt {
     ignore sub [@aBaa_init kaf-ar.init feh-ar.init] @Af' lam-ar.init' lam-ar.medi' @Hf;
     # Supress any remaining *ـالله
     sub @Af' lam-ar.init' lookup LamLamInitX lam-ar.medi' lookup LamLamInitX @Hf;
-} calt;
+} rlig;
 
-feature calt {
+feature rlig {
     # لله
     sub lam-ar.init' lookup LamInitLellah lam-ar.medi' lookup LamMediLellah @Hf' lookup HehFinaLellah;
     sub lam-ar.init' lookup LamInitLellah lam-ar.medi' lookup LamMediLellah shadda-ar' @Hf' lookup HehFinaLellah;
@@ -117,12 +117,12 @@ feature calt {
     sub feh-ar.init' fatha-ar' lam-ar.medi' lookup LamMediFaLellah kasra-ar' lam-ar.medi' lookup LamMediLellah @Hf' lookup HehFinaLellah;
     sub feh-ar.init' fatha-ar' lam-ar.medi' lookup LamMediFaLellah kasra-ar' lam-ar.medi' lookup LamMediLellah shadda-ar' @Hf' lookup HehFinaLellah;
     sub feh-ar.init' fatha-ar' lam-ar.medi' lookup LamMediFaLellah kasra-ar' lam-ar.medi' lookup LamMediLellah shadda-ar' @xF' @Hf' lookup HehFinaLellah;
-} calt;
+} rlig;
 
 # Now put shadda+dagger alef above the medial lam if there are no marks on it.
-feature calt {
+feature rlig {
     sub lam-ar.medi.Lellah' heh-ar.fina.Lellah by lam-ar.medi.Lellah2;
-} calt;
+} rlig;
 
 # This stylistic set removes them.
 feature ss06 {
diff --git a/sources/quran.fea b/sources/quran.fea
index 54e887f609..079cd801a4 100644
--- a/sources/quran.fea
+++ b/sources/quran.fea
@@ -71,7 +71,7 @@ lookup LamAlefFina {
     sub alef-ar by alef-ar.fina.LamAlfFina;
 } LamAlefFina;
 
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     # hamza between lam and alef needs special treatment as it should not have
     # a connecting stroke to avoid breaking lam-alef.
@@ -79,7 +79,7 @@ feature calt {
     sub lam-ar.fina' lookup LamAlefFina hamza-ar' lookup FloatingHamza alef-ar' lookup LamAlefFina;
     # Medial hamza.
     sub @before' lookup Before hamza-ar' lookup MedialHamza @after' lookup After;
-} calt;
+} rlig;
 
 # This is the Unicode-sanctioned way of lam-alef with medial hamza.
 feature ccmp {
@@ -106,18 +106,18 @@ lookup hamzakasra {
     sub wawHamzaabove-ar by waw-ar hamzabelow-ar;
 } hamzakasra;
 
-feature calt {
+feature rlig {
     # lookupflag IgnoreMarks;
     sub [yehHamzaabove-ar yehHamzaabove-ar.init yehHamzaabove-ar.medi yehHamzaabove-ar.fina wawHamzaabove-ar wawHamzaabove-ar.fina]' lookup hamzakasra [kasra-ar kasratan-ar openkasratan-ar];
-} calt;
+} rlig;
 
 #endif
 # small waw after isolated/final heh is lower than usual, so we use an
 # alternate glyph for that
-feature calt {
+feature rlig {
     lookupflag IgnoreMarks;
     sub [@aHeh.isol @aHeh.fina] [wawSmall-ar]' by [wawSmall-ar.low];
-} calt;
+} rlig;
 
 # some glyphs need more room to accommodate madda mark, so we change the advance
 # width on fly.