From 1c657460efacb3848a4a719a1c97b40fb88b49fd Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 10 Jun 2022 06:29:45 -0600 Subject: [PATCH] [indic] Expand MEDIAL_FLAGS --- src/hb-ot-shaper-indic.cc | 2 +- src/hb-ot-shaper-indic.hh | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/hb-ot-shaper-indic.cc b/src/hb-ot-shaper-indic.cc index ea9e7ae9d..412af40e9 100644 --- a/src/hb-ot-shaper-indic.cc +++ b/src/hb-ot-shaper-indic.cc @@ -751,7 +751,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 (I_Cat(N)) | FLAG (I_Cat(RS)) | MEDIAL_FLAGS | FLAG (I_Cat(H))))) + if ((FLAG_UNSAFE (info[i].indic_category()) & (JOINER_FLAGS | FLAG (I_Cat(N)) | FLAG (I_Cat(RS)) | FLAG (I_Cat(CM)) | FLAG (I_Cat(H))))) { info[i].indic_position() = last_pos; if (unlikely (info[i].indic_category() == I_Cat(H) && diff --git a/src/hb-ot-shaper-indic.hh b/src/hb-ot-shaper-indic.hh index 2aced81fb..ee8a04426 100644 --- a/src/hb-ot-shaper-indic.hh +++ b/src/hb-ot-shaper-indic.hh @@ -92,8 +92,6 @@ enum ot_category_t { OT_ML = 42, // Consonant medials }; -#define MEDIAL_FLAGS (FLAG (OT_CM)) - /* Note: * * We treat Vowels and placeholders as if they were consonants. This is safe because Vowels @@ -101,7 +99,7 @@ enum ot_category_t { * consonant syllable logic from the vowel syllable function and get it all right! * * Keep in sync with consonant_categories in the generator. */ -#define CONSONANT_FLAGS (FLAG (OT_C) | FLAG (OT_CS) | FLAG (OT_Ra) | MEDIAL_FLAGS | FLAG (OT_V) | FLAG (OT_PLACEHOLDER) | FLAG (OT_DOTTEDCIRCLE)) +#define CONSONANT_FLAGS (FLAG (OT_C) | FLAG (OT_CS) | FLAG (OT_Ra) | FLAG (OT_CM) | FLAG (OT_V) | FLAG (OT_PLACEHOLDER) | FLAG (OT_DOTTEDCIRCLE)) /* Visual positions in a syllable from left to right. */