diff options
author | Avi Halachmi (:avih) <avihpit@yahoo.com> | 2024-03-29 17:32:57 +0300 |
---|---|---|
committer | Avi Halachmi (:avih) <avihpit@yahoo.com> | 2024-03-29 17:32:57 +0300 |
commit | 95e0a07f891947c5c2d66cd837a5aa379b962308 (patch) | |
tree | 39e2b06871610e38b44b036591ea63c518fa438c | |
parent | c188a345a4d8fe453c4a06796e38d036106fc161 (diff) | |
download | busybox-w32-95e0a07f891947c5c2d66cd837a5aa379b962308.tar.gz busybox-w32-95e0a07f891947c5c2d66cd837a5aa379b962308.tar.bz2 busybox-w32-95e0a07f891947c5c2d66cd837a5aa379b962308.zip |
Revert "unicode: identify emoji width and modifiers"
This reverts commit 878b3cd27fe83f2b0ff476b884c34d165be0072c.
It's no longer required, since the last commit uses a new wcwidth
implementation which covers the cases added by commit 878b3cd2 .
-rw-r--r-- | libbb/unicode.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libbb/unicode.c b/libbb/unicode.c index a0b2db625..22e45878a 100644 --- a/libbb/unicode.c +++ b/libbb/unicode.c | |||
@@ -660,9 +660,6 @@ int FAST_FUNC wcwidth(unsigned ucs) | |||
660 | { 0x0A38, 0x0A3A }, { 0x0A3F, 0x0A3F }, { 0xD167, 0xD169 }, | 660 | { 0x0A38, 0x0A3A }, { 0x0A3F, 0x0A3F }, { 0xD167, 0xD169 }, |
661 | { 0xD173, 0xD182 }, { 0xD185, 0xD18B }, { 0xD1AA, 0xD1AD }, | 661 | { 0xD173, 0xD182 }, { 0xD185, 0xD18B }, { 0xD1AA, 0xD1AD }, |
662 | { 0xD242, 0xD244 } | 662 | { 0xD242, 0xD244 } |
663 | #if ENABLE_PLATFORM_MINGW32 | ||
664 | , { 0xF3FB, 0xF3FF } | ||
665 | #endif | ||
666 | }; | 663 | }; |
667 | /* Binary search in table of non-spacing characters in Supplementary Multilingual Plane */ | 664 | /* Binary search in table of non-spacing characters in Supplementary Multilingual Plane */ |
668 | if (in_interval_table(ucs ^ 0x10000, combining0x10000, ARRAY_SIZE(combining0x10000) - 1)) | 665 | if (in_interval_table(ucs ^ 0x10000, combining0x10000, ARRAY_SIZE(combining0x10000) - 1)) |
@@ -699,11 +696,6 @@ int FAST_FUNC wcwidth(unsigned ucs) | |||
699 | || (ucs >= 0xff00 && ucs <= 0xff60) /* Fullwidth Forms */ | 696 | || (ucs >= 0xff00 && ucs <= 0xff60) /* Fullwidth Forms */ |
700 | || (ucs >= 0xffe0 && ucs <= 0xffe6) | 697 | || (ucs >= 0xffe0 && ucs <= 0xffe6) |
701 | # endif | 698 | # endif |
702 | #if ENABLE_PLATFORM_MINGW32 | ||
703 | # if CONFIG_LAST_SUPPORTED_WCHAR >= 0x10000 | ||
704 | || (ucs >= 0x1f600 && ucs <= 0x1f64f) /* Emoticons */ | ||
705 | # endif | ||
706 | #endif | ||
707 | # if CONFIG_LAST_SUPPORTED_WCHAR >= 0x20000 | 699 | # if CONFIG_LAST_SUPPORTED_WCHAR >= 0x20000 |
708 | || ((ucs >> 17) == (2 >> 1)) /* 20000..3ffff: Supplementary and Tertiary Ideographic Planes */ | 700 | || ((ucs >> 17) == (2 >> 1)) /* 20000..3ffff: Supplementary and Tertiary Ideographic Planes */ |
709 | # endif | 701 | # endif |