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=c458fd0812fcf5934fbe25f698e4a081faa0a04d;hb=0cb355e273c2ef5b0efc545749496def9f25c27e;hpb=68a6ed0e6cea80391ff61990aa37a1865bec8629 diff --git a/dali-toolkit/internal/text/emoji-helper.cpp b/dali-toolkit/internal/text/emoji-helper.cpp index c458fd0..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,