Special characters added to the script.

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / multi-language-support-impl.cpp

diff --git a/dali-toolkit/internal/text/multi-language-support-impl.cpp b/dali-toolkit/internal/text/multi-language-support-impl.cpp
index 2d1f5e6..e0053c8 100644 (file)
--- a/dali-toolkit/internal/text/multi-language-support-impl.cpp
+++ b/dali-toolkit/internal/text/multi-language-support-impl.cpp
@@ -213,8 +213,21 @@ void MultilanguageSupport::SetScripts( const Vector<Character>& text,
 
     if( TextAbstraction::UNKNOWN == script )
     {
-      script = TextAbstraction::LATIN;
-      DALI_ASSERT_DEBUG( !"MultilanguageSupport::SetScripts. Unkown script!" );
+      if( IsZeroWidthNonJoiner( character ) ||
+          IsZeroWidthJoiner( character ) ||
+          IsZeroWidthSpace( character ) ||
+          IsLeftToRightMark( character ) ||
+          IsRightToLeftMark( character ) ||
+          IsThinSpace( character ) )
+      {
+        // Keep previous script if the character is a zero width joiner or a zero width non joiner.
+        script = currentScriptRun.script;
+      }
+      else
+      {
+        script = TextAbstraction::LATIN;
+        DALI_ASSERT_DEBUG( !"MultilanguageSupport::SetScripts. Unkown script!" );
+      }
     }
 
     if( script != currentScriptRun.script )