Index: third_party/harfbuzz-ng/src/hb-ot-shape-complex-indic-private.hh |
diff --git a/third_party/harfbuzz-ng/src/hb-ot-shape-complex-indic-private.hh b/third_party/harfbuzz-ng/src/hb-ot-shape-complex-indic-private.hh |
index 39268b1453380763b7df7143175b3fea494bcf25..3de5c203fa312d81debac162af86476069aaef00 100644 |
--- a/third_party/harfbuzz-ng/src/hb-ot-shape-complex-indic-private.hh |
+++ b/third_party/harfbuzz-ng/src/hb-ot-shape-complex-indic-private.hh |
@@ -43,23 +43,25 @@ |
* Not sure how to avoid duplication. */ |
enum indic_category_t { |
OT_X = 0, |
- OT_C, |
- OT_V, |
- OT_N, |
- OT_H, |
- OT_ZWNJ, |
- OT_ZWJ, |
- OT_M, |
- OT_SM, |
- OT_VD, |
- OT_A, |
- OT_NBSP, |
- OT_DOTTEDCIRCLE, /* Not in the spec, but special in Uniscribe. /Very very/ special! */ |
- OT_RS, /* Register Shifter, used in Khmer OT spec */ |
- OT_Coeng, |
- OT_Repha, |
- OT_Ra, /* Not explicitly listed in the OT spec, but used in the grammar. */ |
- OT_CM |
+ OT_C = 1, |
+ OT_V = 2, |
+ OT_N = 3, |
+ OT_H = 4, |
+ OT_ZWNJ = 5, |
+ OT_ZWJ = 6, |
+ OT_M = 7, |
+ OT_SM = 8, |
+ OT_VD = 9, |
+ OT_A = 10, |
+ OT_NBSP = 11, |
+ OT_DOTTEDCIRCLE = 12, |
+ OT_RS = 13, /* Register Shifter, used in Khmer OT spec. */ |
+ OT_Coeng = 14, /* Khmer-style Virama. */ |
+ OT_Repha = 15, /* Atomically-encoded logical or visual repha. */ |
+ OT_Ra = 16, |
+ OT_CM = 17, /* Consonant-Medial. */ |
+ OT_Avag = 18, /* Avagraha. */ |
+ OT_CM2 = 31 /* Consonant-Medial, second slot. */ |
}; |
/* Visual positions in a syllable from left to right. */ |
@@ -93,7 +95,7 @@ enum indic_position_t { |
enum indic_syllabic_category_t { |
INDIC_SYLLABIC_CATEGORY_OTHER = OT_X, |
- INDIC_SYLLABIC_CATEGORY_AVAGRAHA = OT_X, |
+ INDIC_SYLLABIC_CATEGORY_AVAGRAHA = OT_Avag, |
INDIC_SYLLABIC_CATEGORY_BINDU = OT_SM, |
INDIC_SYLLABIC_CATEGORY_CONSONANT = OT_C, |
INDIC_SYLLABIC_CATEGORY_CONSONANT_DEAD = OT_C, |
@@ -101,7 +103,7 @@ enum indic_syllabic_category_t { |
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_SUBJOINED = OT_C, |
+ INDIC_SYLLABIC_CATEGORY_CONSONANT_SUBJOINED = OT_CM, |
INDIC_SYLLABIC_CATEGORY_CONSONANT_REPHA = OT_Repha, |
INDIC_SYLLABIC_CATEGORY_MODIFYING_LETTER = OT_X, |
INDIC_SYLLABIC_CATEGORY_NUKTA = OT_N, |