From 421e1d8ae101c2c7b87e9f0390d0f6e83f5e4999 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Sun, 30 Jan 2011 10:38:28 +0000 Subject: [PATCH] Evas font-engine: Also split on script common. SVN revision: 56472 --- legacy/evas/src/lib/engines/common/evas_font_ot.c | 1 - .../src/lib/engines/common/language/evas_language_utils.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/legacy/evas/src/lib/engines/common/evas_font_ot.c b/legacy/evas/src/lib/engines/common/evas_font_ot.c index 3a77afec8d..c78617e114 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_ot.c +++ b/legacy/evas/src/lib/engines/common/evas_font_ot.c @@ -131,7 +131,6 @@ evas_common_font_ot_cutoff_text_props(Evas_Text_Props *props, int cutoff) cutoff * sizeof(Evas_Font_OT_Data_Item)); props->ot_data->items = tmp; props->ot_data->len = cutoff; - } EAPI Eina_Bool diff --git a/legacy/evas/src/lib/engines/common/language/evas_language_utils.c b/legacy/evas/src/lib/engines/common/language/evas_language_utils.c index bd9732b8d9..c630004ace 100644 --- a/legacy/evas/src/lib/engines/common/language/evas_language_utils.c +++ b/legacy/evas/src/lib/engines/common/language/evas_language_utils.c @@ -65,12 +65,12 @@ evas_common_language_script_end_of_run_get(const Eina_Unicode *str, tmp = _get_script(*str); /* Arabic is the first script in the array that's not * common/inherited. */ - if ((first == EVAS_SCRIPT_UNKNOWN) && (tmp >= EVAS_SCRIPT_ARABIC)) + if ((first == EVAS_SCRIPT_UNKNOWN) && (tmp >= EVAS_SCRIPT_COMMON)) { first = tmp; continue; } - if ((first != tmp) && (tmp >= EVAS_SCRIPT_ARABIC)) + if ((first != tmp) && (tmp >= EVAS_SCRIPT_COMMON)) { break; } @@ -102,9 +102,9 @@ evas_common_language_script_end_of_run_get(const Eina_Unicode *str, Evas_Script_Type evas_common_language_script_type_get(const Eina_Unicode *str) { - Evas_Script_Type script = EVAS_SCRIPT_COMMON; + Evas_Script_Type script = EVAS_SCRIPT_UNKNOWN; /* Arabic is the first script in the array that's not a common/inherited */ - for ( ; *str && ((script = _get_script(*str)) < EVAS_SCRIPT_ARABIC) ; str++) + for ( ; *str && ((script = _get_script(*str)) < EVAS_SCRIPT_COMMON) ; str++) ; return script; }