From 5a9cba9744876dfc56bdc9aed805f571bd0d4b0a Mon Sep 17 00:00:00 2001
From: David Corbett <corbett.dav@husky.neu.edu>
Date: Wed, 8 Nov 2017 13:15:27 -0500
Subject: [PATCH] Mark non-initial left matras as unsafe to break

---
 src/hb-ot-shape-complex-indic.cc                 |  14 +++++++++-----
 test/shaping/Makefile.am                         |   1 +
 .../1a3d8f381387dd29be1e897e4b5100ac8b4829e1.ttf | Bin 0 -> 1380 bytes
 test/shaping/tests/indic-init.tests              |   1 +
 4 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 test/shaping/fonts/sha1sum/1a3d8f381387dd29be1e897e4b5100ac8b4829e1.ttf
 create mode 100644 test/shaping/tests/indic-init.tests

diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc
index f7df985d1..8e2cd620e 100644
--- a/src/hb-ot-shape-complex-indic.cc
+++ b/src/hb-ot-shape-complex-indic.cc
@@ -1686,11 +1686,15 @@ final_reordering_syllable (const hb_ot_shape_plan_t *plan,
 
 
   /* Apply 'init' to the Left Matra if it's a word start. */
-  if (info[start].indic_position () == POS_PRE_M &&
-      (!start ||
-       !(FLAG_UNSAFE (_hb_glyph_info_get_general_category (&info[start - 1])) &
-	 FLAG_RANGE (HB_UNICODE_GENERAL_CATEGORY_FORMAT, HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK))))
-    info[start].mask |= indic_plan->mask_array[INIT];
+  if (info[start].indic_position () == POS_PRE_M)
+  {
+    if (!start ||
+	!(FLAG_UNSAFE (_hb_glyph_info_get_general_category (&info[start - 1])) &
+	 FLAG_RANGE (HB_UNICODE_GENERAL_CATEGORY_FORMAT, HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK)))
+      info[start].mask |= indic_plan->mask_array[INIT];
+    else
+      buffer->unsafe_to_break (start - 1, start + 1);
+  }
 
 
   /*
diff --git a/test/shaping/Makefile.am b/test/shaping/Makefile.am
index ca7c1c30b..592754b29 100644
--- a/test/shaping/Makefile.am
+++ b/test/shaping/Makefile.am
@@ -58,6 +58,7 @@ TESTS = \
 	tests/hangul-jamo.tests \
 	tests/hyphens.tests \
 	tests/indic-consonant-with-stacker.tests \
+	tests/indic-init.tests \
 	tests/indic-joiner-candrabindu.tests \
 	tests/indic-joiners.tests \
 	tests/indic-old-spec.tests \
diff --git a/test/shaping/fonts/sha1sum/1a3d8f381387dd29be1e897e4b5100ac8b4829e1.ttf b/test/shaping/fonts/sha1sum/1a3d8f381387dd29be1e897e4b5100ac8b4829e1.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..d060ea96ea0740e07cb9aa3119890eed6d99ac54
GIT binary patch
literal 1380
zcmZuxTWB0r82-=9Y`VLt8)KWaP-zA!y2adfg<Ts1>h317G?>LC55`L}d+F{<_QLFB
z%obalgw~LWVM`ON*h(JqU`tRDQLrrtg7HBK1*tE^`p^f#KB?_&n9}t-GpY5#GyLcO
zzyEyaJNFqH85yFTbdp4RA==+Bmp{L8gou77V&#EYUq3aIL?nHQT<bu5XgH=1P67W2
zEDsEiMnYG5ZUNs0)`y0>g5yu-z!x}wBAHi8UNNwVb{Sa9rj^tqm8Y+x{UzW~776if
zHVj+^K9J38(+v`}0-pqaG_OpTNQxsQK3+pX$)|UJcfdy^?#BGQrD9pDpQa%6m(ea0
zfs4@@Ndhs(+@pn@mM&{NexlYywf(HtCe+%*+Ft42j8Qwkwd^wYG*xT#n7OZ+T<FoX
zuQxhX$aNoj(Q(nRjiTYs9JHdvQbo;WvYPBq9+ZRKfpEJVQ}kR)juzEKTGJj3h!Nit
zNMcMnRQ=Vw>N8hr-K|^F<;{B&1Lm#X9o8jl%=ON@v&WZCygzex?t{~A^P<&gSUs-V
z8<JriwT|3$`TqLD47RA>XH52m8DIYD+E0ezwmKG#O><+x7zi6K!{|9YGyay<@!{*A
zSpKETr>_~tne!LUeQdbbR&`a?b+v8Am|dDX<DOpx`}rUAt8U*lvvEsoF^s;$vlA&R
z{+Y$r;;XOz@-ozy7F=gfEzhs;{;O+i`l{MCZB$O2I%XKz%kvisrvLai>t@Hw*EjfF
zZf-^zeCBvdbr&`tn{Jyo@X=G_O}%%7M)7x^zP|U4%l7_1Z{G(|aElzedBqF+8-~+m
z&%l~-_Rz5zW5S;MyXs-VZ7Vxur<Sm>MOG!~3Jby&Bo`geexm>rkR_Kb!R7zk5%=S0
zUy8o<ta~;@x&ADTZPOmIWRlUH-=Ywv!6Xmj2+WBY`GA~QKpfwWeWcTy6s01Ss6r~`
zC_`D&pyj6|9fS{3Hw7q6?TBNffS;ojV%|rk1f{{&Xp{=bYd~exufS($iYCEVZ9NV8
zW$K|Wd`aZeXwlF^N0fw89$yg}W$LtbGvJk=kbp)GjFin$5EsyL482rjx-hd&%&!Y9
zKB5B8)lxvb;6-7bc%LvYY>=<o#^N@Xuui;BFc}Gack6W`$KM^j``o{$uoEn@x!hx)
zJ?oBfhG)Yu<hPHdKF8no{}evDqs3JiK4(Te@1@6SKe1T<;0SIRpF8o{*u`m&<E(br
z?d^$lAw!`=ArqufMpX(FDOc1aMKmQpi8?<S#Cbo|co1<NUKsx=*ms#{@Y~_*fbl!q
J0OKE4`42YqFz5gP

literal 0
HcmV?d00001

diff --git a/test/shaping/tests/indic-init.tests b/test/shaping/tests/indic-init.tests
new file mode 100644
index 000000000..1231eabce
--- /dev/null
+++ b/test/shaping/tests/indic-init.tests
@@ -0,0 +1 @@
+fonts/sha1sum/1a3d8f381387dd29be1e897e4b5100ac8b4829e1.ttf:--no-glyph-names:U+09AC,U+09C7,U+09AC,U+09C7:[3=0+273|1=0+460|2=2+307|1=2+460]