[dali_1.2.45] Merge branch 'devel/master'

Change-Id: Ia73cd7558d3bdfb1e9b952889b353a68b1ae031f

diff --git a/adaptors/public-api/dali-adaptor-version.cpp b/adaptors/public-api/dali-adaptor-version.cpp
index cf80028..e59039c 100644 (file)
--- a/adaptors/public-api/dali-adaptor-version.cpp
+++ b/adaptors/public-api/dali-adaptor-version.cpp
@@ -28,7 +28,7 @@ namespace Dali
 
 const unsigned int ADAPTOR_MAJOR_VERSION = 1;
 const unsigned int ADAPTOR_MINOR_VERSION = 2;
-const unsigned int ADAPTOR_MICRO_VERSION = 44;
+const unsigned int ADAPTOR_MICRO_VERSION = 45;
 const char * const ADAPTOR_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 848f5bf..9555183 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -14,7 +14,7 @@
 
 Name:       dali-adaptor
 Summary:    The DALi Tizen Adaptor
-Version:    1.2.44
+Version:    1.2.45
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT

diff --git a/text/dali/devel-api/text-abstraction/script.cpp b/text/dali/devel-api/text-abstraction/script.cpp
index 3fbe6d1..2314f2d 100644 (file)
--- a/text/dali/devel-api/text-abstraction/script.cpp
+++ b/text/dali/devel-api/text-abstraction/script.cpp
@@ -238,6 +238,16 @@ Script GetCharacterScript( Character character )
   // 0x2d80 - 0x2ddf Ethiopic Extended
   // 0xab00 - 0xab2f Ethiopic Extended-A
 
+  // Baybayin Script
+  // 0x1700 - 0x171f Baybayin
+
+  // Ol Chiki Script
+  // 0x1c50 - 0x1c7f Ol Chiki
+
+  // Meitei Script
+  // 0xabc0 - 0xabff Meetei Mayek
+  // 0xaae0 - 0xaaff Meetei Mayek Extensions
+
   // The Emoji which map to standardized Unicode characters
   // 1. Emoticons ( 1F601 - 1F64F )
   // 2. Dingbats ( 2702 - 27B0 )
@@ -452,6 +462,10 @@ Script GetCharacterScript( Character character )
         {
           return GEEZ;
         }
+        if( ( 0x1700 <= character ) && ( character <= 0x171f ) )
+        {
+          return BAYBAYIN;
+        }
         if( ( 0x1780 <= character ) && ( character <= 0x17ff ) )
         {
           return KHMER;
@@ -464,6 +478,10 @@ Script GetCharacterScript( Character character )
         {
           return SUNDANESE;
         }
+        if( ( 0x1c50 <= character ) && ( character <= 0x1c7f ) )
+        {
+          return OL_CHIKI;
+        }
         if( ( 0x1cc0 <= character ) && ( character <= 0x1ccf ) )
         {
           return SUNDANESE;
@@ -725,6 +743,14 @@ Script GetCharacterScript( Character character )
         {
           return LATIN;
         }
+        if( ( 0xaae0 <= character ) && ( character <= 0xaaff ) )
+        {
+          return MEITEI;
+        }
+        if( ( 0xabc0 <= character ) && ( character <= 0xabff ) )
+        {
+          return MEITEI;
+        }
         if( ( 0xac00 <= character ) && ( character <= 0xd7af ) )
         {
           return HANGUL;

diff --git a/text/dali/devel-api/text-abstraction/script.h b/text/dali/devel-api/text-abstraction/script.h
index ba272bf..93d1021 100644 (file)
--- a/text/dali/devel-api/text-abstraction/script.h
+++ b/text/dali/devel-api/text-abstraction/script.h
@@ -92,6 +92,9 @@ enum Script
   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.
+  OL_CHIKI,      ///< The Ol Chiki script. Used by the Santali.
+  BAYBAYIN,      ///< The Baybayin script. Used by the Tagalog, Bikol languages, Ilocano, Pangasinan, Visayan and other languages in Philippines.
+  MEITEI,        ///< The Meitei script used for the Meitei language in Manipur, India.
 
   EMOJI,         ///< The Emoji which map to standardized Unicode characters.
 
@@ -162,6 +165,9 @@ const char* const ScriptName[] =
   "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.
+  "OL_CHIKI",      ///< The Ol Chiki script. Used by the Santali.
+  "BAYBAYIN",      ///< The Baybayin script. Used by the Tagalog, Bikol languages, Ilocano, Pangasinan, Visayan and other languages in Philippines.
+  "MEITEI",        ///< The Meitei script used for the Meitei language in Manipur, India.
 
   "EMOJI",         ///< The Emoji which map to standardized Unicode characters.
 

diff --git a/text/dali/internal/text-abstraction/shaping-impl.cpp b/text/dali/internal/text-abstraction/shaping-impl.cpp
index e7380d2..3eb3488 100644 (file)
--- a/text/dali/internal/text-abstraction/shaping-impl.cpp
+++ b/text/dali/internal/text-abstraction/shaping-impl.cpp
@@ -98,6 +98,9 @@ const hb_script_t SCRIPT_TO_HARFBUZZ[] =
   HB_SCRIPT_SUNDANESE,
 
   HB_SCRIPT_ETHIOPIC,
+  HB_SCRIPT_OL_CHIKI,
+  HB_SCRIPT_TAGALOG,
+  HB_SCRIPT_MEETEI_MAYEK,
 
   HB_SCRIPT_UNKNOWN, // EMOJI
   HB_SCRIPT_UNKNOWN, // SYMBOLS1