1 files changed, 13 insertions, 3 deletions

diff --git a/src/ui/text.h b/src/ui/text.h
index 5bae8e2a..a0b2dc1a 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -114,11 +114,21 @@ enum iFontId {
 iLocalDef iBool isJapanese_FontId(enum iFontId id) {
     return id >= defaultJapanese_FontId && id <= hugeJapanese_FontId;
 }
-iLocalDef iBool isVariationSelector_Char(iChar ch) {
-    return ch >= 0xfe00 && ch <= 0xfe0f;
+iLocalDef iBool isVariationSelector_Char(iChar c) {
+    return (c >= 0xfe00 && c <= 0xfe0f) || (c >= 0xe0100 && c <= 0xe0121);
+}
+iLocalDef iBool isFitzpatrickType_Char(iChar c) {
+    return c >= 0x1f3fb && c <= 0x1f3ff;
+}
+iLocalDef iBool isDefaultIgnorable_Char(iChar c) {
+    return c == 0x115f || (c >= 0x200b && c <= 0x200e) || c == 0x2060 || c == 0x2061 ||
+           c == 0xfeff;
+}
+iLocalDef iBool isEmoji_Char(iChar c) {
+    return (c >= 0x1f300 && c < 0x1f700) || (c >= 0x1f900 && c <= 0x1f9ff);
 }
 
-#define variationSelectorEmoji_Char     ((iChar) 0xfe0f)
+#define emojiVariationSelector_Char     ((iChar) 0xfe0f)
 
 enum iTextFont {
     nunito_TextFont,