From 7ce45d8bd498b078c67b346c0833cca0bb4ca001 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Sun, 30 Jan 2011 10:39:29 +0000 Subject: [PATCH] Revert "Evas font-engine: Also split on script common." - After reviewing the standard again, it's not really wanted. This reverts commit 26cc8747fda51e95d340ef1a1838817fe495be23. SVN revision: 56482 --- legacy/evas/src/lib/engines/common/evas_font_ot.c | 1 + .../src/lib/engines/common/language/evas_language_utils.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 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 c78617e114..3a77afec8d 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_ot.c +++ b/legacy/evas/src/lib/engines/common/evas_font_ot.c @@ -131,6 +131,7 @@ 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 8cdf709502..3af42b4bfd 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_COMMON)) + if ((first == EVAS_SCRIPT_UNKNOWN) && (tmp >= EVAS_SCRIPT_ARABIC)) { first = tmp; continue; } - if ((first != tmp) && (tmp >= EVAS_SCRIPT_COMMON)) + if ((first != tmp) && (tmp >= EVAS_SCRIPT_ARABIC)) { break; } @@ -103,9 +103,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_UNKNOWN; + Evas_Script_Type script = EVAS_SCRIPT_COMMON; /* Arabic is the first script in the array that's not a common/inherited */ - for ( ; *str && ((script = _get_script(*str)) < EVAS_SCRIPT_COMMON) ; str++) + for ( ; *str && ((script = _get_script(*str)) < EVAS_SCRIPT_ARABIC) ; str++) ; return script; }