From: Behdad Esfahbod Date: Thu, 21 Jul 2011 04:12:33 +0000 (-0400) Subject: Rename HB_UNICODE_GENERAL_CATEGORY_COMBINING_MARK to HB_UNICODE_GENERAL_CATEGORY_SPAC... X-Git-Tag: submit/master/20120920.151126~7^2~64 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5157e12a55f943b7fc5be7dce0b2ee1bcacca6ec;p=framework%2Fuifw%2Fharfbuzz.git Rename HB_UNICODE_GENERAL_CATEGORY_COMBINING_MARK to HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK Spacing_Mark is the current Unicode long-name for this property value. The previous name was wrongly carried from glib. --- diff --git a/src/hb-common.h b/src/hb-common.h index 9e39cd2..a0ab17e 100644 --- a/src/hb-common.h +++ b/src/hb-common.h @@ -145,7 +145,7 @@ typedef enum HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER, /* Lo */ HB_UNICODE_GENERAL_CATEGORY_TITLECASE_LETTER, /* Lt */ HB_UNICODE_GENERAL_CATEGORY_UPPERCASE_LETTER, /* Lu */ - HB_UNICODE_GENERAL_CATEGORY_COMBINING_MARK, /* Mc */ + HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK, /* Mc */ HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK, /* Me */ HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK, /* Mn */ HB_UNICODE_GENERAL_CATEGORY_DECIMAL_NUMBER, /* Nd */ diff --git a/src/hb-icu.cc b/src/hb-icu.cc index 384b77d..7b85cd5 100644 --- a/src/hb-icu.cc +++ b/src/hb-icu.cc @@ -109,7 +109,7 @@ hb_icu_unicode_general_category (hb_unicode_funcs_t *ufuncs HB_UNUSED, case U_NON_SPACING_MARK: return HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK; case U_ENCLOSING_MARK: return HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK; - case U_COMBINING_SPACING_MARK: return HB_UNICODE_GENERAL_CATEGORY_COMBINING_MARK; + case U_COMBINING_SPACING_MARK: return HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK; case U_DECIMAL_DIGIT_NUMBER: return HB_UNICODE_GENERAL_CATEGORY_DECIMAL_NUMBER; case U_LETTER_NUMBER: return HB_UNICODE_GENERAL_CATEGORY_LETTER_NUMBER;