From 4b874e6dbd777d590cb23226f0f3432e61635c34 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sun, 14 May 2017 07:16:49 +0100 Subject: [PATCH] Add Emoji_Modifier from emoji-data.txt. --- src/include/ucd/ucd.h | 2 ++ src/proplist.c | 2 +- tools/printdata.py | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/include/ucd/ucd.h b/src/include/ucd/ucd.h index bdd0a227..0dc3cb70 100644 --- a/src/include/ucd/ucd.h +++ b/src/include/ucd/ucd.h @@ -364,6 +364,7 @@ typedef uint64_t ucd_property; #define UCD_PROPERTY_PREPENDED_CONCATENATION_MARK 0x0000000100000000ull /**< @brief Prepended_Concatenation_Mark */ #define UCD_PROPERTY_EMOJI 0x0000000200000000ull /**< @brief Emoji */ #define UCD_PROPERTY_EMOJI_PRESENTATION 0x0000000400000000ull /**< @brief Emoji_Presentation */ +#define UCD_PROPERTY_EMOJI_MODIFIER 0x0000000800000000ull /**< @brief Emoji_Modifier */ /** @brief Return the properties of the specified codepoint. * @@ -858,6 +859,7 @@ namespace ucd Prepended_Concatenation_Mark = UCD_PROPERTY_PREPENDED_CONCATENATION_MARK, /**< @brief Prepended_Concatenation_Mark */ Emoji = UCD_PROPERTY_EMOJI, /**< @brief Emoji */ Emoji_Presentation = UCD_PROPERTY_EMOJI_PRESENTATION, /**< @brief Emoji_Presentation */ + Emoji_Modifier = UCD_PROPERTY_EMOJI_MODIFIER, /**< @brief Emoji_Modifier */ }; /** @brief Return the properties of the specified codepoint. diff --git a/src/proplist.c b/src/proplist.c index 1146ef8d..df9588a4 100644 --- a/src/proplist.c +++ b/src/proplist.c @@ -1667,7 +1667,7 @@ static ucd_property properties_Sk(codepoint_t c) if (c == 0xFFE3) return UCD_PROPERTY_DIACRITIC; break; case 0x01F300: - return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER; } return 0; } diff --git a/tools/printdata.py b/tools/printdata.py index 5f93bff4..f1dd7233 100755 --- a/tools/printdata.py +++ b/tools/printdata.py @@ -163,6 +163,7 @@ def properties(data): props += (2 ** 32) * data.get('Prepended_Concatenation_Mark', 0) props += (2 ** 33) * data.get('Emoji', 0) # emoji-data props += (2 ** 34) * data.get('Emoji_Presentation', 0) # emoji-data + props += (2 ** 35) * data.get('Emoji_Modifier', 0) # emoji-data return props if __name__ == '__main__':