From 125c45ed368ae61a74e2c558b9c884cfde6295e1 Mon Sep 17 00:00:00 2001
From: David Corbett <corbett.dav@husky.neu.edu>
Date: Wed, 15 May 2019 17:02:32 -0400
Subject: [PATCH] Convert Consonant_Initial_Postfixed to CONS_MED

---
 src/gen-use-table.py                             |   6 +++---
 src/hb-ot-shape-complex-use-table.cc             |   2 +-
 .../fd565cabd5208d345d0ed4fda7ae742917d846a5.ttf | Bin 0 -> 1056 bytes
 .../data/in-house/tests/use-syllable.tests       |   1 +
 4 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 test/shaping/data/in-house/fonts/fd565cabd5208d345d0ed4fda7ae742917d846a5.ttf

diff --git a/src/gen-use-table.py b/src/gen-use-table.py
index 9b1a00a68..164f8027f 100755
--- a/src/gen-use-table.py
+++ b/src/gen-use-table.py
@@ -197,15 +197,15 @@ def is_BASE_OTHER(U, UISC, UGC):
 def is_CGJ(U, UISC, UGC):
 	return U == 0x034F
 def is_CONS_FINAL(U, UISC, UGC):
-	# Consonant_Initial_Postfixed is new in Unicode 11; not in the spec.
 	return ((UISC == Consonant_Final and UGC != Lo) or
-		UISC == Consonant_Initial_Postfixed or
 		UISC == Consonant_Succeeding_Repha)
 def is_CONS_FINAL_MOD(U, UISC, UGC):
 	#SPEC-DRAFT return  UISC in [Consonant_Final_Modifier, Syllable_Modifier]
 	return  UISC == Syllable_Modifier
 def is_CONS_MED(U, UISC, UGC):
-	return UISC == Consonant_Medial and UGC != Lo
+	# Consonant_Initial_Postfixed is new in Unicode 11; not in the spec.
+	return (UISC == Consonant_Medial and UGC != Lo or
+		UISC == Consonant_Initial_Postfixed)
 def is_CONS_MOD(U, UISC, UGC):
 	return UISC in [Nukta, Gemination_Mark, Consonant_Killer]
 def is_CONS_SUB(U, UISC, UGC):
diff --git a/src/hb-ot-shape-complex-use-table.cc b/src/hb-ot-shape-complex-use-table.cc
index f47d5e847..c065ff289 100644
--- a/src/hb-ot-shape-complex-use-table.cc
+++ b/src/hb-ot-shape-complex-use-table.cc
@@ -302,7 +302,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* 1A20 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,
   /* 1A30 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,
   /* 1A40 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,
-  /* 1A50 */     B,     B,     B,     B,     B,  MPre,  MBlw,   SUB,  FAbv,  FAbv,  FAbv,   SUB,   SUB,   SUB,   SUB,     O,
+  /* 1A50 */     B,     B,     B,     B,     B,  MPre,  MBlw,   SUB,  FAbv,  FAbv,  MAbv,   SUB,   SUB,   SUB,   SUB,     O,
   /* 1A60 */     H,  VPst,  VAbv,  VPst,  VPst,  VAbv,  VAbv,  VAbv,  VAbv,  VBlw,  VBlw,  VAbv,  VBlw,  VPst,  VPre,  VPre,
   /* 1A70 */  VPre,  VPre,  VPre,  VAbv, VMAbv, VMAbv, VMAbv, VMAbv, VMAbv, VMAbv,  VAbv,    FM,    FM,     O,     O,  FBlw,
   /* 1A80 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     O,     O,     O,     O,     O,     O,
diff --git a/test/shaping/data/in-house/fonts/fd565cabd5208d345d0ed4fda7ae742917d846a5.ttf b/test/shaping/data/in-house/fonts/fd565cabd5208d345d0ed4fda7ae742917d846a5.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..4ec847c5acf440fe9e3002dd2c8559518bfd6a12
GIT binary patch
literal 1056
zcmZ`&O-~a+7=C7U3s|wD)<k=tOQZ&jqHO~~0|_5hOl(49qalrntZivY`ej=T98{v5
zjEVdK6Hdk-P~*iTdg{Rh4pcdKY2umag@fxe+f@{0H#5)syz_p|J2Mafj$j!YVpFl{
zI8LJz(CXB7O~r3beC*nGlW&tprsEewFW#=S0b+}MHkmg|H$L>Q0&<u<nlURS%VH#G
z>*O7o+|pcl=B$^p@}JG7&D62`PdDhFB_GOCp*?~{UL)_#=Bta^V{3(cjr@47m^5(-
z*U9gYcjnE-5;|~*e1zO6nEAA4rtdxT(+A&5#Y(lg`m(|Ni{w!V_(c>OVn@|<B7E|U
zzg81FuOO^|9IzU4)2@~J&$XJ|r2ZiL1NDH56-j1eQTDul>clDZau;fqW2^k|$K9hN
z-*H&`s!SWQoBdGOGi3#6a*kE8cTP-*9D1+|KfqOmlvEtsDuLaW&p)|!=-3sjtPb*-
zd`F+>Efil66s%Xm#h&ba#&0n;cQu7&-)Nw&8P+focBa2~XW04Fu2l>#XSF*obE<pb
zwyT%EQD4HB4AgleuqQXyo3EQ|pN98U+>V5bqVsGq#?g`m%N%oL2@fV5SwjdhN7nza
zak1A=9DSRupF|NQETN2fWROJ_2KtahKQY8p3F0!P2uwVnMT)ZWDB~W|w5>ABO-dOo
zAV-@ru5q<My}~l}X?k4Yh&dR<ATHSBSM=MoDWk&Z%F|%R0p>MWo&8yFSjYc9o}7?E
z6S{D<FBIm3<KajP2gh4D6jm4-oSdY)V3(!cQ#aqQ#|bEiZgk^3uaQ|Wc`mwIp{-gG
U$z)!=Crb9v9qb_TjdSMz6SDiKJ^%m!

literal 0
HcmV?d00001

diff --git a/test/shaping/data/in-house/tests/use-syllable.tests b/test/shaping/data/in-house/tests/use-syllable.tests
index 6a247ed0c..cd6cd25f5 100644
--- a/test/shaping/data/in-house/tests/use-syllable.tests
+++ b/test/shaping/data/in-house/tests/use-syllable.tests
@@ -10,3 +10,4 @@
 ../fonts/28f497629c04ceb15546c9a70e0730125ed6698d.ttf::U+11013,U+11044,U+11046:[brm_KA=0+754|brm_vowelOO=0@-647,0+0|brm_virama=0@-524,0+0]
 ../fonts/28f497629c04ceb15546c9a70e0730125ed6698d.ttf::U+11013,U+1103C:[brm_KA=0+754|brm_vowelU=0@-403,0+0]
 ../fonts/86cdd983c4e4c4d7f27dd405d6ceb7d4b9ed3d35.ttf::U+111C8,U+111C9,U+111C9:[u111C8=0+500|u111C9=0@-500,0+0|u111C9=0@-500,0+0]
+../fonts/fd565cabd5208d345d0ed4fda7ae742917d846a5.ttf::U+1A3D,U+1A5A,U+1A63:[uni1A3D=0+250|uni1A5A=0+0|uni1A63=0+250]