1 files changed, 245 insertions, 343 deletions
diff --git a/src/3rdparty/harfbuzz-ng/src/hb-ot-shape-complex-use-machine.hh b/src/3rdparty/harfbuzz-ng/src/hb-ot-shape-complex-use-machine.hh
index ced9d97f28..44e5d0d56b 100644
--- a/src/3rdparty/harfbuzz-ng/src/hb-ot-shape-complex-use-machine.hh
+++ b/src/3rdparty/harfbuzz-ng/src/hb-ot-shape-complex-use-machine.hh
@@ -36,291 +36,222 @@
 
 #line 38 "hb-ot-shape-complex-use-machine.hh"
 static const unsigned char _use_syllable_machine_trans_keys[] = {
-	0u, 0u, 4u, 4u, 1u, 1u, 0u, 39u, 21u, 21u, 8u, 39u, 8u, 39u, 1u, 1u, 
-	8u, 39u, 8u, 39u, 8u, 39u, 8u, 26u, 8u, 26u, 8u, 26u, 8u, 39u, 8u, 39u, 
-	8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 
-	8u, 39u, 8u, 39u, 8u, 39u, 1u, 1u, 8u, 39u, 8u, 39u, 8u, 26u, 8u, 26u, 
+	1u, 1u, 0u, 39u, 21u, 21u, 8u, 39u, 8u, 39u, 1u, 1u, 8u, 39u, 8u, 39u, 
+	8u, 39u, 8u, 26u, 8u, 26u, 8u, 26u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 
+	8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 13u, 21u, 
+	4u, 4u, 13u, 13u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 26u, 8u, 26u, 
 	8u, 26u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 
-	8u, 39u, 12u, 21u, 12u, 13u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 26u, 
-	8u, 26u, 8u, 26u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 
-	8u, 39u, 8u, 39u, 8u, 39u, 8u, 39u, 1u, 39u, 8u, 39u, 21u, 42u, 41u, 42u, 
+	8u, 39u, 8u, 39u, 8u, 39u, 1u, 1u, 1u, 39u, 8u, 39u, 21u, 42u, 41u, 42u, 
 	42u, 42u, 0
 };
 
 static const char _use_syllable_machine_key_spans[] = {
-	0, 1, 1, 40, 1, 32, 32, 1, 
-	32, 32, 32, 19, 19, 19, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 1, 32, 32, 19, 19, 
+	1, 40, 1, 32, 32, 1, 32, 32, 
+	32, 19, 19, 19, 32, 32, 32, 32, 
+	32, 32, 32, 32, 32, 32, 32, 9, 
+	1, 1, 32, 32, 32, 32, 19, 19, 
 	19, 32, 32, 32, 32, 32, 32, 32, 
-	32, 10, 2, 32, 32, 32, 32, 19, 
-	19, 19, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 32, 39, 32, 22, 2, 
+	32, 32, 32, 1, 39, 32, 22, 2, 
 	1
 };
 
 static const short _use_syllable_machine_index_offsets[] = {
-	0, 0, 2, 4, 45, 47, 80, 113, 
-	115, 148, 181, 214, 234, 254, 274, 307, 
-	340, 373, 406, 439, 472, 505, 538, 571, 
-	604, 637, 670, 703, 705, 738, 771, 791, 
-	811, 831, 864, 897, 930, 963, 996, 1029, 
-	1062, 1095, 1106, 1109, 1142, 1175, 1208, 1241, 
-	1261, 1281, 1301, 1334, 1367, 1400, 1433, 1466, 
-	1499, 1532, 1565, 1598, 1631, 1671, 1704, 1727, 
-	1730
+	0, 2, 43, 45, 78, 111, 113, 146, 
+	179, 212, 232, 252, 272, 305, 338, 371, 
+	404, 437, 470, 503, 536, 569, 602, 635, 
+	645, 647, 649, 682, 715, 748, 781, 801, 
+	821, 841, 874, 907, 940, 973, 1006, 1039, 
+	1072, 1105, 1138, 1171, 1173, 1213, 1246, 1269, 
+	1272
 };
 
 static const char _use_syllable_machine_indicies[] = {
-	1, 0, 3, 2, 4, 5, 6, 
-	4, 1, 5, 8, 8, 7, 8, 8, 
-	3, 9, 8, 8, 8, 4, 4, 10, 
-	11, 8, 8, 12, 13, 14, 15, 16, 
-	17, 18, 12, 19, 20, 21, 22, 23, 
-	24, 8, 25, 26, 27, 8, 29, 28, 
-	31, 30, 30, 32, 33, 30, 30, 30, 
-	30, 30, 30, 30, 30, 34, 35, 36, 
-	37, 38, 39, 40, 41, 35, 42, 34, 
-	43, 44, 45, 46, 30, 47, 48, 49, 
-	30, 31, 30, 30, 32, 33, 30, 30, 
-	30, 30, 30, 30, 30, 30, 50, 35, 
-	36, 37, 38, 39, 40, 41, 35, 42, 
-	43, 43, 44, 45, 46, 30, 47, 48, 
-	49, 30, 32, 51, 31, 30, 30, 32, 
-	33, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 35, 36, 37, 38, 39, 40, 
-	41, 35, 42, 43, 43, 44, 45, 46, 
-	30, 47, 48, 49, 30, 31, 30, 30, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 30, 35, 36, 37, 38, 39, 
-	30, 30, 30, 30, 30, 30, 44, 45, 
-	46, 30, 47, 48, 49, 30, 31, 30, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 30, 30, 30, 36, 37, 38, 
-	39, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 30, 47, 48, 49, 30, 31, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 30, 30, 30, 30, 30, 37, 
-	38, 39, 30, 31, 30, 30, 30, 30, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 30, 30, 38, 39, 30, 31, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 39, 30, 31, 30, 30, 30, 30, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 30, 37, 38, 39, 30, 30, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	47, 48, 49, 30, 31, 30, 30, 30, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 30, 30, 37, 38, 39, 30, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 48, 49, 30, 31, 30, 30, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 30, 30, 30, 37, 38, 39, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 30, 30, 49, 30, 31, 30, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 30, 30, 30, 36, 37, 38, 
-	39, 30, 30, 30, 30, 30, 30, 44, 
-	45, 46, 30, 47, 48, 49, 30, 31, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 30, 30, 30, 30, 36, 37, 
-	38, 39, 30, 30, 30, 30, 30, 30, 
-	30, 45, 46, 30, 47, 48, 49, 30, 
-	31, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 30, 30, 30, 30, 30, 36, 
-	37, 38, 39, 30, 30, 30, 30, 30, 
-	30, 30, 30, 46, 30, 47, 48, 49, 
-	30, 31, 30, 30, 30, 30, 30, 30, 
-	30, 30, 30, 30, 30, 30, 30, 35, 
-	36, 37, 38, 39, 30, 41, 35, 30, 
-	30, 30, 44, 45, 46, 30, 47, 48, 
-	49, 30, 31, 30, 30, 30, 30, 30, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	35, 36, 37, 38, 39, 30, 30, 35, 
-	30, 30, 30, 44, 45, 46, 30, 47, 
-	48, 49, 30, 31, 30, 30, 30, 30, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 35, 36, 37, 38, 39, 40, 41, 
-	35, 30, 30, 30, 44, 45, 46, 30, 
-	47, 48, 49, 30, 31, 30, 30, 32, 
-	33, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 35, 36, 37, 38, 39, 40, 
-	41, 35, 42, 30, 43, 44, 45, 46, 
-	30, 47, 48, 49, 30, 31, 30, 30, 
-	32, 33, 30, 30, 30, 30, 30, 30, 
-	30, 30, 30, 35, 36, 37, 38, 39, 
-	40, 41, 35, 42, 34, 43, 44, 45, 
-	46, 30, 47, 48, 49, 30, 53, 52, 
-	52, 54, 55, 52, 52, 52, 52, 52, 
-	52, 52, 52, 56, 52, 57, 58, 59, 
-	60, 61, 62, 57, 63, 56, 64, 52, 
-	52, 52, 52, 65, 66, 67, 52, 53, 
-	52, 52, 54, 55, 52, 52, 52, 52, 
-	52, 52, 52, 52, 68, 52, 57, 58, 
-	59, 60, 61, 62, 57, 63, 64, 64, 
-	52, 52, 52, 52, 65, 66, 67, 52, 
-	54, 51, 53, 52, 52, 54, 55, 52, 
-	52, 52, 52, 52, 52, 52, 52, 52, 
-	52, 57, 58, 59, 60, 61, 62, 57, 
-	63, 64, 64, 52, 52, 52, 52, 65, 
-	66, 67, 52, 53, 52, 52, 52, 52, 
-	52, 52, 52, 52, 52, 52, 52, 52, 
-	52, 52, 57, 58, 59, 60, 52, 52, 
-	52, 52, 52, 52, 52, 52, 52, 52, 
-	65, 66, 67, 52, 53, 52, 52, 52, 
-	52, 52, 52, 52, 52, 52, 52, 52, 
-	52, 52, 52, 52, 58, 59, 60, 52, 
-	53, 52, 52, 52, 52, 52, 52, 52, 
-	52, 52, 52, 52, 52, 52, 52, 52, 
-	52, 59, 60, 52, 53, 52, 52, 52, 
-	52, 52, 52, 52, 52, 52, 52, 52, 
-	52, 52, 52, 52, 52, 52, 60, 52, 
-	53, 52, 52, 52, 52, 52, 52, 52, 
-	52, 52, 52, 52, 52, 52, 52, 52, 
-	58, 59, 60, 52, 52, 52, 52, 52, 
-	52, 52, 52, 52, 52, 65, 66, 67, 
-	52, 53, 52, 52, 52, 52, 52, 52, 
-	52, 52, 52, 52, 52, 52, 52, 52, 
-	52, 58, 59, 60, 52, 52, 52, 52, 
-	52, 52, 52, 52, 52, 52, 52, 66, 
-	67, 52, 53, 52, 52, 52, 52, 52, 
-	52, 52, 52, 52, 52, 52, 52, 52, 
-	52, 52, 58, 59, 60, 52, 52, 52, 
-	52, 52, 52, 52, 52, 52, 52, 52, 
-	52, 67, 52, 53, 52, 52, 52, 52, 
-	52, 52, 52, 52, 52, 52, 52, 52, 
-	52, 52, 57, 58, 59, 60, 52, 62, 
-	57, 52, 52, 52, 52, 52, 52, 52, 
-	65, 66, 67, 52, 53, 52, 52, 52, 
-	52, 52, 52, 52, 52, 52, 52, 52, 
-	52, 52, 52, 57, 58, 59, 60, 52, 
-	52, 57, 52, 52, 52, 52, 52, 52, 
-	52, 65, 66, 67, 52, 53, 52, 52, 
-	52, 52, 52, 52, 52, 52, 52, 52, 
-	52, 52, 52, 52, 57, 58, 59, 60, 
-	61, 62, 57, 52, 52, 52, 52, 52, 
-	52, 52, 65, 66, 67, 52, 53, 52, 
-	52, 54, 55, 52, 52, 52, 52, 52, 
-	52, 52, 52, 52, 52, 57, 58, 59, 
-	60, 61, 62, 57, 63, 52, 64, 52, 
-	52, 52, 52, 65, 66, 67, 52, 53, 
-	52, 52, 54, 55, 52, 52, 52, 52, 
-	52, 52, 52, 52, 52, 52, 57, 58, 
-	59, 60, 61, 62, 57, 63, 56, 64, 
-	52, 52, 52, 52, 65, 66, 67, 52, 
-	70, 71, 69, 69, 69, 69, 69, 69, 
-	69, 72, 69, 70, 71, 69, 7, 73, 
-	73, 3, 9, 73, 73, 73, 73, 73, 
-	73, 73, 73, 74, 12, 13, 14, 15, 
-	16, 17, 18, 12, 19, 21, 21, 22, 
-	23, 24, 73, 25, 26, 27, 73, 7, 
-	73, 73, 3, 9, 73, 73, 73, 73, 
-	73, 73, 73, 73, 73, 12, 13, 14, 
-	15, 16, 17, 18, 12, 19, 21, 21, 
-	22, 23, 24, 73, 25, 26, 27, 73, 
-	7, 73, 73, 73, 73, 73, 73, 73, 
-	73, 73, 73, 73, 73, 73, 12, 13, 
-	14, 15, 16, 73, 73, 73, 73, 73, 
-	73, 22, 23, 24, 73, 25, 26, 27, 
-	73, 7, 73, 73, 73, 73, 73, 73, 
-	73, 73, 73, 73, 73, 73, 73, 73, 
-	13, 14, 15, 16, 73, 73, 73, 73, 
-	73, 73, 73, 73, 73, 73, 25, 26, 
-	27, 73, 7, 73, 73, 73, 73, 73, 
-	73, 73, 73, 73, 73, 73, 73, 73, 
-	73, 73, 14, 15, 16, 73, 7, 73, 
-	73, 73, 73, 73, 73, 73, 73, 73, 
-	73, 73, 73, 73, 73, 73, 73, 15, 
-	16, 73, 7, 73, 73, 73, 73, 73, 
-	73, 73, 73, 73, 73, 73, 73, 73, 
-	73, 73, 73, 73, 16, 73, 7, 73, 
-	73, 73, 73, 73, 73, 73, 73, 73, 
-	73, 73, 73, 73, 73, 73, 14, 15, 
-	16, 73, 73, 73, 73, 73, 73, 73, 
-	73, 73, 73, 25, 26, 27, 73, 7, 
-	73, 73, 73, 73, 73, 73, 73, 73, 
-	73, 73, 73, 73, 73, 73, 73, 14, 
-	15, 16, 73, 73, 73, 73, 73, 73, 
-	73, 73, 73, 73, 73, 26, 27, 73, 
-	7, 73, 73, 73, 73, 73, 73, 73, 
-	73, 73, 73, 73, 73, 73, 73, 73, 
-	14, 15, 16, 73, 73, 73, 73, 73, 
-	73, 73, 73, 73, 73, 73, 73, 27, 
-	73, 7, 73, 73, 73, 73, 73, 73, 
-	73, 73, 73, 73, 73, 73, 73, 73, 
-	13, 14, 15, 16, 73, 73, 73, 73, 
-	73, 73, 22, 23, 24, 73, 25, 26, 
-	27, 73, 7, 73, 73, 73, 73, 73, 
-	73, 73, 73, 73, 73, 73, 73, 73, 
-	73, 13, 14, 15, 16, 73, 73, 73, 
-	73, 73, 73, 73, 23, 24, 73, 25, 
-	26, 27, 73, 7, 73, 73, 73, 73, 
-	73, 73, 73, 73, 73, 73, 73, 73, 
-	73, 73, 13, 14, 15, 16, 73, 73, 
-	73, 73, 73, 73, 73, 73, 24, 73, 
-	25, 26, 27, 73, 7, 73, 73, 73, 
-	73, 73, 73, 73, 73, 73, 73, 73, 
-	73, 73, 12, 13, 14, 15, 16, 73, 
-	18, 12, 73, 73, 73, 22, 23, 24, 
-	73, 25, 26, 27, 73, 7, 73, 73, 
-	73, 73, 73, 73, 73, 73, 73, 73, 
-	73, 73, 73, 12, 13, 14, 15, 16, 
-	73, 73, 12, 73, 73, 73, 22, 23, 
-	24, 73, 25, 26, 27, 73, 7, 73, 
-	73, 73, 73, 73, 73, 73, 73, 73, 
-	73, 73, 73, 73, 12, 13, 14, 15, 
-	16, 17, 18, 12, 73, 73, 73, 22, 
-	23, 24, 73, 25, 26, 27, 73, 7, 
-	73, 73, 3, 9, 73, 73, 73, 73, 
-	73, 73, 73, 73, 73, 12, 13, 14, 
-	15, 16, 17, 18, 12, 19, 73, 21, 
-	22, 23, 24, 73, 25, 26, 27, 73, 
-	5, 6, 73, 73, 5, 73, 73, 7, 
-	73, 73, 3, 9, 73, 73, 73, 73, 
-	73, 73, 73, 73, 73, 12, 13, 14, 
-	15, 16, 17, 18, 12, 19, 20, 21, 
-	22, 23, 24, 73, 25, 26, 27, 73, 
-	7, 73, 73, 3, 9, 73, 73, 73, 
-	73, 73, 73, 73, 73, 73, 12, 13, 
-	14, 15, 16, 17, 18, 12, 19, 20, 
-	21, 22, 23, 24, 73, 25, 26, 27, 
-	73, 76, 75, 75, 75, 75, 75, 75, 
-	75, 75, 75, 75, 75, 75, 75, 75, 
-	75, 75, 75, 75, 75, 76, 77, 75, 
-	76, 77, 75, 77, 75, 0
+	1, 0, 2, 3, 4, 2, 5, 3, 
+	4, 4, 6, 4, 4, 1, 7, 4, 
+	4, 4, 2, 2, 8, 9, 4, 4, 
+	10, 11, 12, 13, 14, 15, 16, 10, 
+	17, 18, 19, 20, 21, 22, 4, 23, 
+	24, 25, 4, 27, 26, 29, 28, 28, 
+	30, 31, 28, 28, 28, 28, 28, 28, 
+	28, 28, 32, 33, 34, 35, 36, 37, 
+	38, 39, 33, 40, 32, 41, 42, 43, 
+	44, 28, 45, 46, 47, 28, 29, 28, 
+	28, 30, 31, 28, 28, 28, 28, 28, 
+	28, 28, 28, 48, 33, 34, 35, 36, 
+	37, 38, 39, 33, 40, 41, 41, 42, 
+	43, 44, 28, 45, 46, 47, 28, 30, 
+	49, 29, 28, 28, 30, 31, 28, 28, 
+	28, 28, 28, 28, 28, 28, 28, 33, 
+	34, 35, 36, 37, 38, 39, 33, 40, 
+	41, 41, 42, 43, 44, 28, 45, 46, 
+	47, 28, 29, 28, 28, 28, 28, 28, 
+	28, 28, 28, 28, 28, 28, 28, 28, 
+	33, 34, 35, 36, 37, 28, 28, 28, 
+	28, 28, 28, 42, 43, 44, 28, 45, 
+	46, 47, 28, 29, 28, 28, 28, 28, 
+	28, 28, 28, 28, 28, 28, 28, 28, 
+	28, 28, 34, 35, 36, 37, 28, 28, 
+	28, 28, 28, 28, 28, 28, 28, 28, 
+	45, 46, 47, 28, 29, 28, 28, 28, 
+	28, 28, 28, 28, 28, 28, 28, 28, 
+	28, 28, 28, 28, 35, 36, 37, 28, 
+	29, 28, 28, 28, 28, 28, 28, 28, 
+	28, 28, 28, 28, 28, 28, 28, 28, 
+	28, 36, 37, 28, 29, 28, 28, 28, 
+	28, 28, 28, 28, 28, 28, 28, 28, 
+	28, 28, 28, 28, 28, 28, 37, 28, 
+	29, 28, 28, 28, 28, 28, 28, 28, 
+	28, 28, 28, 28, 28, 28, 28, 28, 
+	35, 36, 37, 28, 28, 28, 28, 28, 
+	28, 28, 28, 28, 28, 45, 46, 47, 
+	28, 29, 28, 28, 28, 28, 28, 28, 
+	28, 28, 28, 28, 28, 28, 28, 28, 
+	28, 35, 36, 37, 28, 28, 28, 28, 
+	28, 28, 28, 28, 28, 28, 28, 46, 
+	47, 28, 29, 28, 28, 28, 28, 28, 
+	28, 28, 28, 28, 28, 28, 28, 28, 
+	28, 28, 35, 36, 37, 28, 28, 28, 
+	28, 28, 28, 28, 28, 28, 28, 28, 
+	28, 47, 28, 29, 28, 28, 28, 28, 
+	28, 28, 28, 28, 28, 28, 28, 28, 
+	28, 28, 34, 35, 36, 37, 28, 28, 
+	28, 28, 28, 28, 42, 43, 44, 28, 
+	45, 46, 47, 28, 29, 28, 28, 28, 
+	28, 28, 28, 28, 28, 28, 28, 28, 
+	28, 28, 28, 34, 35, 36, 37, 28, 
+	28, 28, 28, 28, 28, 28, 43, 44, 
+	28, 45, 46, 47, 28, 29, 28, 28, 
+	28, 28, 28, 28, 28, 28, 28, 28, 
+	28, 28, 28, 28, 34, 35, 36, 37, 
+	28, 28, 28, 28, 28, 28, 28, 28, 
+	44, 28, 45, 46, 47, 28, 29, 28, 
+	28, 28, 28, 28, 28, 28, 28, 28, 
+	28, 28, 28, 28, 33, 34, 35, 36, 
+	37, 28, 39, 33, 28, 28, 28, 42, 
+	43, 44, 28, 45, 46, 47, 28, 29, 
+	28, 28, 28, 28, 28, 28, 28, 28, 
+	28, 28, 28, 28, 28, 33, 34, 35, 
+	36, 37, 28, 28, 33, 28, 28, 28, 
+	42, 43, 44, 28, 45, 46, 47, 28, 
+	29, 28, 28, 28, 28, 28, 28, 28, 
+	28, 28, 28, 28, 28, 28, 33, 34, 
+	35, 36, 37, 38, 39, 33, 28, 28, 
+	28, 42, 43, 44, 28, 45, 46, 47, 
+	28, 29, 28, 28, 30, 31, 28, 28, 
+	28, 28, 28, 28, 28, 28, 28, 33, 
+	34, 35, 36, 37, 38, 39, 33, 40, 
+	28, 41, 42, 43, 44, 28, 45, 46, 
+	47, 28, 29, 28, 28, 30, 31, 28, 
+	28, 28, 28, 28, 28, 28, 28, 28, 
+	33, 34, 35, 36, 37, 38, 39, 33, 
+	40, 32, 41, 42, 43, 44, 28, 45, 
+	46, 47, 28, 51, 50, 50, 50, 50, 
+	50, 50, 50, 52, 50, 5, 53, 51, 
+	50, 6, 54, 54, 1, 55, 54, 54, 
+	54, 54, 54, 54, 54, 54, 56, 10, 
+	11, 12, 13, 14, 15, 16, 10, 17, 
+	19, 19, 20, 21, 22, 54, 23, 24, 
+	25, 54, 6, 54, 54, 1, 55, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	10, 11, 12, 13, 14, 15, 16, 10, 
+	17, 19, 19, 20, 21, 22, 54, 23, 
+	24, 25, 54, 6, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 10, 11, 12, 13, 14, 54, 54, 
+	54, 54, 54, 54, 20, 21, 22, 54, 
+	23, 24, 25, 54, 6, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 11, 12, 13, 14, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 23, 24, 25, 54, 6, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 12, 13, 14, 
+	54, 6, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 13, 14, 54, 6, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 14, 
+	54, 6, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 12, 13, 14, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 23, 24, 
+	25, 54, 6, 54, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 12, 13, 14, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	24, 25, 54, 6, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 12, 13, 14, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 25, 54, 6, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 11, 12, 13, 14, 54, 
+	54, 54, 54, 54, 54, 20, 21, 22, 
+	54, 23, 24, 25, 54, 6, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 54, 11, 12, 13, 14, 
+	54, 54, 54, 54, 54, 54, 54, 21, 
+	22, 54, 23, 24, 25, 54, 6, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 11, 12, 13, 
+	14, 54, 54, 54, 54, 54, 54, 54, 
+	54, 22, 54, 23, 24, 25, 54, 6, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 10, 11, 12, 
+	13, 14, 54, 16, 10, 54, 54, 54, 
+	20, 21, 22, 54, 23, 24, 25, 54, 
+	6, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 10, 11, 
+	12, 13, 14, 54, 54, 10, 54, 54, 
+	54, 20, 21, 22, 54, 23, 24, 25, 
+	54, 6, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 10, 
+	11, 12, 13, 14, 15, 16, 10, 54, 
+	54, 54, 20, 21, 22, 54, 23, 24, 
+	25, 54, 6, 54, 54, 1, 55, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	10, 11, 12, 13, 14, 15, 16, 10, 
+	17, 54, 19, 20, 21, 22, 54, 23, 
+	24, 25, 54, 1, 57, 3, 54, 54, 
+	54, 3, 54, 54, 6, 54, 54, 1, 
+	55, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 10, 11, 12, 13, 14, 15, 
+	16, 10, 17, 18, 19, 20, 21, 22, 
+	54, 23, 24, 25, 54, 6, 54, 54, 
+	1, 55, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 10, 11, 12, 13, 14, 
+	15, 16, 10, 17, 18, 19, 20, 21, 
+	22, 54, 23, 24, 25, 54, 59, 58, 
+	58, 58, 58, 58, 58, 58, 58, 58, 
+	58, 58, 58, 58, 58, 58, 58, 58, 
+	58, 58, 59, 60, 58, 59, 60, 58, 
+	60, 58, 0
 };
 
 static const char _use_syllable_machine_trans_targs[] = {
-	3, 41, 3, 43, 4, 5, 25, 3, 
-	0, 2, 60, 62, 45, 46, 47, 48, 
-	49, 56, 57, 58, 61, 59, 53, 54, 
-	55, 50, 51, 52, 3, 3, 3, 3, 
-	6, 7, 24, 9, 10, 11, 12, 13, 
-	20, 21, 22, 23, 17, 18, 19, 14, 
-	15, 16, 8, 3, 3, 3, 26, 27, 
-	40, 29, 30, 31, 32, 36, 37, 38, 
-	39, 33, 34, 35, 28, 3, 3, 1, 
-	42, 3, 44, 3, 63, 64
+	1, 26, 2, 3, 1, 23, 1, 43, 
+	44, 46, 28, 29, 30, 31, 32, 39, 
+	40, 41, 45, 42, 36, 37, 38, 33, 
+	34, 35, 1, 1, 1, 1, 4, 5, 
+	22, 7, 8, 9, 10, 11, 18, 19, 
+	20, 21, 15, 16, 17, 12, 13, 14, 
+	6, 1, 1, 24, 25, 1, 1, 0, 
+	27, 1, 1, 47, 48
 };
 
 static const char _use_syllable_machine_trans_actions[] = {
-	1, 2, 3, 4, 0, 0, 0, 7, 
-	0, 0, 4, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 4, 4, 0, 0, 
-	0, 0, 0, 0, 8, 9, 10, 11, 
+	1, 2, 0, 0, 5, 0, 6, 0, 
+	2, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 2, 2, 0, 0, 0, 0, 
+	0, 0, 7, 8, 9, 10, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 12, 13, 14, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 15, 16, 0, 
-	2, 17, 4, 18, 0, 0
+	0, 11, 12, 0, 0, 13, 14, 0, 
+	2, 15, 16, 0, 0
 };
 
 static const char _use_syllable_machine_to_state_actions[] = {
-	0, 0, 0, 5, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 3, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
@@ -330,9 +261,7 @@ static const char _use_syllable_machine_to_state_actions[] = {
 };
 
 static const char _use_syllable_machine_from_state_actions[] = {
-	0, 0, 0, 6, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 4, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
@@ -342,29 +271,27 @@ static const char _use_syllable_machine_from_state_actions[] = {
 };
 
 static const short _use_syllable_machine_eof_trans[] = {
-	0, 1, 3, 0, 29, 31, 31, 52, 
-	31, 31, 31, 31, 31, 31, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 31, 
-	31, 53, 53, 52, 53, 53, 53, 53, 
-	53, 53, 53, 53, 53, 53, 53, 53, 
-	53, 70, 70, 74, 74, 74, 74, 74, 
-	74, 74, 74, 74, 74, 74, 74, 74, 
-	74, 74, 74, 74, 74, 74, 76, 76, 
-	76
+	1, 0, 27, 29, 29, 50, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 51, 
+	54, 51, 55, 55, 55, 55, 55, 55, 
+	55, 55, 55, 55, 55, 55, 55, 55, 
+	55, 55, 55, 58, 55, 55, 59, 59, 
+	59
 };
 
-static const int use_syllable_machine_start = 3;
-static const int use_syllable_machine_first_final = 3;
-static const int use_syllable_machine_error = 0;
+static const int use_syllable_machine_start = 1;
+static const int use_syllable_machine_first_final = 1;
+static const int use_syllable_machine_error = -1;
 
-static const int use_syllable_machine_en_main = 3;
+static const int use_syllable_machine_en_main = 1;
 
 
 #line 38 "hb-ot-shape-complex-use-machine.rl"
 
 
 
-#line 145 "hb-ot-shape-complex-use-machine.rl"
+#line 138 "hb-ot-shape-complex-use-machine.rl"
 
 
 #define found_syllable(syllable_type) \
@@ -384,7 +311,7 @@ find_syllables (hb_buffer_t *buffer)
   int cs;
   hb_glyph_info_t *info = buffer->info;
   
-#line 388 "hb-ot-shape-complex-use-machine.hh"
+#line 315 "hb-ot-shape-complex-use-machine.hh"
 	{
 	cs = use_syllable_machine_start;
 	ts = 0;
@@ -392,7 +319,7 @@ find_syllables (hb_buffer_t *buffer)
 	act = 0;
 	}
 
-#line 166 "hb-ot-shape-complex-use-machine.rl"
+#line 159 "hb-ot-shape-complex-use-machine.rl"
 
 
   p = 0;
@@ -401,7 +328,7 @@ find_syllables (hb_buffer_t *buffer)
   unsigned int last = 0;
   unsigned int syllable_serial = 1;
   
-#line 405 "hb-ot-shape-complex-use-machine.hh"
+#line 332 "hb-ot-shape-complex-use-machine.hh"
 	{
 	int _slen;
 	int _trans;
@@ -409,15 +336,13 @@ find_syllables (hb_buffer_t *buffer)
 	const char *_inds;
 	if ( p == pe )
 		goto _test_eof;
-	if ( cs == 0 )
-		goto _out;
 _resume:
 	switch ( _use_syllable_machine_from_state_actions[cs] ) {
-	case 6:
+	case 4:
 #line 1 "NONE"
 	{ts = p;}
 	break;
-#line 421 "hb-ot-shape-complex-use-machine.hh"
+#line 346 "hb-ot-shape-complex-use-machine.hh"
 	}
 
 	_keys = _use_syllable_machine_trans_keys + (cs<<1);
@@ -439,92 +364,70 @@ _eof_trans:
 #line 1 "NONE"
 	{te = p+1;}
 	break;
-	case 9:
-#line 134 "hb-ot-shape-complex-use-machine.rl"
+	case 8:
+#line 127 "hb-ot-shape-complex-use-machine.rl"
 	{te = p+1;{ found_syllable (independent_cluster); }}
 	break;
-	case 11:
-#line 136 "hb-ot-shape-complex-use-machine.rl"
-	{te = p+1;{ found_syllable (consonant_cluster); }}
-	break;
-	case 14:
-#line 137 "hb-ot-shape-complex-use-machine.rl"
-	{te = p+1;{ found_syllable (vowel_cluster); }}
-	break;
-	case 16:
-#line 138 "hb-ot-shape-complex-use-machine.rl"
-	{te = p+1;{ found_syllable (number_joiner_terminated_cluster); }}
+	case 10:
+#line 129 "hb-ot-shape-complex-use-machine.rl"
+	{te = p+1;{ found_syllable (standard_cluster); }}
 	break;
-	case 7:
-#line 141 "hb-ot-shape-complex-use-machine.rl"
+	case 6:
+#line 133 "hb-ot-shape-complex-use-machine.rl"
 	{te = p+1;{ found_syllable (broken_cluster); }}
 	break;
-	case 8:
+	case 5:
 #line 134 "hb-ot-shape-complex-use-machine.rl"
+	{te = p+1;{ found_syllable (non_cluster); }}
+	break;
+	case 7:
+#line 127 "hb-ot-shape-complex-use-machine.rl"
 	{te = p;p--;{ found_syllable (independent_cluster); }}
 	break;
-	case 12:
-#line 135 "hb-ot-shape-complex-use-machine.rl"
+	case 11:
+#line 128 "hb-ot-shape-complex-use-machine.rl"
 	{te = p;p--;{ found_syllable (virama_terminated_cluster); }}
 	break;
-	case 10:
-#line 136 "hb-ot-shape-complex-use-machine.rl"
-	{te = p;p--;{ found_syllable (consonant_cluster); }}
+	case 9:
+#line 129 "hb-ot-shape-complex-use-machine.rl"
+	{te = p;p--;{ found_syllable (standard_cluster); }}
 	break;
 	case 13:
-#line 137 "hb-ot-shape-complex-use-machine.rl"
-	{te = p;p--;{ found_syllable (vowel_cluster); }}
+#line 130 "hb-ot-shape-complex-use-machine.rl"
+	{te = p;p--;{ found_syllable (number_joiner_terminated_cluster); }}
 	break;
-	case 15:
-#line 139 "hb-ot-shape-complex-use-machine.rl"
+	case 12:
+#line 131 "hb-ot-shape-complex-use-machine.rl"
 	{te = p;p--;{ found_syllable (numeral_cluster); }}
 	break;
-	case 18:
-#line 140 "hb-ot-shape-complex-use-machine.rl"
+	case 16:
+#line 132 "hb-ot-shape-complex-use-machine.rl"
 	{te = p;p--;{ found_syllable (symbol_cluster); }}
 	break;
-	case 17:
-#line 141 "hb-ot-shape-complex-use-machine.rl"
+	case 14:
+#line 133 "hb-ot-shape-complex-use-machine.rl"
 	{te = p;p--;{ found_syllable (broken_cluster); }}
 	break;
-	case 1:
-#line 139 "hb-ot-shape-complex-use-machine.rl"
-	{{p = ((te))-1;}{ found_syllable (numeral_cluster); }}
-	break;
-	case 3:
-#line 1 "NONE"
-	{	switch( act ) {
-	case 0:
-	{{cs = 0; goto _again;}}
-	break;
-	case 8:
-	{{p = ((te))-1;} found_syllable (broken_cluster); }
-	break;
-	}
-	}
+	case 15:
+#line 134 "hb-ot-shape-complex-use-machine.rl"
+	{te = p;p--;{ found_syllable (non_cluster); }}
 	break;
-	case 4:
-#line 1 "NONE"
-	{te = p+1;}
-#line 141 "hb-ot-shape-complex-use-machine.rl"
-	{act = 8;}
+	case 1:
+#line 133 "hb-ot-shape-complex-use-machine.rl"
+	{{p = ((te))-1;}{ found_syllable (broken_cluster); }}
 	break;
-#line 513 "hb-ot-shape-complex-use-machine.hh"
+#line 420 "hb-ot-shape-complex-use-machine.hh"
 	}
 
 _again:
 	switch ( _use_syllable_machine_to_state_actions[cs] ) {
-	case 5:
+	case 3:
 #line 1 "NONE"
 	{ts = 0;}
-#line 1 "NONE"
-	{act = 0;}
 	break;
-#line 524 "hb-ot-shape-complex-use-machine.hh"
+#line 429 "hb-ot-shape-complex-use-machine.hh"
 	}
 
-	if ( cs == 0 )
-		goto _out;
 	if ( ++p != pe )
 		goto _resume;
 	_test_eof: {}
@@ -536,10 +439,9 @@ _again:
 	}
 	}
 
-	_out: {}
 	}
 
-#line 175 "hb-ot-shape-complex-use-machine.rl"
+#line 168 "hb-ot-shape-complex-use-machine.rl"
 
 }