Revert "Evas font-engine: Also split on script common." - After

reviewing the standard again, it's not really wanted.

This reverts commit 26cc8747fda51e95d340ef1a1838817fe495be23.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@56482 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/engines/common/evas_font_ot.c b/src/lib/engines/common/evas_font_ot.c
index c78617e..3a77afe 100644 (file)
--- a/src/lib/engines/common/evas_font_ot.c
+++ b/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/src/lib/engines/common/language/evas_language_utils.c b/src/lib/engines/common/language/evas_language_utils.c
index 8cdf709..3af42b4 100644 (file)
--- a/src/lib/engines/common/language/evas_language_utils.c
+++ b/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;
 }