From 2164bd6f29df265acdc04b84f5f94cf63b2cea8a Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Fri, 16 Aug 2019 00:28:41 +0200 Subject: [PATCH] [ot-shape] Enable dist feature by default (#1908) Fixes https://github.com/harfbuzz/harfbuzz/issues/1907 --- src/hb-ot-shape-complex-indic.cc | 2 -- src/hb-ot-shape-complex-khmer.cc | 2 -- src/hb-ot-shape-complex-myanmar.cc | 1 - src/hb-ot-shape-complex-use.cc | 1 - src/hb-ot-shape.cc | 1 + test/shaping/data/in-house/Makefile.sources | 1 + .../53a91c20e33a596f2be17fb68b382d6b7eb85d5c.ttf | Bin 0 -> 2020 bytes test/shaping/data/in-house/tests/dist.tests | 1 + 8 files changed, 3 insertions(+), 6 deletions(-) create mode 100644 test/shaping/data/in-house/fonts/53a91c20e33a596f2be17fb68b382d6b7eb85d5c.ttf create mode 100644 test/shaping/data/in-house/tests/dist.tests diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc index fd099cac7..7c9205a81 100644 --- a/src/hb-ot-shape-complex-indic.cc +++ b/src/hb-ot-shape-complex-indic.cc @@ -135,7 +135,6 @@ indic_features[] = * Positioning features. * We don't care about the types. */ - {HB_TAG('d','i','s','t'), F_GLOBAL}, {HB_TAG('a','b','v','m'), F_GLOBAL}, {HB_TAG('b','l','w','m'), F_GLOBAL}, }; @@ -163,7 +162,6 @@ enum { _INDIC_PSTS, _INDIC_HALN, - _INDIC_DIST, _INDIC_ABVM, _INDIC_BLWM, diff --git a/src/hb-ot-shape-complex-khmer.cc b/src/hb-ot-shape-complex-khmer.cc index b1fa0156a..73921ed9b 100644 --- a/src/hb-ot-shape-complex-khmer.cc +++ b/src/hb-ot-shape-complex-khmer.cc @@ -60,7 +60,6 @@ khmer_features[] = * Positioning features. * We don't care about the types. */ - {HB_TAG('d','i','s','t'), F_GLOBAL}, {HB_TAG('a','b','v','m'), F_GLOBAL}, {HB_TAG('b','l','w','m'), F_GLOBAL}, }; @@ -80,7 +79,6 @@ enum { _KHMER_BLWS, _KHMER_PSTS, - _KHMER_DIST, _KHMER_ABVM, _KHMER_BLWM, diff --git a/src/hb-ot-shape-complex-myanmar.cc b/src/hb-ot-shape-complex-myanmar.cc index 14d215eac..f734a3371 100644 --- a/src/hb-ot-shape-complex-myanmar.cc +++ b/src/hb-ot-shape-complex-myanmar.cc @@ -66,7 +66,6 @@ myanmar_positioning_features[] = * Positioning features. * We don't care about the types. */ - HB_TAG('d','i','s','t'), /* Pre-release version of Windows 8 Myanmar font had abvm,blwm * features. The released Windows 8 version of the font (as well * as the released spec) used 'mark' instead. The Windows 8 diff --git a/src/hb-ot-shape-complex-use.cc b/src/hb-ot-shape-complex-use.cc index 1ea2957f2..7f4b6f346 100644 --- a/src/hb-ot-shape-complex-use.cc +++ b/src/hb-ot-shape-complex-use.cc @@ -95,7 +95,6 @@ use_positioning_features[] = * Positioning features. * We don't care about the types. */ - HB_TAG('d','i','s','t'), HB_TAG('a','b','v','m'), HB_TAG('b','l','w','m'), }; diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc index c8bda2aad..cf40ff973 100644 --- a/src/hb-ot-shape.cc +++ b/src/hb-ot-shape.cc @@ -300,6 +300,7 @@ horizontal_features[] = {HB_TAG('c','l','i','g'), F_GLOBAL}, {HB_TAG('c','u','r','s'), F_GLOBAL}, {HB_TAG('k','e','r','n'), F_GLOBAL_HAS_FALLBACK}, + {HB_TAG('d','i','s','t'), F_GLOBAL}, {HB_TAG('l','i','g','a'), F_GLOBAL}, {HB_TAG('r','c','l','t'), F_GLOBAL}, }; diff --git a/test/shaping/data/in-house/Makefile.sources b/test/shaping/data/in-house/Makefile.sources index 0e9a3a21e..f3a6a6211 100644 --- a/test/shaping/data/in-house/Makefile.sources +++ b/test/shaping/data/in-house/Makefile.sources @@ -14,6 +14,7 @@ TESTS = \ tests/context-matching.tests \ tests/cursive-positioning.tests \ tests/default-ignorables.tests \ + tests/dist.tests \ tests/emoji.tests \ tests/fallback-positioning.tests \ tests/hangul-jamo.tests \ diff --git a/test/shaping/data/in-house/fonts/53a91c20e33a596f2be17fb68b382d6b7eb85d5c.ttf b/test/shaping/data/in-house/fonts/53a91c20e33a596f2be17fb68b382d6b7eb85d5c.ttf new file mode 100644 index 0000000000000000000000000000000000000000..f3d52e51f226638462dee8528f83171670c3821b GIT binary patch literal 2020 zcma)6No*5W82;b$cDphTxR-zn`8oS?{aVQ`TywS}6 zzW@E}H~$PVB689hve0OL_tSgmHEJM|XQ9pJM@PoxL%&`Deh>JA{P<*U_UsruY|j9n z9~tjSJzqKeF_Gm5;3L!Xg(Z5K-XM~Cfd^(vr;d$HbneIgCJ`T-Ef$Wtf4uTD?2kZ~ zorR)d#`YEPDsXgmzI@VoiOvF_18yxXP8WC^n*kmLcFh+~E>S=G6F31JTqw*J!v_ak z$hSnq)|M7m$`|WyW>Bv<-%cD);+Ofi6rea!GLuea``l@_s;1MP5KyK!7LSK)vPXf! zl8(n>aap#x{r;9;hHuq(_??w?Z9tMbD|cgcIZeAY*yOd_)Mh=9;A0!_bf~(Xu(#AN z&9%CdItzW;H5`rRdQggy_X6@pi9(iGEE36tJdv0lD#nIiAX9GBz1~t8XQ?k3P4xITUEwqVLP(hTN@% z7Hf05E)?rXZt=3yy{S}>#QlL-r%%zszGVM7tts5C1iQCIdKiy}I$A-o(eEhlM}GZb zp3x(+38EurMo=B!q}r+ZoL`K8R_9k6Zu{JAk|pqyPqMbDUiX)YdevrE8+0|yZd812 zimo@g?9KMc{SMXcYSw>$J(%;i4+b~cP9i(lPMd5Sw0aaxGuiHYknKCG_IAbfSG%Iw z4mnz^R>g79V(s>Q*XH&(KV<7lldd;98=I@`PkOxrfxC4cn_t&GkqTzWc(*eBL9O&J zdCWI0x;K`MBts5RnLel6>x@9P1C&AYw>-lD$nIk{-LwzuFrK2zIEc*9@U z_Ewt3U&Zv5Da>}$Q?y7+bPAqxG=tMJYE4msl9a(NkJClyOH>4UmKJE5y0IIArUW^5 z&uhg%MOuO7GM&KlC@hEJUB(@xaYH{x$KX>$#24USfMp6+3FGQVwh>%;>c8jrzt^^h z{2moq)N_CA14hmj)VPSsMPHA~wNR^Z8){!fUCZdPNIPpR^r5yL1{*se6F4~rxr5TU zwo@N$6OU1?@vRe8&m-!imJDSSQQu{pS)@Yu%CvL>4`V9ur#4mqh+#g(Q%s<^#4IWg z+~UlfPX{U+Bx(1aeG}xJKDAsT@62-XIC)Ej@&b7cU&6c@(T>iol*wN66mdBa!_6sY zSPr90tN1z|T-B@9RZ~;FUcHD8uU4