From 7d64b09765e326da810e98d3234ca72209cd5aae Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaledhosny@eglug.org>
Date: Sat, 12 Sep 2020 21:17:18 +0200
Subject: [PATCH] =?UTF-8?q?[myanmar]=20Don=E2=80=99t=20disable=20liga=20fe?=
 =?UTF-8?q?ature?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This seems to have been carried over from the Indic shaper, but
Uniscribe enables it by default.

See https://github.com/harfbuzz/harfbuzz/issues/2213#issuecomment-686062915
---
 src/hb-ot-shape-complex-myanmar.cc               |   8 +-------
 test/shaping/data/in-house/Makefile.sources      |   1 +
 .../065b01e54f35f0d849fd43bd5b936212739a50cb.ttf | Bin 0 -> 1808 bytes
 test/shaping/data/in-house/meson.build           |   1 +
 .../data/in-house/tests/myanmar-misc.tests       |   1 +
 5 files changed, 4 insertions(+), 7 deletions(-)
 create mode 100644 test/shaping/data/in-house/fonts/065b01e54f35f0d849fd43bd5b936212739a50cb.ttf
 create mode 100644 test/shaping/data/in-house/tests/myanmar-misc.tests

diff --git a/src/hb-ot-shape-complex-myanmar.cc b/src/hb-ot-shape-complex-myanmar.cc
index fc3490d71..294ab3412 100644
--- a/src/hb-ot-shape-complex-myanmar.cc
+++ b/src/hb-ot-shape-complex-myanmar.cc
@@ -97,12 +97,6 @@ collect_features_myanmar (hb_ot_shape_planner_t *plan)
     map->enable_feature (myanmar_other_features[i], F_MANUAL_ZWJ);
 }
 
-static void
-override_features_myanmar (hb_ot_shape_planner_t *plan)
-{
-  plan->map.disable_feature (HB_TAG('l','i','g','a'));
-}
-
 
 enum myanmar_syllable_type_t {
   myanmar_consonant_syllable,
@@ -346,7 +340,7 @@ reorder_myanmar (const hb_ot_shape_plan_t *plan,
 const hb_ot_complex_shaper_t _hb_ot_complex_shaper_myanmar =
 {
   collect_features_myanmar,
-  override_features_myanmar,
+  nullptr, /* override_features */
   nullptr, /* data_create */
   nullptr, /* data_destroy */
   nullptr, /* preprocess_text */
diff --git a/test/shaping/data/in-house/Makefile.sources b/test/shaping/data/in-house/Makefile.sources
index 93b212d10..b3fdca274 100644
--- a/test/shaping/data/in-house/Makefile.sources
+++ b/test/shaping/data/in-house/Makefile.sources
@@ -38,6 +38,7 @@ TESTS = \
 	tests/mark-attachment.tests \
 	tests/mark-filtering-sets.tests \
 	tests/mongolian-variation-selector.tests \
+	tests/myanmar-misc.tests \
 	tests/myanmar-syllable.tests \
 	tests/myanmar-zawgyi.tests \
 	tests/none-directional.tests \
diff --git a/test/shaping/data/in-house/fonts/065b01e54f35f0d849fd43bd5b936212739a50cb.ttf b/test/shaping/data/in-house/fonts/065b01e54f35f0d849fd43bd5b936212739a50cb.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..46ebee86f35911bb9efbccc4dc714e0141dedb48
GIT binary patch
literal 1808
zcmbVMUrbw782`?_w=Jd67HDbNR(5HTIw*w}+QJIRN})10aFps|#-B?mf3g;^bU>43
zS>}uLL1$*N#Q3(w_-u4B(FYSAOf;a0?rDiJ#>8n%_M{I6Z~dKKV3U}bcy7+Q-|u(6
zzxRCS5+forT_=%d6Y=2@s;84gy3fJNi5JI{^83Lg@DIQniDWAFi*H*b(q9C=Kc4Ie
zUU#lE5Q#GIY&xf`S?8>mfUg7hEh_74r4l@o?i1jO#cXlm$LDswg8Um1dv__L%-e3y
zJtPu70vBEaVe-%n@E&mUQm(LN{8SwThCW%dt7(PFbQ|~s;L4n`wMHk|F!1ZZ@`{qn
zxTm655dSmyzrVJ+UYPB<_YL9~uz!XaMM{52e!)$>;M{%|>JCR7W@fiFvaa9&V2d}>
zDA;WVj>CW+x4}CAxe+>M=5e=p&5WHNzcxA&?P~LPPDaAXjt*b&RJ5tmv(%eP&rkGt
zWmn99t}qn8ni?&7n>Q-Y-k40j)jH@&$74z;q{QNB&*1UYLfCg|VCdDUsa$Q$Ts3?(
zHFoW6^mJqZ#i$KJzVw>-E1jTcQAasXo<zOF;71O6yUn3NGxNIjTCNd4Q@@K&`Z_Q6
z1uxYNntI&f)2u%1=}n!endx`<?dDdOtKCx5D&zw%g~F*osI#f@nUOAop~mKy`=5W?
zQfqe}cT`&tu(Vs+m5zxMyc6^-q3(#0wRA_qL5Gorkp(`Fk=5JuZm*H)?XEhut@hWM
zE#7MOfIX<L1*7(}?K+pYT5VI?s)H`O)54b7vZdW@F{wA%rinA^9rcc--DP5%>P-_)
zhxegGx5!E#lD>>U><@{AvXsQx??B?Z0>x}w6(7%7`hF*q_=xX+yZ7=v{(gAli|_aD
z{xxR2ApHbbv2RT*OHI-OMTpb}@lok(?nmd_gN^Z>y}N(9jTer@<rzt$liea60=^;e
zu75#$vuO&l7+8}|kaUtDNIbGOG%+zgo?wI4W7d!sL+2B5GqebTQ}`0Hj7oVWXjn`e
zR$iG6QE~3rlYj;80k?>>_v4=*?`S@tL1ds;xRqptJdLTzjNCw)EbQNIt|NkdbDx(e
zh+C-X=*Y?%_hmi#nV*JemDZ?8d0M7LTA~7S4N@lsC<G~i-Bs{e$^ebh3Z=;p=?s`G
z-V=vb>t&Rob!g^k1M56A$6#H+lqpFHthv^CMB{P}YaSjl@P7r~IQnmW9`k97C_DzJ
z8?ibOu^W2<;+$4PFSUb@l-I!j@P5?uL4F6-{Iiz!Be`iOj>9UwhkX8Rpn;gcL?#JE
zrD7&Cqs*;tWGaiwfvDLqbcImvg{m^)gv|IUVsf5O{@_oE@6bm=eB|6DnRCTlkeui(
z4Bl6V64zuoC4U(=M(b0CJ+8;VFsh<jtWIji`ouf8!hKbDg=w(pSg{R~W?xBhbeygn
zS56o6=#9%tcA4a?Qdl9moQdzL_}m_&To?Bs%w;#%$(&tYRB$UapM2%f_0&UpTpga9
kfH+n>PDq5mrdBuC;`{s-@rREm)$m$)RZ{tD9e%670mCaH>;M1&

literal 0
HcmV?d00001

diff --git a/test/shaping/data/in-house/meson.build b/test/shaping/data/in-house/meson.build
index 20b5773e8..0bd1a9dcd 100644
--- a/test/shaping/data/in-house/meson.build
+++ b/test/shaping/data/in-house/meson.build
@@ -38,6 +38,7 @@ in_house_tests = [
   'mark-attachment.tests',
   'mark-filtering-sets.tests',
   'mongolian-variation-selector.tests',
+  'myanmar-misc.tests',
   'myanmar-syllable.tests',
   'myanmar-zawgyi.tests',
   'none-directional.tests',
diff --git a/test/shaping/data/in-house/tests/myanmar-misc.tests b/test/shaping/data/in-house/tests/myanmar-misc.tests
new file mode 100644
index 000000000..eb903c92b
--- /dev/null
+++ b/test/shaping/data/in-house/tests/myanmar-misc.tests
@@ -0,0 +1 @@
+../fonts/065b01e54f35f0d849fd43bd5b936212739a50cb.ttf::U+101A,U+1035:[ya_e_above=0+1000]