From cf78dd483cbe1759a8ecb731879e041a53ba9bb3 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 27 May 2014 17:53:37 -0400 Subject: [PATCH] [indic/myanmar] Rename OT_NBSP to OT_PLACEHOLDER --- src/hb-ot-shape-complex-indic-machine.rl | 4 ++-- src/hb-ot-shape-complex-indic-private.hh | 6 +++--- src/hb-ot-shape-complex-indic.cc | 4 ++-- src/hb-ot-shape-complex-myanmar.cc | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/hb-ot-shape-complex-indic-machine.rl b/src/hb-ot-shape-complex-indic-machine.rl index 8332348f3..09b4ac52a 100644 --- a/src/hb-ot-shape-complex-indic-machine.rl +++ b/src/hb-ot-shape-complex-indic-machine.rl @@ -49,7 +49,7 @@ M = 7; SM = 8; VD = 9; A = 10; -NBSP = 11; +PLACEHOLDER = 11; DOTTEDCIRCLE = 12; RS = 13; Coeng = 14; @@ -70,7 +70,7 @@ forced_rakar = ZWJ H ZWJ Ra; symbol = Symbol.N?; matra_group = z{0,3}.M.N?.(H | forced_rakar)?; syllable_tail = (SM.SM?.ZWNJ?)? A{0,3}? VD{0,2}; -place_holder = NBSP | DOTTEDCIRCLE; +place_holder = PLACEHOLDER | DOTTEDCIRCLE; halant_group = (z?.h.(ZWJ.N?)?); final_halant_group = halant_group | h.ZWNJ; medial_group = CM?.CM2?; diff --git a/src/hb-ot-shape-complex-indic-private.hh b/src/hb-ot-shape-complex-indic-private.hh index beabe0d4e..266adbcd7 100644 --- a/src/hb-ot-shape-complex-indic-private.hh +++ b/src/hb-ot-shape-complex-indic-private.hh @@ -53,7 +53,7 @@ enum indic_category_t { OT_SM = 8, OT_VD = 9, OT_A = 10, - OT_NBSP = 11, + OT_PLACEHOLDER = 11, OT_DOTTEDCIRCLE = 12, OT_RS = 13, /* Register Shifter, used in Khmer OT spec. */ OT_Coeng = 14, /* Khmer-style Virama. */ @@ -71,7 +71,7 @@ enum indic_category_t { * 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_Ra) | MEDIAL_FLAGS | FLAG (OT_V) | FLAG (OT_NBSP) | FLAG (OT_DOTTEDCIRCLE)) +#define CONSONANT_FLAGS (FLAG (OT_C) | FLAG (OT_Ra) | MEDIAL_FLAGS | FLAG (OT_V) | FLAG (OT_PLACEHOLDER) | FLAG (OT_DOTTEDCIRCLE)) #define JOINER_FLAGS (FLAG (OT_ZWJ) | FLAG (OT_ZWNJ)) #define HALANT_OR_COENG_FLAGS (FLAG (OT_H) | FLAG (OT_Coeng)) @@ -114,7 +114,7 @@ enum indic_syllabic_category_t { INDIC_SYLLABIC_CATEGORY_CONSONANT_FINAL = OT_CM, INDIC_SYLLABIC_CATEGORY_CONSONANT_HEAD_LETTER = OT_C, INDIC_SYLLABIC_CATEGORY_CONSONANT_MEDIAL = OT_CM, - INDIC_SYLLABIC_CATEGORY_CONSONANT_PLACEHOLDER = OT_NBSP, + INDIC_SYLLABIC_CATEGORY_CONSONANT_PLACEHOLDER = OT_PLACEHOLDER, INDIC_SYLLABIC_CATEGORY_CONSONANT_SUBJOINED = OT_CM, INDIC_SYLLABIC_CATEGORY_CONSONANT_REPHA = OT_Repha, INDIC_SYLLABIC_CATEGORY_MODIFYING_LETTER = OT_X, diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc index 7f1606cc3..5d8613ced 100644 --- a/src/hb-ot-shape-complex-indic.cc +++ b/src/hb-ot-shape-complex-indic.cc @@ -1185,8 +1185,8 @@ initial_reordering_standalone_cluster (const hb_ot_shape_plan_t *plan, hb_buffer_t *buffer, unsigned int start, unsigned int end) { - /* We treat NBSP/dotted-circle as if they are consonants, so we should just chain. - * Only if not in compatibility mode that is... */ + /* We treat placeholder/dotted-circle as if they are consonants, so we + * should just chain. Only if not in compatibility mode that is... */ if (hb_options ().uniscribe_bug_compatible) { diff --git a/src/hb-ot-shape-complex-myanmar.cc b/src/hb-ot-shape-complex-myanmar.cc index 66ca1cff2..149a0250d 100644 --- a/src/hb-ot-shape-complex-myanmar.cc +++ b/src/hb-ot-shape-complex-myanmar.cc @@ -134,7 +134,7 @@ enum myanmar_category_t { OT_D = 19, /* Digits except zero */ OT_D0 = 20, /* Digit zero */ OT_DB = OT_N, /* Dot below */ - OT_GB = OT_NBSP, + OT_GB = OT_PLACEHOLDER, OT_MH = 21, /* Various consonant medial types */ OT_MR = 22, /* Various consonant medial types */ OT_MW = 23, /* Various consonant medial types */