X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Femoji-helper.cpp;h=35a7760a0d680034e0ee685088fe891a1c4406bf;hp=eec4ee480d90ed413a06ccc9bfd49ddab723b921;hb=HEAD;hpb=2d3b65beba8590908a3a36183c4067e5ac0a51f8

diff --git a/dali-toolkit/internal/text/emoji-helper.cpp b/dali-toolkit/internal/text/emoji-helper.cpp
index eec4ee4..35a7760 100644
--- a/dali-toolkit/internal/text/emoji-helper.cpp
+++ b/dali-toolkit/internal/text/emoji-helper.cpp
@@ -42,13 +42,14 @@ bool IsEmojiSequence(const TextAbstraction::Script&    currentRunScript,
                      const TextAbstraction::Character& character,
                      const TextAbstraction::Script&    characterScript)
 {
-  return (IsOneOfEmojiScripts(currentRunScript) &&
-          (IsOneOfEmojiScripts(characterScript) ||
-           TextAbstraction::IsZeroWidthJoiner(character) ||
-           TextAbstraction::IsZeroWidthNonJoiner(character) ||
-           TextAbstraction::IsEmojiItem(character) ||
-           TextAbstraction::IsMiscellaneousSymbolsAndArrowsEmoji(character) ||
-           TextAbstraction::IsDingbatsEmoji(character)));
+  return (!(TextAbstraction::IsNegativeSquaredLatinCapitalLetter(character)) &&
+          (IsOneOfEmojiScripts(currentRunScript) &&
+           (IsOneOfEmojiScripts(characterScript) ||
+            TextAbstraction::IsZeroWidthJoiner(character) ||
+            TextAbstraction::IsZeroWidthNonJoiner(character) ||
+            TextAbstraction::IsEmojiItem(character) ||
+            TextAbstraction::IsMiscellaneousSymbolsAndArrowsEmoji(character) ||
+            TextAbstraction::IsDingbatsEmoji(character))));
 }
 
 bool IsNewSequence(const Character* const         textBuffer,
@@ -77,7 +78,7 @@ bool IsNewKeycapSequence(const Character* const   textBuffer,
   // Default initialization does not keycap sequence
   bool isNewKeycapSequence = false;
 
-  if(currentCharacterIndex < lastCharacterIndex)
+  if(currentCharacterIndex <= lastCharacterIndex)
   {
     Character currentCharacter = *(textBuffer + currentCharacterIndex);
     if(IsStartForKeycapSequence(currentCharacter))
@@ -112,7 +113,7 @@ bool IsNewVariationSelectorSequence(const Character* const         textBuffer,
   // Default initialization does not VariationSelector sequence
   bool isNewVariationSelectorSequence = false;
 
-  if(currentCharacterIndex < lastCharacterIndex)
+  if(currentCharacterIndex <= lastCharacterIndex)
   {
     Character currentCharacter = *(textBuffer + currentCharacterIndex);
     if(TextAbstraction::IsEmojiVariationSequences(currentCharacter))