walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor

This commit is contained in:
Behdad Esfahbod 2011-07-20 22:16:13 -04:00
parent 26b6024962
commit fca0923b04
1 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/hb-icu.cc
View File

@ -63,18 +63,18 @@ hb_icu_script_from_script (hb_script_t script)
static unsigned int static unsigned int
hb_icu_get_combining_class (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_icu_unicode_combining_class (hb_unicode_funcs_t *ufuncs HB_UNUSED,
hb_codepoint_t unicode, hb_codepoint_t unicode,
void *user_data HB_UNUSED) void *user_data HB_UNUSED)
{ {
return u_getCombiningClass (unicode); return u_getCombiningClass (unicode);
} }
static unsigned int static unsigned int
hb_icu_get_eastasian_width (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_icu_unicode_eastasian_width (hb_unicode_funcs_t *ufuncs HB_UNUSED,
hb_codepoint_t unicode, hb_codepoint_t unicode,
void *user_data HB_UNUSED) void *user_data HB_UNUSED)
{ {
switch (u_getIntPropertyValue(unicode, UCHAR_EAST_ASIAN_WIDTH)) switch (u_getIntPropertyValue(unicode, UCHAR_EAST_ASIAN_WIDTH))
{ {
@ -91,9 +91,9 @@ hb_icu_get_eastasian_width (hb_unicode_funcs_t *ufuncs HB_UNUSED,
} }
static hb_unicode_general_category_t static hb_unicode_general_category_t
hb_icu_get_general_category (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_icu_unicode_general_category (hb_unicode_funcs_t *ufuncs HB_UNUSED,
hb_codepoint_t unicode, hb_codepoint_t unicode,
void *user_data HB_UNUSED) void *user_data HB_UNUSED)
{ {
switch (u_getIntPropertyValue(unicode, UCHAR_GENERAL_CATEGORY)) switch (u_getIntPropertyValue(unicode, UCHAR_GENERAL_CATEGORY))
{ {
@ -142,17 +142,17 @@ hb_icu_get_general_category (hb_unicode_funcs_t *ufuncs HB_UNUSED,
} }
static hb_codepoint_t static hb_codepoint_t
hb_icu_get_mirroring (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_icu_unicode_mirroring (hb_unicode_funcs_t *ufuncs HB_UNUSED,
hb_codepoint_t unicode, hb_codepoint_t unicode,
void *user_data HB_UNUSED) void *user_data HB_UNUSED)
{ {
return u_charMirror(unicode); return u_charMirror(unicode);
} }
static hb_script_t static hb_script_t
hb_icu_get_script (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_icu_unicode_script (hb_unicode_funcs_t *ufuncs HB_UNUSED,
hb_codepoint_t unicode, hb_codepoint_t unicode,
void *user_data HB_UNUSED) void *user_data HB_UNUSED)
{ {
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
UScriptCode scriptCode = uscript_getScript(unicode, &status); UScriptCode scriptCode = uscript_getScript(unicode, &status);
@ -163,6 +163,26 @@ hb_icu_get_script (hb_unicode_funcs_t *ufuncs HB_UNUSED,
return hb_icu_script_to_script (scriptCode); return hb_icu_script_to_script (scriptCode);
} }
static hb_bool_t
hb_icu_unicode_compose (hb_unicode_funcs_t *ufuncs HB_UNUSED,
hb_codepoint_t a,
hb_codepoint_t b,
hb_codepoint_t *ab,
void *user_data HB_UNUSED)
{
return FALSE;
}
static hb_bool_t
hb_icu_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED,
hb_codepoint_t ab,
hb_codepoint_t *a,
hb_codepoint_t *b,
void *user_data HB_UNUSED)
{
return FALSE;
}
extern HB_INTERNAL hb_unicode_funcs_t _hb_unicode_funcs_icu; extern HB_INTERNAL hb_unicode_funcs_t _hb_unicode_funcs_icu;
hb_unicode_funcs_t _hb_icu_unicode_funcs = { hb_unicode_funcs_t _hb_icu_unicode_funcs = {
HB_OBJECT_HEADER_STATIC, HB_OBJECT_HEADER_STATIC,
@ -170,15 +190,9 @@ hb_unicode_funcs_t _hb_icu_unicode_funcs = {
NULL, /* parent */ NULL, /* parent */
TRUE, /* immutable */ TRUE, /* immutable */
{ {
hb_icu_get_combining_class, #define HB_UNICODE_FUNC_IMPLEMENT(name) hb_icu_unicode_##name,
hb_icu_get_eastasian_width, HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS
hb_icu_get_general_category, #undef HB_UNICODE_FUNC_IMPLEMENT
hb_icu_get_mirroring,
hb_icu_get_script,
/* TODO
hb_icu_compose,
hb_icu_decompose,
*/
} }
}; };