From 0e63cbed9cceb1d0238974ddfa9bc68d25d9c616 Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaledhosny@eglug.org>
Date: Wed, 1 Nov 2017 20:49:42 +0200
Subject: [PATCH] [test] Fix difference between ft and ot font funcs

See https://github.com/behdad/harfbuzz/pull/590#issuecomment-341194673.

I simply removed the composite glyph and use the referenced simple
glyph directly.
---
 .../4fac3929fc3332834e93673780ec0fe94342d193.ttf  | Bin 0 -> 804 bytes
 .../6466d38c62e73a39202435a4f73bf5d6acbb73c0.ttf  | Bin 824 -> 0 bytes
 test/shaping/tests/cluster.tests                  |   2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 test/shaping/fonts/sha1sum/4fac3929fc3332834e93673780ec0fe94342d193.ttf
 delete mode 100644 test/shaping/fonts/sha1sum/6466d38c62e73a39202435a4f73bf5d6acbb73c0.ttf

diff --git a/test/shaping/fonts/sha1sum/4fac3929fc3332834e93673780ec0fe94342d193.ttf b/test/shaping/fonts/sha1sum/4fac3929fc3332834e93673780ec0fe94342d193.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..0f691e1da700208fbe21b1e5ee2d30610fd084f8
GIT binary patch
literal 804
zcmZuvO-NKx7(MsC`<&;DR)qOO;NPSWEk<Xi!O%%v83s+{MsQJ2of#!Zr~GN8j9Lg4
z32usTQQHYxM1;6-V}ctQVipyxY7w=KFvxP=>)e@vHr=0hzjN;Qo%?<FJ_rCl+<}3P
z*iaz2-}3k(AiBt28B5t|JTzVqXNh}~_G}s+b{O@<RmrKvglF&8BKN-&?@Yw)@jv&5
z9?{<9j7*TI?sd=8-s3zmk($d?Z^#k)KOsIcH8W=8E~3O=h`lL0lZF=!#9F_3+D^rd
ztG-i!+#o)io|&C<Cy^ljrT3w87gae=TR3$2aL-TpEE2%hTKI=v-#6{VKuTpR?h{r*
zYL<<0)=GgjsT{0>yvi1pN_(ZRDl!W7<rsa^zh=->YD28T1k5!vM9HSoYUGiSu%z^v
zQkhCh^%>IbL&jyyNi8uDiw&R;!-lt%gS8@uS<16dA1FF#uG6KN>N#wwm#|bf+Nho)
zEBHn_k18m1aJATVMZ?G#URUdvE%&+m;9$S#OS0S=dCz0CMd?O(jt^+@3&9c6LuK>M
zl5=BQe09#`L_$oyaeCy<!m|7=Hw)V`S~$m8=A!D<ppGqv>3F|*<t*pKaZ$hPEQ{5g
z^Ulfd%1+tfjEbj)Z-uvF-5G=wDfQ6^@GX3(V|-18zqS2zI1&ohdcy7g){0{_wV`0d
z2rMO%nM^W%`&xfzu)n)2)N8(uFU*gR&M(-JXf(oEtVyC#--xPYUPsB4Y>7ie7chf4
k&Snh3#x!Pe32`Jbk168oMem}Bo6!H$e;c2XPv^q;3qX;aPXGV_

literal 0
HcmV?d00001

diff --git a/test/shaping/fonts/sha1sum/6466d38c62e73a39202435a4f73bf5d6acbb73c0.ttf b/test/shaping/fonts/sha1sum/6466d38c62e73a39202435a4f73bf5d6acbb73c0.ttf
deleted file mode 100644
index 33c4229cb1c324ac04f98f158bd645a8b1686a66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 824
zcmZvaO-NKx7>3_-?!7wB3>M-~5!mFU5C!Ut4TVlAEexRq4RV)vbY_$so${v%F>)bc
zG$7VW!nO)Qe<CehWVXtN7%0j`6oIv97X&hP@9jN0o1$~>`FXy3-t&FmIR^rO2REUi
zuD!E1u=V=x89>(2+TD{dlSpe1$us1pxH+6eAuF_FWN&=ndaUfptxue<uzl={n!Q`E
z%sYU1K@RoNQ2a=4Qtu@n?n{iMN-m0V{@)^(4h;2}n8YG^iR?|7sU#w5F7A<igJvSC
zUG^NM{tfw5a%gzO=|_zI)qXw*xBz{@SY`$|<QIZpP<{GB)}FAht%+~;$&84J{+D)>
z9Ji)qPOeyMGHjitwwl@sy-jKJGNt#6r}k7v91#1~?I|&nvESR-by+X>+YvEueYf6<
zWxEYhB=ilfwqTm-3hGM>{8cr_8$!WAd0|71zp9|Dv^*FHX|)rvcq$c--ni0IA82Vj
z5j<@yMaM>aBco$xC>##4IgaDgH}JJ!dT${#>lrgscVdVRTtGLB9iky$v^-ZLj2;Z^
zknm<UOLFHf?P>Z2508Xpb*|y38nZv%-QP}IS@*0fLM(z*R%V{Ts{R-*y%E*=yhs3!
zI#0OL)&k&O-cIKx-LwDrW>nDi=VFE<j5#C7P!H~oS{5-0my{ku>V__*{sq!$M#`bH
zBg$iIdwVOI>Brjj;Y!Ocx_t2Y1EXo<9fCKivlo1e>IA$b^$uOED(WtzG`FMn%g>xe
z=l1X1UolElDz#ojYYA8G&LxUT=P`s4HXk}+Vi3dVKooI|@)S*6-C50!5ysRT`)^^2
IOv{1x2THxLKmY&$

diff --git a/test/shaping/tests/cluster.tests b/test/shaping/tests/cluster.tests
index 24f04ddf1..29580bfd3 100644
--- a/test/shaping/tests/cluster.tests
+++ b/test/shaping/tests/cluster.tests
@@ -1,2 +1,2 @@
-fonts/sha1sum/6466d38c62e73a39202435a4f73bf5d6acbb73c0.ttf:--cluster-level=2:U+0078,U+030A,U+0058,U+030A:[gid2=0+1083|gid4=1@-555,-8+0|gid1=2+1200|gid4=3@-614,349+0]
+fonts/sha1sum/4fac3929fc3332834e93673780ec0fe94342d193.ttf:--cluster-level=2:U+0078,U+030A,U+0058,U+030A:[gid2=0+1083|gid3=1@-1131,-8+0|gid1=2+1200|gid3=3@-1190,349+0]
 fonts/sha1sum/43ef465752be9af900745f72fe29cb853a1401a5.ttf:--cluster-level=1:U+05D4,U+05B7,U+05E9,U+05BC,U+05C1,U+05B8,U+05DE,U+05B4,U+05DD:[uni05DD=8+1359|uni05B4=7@111,0+0|uni05DE=6+1391|uni05B8=5+0|uni05BC=3+0|uni05C1=3+0|uni05E9=2+1451|uni05B7=1@28,0+0|uni05D4=0+1338]