From: Bowon Ryu <bowon.ryu@samsung.com>
Date: Tue, 19 Jul 2022 01:47:15 +0000 (+0000)
Subject: Merge "Fix: VS15 hides non-Emoji Negative Squared Latin Capital Letter" into devel... 
X-Git-Tag: dali_2.1.32~6
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=d2c068e0a80380a9d72d3296435c14791212c532;hp=ef75e3b7a26f7beafc6376c04a72119d27a57df9

Merge "Fix: VS15 hides non-Emoji Negative Squared Latin Capital Letter" into devel/master
---

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
index f7bf429..0ece717 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
@@ -1146,22 +1146,27 @@ int UtcDaliToolkitTextLabelEmojisP(void)
     "Default &#x262a; \n"                                                                  //default presentation
     "FamilyManWomanGirlBoy &#x1F468;&#x200D;&#x1F469;&#x200D;&#x1F467;&#x200D;&#x1F466;\n" // emoji multi zwj sequence
     "WomanScientist &#x1f469;&#x200d;&#x1f52c;\n"                                          // emoji zwj sequence
-    "WomanScientistLightSkinTone&#x1F469;&#x1F3FB;&#x200D;&#x1F52C; \n"                    //emoji modifier sequence: skin tone & JWZ
-    "LeftRightArrowText&#x2194;&#xfe0e;\n"                                                 //text presentation sequence and selector
-    "LeftRightArrowEmoji&#x2194;&#xfe0f;\n"                                                //emoji presentation sequence and selector
-    "SouthKoreaFlag&#x1f1f0;&#x1f1f7;\n"                                                   //emoji flag sequence
+    "WomanScientistLightSkinTone&#x1F469;&#x1F3FB;&#x200D;&#x1F52C; \n"                    // emoji modifier sequence: skin tone & JWZ
+    "LeftRightArrowText&#x2194;&#xfe0e;\n"                                                 // text presentation sequence and selector
+    "LeftRightArrowEmoji&#x2194;&#xfe0f;\n"                                                // emoji presentation sequence and selector
+    "SouthKoreaFlag&#x1f1f0;&#x1f1f7;\n"                                                   // emoji flag sequence
     "JordanFlag&#x1f1ef;&#x1f1f4;\n"                                                       // emoji flag sequence
-    "EnglandFlag&#x1F3F4;&#xE0067;&#xE0062;&#xE0065;&#xE006E;&#xE0067;&#xE007F;\n"         //emoji tag sequence like England flag
+    "EnglandFlag&#x1F3F4;&#xE0067;&#xE0062;&#xE0065;&#xE006E;&#xE0067;&#xE007F;\n"         // emoji tag sequence like England flag
     "Runner &#x1f3c3;&#x200d;&#x27a1;&#xfe0f; \n"
-    "VictoryHandMediumLightSkinTone:&#x270C;&#xFE0F;&#x1F3FC;\n"               //emoji modifier sequence: skin tone
-    "RainbowFlag:&#x1F3F3;&#xFE0F;&#x200D;&#x1F308; \n"                        //emoji zwj sequence: Rainbow Flag
-    "keycap# &#x0023;&#xFE0F;&#x20E3; \n"                                      // fully-qualified  emoji keycap sequence
-    "keycap#_text &#x0023;&#x20E3; \n"                                         // unqualified emoji keycap sequence
-    "keycap3 &#x0033;&#xfe0f;&#x20e3; \n"                                      // fully-qualified  emoji keycap sequence
-    "keycap3_text &#x0033;&#x20e3; \n"                                         // unqualified emoji keycap sequence
-    "two adjacent glyphs &#x262a;&#xfe0f;&#xfe0f;&#xfe0f;&#x262a;&#xfe0f;\n"   //This line should be rendered as two adjacent glyphs
-    "Digit 8&#xfe0f; 8&#xfe0e; 8\n"                                            // should be rendered according to selector
-    "Surfing Medium Skin Female:  &#x1f3c4;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;"; // Person Surfing + Medium Skin Tone +? Zero Width Joiner + Female Sign
+    "VictoryHandMediumLightSkinTone:&#x270C;&#xFE0F;&#x1F3FC;\n"                                                                // emoji modifier sequence: skin tone
+    "RainbowFlag:&#x1F3F3;&#xFE0F;&#x200D;&#x1F308; \n"                                                                         // emoji zwj sequence: Rainbow Flag
+    "keycap# &#x0023;&#xFE0F;&#x20E3; \n"                                                                                       // fully-qualified  emoji keycap sequence
+    "keycap#_text &#x0023;&#x20E3; \n"                                                                                          // unqualified emoji keycap sequence
+    "keycap3 &#x0033;&#xfe0f;&#x20e3; \n"                                                                                       // fully-qualified  emoji keycap sequence
+    "keycap3_text &#x0033;&#x20e3; \n"                                                                                          // unqualified emoji keycap sequence
+    "two adjacent glyphs &#x262a;&#xfe0f;&#xfe0f;&#xfe0f;&#x262a;&#xfe0f;\n"                                                    // This line should be rendered as two adjacent glyphs
+    "Digit 8&#xfe0f; 8&#xfe0e; 8\n"                                                                                             // should be rendered according to selector
+    "Surfing Medium Skin Female:  &#x1f3c4;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;\n"                                                 // Person Surfing + Medium Skin Tone +? Zero Width Joiner + Female Sign
+    "SYMBOLS_NSLCL variation selector: &#x1f170;&#xfe0f;&#x1f171;&#xfe0f;&#x1f172;&#xfe0e;&#x1f173;&#xfe0e;&#x1f174;&#xfe0e;\n" // 1F170 ~ 1F174 with variation selector, text vs emoji
+    "SYMBOLS_NSLCL with VS15: &#x1f170;&#xfe0e;&#x1f171;&#xfe0e;&#x1f172;&#xfe0e;&#x1f173;&#xfe0e;&#x1f174;&#xfe0e;\n"          // 1F170 ~ 1F174 with VS15
+    "SYMBOLS_NSLCL with VS16: &#x1f170;&#xfe0f;&#x1f171;&#xfe0f;&#x1f172;&#xfe0f;&#x1f173;&#xfe0f;&#x1f174;&#xfe0f;\n"          // 1F170 ~ 1F174 with VS16
+
+    ;
 
   label.SetProperty(TextLabel::Property::TEXT, emojiSequences);
   label.SetProperty(TextLabel::Property::ENABLE_MARKUP, true);
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,