From 07bab5253e831d5c9b7797f1170243628f6895e3 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 9 Feb 2023 09:45:42 +0530 Subject: [PATCH] Update Unicode data --- kitty/emoji.h | 20 ++++++++------------ kitty/wcwidth-std.h | 20 ++++++++------------ tools/wcswidth/std.go | 20 ++++++++------------ 3 files changed, 24 insertions(+), 36 deletions(-) diff --git a/kitty/emoji.h b/kitty/emoji.h index 665eea98d..07586652d 100644 --- a/kitty/emoji.h +++ b/kitty/emoji.h @@ -277,7 +277,7 @@ is_emoji(char_type code) { return true; case 0x1f6d5 ... 0x1f6d7: return true; - case 0x1f6dd ... 0x1f6e5: + case 0x1f6dc ... 0x1f6e5: return true; case 0x1f6e9: return true; @@ -297,23 +297,19 @@ is_emoji(char_type code) { return true; case 0x1f947 ... 0x1f9ff: return true; - case 0x1fa70 ... 0x1fa74: + case 0x1fa70 ... 0x1fa7c: return true; - case 0x1fa78 ... 0x1fa7c: + case 0x1fa80 ... 0x1fa88: return true; - case 0x1fa80 ... 0x1fa86: + case 0x1fa90 ... 0x1fabd: return true; - case 0x1fa90 ... 0x1faac: + case 0x1fabf ... 0x1fac5: return true; - case 0x1fab0 ... 0x1faba: + case 0x1face ... 0x1fadb: return true; - case 0x1fac0 ... 0x1fac5: + case 0x1fae0 ... 0x1fae8: return true; - case 0x1fad0 ... 0x1fad9: - return true; - case 0x1fae0 ... 0x1fae7: - return true; - case 0x1faf0 ... 0x1faf6: + case 0x1faf0 ... 0x1faf8: return true; default: return false; } diff --git a/kitty/wcwidth-std.h b/kitty/wcwidth-std.h index b14e89b35..270838347 100644 --- a/kitty/wcwidth-std.h +++ b/kitty/wcwidth-std.h @@ -3209,7 +3209,7 @@ is_emoji_presentation_base(uint32_t code) { return true; case 0x1f6d5 ... 0x1f6d7: return true; - case 0x1f6dd ... 0x1f6e5: + case 0x1f6dc ... 0x1f6e5: return true; case 0x1f6e9: return true; @@ -3229,23 +3229,19 @@ is_emoji_presentation_base(uint32_t code) { return true; case 0x1f947 ... 0x1f9ff: return true; - case 0x1fa70 ... 0x1fa74: + case 0x1fa70 ... 0x1fa7c: return true; - case 0x1fa78 ... 0x1fa7c: + case 0x1fa80 ... 0x1fa88: return true; - case 0x1fa80 ... 0x1fa86: + case 0x1fa90 ... 0x1fabd: return true; - case 0x1fa90 ... 0x1faac: + case 0x1fabf ... 0x1fac5: return true; - case 0x1fab0 ... 0x1faba: + case 0x1face ... 0x1fadb: return true; - case 0x1fac0 ... 0x1fac5: + case 0x1fae0 ... 0x1fae8: return true; - case 0x1fad0 ... 0x1fad9: - return true; - case 0x1fae0 ... 0x1fae7: - return true; - case 0x1faf0 ... 0x1faf6: + case 0x1faf0 ... 0x1faf8: return true; default: return false; } diff --git a/tools/wcswidth/std.go b/tools/wcswidth/std.go index 16d6e89c4..35ffcc478 100644 --- a/tools/wcswidth/std.go +++ b/tools/wcswidth/std.go @@ -3199,7 +3199,7 @@ func IsEmojiPresentationBase(code rune) bool { return true case 0x1f6d5, 0x1f6d6, 0x1f6d7: return true - case 0x1f6dd, 0x1f6de, 0x1f6df, 0x1f6e0, 0x1f6e1, 0x1f6e2, 0x1f6e3, 0x1f6e4, 0x1f6e5: + case 0x1f6dc, 0x1f6dd, 0x1f6de, 0x1f6df, 0x1f6e0, 0x1f6e1, 0x1f6e2, 0x1f6e3, 0x1f6e4, 0x1f6e5: return true case 0x1f6e9: return true @@ -3219,23 +3219,19 @@ func IsEmojiPresentationBase(code rune) bool { return true case 0x1f947, 0x1f948, 0x1f949, 0x1f94a, 0x1f94b, 0x1f94c, 0x1f94d, 0x1f94e, 0x1f94f, 0x1f950, 0x1f951, 0x1f952, 0x1f953, 0x1f954, 0x1f955, 0x1f956, 0x1f957, 0x1f958, 0x1f959, 0x1f95a, 0x1f95b, 0x1f95c, 0x1f95d, 0x1f95e, 0x1f95f, 0x1f960, 0x1f961, 0x1f962, 0x1f963, 0x1f964, 0x1f965, 0x1f966, 0x1f967, 0x1f968, 0x1f969, 0x1f96a, 0x1f96b, 0x1f96c, 0x1f96d, 0x1f96e, 0x1f96f, 0x1f970, 0x1f971, 0x1f972, 0x1f973, 0x1f974, 0x1f975, 0x1f976, 0x1f977, 0x1f978, 0x1f979, 0x1f97a, 0x1f97b, 0x1f97c, 0x1f97d, 0x1f97e, 0x1f97f, 0x1f980, 0x1f981, 0x1f982, 0x1f983, 0x1f984, 0x1f985, 0x1f986, 0x1f987, 0x1f988, 0x1f989, 0x1f98a, 0x1f98b, 0x1f98c, 0x1f98d, 0x1f98e, 0x1f98f, 0x1f990, 0x1f991, 0x1f992, 0x1f993, 0x1f994, 0x1f995, 0x1f996, 0x1f997, 0x1f998, 0x1f999, 0x1f99a, 0x1f99b, 0x1f99c, 0x1f99d, 0x1f99e, 0x1f99f, 0x1f9a0, 0x1f9a1, 0x1f9a2, 0x1f9a3, 0x1f9a4, 0x1f9a5, 0x1f9a6, 0x1f9a7, 0x1f9a8, 0x1f9a9, 0x1f9aa, 0x1f9ab, 0x1f9ac, 0x1f9ad, 0x1f9ae, 0x1f9af, 0x1f9b0, 0x1f9b1, 0x1f9b2, 0x1f9b3, 0x1f9b4, 0x1f9b5, 0x1f9b6, 0x1f9b7, 0x1f9b8, 0x1f9b9, 0x1f9ba, 0x1f9bb, 0x1f9bc, 0x1f9bd, 0x1f9be, 0x1f9bf, 0x1f9c0, 0x1f9c1, 0x1f9c2, 0x1f9c3, 0x1f9c4, 0x1f9c5, 0x1f9c6, 0x1f9c7, 0x1f9c8, 0x1f9c9, 0x1f9ca, 0x1f9cb, 0x1f9cc, 0x1f9cd, 0x1f9ce, 0x1f9cf, 0x1f9d0, 0x1f9d1, 0x1f9d2, 0x1f9d3, 0x1f9d4, 0x1f9d5, 0x1f9d6, 0x1f9d7, 0x1f9d8, 0x1f9d9, 0x1f9da, 0x1f9db, 0x1f9dc, 0x1f9dd, 0x1f9de, 0x1f9df, 0x1f9e0, 0x1f9e1, 0x1f9e2, 0x1f9e3, 0x1f9e4, 0x1f9e5, 0x1f9e6, 0x1f9e7, 0x1f9e8, 0x1f9e9, 0x1f9ea, 0x1f9eb, 0x1f9ec, 0x1f9ed, 0x1f9ee, 0x1f9ef, 0x1f9f0, 0x1f9f1, 0x1f9f2, 0x1f9f3, 0x1f9f4, 0x1f9f5, 0x1f9f6, 0x1f9f7, 0x1f9f8, 0x1f9f9, 0x1f9fa, 0x1f9fb, 0x1f9fc, 0x1f9fd, 0x1f9fe, 0x1f9ff: return true - case 0x1fa70, 0x1fa71, 0x1fa72, 0x1fa73, 0x1fa74: + case 0x1fa70, 0x1fa71, 0x1fa72, 0x1fa73, 0x1fa74, 0x1fa75, 0x1fa76, 0x1fa77, 0x1fa78, 0x1fa79, 0x1fa7a, 0x1fa7b, 0x1fa7c: return true - case 0x1fa78, 0x1fa79, 0x1fa7a, 0x1fa7b, 0x1fa7c: + case 0x1fa80, 0x1fa81, 0x1fa82, 0x1fa83, 0x1fa84, 0x1fa85, 0x1fa86, 0x1fa87, 0x1fa88: return true - case 0x1fa80, 0x1fa81, 0x1fa82, 0x1fa83, 0x1fa84, 0x1fa85, 0x1fa86: + case 0x1fa90, 0x1fa91, 0x1fa92, 0x1fa93, 0x1fa94, 0x1fa95, 0x1fa96, 0x1fa97, 0x1fa98, 0x1fa99, 0x1fa9a, 0x1fa9b, 0x1fa9c, 0x1fa9d, 0x1fa9e, 0x1fa9f, 0x1faa0, 0x1faa1, 0x1faa2, 0x1faa3, 0x1faa4, 0x1faa5, 0x1faa6, 0x1faa7, 0x1faa8, 0x1faa9, 0x1faaa, 0x1faab, 0x1faac, 0x1faad, 0x1faae, 0x1faaf, 0x1fab0, 0x1fab1, 0x1fab2, 0x1fab3, 0x1fab4, 0x1fab5, 0x1fab6, 0x1fab7, 0x1fab8, 0x1fab9, 0x1faba, 0x1fabb, 0x1fabc, 0x1fabd: return true - case 0x1fa90, 0x1fa91, 0x1fa92, 0x1fa93, 0x1fa94, 0x1fa95, 0x1fa96, 0x1fa97, 0x1fa98, 0x1fa99, 0x1fa9a, 0x1fa9b, 0x1fa9c, 0x1fa9d, 0x1fa9e, 0x1fa9f, 0x1faa0, 0x1faa1, 0x1faa2, 0x1faa3, 0x1faa4, 0x1faa5, 0x1faa6, 0x1faa7, 0x1faa8, 0x1faa9, 0x1faaa, 0x1faab, 0x1faac: + case 0x1fabf, 0x1fac0, 0x1fac1, 0x1fac2, 0x1fac3, 0x1fac4, 0x1fac5: return true - case 0x1fab0, 0x1fab1, 0x1fab2, 0x1fab3, 0x1fab4, 0x1fab5, 0x1fab6, 0x1fab7, 0x1fab8, 0x1fab9, 0x1faba: + case 0x1face, 0x1facf, 0x1fad0, 0x1fad1, 0x1fad2, 0x1fad3, 0x1fad4, 0x1fad5, 0x1fad6, 0x1fad7, 0x1fad8, 0x1fad9, 0x1fada, 0x1fadb: return true - case 0x1fac0, 0x1fac1, 0x1fac2, 0x1fac3, 0x1fac4, 0x1fac5: + case 0x1fae0, 0x1fae1, 0x1fae2, 0x1fae3, 0x1fae4, 0x1fae5, 0x1fae6, 0x1fae7, 0x1fae8: return true - case 0x1fad0, 0x1fad1, 0x1fad2, 0x1fad3, 0x1fad4, 0x1fad5, 0x1fad6, 0x1fad7, 0x1fad8, 0x1fad9: - return true - case 0x1fae0, 0x1fae1, 0x1fae2, 0x1fae3, 0x1fae4, 0x1fae5, 0x1fae6, 0x1fae7: - return true - case 0x1faf0, 0x1faf1, 0x1faf2, 0x1faf3, 0x1faf4, 0x1faf5, 0x1faf6: + case 0x1faf0, 0x1faf1, 0x1faf2, 0x1faf3, 0x1faf4, 0x1faf5, 0x1faf6, 0x1faf7, 0x1faf8: return true default: return false