wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-05 23:38:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #2538 - Part 2: Add IsEmojiClusterExtender

Browse source 
Check specifically for Emoji-specific clusters only in Emoji-specific contexts.
This commit is contained in:
Andy 2024-06-26 11:11:19 -07:00 • committed by roytam1
commit 68bcd4e61e
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
intl/unicharutil/util/nsUnicodeProperties.cpp
View file

@ -156,6 +156,15 @@ IsClusterExtender(uint32_t aCh, uint8_t aCategory)
(aCh >= 0xff9e && aCh <= 0xff9f)); // katakana sound marks
}
bool
IsEmojiClusterExtender(uint32_t aCh)
{
return ((aCh == 0x200d) || (aCh == 0xfe0f) || // ZWJ, VS16
(aCh >= 0x1f3fb && aCh <= 0x1f3ff) || // fitzpatrick skin tones
(aCh >= 0x1f9b0 && aCh <= 0x1f9b3) || // hair colors
(aCh >= 0xe0020 && aCh <= 0xe007f)); // TAGs
}
enum HSType {
HST_NONE = U_HST_NOT_APPLICABLE,
HST_L = U_HST_LEADING_JAMO,
@ -263,6 +272,7 @@ ClusterIterator::Next()
}
bool extendCluster =
IsClusterExtender(ch) ||
IsEmojiClusterExtender(ch) ||
(baseIsEmoji && prevWasZwj &&
((GetEmojiPresentation(ch) == EmojiDefault) ||
(GetEmojiPresentation(ch) == EmojiComponent) ||
@ -297,7 +307,8 @@ ClusterReverseIterator::Next()
ch = SURROGATE_TO_UCS4(*--mPos, ch);
}
if (!IsClusterExtender(ch)) {
// TODO: Full extendCluster support.
if (!(IsClusterExtender(ch) || IsEmojiClusterExtender(ch))) {
break;
}
} while (mPos > mLimit);

2
intl/unicharutil/util/nsUnicodeProperties.h
View file

@ -219,6 +219,8 @@ inline bool IsClusterExtender(uint32_t aCh) {
return IsClusterExtender(aCh, GetGeneralCategory(aCh));
}
bool IsEmojiClusterExtender(uint32_t aCh);
// A simple iterator for a string of char16_t codepoints that advances
// by Unicode grapheme clusters
class ClusterIterator