Revert "evas_font_query: fixed the wrong arrangement when white-char is on wrapping...

This reverts commit 9f50447c1dbbc67f05add96fad12c86a282d0ef0.

Change-Id: Iaf713d5584161a446b83793a7048e478891152a1

diff --git a/src/lib/evas/common/evas_font_query.c b/src/lib/evas/common/evas_font_query.c
index df15503..a25c19c 100644 (file)
--- a/src/lib/evas/common/evas_font_query.c
+++ b/src/lib/evas/common/evas_font_query.c
@@ -2,54 +2,6 @@
 
 #define VAR_SEQ_SAFE(x) (((x)<run_end) ? VAR_SEQ(*(x)) : 0)
 
-// TIZEN_ONLY(20050) : Textblock does not have proper logic for line wrapping with below conditions
-//                    1. one of white characters is on the wrapping point
-//                    2. the white character is drawn with different font from the characters which are before and after that.
-//
-//                     This causes the issue that the advance of white is added to the line-width, and results the wrong arrangement of the line.
-//                     And, this is also bad in the ellipsis case.
-//
-//                     So, we need to follow the old logic which has assumed that -
-//                     the fonts for white characters can always be cached by the current processing font. (tag: wrapping_with_white_char)
-static Eina_Bool
-_is_white(Eina_Unicode c)
-{
-   /*
-    * unicode list of whitespace chars
-    *
-    * 0009..000D <control-0009>..<control-000D>
-    * 0020 SPACE
-    * 0085 <control-0085>
-    * 00A0 NO-BREAK SPACE
-    * 1680 OGHAM SPACE MARK
-    * 180E MONGOLIAN VOWEL SEPARATOR
-    * 2000..200A EN QUAD..HAIR SPACE
-    * 2028 LINE SEPARATOR
-    * 2029 PARAGRAPH SEPARATOR
-    * 202F NARROW NO-BREAK SPACE
-    * 205F MEDIUM MATHEMATICAL SPACE
-    * 3000 IDEOGRAPHIC SPACE
-    */
-   if (
-         (c == 0x20) ||
-         ((c >= 0x9) && (c <= 0xd)) ||
-         (c == 0x85) ||
-         (c == 0xa0) ||
-         (c == 0x1680) ||
-         (c == 0x180e) ||
-         ((c >= 0x2000) && (c <= 0x200a)) ||
-         (c == 0x2028) ||
-         (c == 0x2029) ||
-         (c == 0x202f) ||
-         (c == 0x205f) ||
-         (c == 0x3000)
-      )
-     return EINA_TRUE;
-   return EINA_FALSE;
-}
-// END //
-
-
 /* FIXME: Check coverage according to the font and not by actually loading */
 /**
  * @internal
@@ -109,9 +61,6 @@ evas_common_font_query_run_font_end_get(RGBA_Font *fn, RGBA_Font_Int **script_fi
               * script's font. */
              if (!evas_common_get_char_index(fi, *itr, variation_sequence))
                break;
-             // TIZEN_ONLY(20050) : please refer to "wrapping_with_white_char" tag to get details of this code
-             else if (_is_white(*itr)) continue;
-             // END
 
              if (fi != *script_fi)
                {