Control: tags 1132241 + patch Control: tags 1132241 + pending Dear maintainer,
I've prepared an NMU for libtsm (versioned as 4.4.3-0.1) and uploaded it to DELAYED/10. Please feel free to tell me if I should cancel it. Regards. diffstat for libtsm-4.4.2 libtsm-4.4.3 NEWS.md | 13 debian/changelog | 7 debian/copyright | 1 external/wcwidth/LICENSE.txt | 6 external/wcwidth/wcwidth.c | 697 ++++++++++++++++++++++++------------------- external/wcwidth/wcwidth.h | 9 meson.build | 2 src/tsm/libtsm.h | 1 src/tsm/tsm-screen.c | 2 src/tsm/tsm-vte.c | 43 ++ 10 files changed, 458 insertions(+), 323 deletions(-) diff -Nru libtsm-4.4.2/NEWS.md libtsm-4.4.3/NEWS.md --- libtsm-4.4.2/NEWS.md 2026-01-29 04:45:44.000000000 -0500 +++ libtsm-4.4.3/NEWS.md 2026-03-20 09:44:52.000000000 -0400 @@ -1,5 +1,18 @@ # libtsm Release News +## CHANGES WITH 4.4.3 +### New features +* Add support for VT200 mouse tracking by @caramelli in https://github.com/kmscon/libtsm/pull/27 +### Bug Fixes +* Fix Ctrl-PgUp and Ctrl-PgDn combinations by @Karlson2k in https://github.com/kmscon/libtsm/pull/24 +* Fix scrollback reset position in tsm_screen_sb_reset() by @caramelli in https://github.com/kmscon/libtsm/pull/26 +* vte: guard case 'm' (SGR) against CSI_GT prefix by @kdj0c in https://github.com/kmscon/libtsm/pull/29 +* wcwidth: update to upstream v4 by @kdj0c in https://github.com/kmscon/libtsm/pull/28 + +## New Contributors +* @Karlson2k made their first contribution in https://github.com/kmscon/libtsm/pull/24 +* @caramelli made their first contribution in https://github.com/kmscon/libtsm/pull/26 + ## CHANGES WITH 4.4.2 ### New features * add nord color scheme by @kdj0c in https://github.com/kmscon/libtsm/pull/21 diff -Nru libtsm-4.4.2/debian/changelog libtsm-4.4.3/debian/changelog --- libtsm-4.4.2/debian/changelog 2026-01-31 23:48:57.000000000 -0500 +++ libtsm-4.4.3/debian/changelog 2026-04-03 19:06:22.000000000 -0400 @@ -1,3 +1,10 @@ +libtsm (4.4.3-0.1) unstable; urgency=medium + + * Non-maintainer upload. + * New upstream release. (Closes: #1132241) + + -- Boyuan Yang <[email protected]> Fri, 03 Apr 2026 19:06:22 -0400 + libtsm (4.4.2-0.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru libtsm-4.4.2/debian/copyright libtsm-4.4.3/debian/copyright --- libtsm-4.4.2/debian/copyright 2026-01-31 23:30:13.000000000 -0500 +++ libtsm-4.4.3/debian/copyright 2026-04-03 19:06:18.000000000 -0400 @@ -11,6 +11,7 @@ Files: external/wcwidth/* Copyright: 2016 Fredrik Fornwall <[email protected]> 2014 Jeff Quast <[email protected]> + 2015 Markus Kuhn License: Expat Files: debian/* diff -Nru libtsm-4.4.2/external/wcwidth/LICENSE.txt libtsm-4.4.3/external/wcwidth/LICENSE.txt --- libtsm-4.4.2/external/wcwidth/LICENSE.txt 2026-01-29 04:45:44.000000000 -0500 +++ libtsm-4.4.3/external/wcwidth/LICENSE.txt 2026-03-20 09:44:52.000000000 -0400 @@ -49,4 +49,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Markus Kuhn -- 2007-05-26 (Unicode 5.0) + +Permission to use, copy, modify, and distribute this software +for any purpose and without fee is hereby granted. The author +disclaims all warranties with regard to this software. """ diff -Nru libtsm-4.4.2/external/wcwidth/wcwidth.c libtsm-4.4.3/external/wcwidth/wcwidth.c --- libtsm-4.4.2/external/wcwidth/wcwidth.c 2026-01-29 04:45:44.000000000 -0500 +++ libtsm-4.4.3/external/wcwidth/wcwidth.c 2026-03-20 09:44:52.000000000 -0400 @@ -7,6 +7,12 @@ * * Report issues at: * https://github.com/termux/wcwidth + * + * IMPORTANT: + * Must be kept in sync with the following: + * https://github.com/termux/termux-app/blob/master/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java + * https://github.com/termux/libandroid-support + * https://github.com/termux/termux-packages/tree/master/packages/libandroid-support */ #include <stdbool.h> @@ -18,208 +24,218 @@ }; // From https://github.com/jquast/wcwidth/blob/master/wcwidth/table_zero.py -// at commit 0d7de112202cc8b2ebe9232ff4a5c954f19d561a (2016-07-02): +// from https://github.com/jquast/wcwidth/pull/64 +// at commit 1b9b6585b0080ea5cb88dc9815796505724793fe (2022-12-16): static struct width_interval ZERO_WIDTH[] = { - {0x0300, 0x036f}, // Combining Grave Accent ..Combining Latin Small Le - {0x0483, 0x0489}, // Combining Cyrillic Titlo..Combining Cyrillic Milli - {0x0591, 0x05bd}, // Hebrew Accent Etnahta ..Hebrew Point Meteg - {0x05bf, 0x05bf}, // Hebrew Point Rafe ..Hebrew Point Rafe - {0x05c1, 0x05c2}, // Hebrew Point Shin Dot ..Hebrew Point Sin Dot - {0x05c4, 0x05c5}, // Hebrew Mark Upper Dot ..Hebrew Mark Lower Dot - {0x05c7, 0x05c7}, // Hebrew Point Qamats Qata..Hebrew Point Qamats Qata - {0x0610, 0x061a}, // Arabic Sign Sallallahou ..Arabic Small Kasra - {0x064b, 0x065f}, // Arabic Fathatan ..Arabic Wavy Hamza Below - {0x0670, 0x0670}, // Arabic Letter Superscrip..Arabic Letter Superscrip - {0x06d6, 0x06dc}, // Arabic Small High Ligatu..Arabic Small High Seen - {0x06df, 0x06e4}, // Arabic Small High Rounde..Arabic Small High Madda - {0x06e7, 0x06e8}, // Arabic Small High Yeh ..Arabic Small High Noon - {0x06ea, 0x06ed}, // Arabic Empty Centre Low ..Arabic Small Low Meem - {0x0711, 0x0711}, // Syriac Letter Superscrip..Syriac Letter Superscrip - {0x0730, 0x074a}, // Syriac Pthaha Above ..Syriac Barrekh - {0x07a6, 0x07b0}, // Thaana Abafili ..Thaana Sukun - {0x07eb, 0x07f3}, // Nko Combining Sh||t High..Nko Combining Double Dot - {0x0816, 0x0819}, // Samaritan Mark In ..Samaritan Mark Dagesh - {0x081b, 0x0823}, // Samaritan Mark Epentheti..Samaritan Vowel Sign A - {0x0825, 0x0827}, // Samaritan Vowel Sign Sho..Samaritan Vowel Sign U - {0x0829, 0x082d}, // Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa - {0x0859, 0x085b}, // Mandaic Affrication Mark..Mandaic Gemination Mark - {0x08d4, 0x08e1}, // (nil) .. - {0x08e3, 0x0902}, // Arabic Turned Damma Belo..Devanagari Sign Anusvara - {0x093a, 0x093a}, // Devanagari Vowel Sign Oe..Devanagari Vowel Sign Oe - {0x093c, 0x093c}, // Devanagari Sign Nukta ..Devanagari Sign Nukta - {0x0941, 0x0948}, // Devanagari Vowel Sign U ..Devanagari Vowel Sign Ai - {0x094d, 0x094d}, // Devanagari Sign Virama ..Devanagari Sign Virama - {0x0951, 0x0957}, // Devanagari Stress Sign U..Devanagari Vowel Sign Uu - {0x0962, 0x0963}, // Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo - {0x0981, 0x0981}, // Bengali Sign Candrabindu..Bengali Sign Candrabindu - {0x09bc, 0x09bc}, // Bengali Sign Nukta ..Bengali Sign Nukta - {0x09c1, 0x09c4}, // Bengali Vowel Sign U ..Bengali Vowel Sign Vocal - {0x09cd, 0x09cd}, // Bengali Sign Virama ..Bengali Sign Virama - {0x09e2, 0x09e3}, // Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal - {0x0a01, 0x0a02}, // Gurmukhi Sign Adak Bindi..Gurmukhi Sign Bindi - {0x0a3c, 0x0a3c}, // Gurmukhi Sign Nukta ..Gurmukhi Sign Nukta - {0x0a41, 0x0a42}, // Gurmukhi Vowel Sign U ..Gurmukhi Vowel Sign Uu - {0x0a47, 0x0a48}, // Gurmukhi Vowel Sign Ee ..Gurmukhi Vowel Sign Ai - {0x0a4b, 0x0a4d}, // Gurmukhi Vowel Sign Oo ..Gurmukhi Sign Virama - {0x0a51, 0x0a51}, // Gurmukhi Sign Udaat ..Gurmukhi Sign Udaat - {0x0a70, 0x0a71}, // Gurmukhi Tippi ..Gurmukhi Addak - {0x0a75, 0x0a75}, // Gurmukhi Sign Yakash ..Gurmukhi Sign Yakash - {0x0a81, 0x0a82}, // Gujarati Sign Candrabind..Gujarati Sign Anusvara - {0x0abc, 0x0abc}, // Gujarati Sign Nukta ..Gujarati Sign Nukta - {0x0ac1, 0x0ac5}, // Gujarati Vowel Sign U ..Gujarati Vowel Sign Cand - {0x0ac7, 0x0ac8}, // Gujarati Vowel Sign E ..Gujarati Vowel Sign Ai - {0x0acd, 0x0acd}, // Gujarati Sign Virama ..Gujarati Sign Virama - {0x0ae2, 0x0ae3}, // Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca - {0x0b01, 0x0b01}, // ||iya Sign Candrabindu ..||iya Sign Candrabindu - {0x0b3c, 0x0b3c}, // ||iya Sign Nukta ..||iya Sign Nukta - {0x0b3f, 0x0b3f}, // ||iya Vowel Sign I ..||iya Vowel Sign I - {0x0b41, 0x0b44}, // ||iya Vowel Sign U ..||iya Vowel Sign Vocalic - {0x0b4d, 0x0b4d}, // ||iya Sign Virama ..||iya Sign Virama - {0x0b56, 0x0b56}, // ||iya Ai Length Mark ..||iya Ai Length Mark - {0x0b62, 0x0b63}, // ||iya Vowel Sign Vocalic..||iya Vowel Sign Vocalic - {0x0b82, 0x0b82}, // Tamil Sign Anusvara ..Tamil Sign Anusvara - {0x0bc0, 0x0bc0}, // Tamil Vowel Sign Ii ..Tamil Vowel Sign Ii - {0x0bcd, 0x0bcd}, // Tamil Sign Virama ..Tamil Sign Virama - {0x0c00, 0x0c00}, // Telugu Sign Combining Ca..Telugu Sign Combining Ca - {0x0c3e, 0x0c40}, // Telugu Vowel Sign Aa ..Telugu Vowel Sign Ii - {0x0c46, 0x0c48}, // Telugu Vowel Sign E ..Telugu Vowel Sign Ai - {0x0c4a, 0x0c4d}, // Telugu Vowel Sign O ..Telugu Sign Virama - {0x0c55, 0x0c56}, // Telugu Length Mark ..Telugu Ai Length Mark - {0x0c62, 0x0c63}, // Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali - {0x0c81, 0x0c81}, // Kannada Sign Candrabindu..Kannada Sign Candrabindu - {0x0cbc, 0x0cbc}, // Kannada Sign Nukta ..Kannada Sign Nukta - {0x0cbf, 0x0cbf}, // Kannada Vowel Sign I ..Kannada Vowel Sign I - {0x0cc6, 0x0cc6}, // Kannada Vowel Sign E ..Kannada Vowel Sign E - {0x0ccc, 0x0ccd}, // Kannada Vowel Sign Au ..Kannada Sign Virama - {0x0ce2, 0x0ce3}, // Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal - {0x0d01, 0x0d01}, // Malayalam Sign Candrabin..Malayalam Sign Candrabin - {0x0d41, 0x0d44}, // Malayalam Vowel Sign U ..Malayalam Vowel Sign Voc - {0x0d4d, 0x0d4d}, // Malayalam Sign Virama ..Malayalam Sign Virama - {0x0d62, 0x0d63}, // Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc - {0x0dca, 0x0dca}, // Sinhala Sign Al-lakuna ..Sinhala Sign Al-lakuna - {0x0dd2, 0x0dd4}, // Sinhala Vowel Sign Ketti..Sinhala Vowel Sign Ketti - {0x0dd6, 0x0dd6}, // Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga - {0x0e31, 0x0e31}, // Thai Character Mai Han-a..Thai Character Mai Han-a - {0x0e34, 0x0e3a}, // Thai Character Sara I ..Thai Character Phinthu - {0x0e47, 0x0e4e}, // Thai Character Maitaikhu..Thai Character Yamakkan - {0x0eb1, 0x0eb1}, // Lao Vowel Sign Mai Kan ..Lao Vowel Sign Mai Kan - {0x0eb4, 0x0eb9}, // Lao Vowel Sign I ..Lao Vowel Sign Uu - {0x0ebb, 0x0ebc}, // Lao Vowel Sign Mai Kon ..Lao Semivowel Sign Lo - {0x0ec8, 0x0ecd}, // Lao Tone Mai Ek ..Lao Niggahita - {0x0f18, 0x0f19}, // Tibetan Astrological Sig..Tibetan Astrological Sig - {0x0f35, 0x0f35}, // Tibetan Mark Ngas Bzung ..Tibetan Mark Ngas Bzung - {0x0f37, 0x0f37}, // Tibetan Mark Ngas Bzung ..Tibetan Mark Ngas Bzung - {0x0f39, 0x0f39}, // Tibetan Mark Tsa -phru ..Tibetan Mark Tsa -phru - {0x0f71, 0x0f7e}, // Tibetan Vowel Sign Aa ..Tibetan Sign Rjes Su Nga - {0x0f80, 0x0f84}, // Tibetan Vowel Sign Rever..Tibetan Mark Halanta - {0x0f86, 0x0f87}, // Tibetan Sign Lci Rtags ..Tibetan Sign Yang Rtags - {0x0f8d, 0x0f97}, // Tibetan Subjoined Sign L..Tibetan Subjoined Letter - {0x0f99, 0x0fbc}, // Tibetan Subjoined Letter..Tibetan Subjoined Letter - {0x0fc6, 0x0fc6}, // Tibetan Symbol Padma Gda..Tibetan Symbol Padma Gda - {0x102d, 0x1030}, // Myanmar Vowel Sign I ..Myanmar Vowel Sign Uu - {0x1032, 0x1037}, // Myanmar Vowel Sign Ai ..Myanmar Sign Dot Below - {0x1039, 0x103a}, // Myanmar Sign Virama ..Myanmar Sign Asat - {0x103d, 0x103e}, // Myanmar Consonant Sign M..Myanmar Consonant Sign M - {0x1058, 0x1059}, // Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal - {0x105e, 0x1060}, // Myanmar Consonant Sign M..Myanmar Consonant Sign M - {0x1071, 0x1074}, // Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah - {0x1082, 0x1082}, // Myanmar Consonant Sign S..Myanmar Consonant Sign S - {0x1085, 0x1086}, // Myanmar Vowel Sign Shan ..Myanmar Vowel Sign Shan - {0x108d, 0x108d}, // Myanmar Sign Shan Counci..Myanmar Sign Shan Counci - {0x109d, 0x109d}, // Myanmar Vowel Sign Aiton..Myanmar Vowel Sign Aiton - {0x135d, 0x135f}, // Ethiopic Combining Gemin..Ethiopic Combining Gemin - {0x1712, 0x1714}, // Tagalog Vowel Sign I ..Tagalog Sign Virama - {0x1732, 0x1734}, // Hanunoo Vowel Sign I ..Hanunoo Sign Pamudpod - {0x1752, 0x1753}, // Buhid Vowel Sign I ..Buhid Vowel Sign U - {0x1772, 0x1773}, // Tagbanwa Vowel Sign I ..Tagbanwa Vowel Sign U - {0x17b4, 0x17b5}, // Khmer Vowel Inherent Aq ..Khmer Vowel Inherent Aa - {0x17b7, 0x17bd}, // Khmer Vowel Sign I ..Khmer Vowel Sign Ua - {0x17c6, 0x17c6}, // Khmer Sign Nikahit ..Khmer Sign Nikahit - {0x17c9, 0x17d3}, // Khmer Sign Muusikatoan ..Khmer Sign Bathamasat - {0x17dd, 0x17dd}, // Khmer Sign Atthacan ..Khmer Sign Atthacan - {0x180b, 0x180d}, // Mongolian Free Variation..Mongolian Free Variation - {0x1885, 0x1886}, // Mongolian Letter Ali Gal..Mongolian Letter Ali Gal - {0x18a9, 0x18a9}, // Mongolian Letter Ali Gal..Mongolian Letter Ali Gal - {0x1920, 0x1922}, // Limbu Vowel Sign A ..Limbu Vowel Sign U - {0x1927, 0x1928}, // Limbu Vowel Sign E ..Limbu Vowel Sign O - {0x1932, 0x1932}, // Limbu Small Letter Anusv..Limbu Small Letter Anusv - {0x1939, 0x193b}, // Limbu Sign Mukphreng ..Limbu Sign Sa-i - {0x1a17, 0x1a18}, // Buginese Vowel Sign I ..Buginese Vowel Sign U - {0x1a1b, 0x1a1b}, // Buginese Vowel Sign Ae ..Buginese Vowel Sign Ae - {0x1a56, 0x1a56}, // Tai Tham Consonant Sign ..Tai Tham Consonant Sign - {0x1a58, 0x1a5e}, // Tai Tham Sign Mai Kang L..Tai Tham Consonant Sign - {0x1a60, 0x1a60}, // Tai Tham Sign Sakot ..Tai Tham Sign Sakot - {0x1a62, 0x1a62}, // Tai Tham Vowel Sign Mai ..Tai Tham Vowel Sign Mai - {0x1a65, 0x1a6c}, // Tai Tham Vowel Sign I ..Tai Tham Vowel Sign Oa B - {0x1a73, 0x1a7c}, // Tai Tham Vowel Sign Oa A..Tai Tham Sign Khuen-lue - {0x1a7f, 0x1a7f}, // Tai Tham Combining Crypt..Tai Tham Combining Crypt - {0x1ab0, 0x1abe}, // Combining Doubled Circum..Combining Parentheses Ov - {0x1b00, 0x1b03}, // Balinese Sign Ulu Ricem ..Balinese Sign Surang - {0x1b34, 0x1b34}, // Balinese Sign Rerekan ..Balinese Sign Rerekan - {0x1b36, 0x1b3a}, // Balinese Vowel Sign Ulu ..Balinese Vowel Sign Ra R - {0x1b3c, 0x1b3c}, // Balinese Vowel Sign La L..Balinese Vowel Sign La L - {0x1b42, 0x1b42}, // Balinese Vowel Sign Pepe..Balinese Vowel Sign Pepe - {0x1b6b, 0x1b73}, // Balinese Musical Symbol ..Balinese Musical Symbol - {0x1b80, 0x1b81}, // Sundanese Sign Panyecek ..Sundanese Sign Panglayar - {0x1ba2, 0x1ba5}, // Sundanese Consonant Sign..Sundanese Vowel Sign Pan - {0x1ba8, 0x1ba9}, // Sundanese Vowel Sign Pam..Sundanese Vowel Sign Pan - {0x1bab, 0x1bad}, // Sundanese Sign Virama ..Sundanese Consonant Sign - {0x1be6, 0x1be6}, // Batak Sign Tompi ..Batak Sign Tompi - {0x1be8, 0x1be9}, // Batak Vowel Sign Pakpak ..Batak Vowel Sign Ee - {0x1bed, 0x1bed}, // Batak Vowel Sign Karo O ..Batak Vowel Sign Karo O - {0x1bef, 0x1bf1}, // Batak Vowel Sign U F|| S..Batak Consonant Sign H - {0x1c2c, 0x1c33}, // Lepcha Vowel Sign E ..Lepcha Consonant Sign T - {0x1c36, 0x1c37}, // Lepcha Sign Ran ..Lepcha Sign Nukta - {0x1cd0, 0x1cd2}, // Vedic Tone Karshana ..Vedic Tone Prenkha - {0x1cd4, 0x1ce0}, // Vedic Sign Yajurvedic Mi..Vedic Tone Rigvedic Kash - {0x1ce2, 0x1ce8}, // Vedic Sign Visarga Svari..Vedic Sign Visarga Anuda - {0x1ced, 0x1ced}, // Vedic Sign Tiryak ..Vedic Sign Tiryak - {0x1cf4, 0x1cf4}, // Vedic Tone Candra Above ..Vedic Tone Candra Above - {0x1cf8, 0x1cf9}, // Vedic Tone Ring Above ..Vedic Tone Double Ring A - {0x1dc0, 0x1df5}, // Combining Dotted Grave A..Combining Up Tack Above - {0x1dfb, 0x1dff}, // (nil) ..Combining Right Arrowhea - {0x20d0, 0x20f0}, // Combining Left Harpoon A..Combining Asterisk Above - {0x2cef, 0x2cf1}, // Coptic Combining Ni Abov..Coptic Combining Spiritu - {0x2d7f, 0x2d7f}, // Tifinagh Consonant Joine..Tifinagh Consonant Joine - {0x2de0, 0x2dff}, // Combining Cyrillic Lette..Combining Cyrillic Lette - {0x302a, 0x302d}, // Ideographic Level Tone M..Ideographic Entering Ton - {0x3099, 0x309a}, // Combining Katakana-hirag..Combining Katakana-hirag - {0xa66f, 0xa672}, // Combining Cyrillic Vzmet..Combining Cyrillic Thous - {0xa674, 0xa67d}, // Combining Cyrillic Lette..Combining Cyrillic Payer - {0xa69e, 0xa69f}, // Combining Cyrillic Lette..Combining Cyrillic Lette - {0xa6f0, 0xa6f1}, // Bamum Combining Mark Koq..Bamum Combining Mark Tuk - {0xa802, 0xa802}, // Syloti Nagri Sign Dvisva..Syloti Nagri Sign Dvisva - {0xa806, 0xa806}, // Syloti Nagri Sign Hasant..Syloti Nagri Sign Hasant - {0xa80b, 0xa80b}, // Syloti Nagri Sign Anusva..Syloti Nagri Sign Anusva - {0xa825, 0xa826}, // Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign - {0xa8c4, 0xa8c5}, // Saurashtra Sign Virama .. - {0xa8e0, 0xa8f1}, // Combining Devanagari Dig..Combining Devanagari Sig - {0xa926, 0xa92d}, // Kayah Li Vowel Ue ..Kayah Li Tone Calya Plop - {0xa947, 0xa951}, // Rejang Vowel Sign I ..Rejang Consonant Sign R - {0xa980, 0xa982}, // Javanese Sign Panyangga ..Javanese Sign Layar - {0xa9b3, 0xa9b3}, // Javanese Sign Cecak Telu..Javanese Sign Cecak Telu - {0xa9b6, 0xa9b9}, // Javanese Vowel Sign Wulu..Javanese Vowel Sign Suku - {0xa9bc, 0xa9bc}, // Javanese Vowel Sign Pepe..Javanese Vowel Sign Pepe - {0xa9e5, 0xa9e5}, // Myanmar Sign Shan Saw ..Myanmar Sign Shan Saw - {0xaa29, 0xaa2e}, // Cham Vowel Sign Aa ..Cham Vowel Sign Oe - {0xaa31, 0xaa32}, // Cham Vowel Sign Au ..Cham Vowel Sign Ue - {0xaa35, 0xaa36}, // Cham Consonant Sign La ..Cham Consonant Sign Wa - {0xaa43, 0xaa43}, // Cham Consonant Sign Fina..Cham Consonant Sign Fina - {0xaa4c, 0xaa4c}, // Cham Consonant Sign Fina..Cham Consonant Sign Fina - {0xaa7c, 0xaa7c}, // Myanmar Sign Tai Laing T..Myanmar Sign Tai Laing T - {0xaab0, 0xaab0}, // Tai Viet Mai Kang ..Tai Viet Mai Kang - {0xaab2, 0xaab4}, // Tai Viet Vowel I ..Tai Viet Vowel U - {0xaab7, 0xaab8}, // Tai Viet Mai Khit ..Tai Viet Vowel Ia - {0xaabe, 0xaabf}, // Tai Viet Vowel Am ..Tai Viet Tone Mai Ek - {0xaac1, 0xaac1}, // Tai Viet Tone Mai Tho ..Tai Viet Tone Mai Tho - {0xaaec, 0xaaed}, // Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign - {0xaaf6, 0xaaf6}, // Meetei Mayek Virama ..Meetei Mayek Virama - {0xabe5, 0xabe5}, // Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign - {0xabe8, 0xabe8}, // Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign - {0xabed, 0xabed}, // Meetei Mayek Apun Iyek ..Meetei Mayek Apun Iyek - {0xfb1e, 0xfb1e}, // Hebrew Point Judeo-spani..Hebrew Point Judeo-spani - {0xfe00, 0xfe0f}, // Variation Select||-1 ..Variation Select||-16 - {0xfe20, 0xfe2f}, // Combining Ligature Left ..Combining Cyrillic Titlo + {0x00300, 0x0036f}, // Combining Grave Accent ..Combining Latin Small Le + {0x00483, 0x00489}, // Combining Cyrillic Titlo..Combining Cyrillic Milli + {0x00591, 0x005bd}, // Hebrew Accent Etnahta ..Hebrew Point Meteg + {0x005bf, 0x005bf}, // Hebrew Point Rafe ..Hebrew Point Rafe + {0x005c1, 0x005c2}, // Hebrew Point Shin Dot ..Hebrew Point Sin Dot + {0x005c4, 0x005c5}, // Hebrew Mark Upper Dot ..Hebrew Mark Lower Dot + {0x005c7, 0x005c7}, // Hebrew Point Qamats Qata..Hebrew Point Qamats Qata + {0x00610, 0x0061a}, // Arabic Sign Sallallahou ..Arabic Small Kasra + {0x0064b, 0x0065f}, // Arabic Fathatan ..Arabic Wavy Hamza Below + {0x00670, 0x00670}, // Arabic Letter Superscrip..Arabic Letter Superscrip + {0x006d6, 0x006dc}, // Arabic Small High Ligatu..Arabic Small High Seen + {0x006df, 0x006e4}, // Arabic Small High Rounde..Arabic Small High Madda + {0x006e7, 0x006e8}, // Arabic Small High Yeh ..Arabic Small High Noon + {0x006ea, 0x006ed}, // Arabic Empty Centre Low ..Arabic Small Low Meem + {0x00711, 0x00711}, // Syriac Letter Superscrip..Syriac Letter Superscrip + {0x00730, 0x0074a}, // Syriac Pthaha Above ..Syriac Barrekh + {0x007a6, 0x007b0}, // Thaana Abafili ..Thaana Sukun + {0x007eb, 0x007f3}, // Nko Combining Short High..Nko Combining Double Dot + {0x007fd, 0x007fd}, // Nko Dantayalan ..Nko Dantayalan + {0x00816, 0x00819}, // Samaritan Mark In ..Samaritan Mark Dagesh + {0x0081b, 0x00823}, // Samaritan Mark Epentheti..Samaritan Vowel Sign A + {0x00825, 0x00827}, // Samaritan Vowel Sign Sho..Samaritan Vowel Sign U + {0x00829, 0x0082d}, // Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa + {0x00859, 0x0085b}, // Mandaic Affrication Mark..Mandaic Gemination Mark + {0x00898, 0x0089f}, // Arabic Small High Word A..Arabic Half Madda Over M + {0x008ca, 0x008e1}, // Arabic Small High Farsi ..Arabic Small High Sign S + {0x008e3, 0x00902}, // Arabic Turned Damma Belo..Devanagari Sign Anusvara + {0x0093a, 0x0093a}, // Devanagari Vowel Sign Oe..Devanagari Vowel Sign Oe + {0x0093c, 0x0093c}, // Devanagari Sign Nukta ..Devanagari Sign Nukta + {0x00941, 0x00948}, // Devanagari Vowel Sign U ..Devanagari Vowel Sign Ai + {0x0094d, 0x0094d}, // Devanagari Sign Virama ..Devanagari Sign Virama + {0x00951, 0x00957}, // Devanagari Stress Sign U..Devanagari Vowel Sign Uu + {0x00962, 0x00963}, // Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo + {0x00981, 0x00981}, // Bengali Sign Candrabindu..Bengali Sign Candrabindu + {0x009bc, 0x009bc}, // Bengali Sign Nukta ..Bengali Sign Nukta + {0x009c1, 0x009c4}, // Bengali Vowel Sign U ..Bengali Vowel Sign Vocal + {0x009cd, 0x009cd}, // Bengali Sign Virama ..Bengali Sign Virama + {0x009e2, 0x009e3}, // Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal + {0x009fe, 0x009fe}, // Bengali Sandhi Mark ..Bengali Sandhi Mark + {0x00a01, 0x00a02}, // Gurmukhi Sign Adak Bindi..Gurmukhi Sign Bindi + {0x00a3c, 0x00a3c}, // Gurmukhi Sign Nukta ..Gurmukhi Sign Nukta + {0x00a41, 0x00a42}, // Gurmukhi Vowel Sign U ..Gurmukhi Vowel Sign Uu + {0x00a47, 0x00a48}, // Gurmukhi Vowel Sign Ee ..Gurmukhi Vowel Sign Ai + {0x00a4b, 0x00a4d}, // Gurmukhi Vowel Sign Oo ..Gurmukhi Sign Virama + {0x00a51, 0x00a51}, // Gurmukhi Sign Udaat ..Gurmukhi Sign Udaat + {0x00a70, 0x00a71}, // Gurmukhi Tippi ..Gurmukhi Addak + {0x00a75, 0x00a75}, // Gurmukhi Sign Yakash ..Gurmukhi Sign Yakash + {0x00a81, 0x00a82}, // Gujarati Sign Candrabind..Gujarati Sign Anusvara + {0x00abc, 0x00abc}, // Gujarati Sign Nukta ..Gujarati Sign Nukta + {0x00ac1, 0x00ac5}, // Gujarati Vowel Sign U ..Gujarati Vowel Sign Cand + {0x00ac7, 0x00ac8}, // Gujarati Vowel Sign E ..Gujarati Vowel Sign Ai + {0x00acd, 0x00acd}, // Gujarati Sign Virama ..Gujarati Sign Virama + {0x00ae2, 0x00ae3}, // Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca + {0x00afa, 0x00aff}, // Gujarati Sign Sukun ..Gujarati Sign Two-circle + {0x00b01, 0x00b01}, // Oriya Sign Candrabindu ..Oriya Sign Candrabindu + {0x00b3c, 0x00b3c}, // Oriya Sign Nukta ..Oriya Sign Nukta + {0x00b3f, 0x00b3f}, // Oriya Vowel Sign I ..Oriya Vowel Sign I + {0x00b41, 0x00b44}, // Oriya Vowel Sign U ..Oriya Vowel Sign Vocalic + {0x00b4d, 0x00b4d}, // Oriya Sign Virama ..Oriya Sign Virama + {0x00b55, 0x00b56}, // Oriya Sign Overline ..Oriya Ai Length Mark + {0x00b62, 0x00b63}, // Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic + {0x00b82, 0x00b82}, // Tamil Sign Anusvara ..Tamil Sign Anusvara + {0x00bc0, 0x00bc0}, // Tamil Vowel Sign Ii ..Tamil Vowel Sign Ii + {0x00bcd, 0x00bcd}, // Tamil Sign Virama ..Tamil Sign Virama + {0x00c00, 0x00c00}, // Telugu Sign Combining Ca..Telugu Sign Combining Ca + {0x00c04, 0x00c04}, // Telugu Sign Combining An..Telugu Sign Combining An + {0x00c3c, 0x00c3c}, // Telugu Sign Nukta ..Telugu Sign Nukta + {0x00c3e, 0x00c40}, // Telugu Vowel Sign Aa ..Telugu Vowel Sign Ii + {0x00c46, 0x00c48}, // Telugu Vowel Sign E ..Telugu Vowel Sign Ai + {0x00c4a, 0x00c4d}, // Telugu Vowel Sign O ..Telugu Sign Virama + {0x00c55, 0x00c56}, // Telugu Length Mark ..Telugu Ai Length Mark + {0x00c62, 0x00c63}, // Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali + {0x00c81, 0x00c81}, // Kannada Sign Candrabindu..Kannada Sign Candrabindu + {0x00cbc, 0x00cbc}, // Kannada Sign Nukta ..Kannada Sign Nukta + {0x00cbf, 0x00cbf}, // Kannada Vowel Sign I ..Kannada Vowel Sign I + {0x00cc6, 0x00cc6}, // Kannada Vowel Sign E ..Kannada Vowel Sign E + {0x00ccc, 0x00ccd}, // Kannada Vowel Sign Au ..Kannada Sign Virama + {0x00ce2, 0x00ce3}, // Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal + {0x00d00, 0x00d01}, // Malayalam Sign Combining..Malayalam Sign Candrabin + {0x00d3b, 0x00d3c}, // Malayalam Sign Vertical ..Malayalam Sign Circular + {0x00d41, 0x00d44}, // Malayalam Vowel Sign U ..Malayalam Vowel Sign Voc + {0x00d4d, 0x00d4d}, // Malayalam Sign Virama ..Malayalam Sign Virama + {0x00d62, 0x00d63}, // Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc + {0x00d81, 0x00d81}, // Sinhala Sign Candrabindu..Sinhala Sign Candrabindu + {0x00dca, 0x00dca}, // Sinhala Sign Al-lakuna ..Sinhala Sign Al-lakuna + {0x00dd2, 0x00dd4}, // Sinhala Vowel Sign Ketti..Sinhala Vowel Sign Ketti + {0x00dd6, 0x00dd6}, // Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga + {0x00e31, 0x00e31}, // Thai Character Mai Han-a..Thai Character Mai Han-a + {0x00e34, 0x00e3a}, // Thai Character Sara I ..Thai Character Phinthu + {0x00e47, 0x00e4e}, // Thai Character Maitaikhu..Thai Character Yamakkan + {0x00eb1, 0x00eb1}, // Lao Vowel Sign Mai Kan ..Lao Vowel Sign Mai Kan + {0x00eb4, 0x00ebc}, // Lao Vowel Sign I ..Lao Semivowel Sign Lo + {0x00ec8, 0x00ece}, // Lao Tone Mai Ek ..(nil) + {0x00f18, 0x00f19}, // Tibetan Astrological Sig..Tibetan Astrological Sig + {0x00f35, 0x00f35}, // Tibetan Mark Ngas Bzung ..Tibetan Mark Ngas Bzung + {0x00f37, 0x00f37}, // Tibetan Mark Ngas Bzung ..Tibetan Mark Ngas Bzung + {0x00f39, 0x00f39}, // Tibetan Mark Tsa -phru ..Tibetan Mark Tsa -phru + {0x00f71, 0x00f7e}, // Tibetan Vowel Sign Aa ..Tibetan Sign Rjes Su Nga + {0x00f80, 0x00f84}, // Tibetan Vowel Sign Rever..Tibetan Mark Halanta + {0x00f86, 0x00f87}, // Tibetan Sign Lci Rtags ..Tibetan Sign Yang Rtags + {0x00f8d, 0x00f97}, // Tibetan Subjoined Sign L..Tibetan Subjoined Letter + {0x00f99, 0x00fbc}, // Tibetan Subjoined Letter..Tibetan Subjoined Letter + {0x00fc6, 0x00fc6}, // Tibetan Symbol Padma Gda..Tibetan Symbol Padma Gda + {0x0102d, 0x01030}, // Myanmar Vowel Sign I ..Myanmar Vowel Sign Uu + {0x01032, 0x01037}, // Myanmar Vowel Sign Ai ..Myanmar Sign Dot Below + {0x01039, 0x0103a}, // Myanmar Sign Virama ..Myanmar Sign Asat + {0x0103d, 0x0103e}, // Myanmar Consonant Sign M..Myanmar Consonant Sign M + {0x01058, 0x01059}, // Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal + {0x0105e, 0x01060}, // Myanmar Consonant Sign M..Myanmar Consonant Sign M + {0x01071, 0x01074}, // Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah + {0x01082, 0x01082}, // Myanmar Consonant Sign S..Myanmar Consonant Sign S + {0x01085, 0x01086}, // Myanmar Vowel Sign Shan ..Myanmar Vowel Sign Shan + {0x0108d, 0x0108d}, // Myanmar Sign Shan Counci..Myanmar Sign Shan Counci + {0x0109d, 0x0109d}, // Myanmar Vowel Sign Aiton..Myanmar Vowel Sign Aiton + {0x0135d, 0x0135f}, // Ethiopic Combining Gemin..Ethiopic Combining Gemin + {0x01712, 0x01714}, // Tagalog Vowel Sign I ..Tagalog Sign Virama + {0x01732, 0x01733}, // Hanunoo Vowel Sign I ..Hanunoo Vowel Sign U + {0x01752, 0x01753}, // Buhid Vowel Sign I ..Buhid Vowel Sign U + {0x01772, 0x01773}, // Tagbanwa Vowel Sign I ..Tagbanwa Vowel Sign U + {0x017b4, 0x017b5}, // Khmer Vowel Inherent Aq ..Khmer Vowel Inherent Aa + {0x017b7, 0x017bd}, // Khmer Vowel Sign I ..Khmer Vowel Sign Ua + {0x017c6, 0x017c6}, // Khmer Sign Nikahit ..Khmer Sign Nikahit + {0x017c9, 0x017d3}, // Khmer Sign Muusikatoan ..Khmer Sign Bathamasat + {0x017dd, 0x017dd}, // Khmer Sign Atthacan ..Khmer Sign Atthacan + {0x0180b, 0x0180d}, // Mongolian Free Variation..Mongolian Free Variation + {0x0180f, 0x0180f}, // Mongolian Free Variation..Mongolian Free Variation + {0x01885, 0x01886}, // Mongolian Letter Ali Gal..Mongolian Letter Ali Gal + {0x018a9, 0x018a9}, // Mongolian Letter Ali Gal..Mongolian Letter Ali Gal + {0x01920, 0x01922}, // Limbu Vowel Sign A ..Limbu Vowel Sign U + {0x01927, 0x01928}, // Limbu Vowel Sign E ..Limbu Vowel Sign O + {0x01932, 0x01932}, // Limbu Small Letter Anusv..Limbu Small Letter Anusv + {0x01939, 0x0193b}, // Limbu Sign Mukphreng ..Limbu Sign Sa-i + {0x01a17, 0x01a18}, // Buginese Vowel Sign I ..Buginese Vowel Sign U + {0x01a1b, 0x01a1b}, // Buginese Vowel Sign Ae ..Buginese Vowel Sign Ae + {0x01a56, 0x01a56}, // Tai Tham Consonant Sign ..Tai Tham Consonant Sign + {0x01a58, 0x01a5e}, // Tai Tham Sign Mai Kang L..Tai Tham Consonant Sign + {0x01a60, 0x01a60}, // Tai Tham Sign Sakot ..Tai Tham Sign Sakot + {0x01a62, 0x01a62}, // Tai Tham Vowel Sign Mai ..Tai Tham Vowel Sign Mai + {0x01a65, 0x01a6c}, // Tai Tham Vowel Sign I ..Tai Tham Vowel Sign Oa B + {0x01a73, 0x01a7c}, // Tai Tham Vowel Sign Oa A..Tai Tham Sign Khuen-lue + {0x01a7f, 0x01a7f}, // Tai Tham Combining Crypt..Tai Tham Combining Crypt + {0x01ab0, 0x01ace}, // Combining Doubled Circum..Combining Latin Small Le + {0x01b00, 0x01b03}, // Balinese Sign Ulu Ricem ..Balinese Sign Surang + {0x01b34, 0x01b34}, // Balinese Sign Rerekan ..Balinese Sign Rerekan + {0x01b36, 0x01b3a}, // Balinese Vowel Sign Ulu ..Balinese Vowel Sign Ra R + {0x01b3c, 0x01b3c}, // Balinese Vowel Sign La L..Balinese Vowel Sign La L + {0x01b42, 0x01b42}, // Balinese Vowel Sign Pepe..Balinese Vowel Sign Pepe + {0x01b6b, 0x01b73}, // Balinese Musical Symbol ..Balinese Musical Symbol + {0x01b80, 0x01b81}, // Sundanese Sign Panyecek ..Sundanese Sign Panglayar + {0x01ba2, 0x01ba5}, // Sundanese Consonant Sign..Sundanese Vowel Sign Pan + {0x01ba8, 0x01ba9}, // Sundanese Vowel Sign Pam..Sundanese Vowel Sign Pan + {0x01bab, 0x01bad}, // Sundanese Sign Virama ..Sundanese Consonant Sign + {0x01be6, 0x01be6}, // Batak Sign Tompi ..Batak Sign Tompi + {0x01be8, 0x01be9}, // Batak Vowel Sign Pakpak ..Batak Vowel Sign Ee + {0x01bed, 0x01bed}, // Batak Vowel Sign Karo O ..Batak Vowel Sign Karo O + {0x01bef, 0x01bf1}, // Batak Vowel Sign U For S..Batak Consonant Sign H + {0x01c2c, 0x01c33}, // Lepcha Vowel Sign E ..Lepcha Consonant Sign T + {0x01c36, 0x01c37}, // Lepcha Sign Ran ..Lepcha Sign Nukta + {0x01cd0, 0x01cd2}, // Vedic Tone Karshana ..Vedic Tone Prenkha + {0x01cd4, 0x01ce0}, // Vedic Sign Yajurvedic Mi..Vedic Tone Rigvedic Kash + {0x01ce2, 0x01ce8}, // Vedic Sign Visarga Svari..Vedic Sign Visarga Anuda + {0x01ced, 0x01ced}, // Vedic Sign Tiryak ..Vedic Sign Tiryak + {0x01cf4, 0x01cf4}, // Vedic Tone Candra Above ..Vedic Tone Candra Above + {0x01cf8, 0x01cf9}, // Vedic Tone Ring Above ..Vedic Tone Double Ring A + {0x01dc0, 0x01dff}, // Combining Dotted Grave A..Combining Right Arrowhea + {0x020d0, 0x020f0}, // Combining Left Harpoon A..Combining Asterisk Above + {0x02cef, 0x02cf1}, // Coptic Combining Ni Abov..Coptic Combining Spiritu + {0x02d7f, 0x02d7f}, // Tifinagh Consonant Joine..Tifinagh Consonant Joine + {0x02de0, 0x02dff}, // Combining Cyrillic Lette..Combining Cyrillic Lette + {0x0302a, 0x0302d}, // Ideographic Level Tone M..Ideographic Entering Ton + {0x03099, 0x0309a}, // Combining Katakana-hirag..Combining Katakana-hirag + {0x0a66f, 0x0a672}, // Combining Cyrillic Vzmet..Combining Cyrillic Thous + {0x0a674, 0x0a67d}, // Combining Cyrillic Lette..Combining Cyrillic Payer + {0x0a69e, 0x0a69f}, // Combining Cyrillic Lette..Combining Cyrillic Lette + {0x0a6f0, 0x0a6f1}, // Bamum Combining Mark Koq..Bamum Combining Mark Tuk + {0x0a802, 0x0a802}, // Syloti Nagri Sign Dvisva..Syloti Nagri Sign Dvisva + {0x0a806, 0x0a806}, // Syloti Nagri Sign Hasant..Syloti Nagri Sign Hasant + {0x0a80b, 0x0a80b}, // Syloti Nagri Sign Anusva..Syloti Nagri Sign Anusva + {0x0a825, 0x0a826}, // Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign + {0x0a82c, 0x0a82c}, // Syloti Nagri Sign Altern..Syloti Nagri Sign Altern + {0x0a8c4, 0x0a8c5}, // Saurashtra Sign Virama ..Saurashtra Sign Candrabi + {0x0a8e0, 0x0a8f1}, // Combining Devanagari Dig..Combining Devanagari Sig + {0x0a8ff, 0x0a8ff}, // Devanagari Vowel Sign Ay..Devanagari Vowel Sign Ay + {0x0a926, 0x0a92d}, // Kayah Li Vowel Ue ..Kayah Li Tone Calya Plop + {0x0a947, 0x0a951}, // Rejang Vowel Sign I ..Rejang Consonant Sign R + {0x0a980, 0x0a982}, // Javanese Sign Panyangga ..Javanese Sign Layar + {0x0a9b3, 0x0a9b3}, // Javanese Sign Cecak Telu..Javanese Sign Cecak Telu + {0x0a9b6, 0x0a9b9}, // Javanese Vowel Sign Wulu..Javanese Vowel Sign Suku + {0x0a9bc, 0x0a9bd}, // Javanese Vowel Sign Pepe..Javanese Consonant Sign + {0x0a9e5, 0x0a9e5}, // Myanmar Sign Shan Saw ..Myanmar Sign Shan Saw + {0x0aa29, 0x0aa2e}, // Cham Vowel Sign Aa ..Cham Vowel Sign Oe + {0x0aa31, 0x0aa32}, // Cham Vowel Sign Au ..Cham Vowel Sign Ue + {0x0aa35, 0x0aa36}, // Cham Consonant Sign La ..Cham Consonant Sign Wa + {0x0aa43, 0x0aa43}, // Cham Consonant Sign Fina..Cham Consonant Sign Fina + {0x0aa4c, 0x0aa4c}, // Cham Consonant Sign Fina..Cham Consonant Sign Fina + {0x0aa7c, 0x0aa7c}, // Myanmar Sign Tai Laing T..Myanmar Sign Tai Laing T + {0x0aab0, 0x0aab0}, // Tai Viet Mai Kang ..Tai Viet Mai Kang + {0x0aab2, 0x0aab4}, // Tai Viet Vowel I ..Tai Viet Vowel U + {0x0aab7, 0x0aab8}, // Tai Viet Mai Khit ..Tai Viet Vowel Ia + {0x0aabe, 0x0aabf}, // Tai Viet Vowel Am ..Tai Viet Tone Mai Ek + {0x0aac1, 0x0aac1}, // Tai Viet Tone Mai Tho ..Tai Viet Tone Mai Tho + {0x0aaec, 0x0aaed}, // Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign + {0x0aaf6, 0x0aaf6}, // Meetei Mayek Virama ..Meetei Mayek Virama + {0x0abe5, 0x0abe5}, // Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign + {0x0abe8, 0x0abe8}, // Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign + {0x0abed, 0x0abed}, // Meetei Mayek Apun Iyek ..Meetei Mayek Apun Iyek + {0x0fb1e, 0x0fb1e}, // Hebrew Point Judeo-spani..Hebrew Point Judeo-spani + {0x0fe00, 0x0fe0f}, // Variation Selector-1 ..Variation Selector-16 + {0x0fe20, 0x0fe2f}, // Combining Ligature Left ..Combining Cyrillic Titlo {0x101fd, 0x101fd}, // Phaistos Disc Sign Combi..Phaistos Disc Sign Combi {0x102e0, 0x102e0}, // Coptic Epact Thousands M..Coptic Epact Thousands M {0x10376, 0x1037a}, // Combining Old Permic Let..Combining Old Permic Let @@ -229,34 +245,45 @@ {0x10a38, 0x10a3a}, // Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo {0x10a3f, 0x10a3f}, // Kharoshthi Virama ..Kharoshthi Virama {0x10ae5, 0x10ae6}, // Manichaean Abbreviation ..Manichaean Abbreviation + {0x10d24, 0x10d27}, // Hanifi Rohingya Sign Har..Hanifi Rohingya Sign Tas + {0x10eab, 0x10eac}, // Yezidi Combining Hamza M..Yezidi Combining Madda M + {0x10efd, 0x10eff}, // (nil) ..(nil) + {0x10f46, 0x10f50}, // Sogdian Combining Dot Be..Sogdian Combining Stroke + {0x10f82, 0x10f85}, // Old Uyghur Combining Dot..Old Uyghur Combining Two {0x11001, 0x11001}, // Brahmi Sign Anusvara ..Brahmi Sign Anusvara {0x11038, 0x11046}, // Brahmi Vowel Sign Aa ..Brahmi Virama + {0x11070, 0x11070}, // Brahmi Sign Old Tamil Vi..Brahmi Sign Old Tamil Vi + {0x11073, 0x11074}, // Brahmi Vowel Sign Old Ta..Brahmi Vowel Sign Old Ta {0x1107f, 0x11081}, // Brahmi Number Joiner ..Kaithi Sign Anusvara {0x110b3, 0x110b6}, // Kaithi Vowel Sign U ..Kaithi Vowel Sign Ai {0x110b9, 0x110ba}, // Kaithi Sign Virama ..Kaithi Sign Nukta + {0x110c2, 0x110c2}, // Kaithi Vowel Sign Vocali..Kaithi Vowel Sign Vocali {0x11100, 0x11102}, // Chakma Sign Candrabindu ..Chakma Sign Visarga {0x11127, 0x1112b}, // Chakma Vowel Sign A ..Chakma Vowel Sign Uu {0x1112d, 0x11134}, // Chakma Vowel Sign Ai ..Chakma Maayyaa {0x11173, 0x11173}, // Mahajani Sign Nukta ..Mahajani Sign Nukta {0x11180, 0x11181}, // Sharada Sign Candrabindu..Sharada Sign Anusvara {0x111b6, 0x111be}, // Sharada Vowel Sign U ..Sharada Vowel Sign O - {0x111ca, 0x111cc}, // Sharada Sign Nukta ..Sharada Extra Sh||t Vowe + {0x111c9, 0x111cc}, // Sharada Sandhi Mark ..Sharada Extra Short Vowe + {0x111cf, 0x111cf}, // Sharada Sign Inverted Ca..Sharada Sign Inverted Ca {0x1122f, 0x11231}, // Khojki Vowel Sign U ..Khojki Vowel Sign Ai {0x11234, 0x11234}, // Khojki Sign Anusvara ..Khojki Sign Anusvara {0x11236, 0x11237}, // Khojki Sign Nukta ..Khojki Sign Shadda - {0x1123e, 0x1123e}, // (nil) .. + {0x1123e, 0x1123e}, // Khojki Sign Sukun ..Khojki Sign Sukun + {0x11241, 0x11241}, // (nil) ..(nil) {0x112df, 0x112df}, // Khudawadi Sign Anusvara ..Khudawadi Sign Anusvara {0x112e3, 0x112ea}, // Khudawadi Vowel Sign U ..Khudawadi Sign Virama {0x11300, 0x11301}, // Grantha Sign Combining A..Grantha Sign Candrabindu - {0x1133c, 0x1133c}, // Grantha Sign Nukta ..Grantha Sign Nukta + {0x1133b, 0x1133c}, // Combining Bindu Below ..Grantha Sign Nukta {0x11340, 0x11340}, // Grantha Vowel Sign Ii ..Grantha Vowel Sign Ii {0x11366, 0x1136c}, // Combining Grantha Digit ..Combining Grantha Digit {0x11370, 0x11374}, // Combining Grantha Letter..Combining Grantha Letter - {0x11438, 0x1143f}, // (nil) .. - {0x11442, 0x11444}, // (nil) .. - {0x11446, 0x11446}, // (nil) .. + {0x11438, 0x1143f}, // Newa Vowel Sign U ..Newa Vowel Sign Ai + {0x11442, 0x11444}, // Newa Sign Virama ..Newa Sign Anusvara + {0x11446, 0x11446}, // Newa Sign Nukta ..Newa Sign Nukta + {0x1145e, 0x1145e}, // Newa Sandhi Mark ..Newa Sandhi Mark {0x114b3, 0x114b8}, // Tirhuta Vowel Sign U ..Tirhuta Vowel Sign Vocal - {0x114ba, 0x114ba}, // Tirhuta Vowel Sign Sh||t..Tirhuta Vowel Sign Sh||t + {0x114ba, 0x114ba}, // Tirhuta Vowel Sign Short..Tirhuta Vowel Sign Short {0x114bf, 0x114c0}, // Tirhuta Sign Candrabindu..Tirhuta Sign Anusvara {0x114c2, 0x114c3}, // Tirhuta Sign Virama ..Tirhuta Sign Nukta {0x115b2, 0x115b5}, // Siddham Vowel Sign U ..Siddham Vowel Sign Vocal @@ -273,17 +300,52 @@ {0x1171d, 0x1171f}, // Ahom Consonant Sign Medi..Ahom Consonant Sign Medi {0x11722, 0x11725}, // Ahom Vowel Sign I ..Ahom Vowel Sign Uu {0x11727, 0x1172b}, // Ahom Vowel Sign Aw ..Ahom Sign Killer - {0x11c30, 0x11c36}, // (nil) .. - {0x11c38, 0x11c3d}, // (nil) .. - {0x11c3f, 0x11c3f}, // (nil) .. - {0x11c92, 0x11ca7}, // (nil) .. - {0x11caa, 0x11cb0}, // (nil) .. - {0x11cb2, 0x11cb3}, // (nil) .. - {0x11cb5, 0x11cb6}, // (nil) .. + {0x1182f, 0x11837}, // Dogra Vowel Sign U ..Dogra Sign Anusvara + {0x11839, 0x1183a}, // Dogra Sign Virama ..Dogra Sign Nukta + {0x1193b, 0x1193c}, // Dives Akuru Sign Anusvar..Dives Akuru Sign Candrab + {0x1193e, 0x1193e}, // Dives Akuru Virama ..Dives Akuru Virama + {0x11943, 0x11943}, // Dives Akuru Sign Nukta ..Dives Akuru Sign Nukta + {0x119d4, 0x119d7}, // Nandinagari Vowel Sign U..Nandinagari Vowel Sign V + {0x119da, 0x119db}, // Nandinagari Vowel Sign E..Nandinagari Vowel Sign A + {0x119e0, 0x119e0}, // Nandinagari Sign Virama ..Nandinagari Sign Virama + {0x11a01, 0x11a0a}, // Zanabazar Square Vowel S..Zanabazar Square Vowel L + {0x11a33, 0x11a38}, // Zanabazar Square Final C..Zanabazar Square Sign An + {0x11a3b, 0x11a3e}, // Zanabazar Square Cluster..Zanabazar Square Cluster + {0x11a47, 0x11a47}, // Zanabazar Square Subjoin..Zanabazar Square Subjoin + {0x11a51, 0x11a56}, // Soyombo Vowel Sign I ..Soyombo Vowel Sign Oe + {0x11a59, 0x11a5b}, // Soyombo Vowel Sign Vocal..Soyombo Vowel Length Mar + {0x11a8a, 0x11a96}, // Soyombo Final Consonant ..Soyombo Sign Anusvara + {0x11a98, 0x11a99}, // Soyombo Gemination Mark ..Soyombo Subjoiner + {0x11c30, 0x11c36}, // Bhaiksuki Vowel Sign I ..Bhaiksuki Vowel Sign Voc + {0x11c38, 0x11c3d}, // Bhaiksuki Vowel Sign E ..Bhaiksuki Sign Anusvara + {0x11c3f, 0x11c3f}, // Bhaiksuki Sign Virama ..Bhaiksuki Sign Virama + {0x11c92, 0x11ca7}, // Marchen Subjoined Letter..Marchen Subjoined Letter + {0x11caa, 0x11cb0}, // Marchen Subjoined Letter..Marchen Vowel Sign Aa + {0x11cb2, 0x11cb3}, // Marchen Vowel Sign U ..Marchen Vowel Sign E + {0x11cb5, 0x11cb6}, // Marchen Sign Anusvara ..Marchen Sign Candrabindu + {0x11d31, 0x11d36}, // Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign + {0x11d3a, 0x11d3a}, // Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign + {0x11d3c, 0x11d3d}, // Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign + {0x11d3f, 0x11d45}, // Masaram Gondi Vowel Sign..Masaram Gondi Virama + {0x11d47, 0x11d47}, // Masaram Gondi Ra-kara ..Masaram Gondi Ra-kara + {0x11d90, 0x11d91}, // Gunjala Gondi Vowel Sign..Gunjala Gondi Vowel Sign + {0x11d95, 0x11d95}, // Gunjala Gondi Sign Anusv..Gunjala Gondi Sign Anusv + {0x11d97, 0x11d97}, // Gunjala Gondi Virama ..Gunjala Gondi Virama + {0x11ef3, 0x11ef4}, // Makasar Vowel Sign I ..Makasar Vowel Sign U + {0x11f00, 0x11f01}, // (nil) ..(nil) + {0x11f36, 0x11f3a}, // (nil) ..(nil) + {0x11f40, 0x11f40}, // (nil) ..(nil) + {0x11f42, 0x11f42}, // (nil) ..(nil) + {0x13440, 0x13440}, // (nil) ..(nil) + {0x13447, 0x13455}, // (nil) ..(nil) {0x16af0, 0x16af4}, // Bassa Vah Combining High..Bassa Vah Combining High {0x16b30, 0x16b36}, // Pahawh Hmong Mark Cim Tu..Pahawh Hmong Mark Cim Ta + {0x16f4f, 0x16f4f}, // Miao Sign Consonant Modi..Miao Sign Consonant Modi {0x16f8f, 0x16f92}, // Miao Tone Right ..Miao Tone Below + {0x16fe4, 0x16fe4}, // Khitan Small Script Fill..Khitan Small Script Fill {0x1bc9d, 0x1bc9e}, // Duployan Thick Letter Se..Duployan Double Mark + {0x1cf00, 0x1cf2d}, // Znamenny Combining Mark ..Znamenny Combining Mark + {0x1cf30, 0x1cf46}, // Znamenny Combining Tonal..Znamenny Priznak Modifie {0x1d167, 0x1d169}, // Musical Symbol Combining..Musical Symbol Combining {0x1d17b, 0x1d182}, // Musical Symbol Combining..Musical Symbol Combining {0x1d185, 0x1d18b}, // Musical Symbol Combining..Musical Symbol Combining @@ -295,97 +357,112 @@ {0x1da84, 0x1da84}, // Signwriting Location Hea..Signwriting Location Hea {0x1da9b, 0x1da9f}, // Signwriting Fill Modifie..Signwriting Fill Modifie {0x1daa1, 0x1daaf}, // Signwriting Rotation Mod..Signwriting Rotation Mod - {0x1e000, 0x1e006}, // (nil) .. - {0x1e008, 0x1e018}, // (nil) .. - {0x1e01b, 0x1e021}, // (nil) .. - {0x1e023, 0x1e024}, // (nil) .. - {0x1e026, 0x1e02a}, // (nil) .. + {0x1e000, 0x1e006}, // Combining Glagolitic Let..Combining Glagolitic Let + {0x1e008, 0x1e018}, // Combining Glagolitic Let..Combining Glagolitic Let + {0x1e01b, 0x1e021}, // Combining Glagolitic Let..Combining Glagolitic Let + {0x1e023, 0x1e024}, // Combining Glagolitic Let..Combining Glagolitic Let + {0x1e026, 0x1e02a}, // Combining Glagolitic Let..Combining Glagolitic Let + {0x1e08f, 0x1e08f}, // (nil) ..(nil) + {0x1e130, 0x1e136}, // Nyiakeng Puachue Hmong T..Nyiakeng Puachue Hmong T + {0x1e2ae, 0x1e2ae}, // Toto Sign Rising Tone ..Toto Sign Rising Tone + {0x1e2ec, 0x1e2ef}, // Wancho Tone Tup ..Wancho Tone Koini + {0x1e4ec, 0x1e4ef}, // (nil) ..(nil) {0x1e8d0, 0x1e8d6}, // Mende Kikakui Combining ..Mende Kikakui Combining - {0x1e944, 0x1e94a}, // (nil) .. - {0xe0100, 0xe01ef}, // Variation Select||-17 ..Variation Select||-256 + {0x1e944, 0x1e94a}, // Adlam Alif Lengthener ..Adlam Nukta + {0xe0100, 0xe01ef}, // Variation Selector-17 ..Variation Selector-256 }; // https://github.com/jquast/wcwidth/blob/master/wcwidth/table_wide.py -// at commit 0d7de112202cc8b2ebe9232ff4a5c954f19d561a (2016-07-02): +// from https://github.com/jquast/wcwidth/pull/64 +// at commit 1b9b6585b0080ea5cb88dc9815796505724793fe (2022-12-16): static struct width_interval WIDE_EASTASIAN[] = { - {0x1100, 0x115f}, // Hangul Choseong Kiyeok ..Hangul Choseong Filler - {0x231a, 0x231b}, // Watch ..Hourglass - {0x2329, 0x232a}, // Left-pointing Angle Brac..Right-pointing Angle Bra - {0x23e9, 0x23ec}, // Black Right-pointing Dou..Black Down-pointing Doub - {0x23f0, 0x23f0}, // Alarm Clock ..Alarm Clock - {0x23f3, 0x23f3}, // Hourglass With Flowing S..Hourglass With Flowing S - {0x25fd, 0x25fe}, // White Medium Small Squar..Black Medium Small Squar - {0x2614, 0x2615}, // Umbrella With Rain Drops..Hot Beverage - {0x2648, 0x2653}, // Aries ..Pisces - {0x267f, 0x267f}, // Wheelchair Symbol ..Wheelchair Symbol - {0x2693, 0x2693}, // Anch|| ..Anch|| - {0x26a1, 0x26a1}, // High Voltage Sign ..High Voltage Sign - {0x26aa, 0x26ab}, // Medium White Circle ..Medium Black Circle - {0x26bd, 0x26be}, // Soccer Ball ..Baseball - {0x26c4, 0x26c5}, // Snowman Without Snow ..Sun Behind Cloud - {0x26ce, 0x26ce}, // Ophiuchus ..Ophiuchus - {0x26d4, 0x26d4}, // No Entry ..No Entry - {0x26ea, 0x26ea}, // Church ..Church - {0x26f2, 0x26f3}, // Fountain ..Flag In Hole - {0x26f5, 0x26f5}, // Sailboat ..Sailboat - {0x26fa, 0x26fa}, // Tent ..Tent - {0x26fd, 0x26fd}, // Fuel Pump ..Fuel Pump - {0x2705, 0x2705}, // White Heavy Check Mark ..White Heavy Check Mark - {0x270a, 0x270b}, // Raised Fist ..Raised Hand - {0x2728, 0x2728}, // Sparkles ..Sparkles - {0x274c, 0x274c}, // Cross Mark ..Cross Mark - {0x274e, 0x274e}, // Negative Squared Cross M..Negative Squared Cross M - {0x2753, 0x2755}, // Black Question Mark ||na..White Exclamation Mark O - {0x2757, 0x2757}, // Heavy Exclamation Mark S..Heavy Exclamation Mark S - {0x2795, 0x2797}, // Heavy Plus Sign ..Heavy Division Sign - {0x27b0, 0x27b0}, // Curly Loop ..Curly Loop - {0x27bf, 0x27bf}, // Double Curly Loop ..Double Curly Loop - {0x2b1b, 0x2b1c}, // Black Large Square ..White Large Square - {0x2b50, 0x2b50}, // White Medium Star ..White Medium Star - {0x2b55, 0x2b55}, // Heavy Large Circle ..Heavy Large Circle - {0x2e80, 0x2e99}, // Cjk Radical Repeat ..Cjk Radical Rap - {0x2e9b, 0x2ef3}, // Cjk Radical Choke ..Cjk Radical C-simplified - {0x2f00, 0x2fd5}, // Kangxi Radical One ..Kangxi Radical Flute - {0x2ff0, 0x2ffb}, // Ideographic Description ..Ideographic Description - {0x3000, 0x303e}, // Ideographic Space ..Ideographic Variation In - {0x3041, 0x3096}, // Hiragana Letter Small A ..Hiragana Letter Small Ke - {0x3099, 0x30ff}, // Combining Katakana-hirag..Katakana Digraph Koto - {0x3105, 0x312d}, // Bopomofo Letter B ..Bopomofo Letter Ih - {0x3131, 0x318e}, // Hangul Letter Kiyeok ..Hangul Letter Araeae - {0x3190, 0x31ba}, // Ideographic Annotation L..Bopomofo Letter Zy - {0x31c0, 0x31e3}, // Cjk Stroke T ..Cjk Stroke Q - {0x31f0, 0x321e}, // Katakana Letter Small Ku..Parenthesized K||ean Cha - {0x3220, 0x3247}, // Parenthesized Ideograph ..Circled Ideograph Koto - {0x3250, 0x32fe}, // Partnership Sign ..Circled Katakana Wo - {0x3300, 0x4dbf}, // Square Apaato .. - {0x4e00, 0xa48c}, // Cjk Unified Ideograph-4e..Yi Syllable Yyr - {0xa490, 0xa4c6}, // Yi Radical Qot ..Yi Radical Ke - {0xa960, 0xa97c}, // Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo - {0xac00, 0xd7a3}, // Hangul Syllable Ga ..Hangul Syllable Hih - {0xf900, 0xfaff}, // Cjk Compatibility Ideogr.. - {0xfe10, 0xfe19}, // Presentation F||m F|| Ve..Presentation F||m F|| Ve - {0xfe30, 0xfe52}, // Presentation F||m F|| Ve..Small Full Stop - {0xfe54, 0xfe66}, // Small Semicolon ..Small Equals Sign - {0xfe68, 0xfe6b}, // Small Reverse Solidus ..Small Commercial At - {0xff01, 0xff60}, // Fullwidth Exclamation Ma..Fullwidth Right White Pa - {0xffe0, 0xffe6}, // Fullwidth Cent Sign ..Fullwidth Won Sign - {0x16fe0, 0x16fe0}, // (nil) .. - {0x17000, 0x187ec}, // (nil) .. - {0x18800, 0x18af2}, // (nil) .. - {0x1b000, 0x1b001}, // Katakana Letter Archaic ..Hiragana Letter Archaic + {0x01100, 0x0115f}, // Hangul Choseong Kiyeok ..Hangul Choseong Filler + {0x0231a, 0x0231b}, // Watch ..Hourglass + {0x02329, 0x0232a}, // Left-pointing Angle Brac..Right-pointing Angle Bra + {0x023e9, 0x023ec}, // Black Right-pointing Dou..Black Down-pointing Doub + {0x023f0, 0x023f0}, // Alarm Clock ..Alarm Clock + {0x023f3, 0x023f3}, // Hourglass With Flowing S..Hourglass With Flowing S + {0x025fd, 0x025fe}, // White Medium Small Squar..Black Medium Small Squar + {0x02614, 0x02615}, // Umbrella With Rain Drops..Hot Beverage + {0x02648, 0x02653}, // Aries ..Pisces + {0x0267f, 0x0267f}, // Wheelchair Symbol ..Wheelchair Symbol + {0x02693, 0x02693}, // Anchor ..Anchor + {0x026a1, 0x026a1}, // High Voltage Sign ..High Voltage Sign + {0x026aa, 0x026ab}, // Medium White Circle ..Medium Black Circle + {0x026bd, 0x026be}, // Soccer Ball ..Baseball + {0x026c4, 0x026c5}, // Snowman Without Snow ..Sun Behind Cloud + {0x026ce, 0x026ce}, // Ophiuchus ..Ophiuchus + {0x026d4, 0x026d4}, // No Entry ..No Entry + {0x026ea, 0x026ea}, // Church ..Church + {0x026f2, 0x026f3}, // Fountain ..Flag In Hole + {0x026f5, 0x026f5}, // Sailboat ..Sailboat + {0x026fa, 0x026fa}, // Tent ..Tent + {0x026fd, 0x026fd}, // Fuel Pump ..Fuel Pump + {0x02705, 0x02705}, // White Heavy Check Mark ..White Heavy Check Mark + {0x0270a, 0x0270b}, // Raised Fist ..Raised Hand + {0x02728, 0x02728}, // Sparkles ..Sparkles + {0x0274c, 0x0274c}, // Cross Mark ..Cross Mark + {0x0274e, 0x0274e}, // Negative Squared Cross M..Negative Squared Cross M + {0x02753, 0x02755}, // Black Question Mark Orna..White Exclamation Mark O + {0x02757, 0x02757}, // Heavy Exclamation Mark S..Heavy Exclamation Mark S + {0x02795, 0x02797}, // Heavy Plus Sign ..Heavy Division Sign + {0x027b0, 0x027b0}, // Curly Loop ..Curly Loop + {0x027bf, 0x027bf}, // Double Curly Loop ..Double Curly Loop + {0x02b1b, 0x02b1c}, // Black Large Square ..White Large Square + {0x02b50, 0x02b50}, // White Medium Star ..White Medium Star + {0x02b55, 0x02b55}, // Heavy Large Circle ..Heavy Large Circle + {0x02e80, 0x02e99}, // Cjk Radical Repeat ..Cjk Radical Rap + {0x02e9b, 0x02ef3}, // Cjk Radical Choke ..Cjk Radical C-simplified + {0x02f00, 0x02fd5}, // Kangxi Radical One ..Kangxi Radical Flute + {0x02ff0, 0x02ffb}, // Ideographic Description ..Ideographic Description + {0x03000, 0x0303e}, // Ideographic Space ..Ideographic Variation In + {0x03041, 0x03096}, // Hiragana Letter Small A ..Hiragana Letter Small Ke + {0x03099, 0x030ff}, // Combining Katakana-hirag..Katakana Digraph Koto + {0x03105, 0x0312f}, // Bopomofo Letter B ..Bopomofo Letter Nn + {0x03131, 0x0318e}, // Hangul Letter Kiyeok ..Hangul Letter Araeae + {0x03190, 0x031e3}, // Ideographic Annotation L..Cjk Stroke Q + {0x031f0, 0x0321e}, // Katakana Letter Small Ku..Parenthesized Korean Cha + {0x03220, 0x03247}, // Parenthesized Ideograph ..Circled Ideograph Koto + {0x03250, 0x04dbf}, // Partnership Sign ..Cjk Unified Ideograph-4d + {0x04e00, 0x0a48c}, // Cjk Unified Ideograph-4e..Yi Syllable Yyr + {0x0a490, 0x0a4c6}, // Yi Radical Qot ..Yi Radical Ke + {0x0a960, 0x0a97c}, // Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo + {0x0ac00, 0x0d7a3}, // Hangul Syllable Ga ..Hangul Syllable Hih + {0x0f900, 0x0faff}, // Cjk Compatibility Ideogr..(nil) + {0x0fe10, 0x0fe19}, // Presentation Form For Ve..Presentation Form For Ve + {0x0fe30, 0x0fe52}, // Presentation Form For Ve..Small Full Stop + {0x0fe54, 0x0fe66}, // Small Semicolon ..Small Equals Sign + {0x0fe68, 0x0fe6b}, // Small Reverse Solidus ..Small Commercial At + {0x0ff01, 0x0ff60}, // Fullwidth Exclamation Ma..Fullwidth Right White Pa + {0x0ffe0, 0x0ffe6}, // Fullwidth Cent Sign ..Fullwidth Won Sign + {0x16fe0, 0x16fe4}, // Tangut Iteration Mark ..Khitan Small Script Fill + {0x16ff0, 0x16ff1}, // Vietnamese Alternate Rea..Vietnamese Alternate Rea + {0x17000, 0x187f7}, // (nil) ..(nil) + {0x18800, 0x18cd5}, // Tangut Component-001 ..Khitan Small Script Char + {0x18d00, 0x18d08}, // (nil) ..(nil) + {0x1aff0, 0x1aff3}, // Katakana Letter Minnan T..Katakana Letter Minnan T + {0x1aff5, 0x1affb}, // Katakana Letter Minnan T..Katakana Letter Minnan N + {0x1affd, 0x1affe}, // Katakana Letter Minnan N..Katakana Letter Minnan N + {0x1b000, 0x1b122}, // Katakana Letter Archaic ..Katakana Letter Archaic + {0x1b132, 0x1b132}, // (nil) ..(nil) + {0x1b150, 0x1b152}, // Hiragana Letter Small Wi..Hiragana Letter Small Wo + {0x1b155, 0x1b155}, // (nil) ..(nil) + {0x1b164, 0x1b167}, // Katakana Letter Small Wi..Katakana Letter Small N + {0x1b170, 0x1b2fb}, // Nushu Character-1b170 ..Nushu Character-1b2fb {0x1f004, 0x1f004}, // Mahjong Tile Red Dragon ..Mahjong Tile Red Dragon {0x1f0cf, 0x1f0cf}, // Playing Card Black Joker..Playing Card Black Joker {0x1f18e, 0x1f18e}, // Negative Squared Ab ..Negative Squared Ab {0x1f191, 0x1f19a}, // Squared Cl ..Squared Vs {0x1f200, 0x1f202}, // Square Hiragana Hoka ..Squared Katakana Sa - {0x1f210, 0x1f23b}, // Squared Cjk Unified Ideo.. - {0x1f240, 0x1f248}, // T||toise Shell Bracketed..T||toise Shell Bracketed + {0x1f210, 0x1f23b}, // Squared Cjk Unified Ideo..Squared Cjk Unified Ideo + {0x1f240, 0x1f248}, // Tortoise Shell Bracketed..Tortoise Shell Bracketed {0x1f250, 0x1f251}, // Circled Ideograph Advant..Circled Ideograph Accept + {0x1f260, 0x1f265}, // Rounded Symbol For Fu ..Rounded Symbol For Cai {0x1f300, 0x1f320}, // Cyclone ..Shooting Star {0x1f32d, 0x1f335}, // Hot Dog ..Cactus {0x1f337, 0x1f37c}, // Tulip ..Baby Bottle - {0x1f37e, 0x1f393}, // Bottle With Popping C||k..Graduation Cap - {0x1f3a0, 0x1f3ca}, // Carousel H||se ..Swimmer + {0x1f37e, 0x1f393}, // Bottle With Popping Cork..Graduation Cap + {0x1f3a0, 0x1f3ca}, // Carousel Horse ..Swimmer {0x1f3cf, 0x1f3d3}, // Cricket Bat And Ball ..Table Tennis Paddle And {0x1f3e0, 0x1f3f0}, // House Building ..European Castle {0x1f3f4, 0x1f3f4}, // Waving Black Flag ..Waving Black Flag @@ -393,27 +470,33 @@ {0x1f440, 0x1f440}, // Eyes ..Eyes {0x1f442, 0x1f4fc}, // Ear ..Videocassette {0x1f4ff, 0x1f53d}, // Prayer Beads ..Down-pointing Small Red - {0x1f54b, 0x1f54e}, // Kaaba ..Men||ah With Nine Branch + {0x1f54b, 0x1f54e}, // Kaaba ..Menorah With Nine Branch {0x1f550, 0x1f567}, // Clock Face One Oclock ..Clock Face Twelve-thirty - {0x1f57a, 0x1f57a}, // (nil) .. + {0x1f57a, 0x1f57a}, // Man Dancing ..Man Dancing {0x1f595, 0x1f596}, // Reversed Hand With Middl..Raised Hand With Part Be - {0x1f5a4, 0x1f5a4}, // (nil) .. + {0x1f5a4, 0x1f5a4}, // Black Heart ..Black Heart {0x1f5fb, 0x1f64f}, // Mount Fuji ..Person With Folded Hands {0x1f680, 0x1f6c5}, // Rocket ..Left Luggage {0x1f6cc, 0x1f6cc}, // Sleeping Accommodation ..Sleeping Accommodation - {0x1f6d0, 0x1f6d2}, // Place Of W||ship .. + {0x1f6d0, 0x1f6d2}, // Place Of Worship ..Shopping Trolley + {0x1f6d5, 0x1f6d7}, // Hindu Temple ..Elevator + {0x1f6dc, 0x1f6df}, // (nil) ..Ring Buoy {0x1f6eb, 0x1f6ec}, // Airplane Departure ..Airplane Arriving - {0x1f6f4, 0x1f6f6}, // (nil) .. - {0x1f910, 0x1f91e}, // Zipper-mouth Face .. - {0x1f920, 0x1f927}, // (nil) .. - {0x1f930, 0x1f930}, // (nil) .. - {0x1f933, 0x1f93e}, // (nil) .. - {0x1f940, 0x1f94b}, // (nil) .. - {0x1f950, 0x1f95e}, // (nil) .. - {0x1f980, 0x1f991}, // Crab .. - {0x1f9c0, 0x1f9c0}, // Cheese Wedge ..Cheese Wedge - {0x20000, 0x2fffd}, // Cjk Unified Ideograph-20.. - {0x30000, 0x3fffd}, // (nil) .. + {0x1f6f4, 0x1f6fc}, // Scooter ..Roller Skate + {0x1f7e0, 0x1f7eb}, // Large Orange Circle ..Large Brown Square + {0x1f7f0, 0x1f7f0}, // Heavy Equals Sign ..Heavy Equals Sign + {0x1f90c, 0x1f93a}, // Pinched Fingers ..Fencer + {0x1f93c, 0x1f945}, // Wrestlers ..Goal Net + {0x1f947, 0x1f9ff}, // First Place Medal ..Nazar Amulet + {0x1fa70, 0x1fa7c}, // Ballet Shoes ..Crutch + {0x1fa80, 0x1fa88}, // Yo-yo ..(nil) + {0x1fa90, 0x1fabd}, // Ringed Planet ..(nil) + {0x1fabf, 0x1fac5}, // (nil) ..Person With Crown + {0x1face, 0x1fadb}, // (nil) ..(nil) + {0x1fae0, 0x1fae8}, // Melting Face ..(nil) + {0x1faf0, 0x1faf8}, // Hand With Index Finger A..(nil) + {0x20000, 0x2fffd}, // Cjk Unified Ideograph-20..(nil) + {0x30000, 0x3fffd}, // Cjk Unified Ideograph-30..(nil) }; static bool intable(struct width_interval* table, int table_length, int c) { diff -Nru libtsm-4.4.2/external/wcwidth/wcwidth.h libtsm-4.4.3/external/wcwidth/wcwidth.h --- libtsm-4.4.2/external/wcwidth/wcwidth.h 2026-01-29 04:45:44.000000000 -0500 +++ libtsm-4.4.3/external/wcwidth/wcwidth.h 2026-03-20 09:44:52.000000000 -0400 @@ -3,15 +3,10 @@ #include <stdlib.h> -#ifdef __cplusplus -extern "C" { -#endif +__BEGIN_DECLS int wcwidth(wchar_t ucs); -#ifdef __cplusplus -} -#endif - +__END_DECLS #endif diff -Nru libtsm-4.4.2/meson.build libtsm-4.4.3/meson.build --- libtsm-4.4.2/meson.build 2026-01-29 04:45:44.000000000 -0500 +++ libtsm-4.4.3/meson.build 2026-03-20 09:44:52.000000000 -0400 @@ -3,7 +3,7 @@ project( 'libtsm', 'c', - version: '4.4.2', + version: '4.4.3', license: 'MIT', meson_version: '>=1.1', default_options: [ diff -Nru libtsm-4.4.2/src/tsm/libtsm.h libtsm-4.4.3/src/tsm/libtsm.h --- libtsm-4.4.2/src/tsm/libtsm.h 2026-01-29 04:45:44.000000000 -0500 +++ libtsm-4.4.3/src/tsm/libtsm.h 2026-03-20 09:44:52.000000000 -0400 @@ -373,6 +373,7 @@ /* control sequence codes sent be the application */ #define TSM_VTE_MOUSE_MODE_X10 9 /* legacy mode (only cell mode, only on mouse click and x and y can be 223 max) */ +#define TSM_VTE_MOUSE_MODE_VT200 1000 /* normal tracking mode (sends mouse position both on button press and release) */ #define TSM_VTE_MOUSE_EVENT_BTN 1002 /* sends position on mouse click only */ #define TSM_VTE_MOUSE_EVENT_ANY 1003 /* sends position on mouse click and mouse move */ #define TSM_VTE_MOUSE_MODE_SGR 1006 /* modern mode that allows unlimited x and y coordinates */ diff -Nru libtsm-4.4.2/src/tsm/tsm-screen.c libtsm-4.4.3/src/tsm/tsm-screen.c --- libtsm-4.4.2/src/tsm/tsm-screen.c 2026-01-29 04:45:44.000000000 -0500 +++ libtsm-4.4.3/src/tsm/tsm-screen.c 2026-03-20 09:44:52.000000000 -0400 @@ -993,7 +993,7 @@ con->age = con->age_cnt; con->sb_pos = NULL; - con->sb_pos_num = 0; + con->sb_pos_num = con->sb_count; } unsigned int tsm_screen_sb_get_line_count(struct tsm_screen *con) diff -Nru libtsm-4.4.2/src/tsm/tsm-vte.c libtsm-4.4.3/src/tsm/tsm-vte.c --- libtsm-4.4.2/src/tsm/tsm-vte.c 2026-01-29 04:45:44.000000000 -0500 +++ libtsm-4.4.3/src/tsm/tsm-vte.c 2026-03-20 09:44:52.000000000 -0400 @@ -1655,6 +1655,7 @@ set_reset_flag(vte, set, TSM_VTE_FLAG_AUTO_REPEAT_MODE); continue; case TSM_VTE_MOUSE_MODE_X10: + case TSM_VTE_MOUSE_MODE_VT200: vte->mouse_mode = set ? vte->csi_argv[i] : 0; vte->mouse_event = TSM_VTE_MOUSE_EVENT_BTN; @@ -1747,7 +1748,7 @@ continue; case TSM_VTE_MOUSE_EVENT_BTN: case TSM_VTE_MOUSE_EVENT_ANY: - if (vte->mouse_mode == TSM_VTE_MOUSE_MODE_X10) { + if (vte->mouse_mode == TSM_VTE_MOUSE_MODE_X10 || vte->mouse_mode == TSM_VTE_MOUSE_MODE_VT200) { vte->mouse_event = TSM_VTE_MOUSE_EVENT_BTN; } else { vte->mouse_event = set ? vte->csi_argv[i] : 0; @@ -1972,7 +1973,11 @@ tsm_screen_erase_chars(vte->con, num); break; case 'm': - csi_attribute(vte); + /* CSI_GT ('>' prefix) marks a private/DEC sequence such as + * XTMODKEYS \033[>4;1m — not an SGR attribute. Guard against + * misinterpreting it as e.g. SGR 4 (underline). */ + if (!(vte->csi_flags & CSI_GT)) + csi_attribute(vte); break; case 'p': if (vte->csi_flags & CSI_GT) { @@ -2952,11 +2957,29 @@ return true; case XKB_KEY_Page_Up: case XKB_KEY_KP_Page_Up: - vte_write(vte, "\e[5~", 4); + /* Combinations with ALT are handled as TSM_VTE_FLAG_PREPEND_ESCAPE flag */ + if ((mods & (TSM_CONTROL_MASK | TSM_SHIFT_MASK)) == (TSM_CONTROL_MASK | TSM_SHIFT_MASK)) { + vte_write(vte, "\e[5;6~", 6); + } else if (mods & TSM_CONTROL_MASK) { + vte_write(vte, "\e[5;5~", 6); + } else if (mods & TSM_SHIFT_MASK) { + vte_write(vte, "\e[5;2~", 6); + } else { + vte_write(vte, "\e[5~", 4); + } return true; case XKB_KEY_KP_Page_Down: case XKB_KEY_Page_Down: - vte_write(vte, "\e[6~", 4); + /* Combinations with ALT are handled as TSM_VTE_FLAG_PREPEND_ESCAPE flag */ + if ((mods & (TSM_CONTROL_MASK | TSM_SHIFT_MASK)) == (TSM_CONTROL_MASK | TSM_SHIFT_MASK)) { + vte_write(vte, "\e[6;6~", 6); + } else if (mods & TSM_CONTROL_MASK) { + vte_write(vte, "\e[6;5~", 6); + } else if (mods & TSM_SHIFT_MASK) { + vte_write(vte, "\e[6;2~", 6); + } else { + vte_write(vte, "\e[6~", 4); + } return true; case XKB_KEY_Up: case XKB_KEY_KP_Up: @@ -3302,7 +3325,7 @@ /* In mode 1002 (BTN), accept MOVED with button pressed (drag, button >= 32) */ /* In mode 1003 (ANY), accept all MOVED events */ bool is_drag = (button >= 32 && button <= 34); - if ((vte->mouse_mode == TSM_VTE_MOUSE_MODE_X10 || + if ((vte->mouse_mode == TSM_VTE_MOUSE_MODE_X10 || vte->mouse_mode == TSM_VTE_MOUSE_MODE_VT200 || (vte->mouse_event == TSM_VTE_MOUSE_EVENT_BTN && !is_drag) || (vte->mouse_event != TSM_VTE_MOUSE_EVENT_BTN && vte->mouse_event != TSM_VTE_MOUSE_EVENT_ANY)) && (event & TSM_MOUSE_EVENT_MOVED)) { @@ -3324,7 +3347,10 @@ reply_flags = button | modifiers; } - if (vte->mouse_mode == TSM_VTE_MOUSE_MODE_X10) { + if (vte->mouse_mode == TSM_VTE_MOUSE_MODE_X10 || vte->mouse_mode == TSM_VTE_MOUSE_MODE_VT200) { + if (vte->mouse_mode == TSM_VTE_MOUSE_MODE_X10 && (event & TSM_MOUSE_EVENT_RELEASED)) + return false; + /* + 0x20 to start in the range of visible characters * and + 1 to start at 1,1 */ cell_x += 0x21; @@ -3344,6 +3370,9 @@ button = 3; } + if (vte->mouse_mode == TSM_VTE_MOUSE_MODE_X10) + modifiers = 0; + reply_flags = (button | modifiers) + 0x20; snprintf((char*) &buffer, sizeof(buffer), "\e[M%c%c%c", reply_flags, cell_x, cell_y); @@ -3411,4 +3440,4 @@ free(buf); } else vte_write(vte, data, strlen(data)); -} \ No newline at end of file +}
signature.asc
Description: This is a digitally signed message part
