Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2024-04-02 22:57:21 +08:00
commit a944026bae
276 changed files with 1072 additions and 11108 deletions

View file

@ -48,7 +48,8 @@ enum IdentifierType {
enum EmojiPresentation {
TextOnly = 0,
TextDefault = 1,
EmojiDefault = 2
EmojiDefault = 2,
EmojiComponent = 3
};
const uint32_t kVariationSelector15 = 0xFE0E; // text presentation
@ -179,14 +180,17 @@ IsDefaultIgnorable(uint32_t aCh)
inline EmojiPresentation
GetEmojiPresentation(uint32_t aCh)
{
if (!u_hasBinaryProperty(aCh, UCHAR_EMOJI)) {
return TextOnly;
if (u_hasBinaryProperty(aCh, UCHAR_EMOJI_COMPONENT)) {
return EmojiComponent;
}
if (u_hasBinaryProperty(aCh, UCHAR_EMOJI_PRESENTATION)) {
if (u_hasBinaryProperty(aCh, UCHAR_EMOJI) &&
!u_hasBinaryProperty(aCh, UCHAR_EMOJI_PRESENTATION)) {
return TextDefault;
}
if (u_hasBinaryProperty(aCh, UCHAR_EXTENDED_PICTOGRAPHIC)) {
return EmojiDefault;
}
return TextDefault;
return TextOnly;
}
// returns the simplified Gen Category as defined in nsIUGenCategory