Ge'ez (Ethiopic) script added.

Change-Id: If4eb00d531bc65755aa2f1d985f3e9480c4e104c
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

diff --git a/text/dali/devel-api/text-abstraction/script.cpp b/text/dali/devel-api/text-abstraction/script.cpp
index e0e4c26..3fbe6d1 100644 (file)
--- a/text/dali/devel-api/text-abstraction/script.cpp
+++ b/text/dali/devel-api/text-abstraction/script.cpp
@@ -232,6 +232,12 @@ Script GetCharacterScript( Character character )
   // 0x1b80 - 0x1bbf Sundanese
   // 0x1cc0 - 0x1ccf Sundanese supplement
 
+  // Ge'ez script (Ethiopic)
+  // 0x1200 - 0x137f Ethiopic
+  // 0x1380 - 0x139f Ethiopic supplement
+  // 0x2d80 - 0x2ddf Ethiopic Extended
+  // 0xab00 - 0xab2f Ethiopic Extended-A
+
   // The Emoji which map to standardized Unicode characters
   // 1. Emoticons ( 1F601 - 1F64F )
   // 2. Dingbats ( 2702 - 27B0 )
@@ -438,6 +444,14 @@ Script GetCharacterScript( Character character )
         {
           return HANGUL;
         }
+        if( ( 0x1200 <= character ) && ( character <= 0x137f ) )
+        {
+          return GEEZ;
+        }
+        if( ( 0x1380 <= character ) && ( character <= 0x139f ) )
+        {
+          return GEEZ;
+        }
         if( ( 0x1780 <= character ) && ( character <= 0x17ff ) )
         {
           return KHMER;
@@ -602,6 +616,10 @@ Script GetCharacterScript( Character character )
         {
           return GEORGIAN;
         }
+        if( ( 0x2d80 <= character ) && ( character <= 0x2ddf ) )
+        {
+          return GEEZ;
+        }
         if( ( 0x2de0 <= character ) && ( character <= 0x2dff ) )
         {
           return CYRILLIC;
@@ -699,6 +717,10 @@ Script GetCharacterScript( Character character )
         {
           return JAVANESE;
         }
+        if( ( 0xab00 <= character ) && ( character <= 0xab2f ) )
+        {
+          return GEEZ;
+        }
         if( ( 0xab30 <= character ) && ( character <= 0xab6f ) )
         {
           return LATIN;

diff --git a/text/dali/devel-api/text-abstraction/script.h b/text/dali/devel-api/text-abstraction/script.h
index 163aae2..ba272bf 100644 (file)
--- a/text/dali/devel-api/text-abstraction/script.h
+++ b/text/dali/devel-api/text-abstraction/script.h
@@ -91,6 +91,8 @@ enum Script
   JAVANESE,      ///< The Javanese script. Used by the Javanese language.
   SUNDANESE,     ///< The Sundanese script. Used by the Sundanese language.
 
+  GEEZ,          ///< The Ge'ez script. Used by the Amharic, Tigrinya and other languages in Ethiopia and Eritrea.
+
   EMOJI,         ///< The Emoji which map to standardized Unicode characters.
 
   SYMBOLS1,      ///< Some symbols.
@@ -159,6 +161,8 @@ const char* const ScriptName[] =
   "JAVANESE",      ///< The Javanese script. Used by the Javanese language.
   "SUNDANESE",     ///< The Sundanese script. Used by the Sundanese language.
 
+  "GEEZ",          ///< The Ge'ez script also known as Ethiopic. Used by the Amharic, Tigrinya and other languages in Ethiopia and Eritrea.
+
   "EMOJI",         ///< The Emoji which map to standardized Unicode characters.
 
   "SYMBOLS1",      ///< Some symbols.

diff --git a/text/dali/internal/text-abstraction/shaping-impl.cpp b/text/dali/internal/text-abstraction/shaping-impl.cpp
index 3df10a2..e7380d2 100644 (file)
--- a/text/dali/internal/text-abstraction/shaping-impl.cpp
+++ b/text/dali/internal/text-abstraction/shaping-impl.cpp
@@ -97,6 +97,8 @@ const hb_script_t SCRIPT_TO_HARFBUZZ[] =
   HB_SCRIPT_JAVANESE,
   HB_SCRIPT_SUNDANESE,
 
+  HB_SCRIPT_ETHIOPIC,
+
   HB_SCRIPT_UNKNOWN, // EMOJI
   HB_SCRIPT_UNKNOWN, // SYMBOLS1
   HB_SCRIPT_UNKNOWN, // SYMBOLS2