Merge branch 'var-subset' of https://github.com/harfbuzz/harfbuzz into var-subset

.circleci/config.yml

@@ -27,9 +27,8 @@ jobs:
       xcode: "10.2.0"
     steps:
       - checkout
-      - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install wget autoconf automake libtool pkg-config ragel freetype glib cairo icu4c
+      - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install wget autoconf automake libtool pkg-config ragel freetype glib cairo icu4c graphite2
-      - run: brew link --force icu4c
+      - run: export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig" && ./autogen.sh --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-coretext --with-graphite2
-      - run: export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig" && ./autogen.sh --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-coretext
       - run: make -j4
       - run: make check || .ci/fail.sh
 
@@ -263,6 +262,7 @@ jobs:
     steps:
       - checkout
       - run: git clone https://github.com/vitasdk/vdpm && cd vdpm && ./bootstrap-vitasdk.sh
+      - run: echo "#""!""/bin/true" > /usr/bin/ragel && chmod +x /usr/bin/ragel
       - run: ./autogen.sh --prefix=/usr/local/vitasdk/arm-vita-eabi --host=arm-vita-eabi
       - run: make -j32
 

NEWS

@@ -1,3 +1,14 @@
+Overview of changes leading to 2.4.0
+Monday, March 25, 2019
+====================================
+- Unicode 12.
+- Misc fixes.
+- Subsetter improvements.
+- New API:
+HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE
+hb_directwrite_face_create()
+
+
 Overview of changes leading to 2.3.1
 Wednesday, January 30, 2019
 ====================================

configure.ac

@@ -1,6 +1,6 @@
 AC_PREREQ([2.64])
 AC_INIT([HarfBuzz],
-        [2.3.1],
+        [2.4.0],
         [https://github.com/harfbuzz/harfbuzz/issues/new],
         [harfbuzz],
         [http://harfbuzz.org/])

src/hb-buffer.h

@@ -287,7 +287,7 @@ hb_buffer_guess_segment_properties (hb_buffer_t *buffer);
  * @HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE:
  *                      flag indicating that a dotted circle should
  *                      not be inserted in the rendering of incorrect
- *                      character sequences (such at <0905 093E>). Since: REPLACEME
+ *                      character sequences (such at <0905 093E>). Since: 2.4
  *
  * Since: 0.9.20
  */

src/hb-ot-shape-complex-indic-machine.rl

@@ -52,6 +52,7 @@ DOTTEDCIRCLE = 12;
 RS    = 13;
 Repha = 15;
 Ra    = 16;
+CM    = 17;
 Symbol= 18;
 CS    = 19;
 
@@ -67,10 +68,10 @@ matra_group = z{0,3}.M.N?.(H | forced_rakar)?;
 syllable_tail = (z?.SM.SM?.ZWNJ?)? A{0,3}?;
 halant_group = (z?.H.(ZWJ.N?)?);
 final_halant_group = halant_group | H.ZWNJ;
+medial_group = CM?;
 halant_or_matra_group = (final_halant_group | matra_group{0,4});
 
-complex_syllable_tail = (halant_group.cn){0,4} halant_or_matra_group syllable_tail;
+complex_syllable_tail = (halant_group.cn){0,4} medial_group halant_or_matra_group syllable_tail;
-
 
 consonant_syllable =	(Repha|CS)? cn complex_syllable_tail;
 vowel_syllable =	reph? V.n? (ZWJ | complex_syllable_tail);

src/hb-ot-shape-complex-indic.cc

@@ -720,7 +720,7 @@ initial_reordering_consonant_syllable (const hb_ot_shape_plan_t *plan,
     indic_position_t last_pos = POS_START;
     for (unsigned int i = start; i < end; i++)
     {
-      if ((FLAG_UNSAFE (info[i].indic_category()) & (JOINER_FLAGS | FLAG (OT_N) | FLAG (OT_RS) | FLAG (OT_H))))
+      if ((FLAG_UNSAFE (info[i].indic_category()) & (JOINER_FLAGS | FLAG (OT_N) | FLAG (OT_RS) | MEDIAL_FLAGS | FLAG (OT_H))))
       {
 	info[i].indic_position() = last_pos;
 	if (unlikely (info[i].indic_category() == OT_H &&

src/hb-ot-shape-complex-indic.hh

@@ -62,17 +62,19 @@ enum indic_category_t {
   OT_Coeng = 14, /* Khmer-style Virama. */
   OT_Repha = 15, /* Atomically-encoded logical or visual repha. */
   OT_Ra = 16,
-  OT_CM = 17,  /* Consonant-Medial; Unused by Indic shaper. */
+  OT_CM = 17,  /* Consonant-Medial. */
   OT_Symbol = 18, /* Avagraha, etc that take marks (SM,A,VD). */
   OT_CS = 19
 };
 
+#define MEDIAL_FLAGS (FLAG (OT_CM))
+
 /* Note:
  *
  * We treat Vowels and placeholders as if they were consonants.  This is safe because Vowels
  * cannot happen in a consonant syllable.  The plus side however is, we can call the
  * consonant syllable logic from the vowel syllable function and get it all right! */
-#define CONSONANT_FLAGS (FLAG (OT_C) | FLAG (OT_CS) | FLAG (OT_Ra) | FLAG (OT_V) | FLAG (OT_PLACEHOLDER) | FLAG (OT_DOTTEDCIRCLE))
+#define CONSONANT_FLAGS (FLAG (OT_C) | FLAG (OT_CS) | FLAG (OT_Ra) | MEDIAL_FLAGS | FLAG (OT_V) | FLAG (OT_PLACEHOLDER) | FLAG (OT_DOTTEDCIRCLE))
 #define JOINER_FLAGS (FLAG (OT_ZWJ) | FLAG (OT_ZWNJ))
 
 

src/hb-ot-shape-complex-khmer-machine.hh

@@ -35,29 +35,27 @@
 #line 36 "hb-ot-shape-complex-khmer-machine.hh"
 static const unsigned char _khmer_syllable_machine_trans_keys[] = {
 	5u, 26u, 5u, 21u, 5u, 26u, 5u, 21u, 1u, 16u, 5u, 21u, 5u, 26u, 5u, 21u, 
-	5u, 26u, 5u, 21u, 1u, 16u, 5u, 21u, 5u, 26u, 5u, 21u, 1u, 16u, 5u, 21u, 
+	5u, 26u, 5u, 21u, 5u, 21u, 5u, 26u, 5u, 21u, 1u, 16u, 5u, 21u, 5u, 26u, 
-	5u, 26u, 5u, 21u, 5u, 26u, 5u, 21u, 5u, 26u, 1u, 16u, 1u, 29u, 5u, 29u, 
+	5u, 21u, 5u, 26u, 5u, 21u, 5u, 26u, 1u, 29u, 5u, 29u, 5u, 29u, 5u, 29u, 
-	5u, 29u, 5u, 29u, 22u, 22u, 5u, 22u, 5u, 29u, 5u, 29u, 5u, 29u, 5u, 26u, 
+	22u, 22u, 5u, 22u, 5u, 29u, 5u, 29u, 5u, 29u, 1u, 16u, 5u, 26u, 5u, 29u, 
-	5u, 29u, 5u, 29u, 22u, 22u, 5u, 22u, 5u, 29u, 5u, 29u, 1u, 16u, 5u, 29u, 
+	5u, 29u, 22u, 22u, 5u, 22u, 5u, 29u, 5u, 29u, 1u, 16u, 5u, 29u, 5u, 29u, 
-	5u, 29u, 0
+	0
 };
 
 static const char _khmer_syllable_machine_key_spans[] = {
 	22, 17, 22, 17, 16, 17, 22, 17, 
-	22, 17, 16, 17, 22, 17, 16, 17, 
+	22, 17, 17, 22, 17, 16, 17, 22, 
-	22, 17, 22, 17, 22, 16, 29, 25, 
+	17, 22, 17, 22, 29, 25, 25, 25, 
-	25, 25, 1, 18, 25, 25, 25, 22, 
+	1, 18, 25, 25, 25, 16, 22, 25, 
-	25, 25, 1, 18, 25, 25, 16, 25, 
+	25, 1, 18, 25, 25, 16, 25, 25
-	25
 };
 
 static const short _khmer_syllable_machine_index_offsets[] = {
 	0, 23, 41, 64, 82, 99, 117, 140, 
-	158, 181, 199, 216, 234, 257, 275, 292, 
+	158, 181, 199, 217, 240, 258, 275, 293, 
-	310, 333, 351, 374, 392, 415, 432, 462, 
+	316, 334, 357, 375, 398, 428, 454, 480, 
-	488, 514, 540, 542, 561, 587, 613, 639, 
+	506, 508, 527, 553, 579, 605, 622, 645, 
-	662, 688, 714, 716, 735, 761, 787, 804, 
+	671, 697, 699, 718, 744, 770, 787, 813
-	830
 };
 
 static const char _khmer_syllable_machine_indicies[] = {
@@ -85,142 +83,136 @@ static const char _khmer_syllable_machine_indicies[] = {
 	0, 0, 0, 0, 0, 0, 12, 0, 
 	0, 0, 0, 4, 0, 11, 11, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 12, 0, 13, 
+	0, 0, 0, 0, 0, 12, 0, 14, 
-	13, 0, 0, 0, 0, 0, 0, 0, 
+	14, 13, 13, 13, 13, 13, 13, 13, 
-	0, 0, 0, 0, 0, 0, 13, 0, 
+	13, 13, 13, 13, 13, 13, 13, 15, 
-	15, 15, 14, 14, 14, 14, 14, 14, 
+	13, 14, 14, 16, 16, 16, 16, 16, 
-	14, 14, 14, 14, 14, 14, 14, 14, 
+	16, 16, 16, 16, 16, 16, 16, 16, 
-	16, 14, 15, 15, 17, 17, 17, 17, 
+	16, 15, 16, 16, 16, 16, 17, 16, 
-	17, 17, 17, 17, 17, 17, 17, 17, 
+	18, 18, 16, 16, 16, 16, 16, 16, 
-	17, 17, 16, 17, 17, 17, 17, 18, 
+	16, 16, 16, 16, 16, 16, 16, 16, 
-	17, 19, 19, 17, 17, 17, 17, 17, 
+	17, 16, 19, 19, 16, 16, 16, 16, 
-	17, 17, 17, 17, 17, 17, 17, 17, 
+	16, 16, 16, 16, 16, 16, 16, 16, 
-	17, 18, 17, 20, 20, 17, 17, 17, 
+	16, 19, 16, 20, 20, 16, 16, 16, 
-	17, 17, 17, 17, 17, 17, 17, 17, 
+	16, 16, 16, 16, 16, 16, 16, 16, 
-	17, 17, 20, 17, 21, 21, 17, 17, 
+	16, 16, 16, 21, 16, 22, 22, 16, 
-	17, 17, 17, 17, 17, 17, 17, 17, 
+	16, 16, 16, 16, 16, 16, 16, 16, 
-	17, 17, 17, 17, 22, 17, 23, 23, 
+	16, 16, 16, 16, 16, 23, 16, 16, 
-	17, 17, 17, 17, 17, 17, 17, 17, 
+	16, 16, 17, 16, 22, 22, 16, 16, 
-	17, 17, 17, 17, 17, 17, 24, 17, 
+	16, 16, 16, 16, 16, 16, 16, 16, 
-	17, 17, 17, 18, 17, 23, 23, 17, 
+	16, 16, 16, 16, 23, 16, 24, 24, 
-	17, 17, 17, 17, 17, 17, 17, 17, 
+	16, 16, 16, 16, 16, 16, 16, 16, 
-	17, 17, 17, 17, 17, 24, 17, 25, 
+	16, 16, 16, 16, 16, 16, 25, 16, 
-	25, 17, 17, 17, 17, 17, 17, 17, 
+	16, 16, 16, 17, 16, 24, 24, 16, 
-	17, 17, 17, 17, 17, 17, 17, 26, 
+	16, 16, 16, 16, 16, 16, 16, 16, 
-	17, 17, 17, 17, 18, 17, 25, 25, 
+	16, 16, 16, 16, 16, 25, 16, 14, 
-	17, 17, 17, 17, 17, 17, 17, 17, 
+	14, 16, 16, 16, 16, 16, 16, 16, 
-	17, 17, 17, 17, 17, 17, 26, 17, 
+	16, 16, 16, 16, 16, 16, 26, 15, 
-	15, 15, 17, 17, 17, 17, 17, 17, 
+	16, 16, 16, 16, 17, 16, 28, 28, 
-	17, 17, 17, 17, 17, 17, 17, 27, 
+	27, 27, 29, 29, 27, 27, 27, 27, 
-	16, 17, 17, 17, 17, 18, 17, 28, 
+	2, 2, 27, 30, 27, 28, 27, 27, 
-	28, 17, 17, 17, 17, 17, 17, 17, 
+	27, 27, 15, 19, 27, 27, 27, 17, 
-	17, 17, 17, 17, 17, 17, 28, 17, 
+	23, 25, 21, 27, 32, 32, 31, 31, 
-	13, 13, 29, 29, 30, 30, 29, 29, 
+	31, 31, 31, 31, 31, 33, 31, 31, 
-	29, 29, 2, 2, 29, 31, 29, 13, 
+	31, 31, 31, 2, 3, 6, 31, 31, 
-	29, 29, 29, 29, 16, 20, 29, 29, 
+	31, 4, 10, 12, 8, 31, 34, 34, 
-	29, 18, 24, 26, 22, 29, 33, 33, 
+	31, 31, 31, 31, 31, 31, 31, 35, 
-	32, 32, 32, 32, 32, 32, 32, 34, 
+	31, 31, 31, 31, 31, 31, 3, 6, 
-	32, 32, 32, 32, 32, 2, 3, 6, 
+	31, 31, 31, 4, 10, 12, 8, 31, 
-	32, 32, 32, 4, 10, 12, 8, 32, 
+	5, 5, 31, 31, 31, 31, 31, 31, 
-	35, 35, 32, 32, 32, 32, 32, 32, 
+	31, 35, 31, 31, 31, 31, 31, 31, 
-	32, 36, 32, 32, 32, 32, 32, 32, 
+	4, 6, 31, 31, 31, 31, 31, 31, 
-	3, 6, 32, 32, 32, 4, 10, 12, 
+	8, 31, 6, 31, 7, 7, 31, 31, 
-	8, 32, 5, 5, 32, 32, 32, 32, 
+	31, 31, 31, 31, 31, 35, 31, 31, 
-	32, 32, 32, 36, 32, 32, 32, 32, 
+	31, 31, 31, 31, 8, 6, 31, 36, 
-	32, 32, 4, 6, 32, 32, 32, 32, 
+	36, 31, 31, 31, 31, 31, 31, 31, 
-	32, 32, 8, 32, 6, 32, 7, 7, 
+	35, 31, 31, 31, 31, 31, 31, 10, 
-	32, 32, 32, 32, 32, 32, 32, 36, 
+	6, 31, 31, 31, 4, 31, 31, 8, 
-	32, 32, 32, 32, 32, 32, 8, 6, 
+	31, 37, 37, 31, 31, 31, 31, 31, 
-	32, 37, 37, 32, 32, 32, 32, 32, 
+	31, 31, 35, 31, 31, 31, 31, 31, 
-	32, 32, 36, 32, 32, 32, 32, 32, 
+	31, 12, 6, 31, 31, 31, 4, 10, 
-	32, 10, 6, 32, 32, 32, 4, 32, 
+	31, 8, 31, 34, 34, 31, 31, 31, 
-	32, 8, 32, 38, 38, 32, 32, 32, 
+	31, 31, 31, 31, 33, 31, 31, 31, 
-	32, 32, 32, 32, 36, 32, 32, 32, 
+	31, 31, 31, 3, 6, 31, 31, 31, 
-	32, 32, 32, 12, 6, 32, 32, 32, 
+	4, 10, 12, 8, 31, 28, 28, 31, 
-	4, 10, 32, 8, 32, 35, 35, 32, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
-	32, 32, 32, 32, 32, 32, 34, 32, 
+	31, 31, 31, 31, 28, 31, 14, 14, 
-	32, 32, 32, 32, 32, 3, 6, 32, 
+	38, 38, 38, 38, 38, 38, 38, 38, 
-	32, 32, 4, 10, 12, 8, 32, 15, 
+	38, 38, 38, 38, 38, 38, 15, 38, 
-	15, 39, 39, 39, 39, 39, 39, 39, 
+	38, 38, 38, 17, 38, 40, 40, 39, 
-	39, 39, 39, 39, 39, 39, 39, 16, 
+	39, 39, 39, 39, 39, 39, 41, 39, 
-	39, 39, 39, 39, 18, 39, 41, 41, 
+	39, 39, 39, 39, 39, 15, 19, 39, 
-	40, 40, 40, 40, 40, 40, 40, 42, 
+	39, 39, 17, 23, 25, 21, 39, 18, 
-	40, 40, 40, 40, 40, 40, 16, 20, 
+	18, 39, 39, 39, 39, 39, 39, 39, 
-	40, 40, 40, 18, 24, 26, 22, 40, 
+	41, 39, 39, 39, 39, 39, 39, 17, 
-	19, 19, 40, 40, 40, 40, 40, 40, 
+	19, 39, 39, 39, 39, 39, 39, 21, 
-	40, 42, 40, 40, 40, 40, 40, 40, 
+	39, 19, 39, 20, 20, 39, 39, 39, 
-	18, 20, 40, 40, 40, 40, 40, 40, 
+	39, 39, 39, 39, 41, 39, 39, 39, 
-	22, 40, 20, 40, 21, 21, 40, 40, 
+	39, 39, 39, 21, 19, 39, 42, 42, 
-	40, 40, 40, 40, 40, 42, 40, 40, 
+	39, 39, 39, 39, 39, 39, 39, 41, 
-	40, 40, 40, 40, 22, 20, 40, 43, 
+	39, 39, 39, 39, 39, 39, 23, 19, 
-	43, 40, 40, 40, 40, 40, 40, 40, 
+	39, 39, 39, 17, 39, 39, 21, 39, 
-	42, 40, 40, 40, 40, 40, 40, 24, 
+	43, 43, 39, 39, 39, 39, 39, 39, 
-	20, 40, 40, 40, 18, 40, 40, 22, 
+	39, 41, 39, 39, 39, 39, 39, 39, 
-	40, 44, 44, 40, 40, 40, 40, 40, 
+	25, 19, 39, 39, 39, 17, 23, 39, 
-	40, 40, 42, 40, 40, 40, 40, 40, 
+	21, 39, 44, 44, 39, 39, 39, 39, 
-	40, 26, 20, 40, 40, 40, 18, 24, 
-	40, 22, 40, 28, 28, 39, 39, 39, 
 	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 28, 39, 45, 45, 40, 40, 
+	39, 44, 39, 45, 45, 39, 39, 39, 
-	40, 40, 40, 40, 40, 46, 40, 40, 
+	39, 39, 39, 39, 30, 39, 39, 39, 
-	40, 40, 40, 27, 16, 20, 40, 40, 
+	39, 39, 26, 15, 19, 39, 39, 39, 
-	40, 18, 24, 26, 22, 40, 41, 41, 
+	17, 23, 25, 21, 39, 40, 40, 39, 
-	40, 40, 40, 40, 40, 40, 40, 46, 
+	39, 39, 39, 39, 39, 39, 30, 39, 
-	40, 40, 40, 40, 40, 40, 16, 20, 
+	39, 39, 39, 39, 39, 15, 19, 39, 
-	40, 40, 40, 18, 24, 26, 22, 40, 
+	39, 39, 17, 23, 25, 21, 39, 0
-	0
 };
 
 static const char _khmer_syllable_machine_trans_targs[] = {
-	22, 1, 30, 24, 25, 3, 26, 5, 
+	20, 1, 28, 22, 23, 3, 24, 5, 
-	27, 7, 28, 9, 29, 23, 22, 11, 
+	25, 7, 26, 9, 27, 20, 10, 31, 
-	32, 22, 33, 13, 34, 15, 35, 17, 
+	20, 32, 12, 33, 14, 34, 16, 35, 
-	36, 19, 37, 40, 39, 22, 31, 38, 
+	18, 36, 39, 20, 21, 30, 37, 20, 
-	22, 0, 10, 2, 4, 6, 8, 22, 
+	0, 29, 2, 4, 6, 8, 20, 20, 
-	22, 12, 14, 16, 18, 20, 21
+	11, 13, 15, 17, 38, 19
 };
 
 static const char _khmer_syllable_machine_trans_actions[] = {
 	1, 0, 2, 2, 2, 0, 0, 0, 
-	2, 0, 2, 0, 2, 2, 3, 0, 
+	2, 0, 2, 0, 2, 3, 0, 4, 
-	4, 5, 2, 0, 0, 0, 2, 0, 
+	5, 2, 0, 0, 0, 2, 0, 2, 
-	2, 0, 2, 4, 4, 8, 9, 0, 
+	0, 2, 4, 8, 2, 9, 0, 10, 
-	10, 0, 0, 0, 0, 0, 0, 11, 
+	0, 0, 0, 0, 0, 0, 11, 12, 
-	12, 0, 0, 0, 0, 0, 0
+	0, 0, 0, 0, 4, 0
 };
 
 static const char _khmer_syllable_machine_to_state_actions[] = {
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 6, 0, 
+	0, 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, 0, 0, 0, 0, 0, 0
-	0
 };
 
 static const char _khmer_syllable_machine_from_state_actions[] = {
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 7, 0, 
+	0, 0, 0, 0, 7, 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
 };
 
 static const unsigned char _khmer_syllable_machine_eof_trans[] = {
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 15, 18, 18, 18, 18, 
+	1, 1, 14, 17, 17, 17, 17, 17, 
-	18, 18, 18, 18, 18, 18, 0, 33, 
+	17, 17, 17, 17, 0, 32, 32, 32, 
-	33, 33, 33, 33, 33, 33, 33, 40, 
+	32, 32, 32, 32, 32, 32, 39, 40, 
-	41, 41, 41, 41, 41, 41, 40, 41, 
+	40, 40, 40, 40, 40, 40, 40, 40
-	41
 };
 
-static const int khmer_syllable_machine_start = 22;
+static const int khmer_syllable_machine_start = 20;
-static const int khmer_syllable_machine_first_final = 22;
+static const int khmer_syllable_machine_first_final = 20;
 static const int khmer_syllable_machine_error = -1;
 
-static const int khmer_syllable_machine_en_main = 22;
+static const int khmer_syllable_machine_en_main = 20;
 
 
 #line 36 "hb-ot-shape-complex-khmer-machine.rl"
@@ -246,7 +238,7 @@ find_syllables (hb_buffer_t *buffer)
   int cs;
   hb_glyph_info_t *info = buffer->info;
   
-#line 250 "hb-ot-shape-complex-khmer-machine.hh"
+#line 242 "hb-ot-shape-complex-khmer-machine.hh"
 	{
 	cs = khmer_syllable_machine_start;
 	ts = 0;
@@ -262,7 +254,7 @@ find_syllables (hb_buffer_t *buffer)
 
   unsigned int syllable_serial = 1;
   
-#line 266 "hb-ot-shape-complex-khmer-machine.hh"
+#line 258 "hb-ot-shape-complex-khmer-machine.hh"
 	{
 	int _slen;
 	int _trans;
@@ -276,7 +268,7 @@ _resume:
 #line 1 "NONE"
 	{ts = p;}
 	break;
-#line 280 "hb-ot-shape-complex-khmer-machine.hh"
+#line 272 "hb-ot-shape-complex-khmer-machine.hh"
 	}
 
 	_keys = _khmer_syllable_machine_trans_keys + (cs<<1);
@@ -346,7 +338,7 @@ _eof_trans:
 #line 76 "hb-ot-shape-complex-khmer-machine.rl"
 	{act = 3;}
 	break;
-#line 350 "hb-ot-shape-complex-khmer-machine.hh"
+#line 342 "hb-ot-shape-complex-khmer-machine.hh"
 	}
 
 _again:
@@ -355,7 +347,7 @@ _again:
 #line 1 "NONE"
 	{ts = 0;}
 	break;
-#line 359 "hb-ot-shape-complex-khmer-machine.hh"
+#line 351 "hb-ot-shape-complex-khmer-machine.hh"
 	}
 
 	if ( ++p != pe )

src/hb-ot-shape-complex-khmer-machine.rl

@@ -66,7 +66,7 @@ matra_group = VPre? xgroup VBlw? xgroup (joiner?.VAbv)? xgroup VPst?;
 syllable_tail = xgroup matra_group xgroup (Coeng.c)? ygroup;
 
 
-broken_cluster =	(Coeng.cn)* syllable_tail;
+broken_cluster =	(Coeng.cn)* (Coeng | syllable_tail);
 consonant_syllable =	(cn|PLACEHOLDER|DOTTEDCIRCLE) broken_cluster;
 other =			any;
 

src/hb-ot-tag.cc

@@ -171,24 +171,6 @@ hb_ot_tag_to_script (hb_tag_t tag)
 
 /* hb_language_t */
 
-static int
-lang_compare_first_component (const void *pa,
-			      const void *pb)
-{
-  const char *a = (const char *) pa;
-  const char *b = (const char *) pb;
-  unsigned int da, db;
-  const char *p;
-
-  p = strchr (a, '-');
-  da = p ? (unsigned int) (p - a) : strlen (a);
-
-  p = strchr (b, '-');
-  db = p ? (unsigned int) (p - b) : strlen (b);
-
-  return strncmp (a, b, MAX (da, db));
-}
-
 static bool
 subtag_matches (const char *lang_str,
 		const char *limit,
@@ -213,10 +195,28 @@ lang_matches (const char *lang_str, const char *spec)
 	 (lang_str[len] == '\0' || lang_str[len] == '-');
 }
 
-typedef struct {
+struct LangTag
+{
   char language[4];
   hb_tag_t tags[HB_OT_MAX_TAGS_PER_LANGUAGE];
-} LangTag;
+
+  int cmp (const char *a) const
+  {
+    const char *b = this->language;
+    unsigned int da, db;
+    const char *p;
+
+    p = strchr (a, '-');
+    da = p ? (unsigned int) (p - a) : strlen (a);
+
+    p = strchr (b, '-');
+    db = p ? (unsigned int) (p - b) : strlen (b);
+
+    return strncmp (a, b, MAX (da, db));
+  }
+  int cmp (const LangTag *that) const
+  { return cmp (that->language); }
+};
 
 #include "hb-ot-tag-table.hh"
 
@@ -263,9 +263,7 @@ hb_ot_tags_from_language (const char   *lang_str,
 	  ISALPHA (s[1]))
 	lang_str = s + 1;
     }
-    lang_tag = (LangTag *) bsearch (lang_str, ot_languages,
+    lang_tag = hb_sorted_array (ot_languages).bsearch (lang_str);
-				    ARRAY_LENGTH (ot_languages), sizeof (LangTag),
-				    lang_compare_first_component);
     if (lang_tag)
     {
       unsigned int i;
@@ -507,7 +505,7 @@ test_langs_sorted ()
 {
   for (unsigned int i = 1; i < ARRAY_LENGTH (ot_languages); i++)
   {
-    int c = lang_compare_first_component (ot_languages[i-1].language, ot_languages[i].language);
+    int c = ot_languages[i].cmp (&ot_languages[i - 1]);
     if (c >= 0)
     {
       fprintf (stderr, "ot_languages not sorted at index %d: %s %d %s\n",

src/hb-version.h

@@ -37,10 +37,10 @@ HB_BEGIN_DECLS
 
 
 #define HB_VERSION_MAJOR 2
-#define HB_VERSION_MINOR 3
+#define HB_VERSION_MINOR 4
-#define HB_VERSION_MICRO 1
+#define HB_VERSION_MICRO 0
 
-#define HB_VERSION_STRING "2.3.1"
+#define HB_VERSION_STRING "2.4.0"
 
 #define HB_VERSION_ATLEAST(major,minor,micro) \
 	((major)*10000+(minor)*100+(micro) <= \

test/shaping/data/in-house/tests/indic-syllable.tests

@@ -6,3 +6,5 @@
 ../fonts/1735326da89f0818cd8c51a0600e9789812c0f94.ttf::U+0A51:[uni25CC=0+1044|udaatguru=0+0]
 ../fonts/1735326da89f0818cd8c51a0600e9789812c0f94.ttf::U+25CC,U+0A51:[uni25CC=0+1044|udaatguru=0+0]
 ../fonts/81c368a33816fb20e9f647e8f24e2180f4720263.ttf:--no-glyph-names:U+0C80,U+0C82:[1=0+502|2=0+502]
+../fonts/f75c4b05a0a4d67c1a808081ae3d74a9c66509e8.ttf::U+0A20,U+0A75,U+0A47:[tthaguru=0+1352|yakashguru=0@-90,0+0|eematraguru=0@-411,0+0]
+../fonts/f75c4b05a0a4d67c1a808081ae3d74a9c66509e8.ttf::U+0A20,U+0A75,U+0A42:[tthaguru=0+1352|yakashuuguru=0+0]

test/shaping/data/in-house/tests/khmer-misc.tests

@@ -87,3 +87,4 @@
 ../fonts/3998336402905b8be8301ef7f47cf7e050cbb1bd.ttf::U+17A0,U+17D2,U+1782,U+17D2,U+179F,U+17CA,U+17C0:[uni17C1=0+288|uni17A0=0+928|uni17D21782=0@20,-26+0|uni17D2179F.low=0+302|uni17CA=0@-4,30+0|uni17C0.right1.high=0+288]
 ../fonts/3998336402905b8be8301ef7f47cf7e050cbb1bd.ttf::U+17A0,U+17D2,U+179A,U+17D2,U+179C,U+1784,U+17D2,U+1780:[uni17D2179A=0+287|uni17A0=0+928|uni17D2179C=0@20,-26+0|uni1784=5+635|uni17D21780=5@0,-26+0]
 ../fonts/3998336402905b8be8301ef7f47cf7e050cbb1bd.ttf::U+17A0,U+17D2,U+179A,U+17D2,U+179C,U+17B6,U+17C6,U+1784:[uni17D2179A=0+287|uni17A017B6=0+1216|uni17D2179C=0@-268,-26+0|uni17C6=0@47,-29+0|uni1784=7+635]
+../fonts/ad01ab2ea1cb1a4d3a2783e2675112ef11ae6404.ttf::U+17D2,U+17D2:[uni25CC=0+635|uni17D2=0+0|uni25CC=0+635|uni17D2=0+0]