ref: 3d1c7cd1545d20552651412a2334aa347c6b1394
parent: 1f14e04d47e4bf86684ae54bb5a9fbc1d2419f04
author: Sigrid Solveig Haflínudóttir <[email protected]>
date: Mon Mar 20 18:46:47 EDT 2023
update wcwidth.c to github.com/termux/wcwidth for plan 9 builds, but use system's one otherwise
--- a/llt/Makefile
+++ b/llt/Makefile
@@ -15,7 +15,6 @@
socket.o\
timefuncs.o\
utf8.o\
- wcwidth.o\
.PHONY: all default clean
--- a/llt/llt.h
+++ b/llt/llt.h
@@ -98,9 +98,6 @@
int str2int(char *str, size_t len, int64_t *res, uint32_t base);
int isdigit_base(char c, int base);
-/* wcwidth.c */
-int llt_wcwidth(uint32_t ucs);
-
void llt_init(void);
#endif
--- a/llt/timefuncs.c
+++ b/llt/timefuncs.c
@@ -1,4 +1,3 @@
-#define _XOPEN_SOURCE 600
#include "platform.h"
#if defined(__plan9__)
--- a/llt/utf8.c
+++ b/llt/utf8.c
@@ -259,7 +259,7 @@
case 0: ch += (uint8_t)*s++;
}
ch -= offsetsFromUTF8[nb];
- w = llt_wcwidth(ch); // might return -1
+ w = wcwidth(ch); // might return -1
if (w > 0) tot += w;
}
}
--- a/llt/wcwidth.c
+++ b/llt/wcwidth.c
@@ -1,205 +1,542 @@
/*
- * This is an implementation of wcwidth() and wcswidth() (defined in
- * IEEE Std 1002.1-2001) for Unicode.
+ * Copyright (C) Fredrik Fornwall 2016.
+ * Distributed under the MIT License.
*
- * http://www.opengroup.org/onlinepubs/007904975/functions/wcwidth.html
- * http://www.opengroup.org/onlinepubs/007904975/functions/wcswidth.html
+ * Implementation of wcwidth(3) as a C port of:
+ * https://github.com/jquast/wcwidth
*
- * In fixed-width output devices, Latin characters all occupy a single
- * "cell" position of equal width, whereas ideographic CJK characters
- * occupy two such cells. Interoperability between terminal-line
- * applications and (teletype-style) character terminals using the
- * UTF-8 encoding requires agreement on which character should advance
- * the cursor by how many cell positions. No established formal
- * standards exist at present on which Unicode character shall occupy
- * how many cell positions on character terminals. These routines are
- * a first attempt of defining such behavior based on simple rules
- * applied to data provided by the Unicode Consortium.
+ * Report issues at:
+ * https://github.com/termux/wcwidth
*
- * For some graphical characters, the Unicode standard explicitly
- * defines a character-cell width via the definition of the East Asian
- * FullWidth (F), Wide (W), Half-width (H), and Narrow (Na) classes.
- * In all these cases, there is no ambiguity about which width a
- * terminal shall use. For characters in the East Asian Ambiguous (A)
- * class, the width choice depends purely on a preference of backward
- * compatibility with either historic CJK or Western practice.
- * Choosing single-width for these characters is easy to justify as
- * the appropriate long-term solution, as the CJK practice of
- * displaying these characters as double-width comes from historic
- * implementation simplicity (8-bit encoded characters were displayed
- * single-width and 16-bit ones double-width, even for Greek,
- * Cyrillic, etc.) and not any typographic considerations.
- *
- * Much less clear is the choice of width for the Not East Asian
- * (Neutral) class. Existing practice does not dictate a width for any
- * of these characters. It would nevertheless make sense
- * typographically to allocate two character cells to characters such
- * as for instance EM SPACE or VOLUME INTEGRAL, which cannot be
- * represented adequately with a single-width glyph. The following
- * routines at present merely assign a single-cell width to all
- * neutral characters, in the interest of simplicity. This is not
- * entirely satisfactory and should be reconsidered before
- * establishing a formal standard in this area. At the moment, the
- * decision which Not East Asian (Neutral) characters should be
- * represented by double-width glyphs cannot yet be answered by
- * applying a simple rule from the Unicode database content. Setting
- * up a proper standard for the behavior of UTF-8 character terminals
- * will require a careful analysis not only of each Unicode character,
- * but also of each presentation form, something the author of these
- * routines has avoided to do so far.
- *
- * http://www.unicode.org/unicode/reports/tr11/
- *
- * 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.
- *
- * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
- *
- * MODIFIED TO USE uint32_t
+ * 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 "llt.h"
-struct interval {- int first;
- int last;
+struct width_interval {+ int start;
+ int end;
};
-/* auxiliary function for binary search in interval table */
-static int bisearch(uint32_t ucs, const struct interval *table, int max) {- int min = 0;
- int mid;
+// From https://github.com/jquast/wcwidth/blob/master/wcwidth/table_zero.py
+// from https://github.com/jquast/wcwidth/pull/64
+// at commit 1b9b6585b0080ea5cb88dc9815796505724793fe (2022-12-16):
+static struct width_interval ZERO_WIDTH[] = {+ {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+ {0x10a01, 0x10a03}, // Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo+ {0x10a05, 0x10a06}, // Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O+ {0x10a0c, 0x10a0f}, // Kharoshthi Vowel Length ..Kharoshthi Sign Visarga+ {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+ {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}, // 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+ {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}, // 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 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+ {0x115bc, 0x115bd}, // Siddham Sign Candrabindu..Siddham Sign Anusvara+ {0x115bf, 0x115c0}, // Siddham Sign Virama ..Siddham Sign Nukta+ {0x115dc, 0x115dd}, // Siddham Vowel Sign Alter..Siddham Vowel Sign Alter+ {0x11633, 0x1163a}, // Modi Vowel Sign U ..Modi Vowel Sign Ai+ {0x1163d, 0x1163d}, // Modi Sign Anusvara ..Modi Sign Anusvara+ {0x1163f, 0x11640}, // Modi Sign Virama ..Modi Sign Ardhacandra+ {0x116ab, 0x116ab}, // Takri Sign Anusvara ..Takri Sign Anusvara+ {0x116ad, 0x116ad}, // Takri Vowel Sign Aa ..Takri Vowel Sign Aa+ {0x116b0, 0x116b5}, // Takri Vowel Sign U ..Takri Vowel Sign Au+ {0x116b7, 0x116b7}, // Takri Sign Nukta ..Takri Sign Nukta+ {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+ {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+ {0x1d1aa, 0x1d1ad}, // Musical Symbol Combining..Musical Symbol Combining+ {0x1d242, 0x1d244}, // Combining Greek Musical ..Combining Greek Musical+ {0x1da00, 0x1da36}, // Signwriting Head Rim ..Signwriting Air Sucking+ {0x1da3b, 0x1da6c}, // Signwriting Mouth Closed..Signwriting Excitement+ {0x1da75, 0x1da75}, // Signwriting Upper Body T..Signwriting Upper Body T+ {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}, // 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}, // Adlam Alif Lengthener ..Adlam Nukta+ {0xe0100, 0xe01ef}, // Variation Selector-17 ..Variation Selector-256+};
- if (ucs < (uint32_t)table[0].first || ucs > (uint32_t)table[max].last)
- return 0;
- while (max >= min) {- mid = (min + max) / 2;
- if (ucs > (uint32_t)table[mid].last)
- min = mid + 1;
- else if (ucs < (uint32_t)table[mid].first)
- max = mid - 1;
- else
- return 1;
- }
+// https://github.com/jquast/wcwidth/blob/master/wcwidth/table_wide.py
+// from https://github.com/jquast/wcwidth/pull/64
+// at commit 1b9b6585b0080ea5cb88dc9815796505724793fe (2022-12-16):
+static struct width_interval WIDE_EASTASIAN[] = {+ {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..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 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+ {0x1f3f8, 0x1f43e}, // Badminton Racquet And Sh..Paw Prints+ {0x1f440, 0x1f440}, // Eyes ..Eyes+ {0x1f442, 0x1f4fc}, // Ear ..Videocassette+ {0x1f4ff, 0x1f53d}, // Prayer Beads ..Down-pointing Small Red+ {0x1f54b, 0x1f54e}, // Kaaba ..Menorah With Nine Branch+ {0x1f550, 0x1f567}, // Clock Face One Oclock ..Clock Face Twelve-thirty+ {0x1f57a, 0x1f57a}, // Man Dancing ..Man Dancing+ {0x1f595, 0x1f596}, // Reversed Hand With Middl..Raised Hand With Part Be+ {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 Worship ..Shopping Trolley+ {0x1f6d5, 0x1f6d7}, // Hindu Temple ..Elevator+ {0x1f6dc, 0x1f6df}, // (nil) ..Ring Buoy+ {0x1f6eb, 0x1f6ec}, // Airplane Departure ..Airplane Arriving+ {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)+};
- return 0;
-}
+static bool intable(struct width_interval* table, int table_length, int c) {+ // First quick check for Latin1 etc. characters.
+ if (c < table[0].start) return false;
+
+ // Binary search in table.
+ int bot = 0;
+ int top = table_length - 1;
+ while (top >= bot) {+ int mid = (bot + top) / 2;
+ if (table[mid].end < c) {+ bot = mid + 1;
+ } else if (table[mid].start > c) {+ top = mid - 1;
+ } else {+ return true;
+ }
+ }
+ return false;
+}
-/* The following two functions define the column width of an ISO 10646
- * character as follows:
- *
- * - The null character (U+0000) has a column width of 0.
- *
- * - Other C0/C1 control characters and DEL will lead to a return
- * value of -1.
- *
- * - Non-spacing and enclosing combining characters (general
- * category code Mn or Me in the Unicode database) have a
- * column width of 0.
- *
- * - SOFT HYPHEN (U+00AD) has a column width of 1.
- *
- * - Other format characters (general category code Cf in the Unicode
- * database) and ZERO WIDTH SPACE (U+200B) have a column width of 0.
- *
- * - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF)
- * have a column width of 0.
- *
- * - Spacing characters in the East Asian Wide (W) or East Asian
- * Full-width (F) category as defined in Unicode Technical
- * Report #11 have a column width of 2.
- *
- * - All remaining characters (including all printable
- * ISO 8859-1 and WGL4 characters, Unicode control characters,
- * etc.) have a column width of 1.
- *
- * This implementation assumes that wchar_t characters are encoded
- * in ISO 10646.
- */
+int wcwidth(wchar_t ucs) {+ // NOTE: created by hand, there isn't anything identifiable other than
+ // general Cf category code to identify these, and some characters in Cf
+ // category code are of non-zero width.
+ if (ucs == 0 ||
+ ucs == 0x034F ||
+ (0x200B <= ucs && ucs <= 0x200F) ||
+ ucs == 0x2028 ||
+ ucs == 0x2029 ||
+ (0x202A <= ucs && ucs <= 0x202E) ||
+ (0x2060 <= ucs && ucs <= 0x2063)) {+ return 0;
+ }
-int llt_wcwidth(uint32_t ucs)
-{- /* sorted list of non-overlapping intervals of non-spacing characters */
- /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */
- static const struct interval combining[] = {- { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 },- { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 },- { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 },- { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 },- { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED },- { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A },- { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 },- { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D },- { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 },- { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD },- { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C },- { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D },- { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC },- { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD },- { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C },- { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D },- { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 },- { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 },- { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC },- { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD },- { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D },- { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 },- { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E },- { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC },- { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 },- { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E },- { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 },- { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 },- { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 },- { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F },- { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 },- { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD },- { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD },- { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 },- { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B },- { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 },- { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 },- { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF },- { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 },- { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F },- { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B },- { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F },- { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB },- { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F },- { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 },- { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD },- { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F },- { 0xE0100, 0xE01EF }- };
+ // C0/C1 control characters.
+ if (ucs < 32 || (0x07F <= ucs && ucs < 0x0A0)) return -1;
- /* test for 8-bit control characters */
- if (ucs == 0)
- return 0;
- if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))
- return -1;
+ // Combining characters with zero width.
+ if (intable(ZERO_WIDTH, sizeof(ZERO_WIDTH)/sizeof(struct width_interval), ucs)) return 0;
- /* binary search in table of non-spacing characters */
- if (bisearch(ucs, combining,
- sizeof(combining) / sizeof(struct interval) - 1))
- return 0;
-
- /* if we arrive here, ucs is not a combining or C0/C1 control character */
-
- return 1 +
- (ucs >= 0x1100 &&
- (ucs <= 0x115f || /* Hangul Jamo init. consonants */
- ucs == 0x2329 || ucs == 0x232a ||
- (ucs >= 0x2e80 && ucs <= 0xa4cf &&
- ucs != 0x303f) || /* CJK ... Yi */
- (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */
- (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */
- (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */
- (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */
- (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */
- (ucs >= 0xffe0 && ucs <= 0xffe6) ||
- (ucs >= 0x20000 && ucs <= 0x2fffd) ||
- (ucs >= 0x30000 && ucs <= 0x3fffd)));
+ return intable(WIDE_EASTASIAN, sizeof(WIDE_EASTASIAN)/sizeof(struct width_interval), ucs) ? 2 : 1;
}
--- a/plan9/platform.h
+++ b/plan9/platform.h
@@ -99,3 +99,6 @@
typedef uintptr uintptr_t;
typedef intptr ssize_t;
typedef uintptr size_t;
+typedef Rune wchar_t;
+typedef enum { false, true } bool;+int wcwidth(wchar_t c);
--- a/posix/platform.h
+++ b/posix/platform.h
@@ -19,6 +19,8 @@
#include <time.h>
#include <unistd.h>
#include <wctype.h>
+#define _XOPEN_SOURCE 600
+#include <wchar.h>
#ifndef __SIZEOF_POINTER__
#error pointer size unknown
--- a/string.c
+++ b/string.c
@@ -41,7 +41,7 @@
if (iscprim(args[0])) {cprim_t *cp = (cprim_t*)ptr(args[0]);
if (cp_class(cp) == wchartype) {- int w = llt_wcwidth(*(uint32_t*)cp_data(cp));
+ int w = wcwidth(*(wchar_t*)cp_data(cp));
if (w < 0)
return FL_F;
return fixnum(w);