diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-24 07:44:03 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-24 07:44:03 +0100 |
commit | 9f93d621925966c22ee51fdcb5def8e131596f9b (patch) | |
tree | c1024fa92d6f422df6cf0991d5c9c8a4977b8625 /libbb | |
parent | 5da9f96ad85a2d9119d92c7a3d89deca7d904210 (diff) | |
download | busybox-w32-9f93d621925966c22ee51fdcb5def8e131596f9b.tar.gz busybox-w32-9f93d621925966c22ee51fdcb5def8e131596f9b.tar.bz2 busybox-w32-9f93d621925966c22ee51fdcb5def8e131596f9b.zip |
libbb: better unicode width support. Hopefully fixes bug 839.
Also opens up a possibility to make other unicode stuff smaller
and more correct later. but:
function old new delta
static.combining - 516 +516
bb_wcwidth - 328 +328
unicode_cut_nchars - 141 +141
mbstowc_internal - 93 +93
in_table - 78 +78
cal_main 899 961 +62
static.combining0x10000 - 40 +40
unicode_strlen - 31 +31
bb_mbstrlen 31 - -31
bb_mbstowcs 173 102 -71
------------------------------------------------------------------------------
(add/remove: 7/1 grow/shrink: 1/1 up/down: 1289/-102) Total: 1187 bytes
Uses code of Markus Kuhn, which is in public domain:
http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
"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."
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/lineedit.c | 4 | ||||
-rw-r--r-- | libbb/unicode.c | 210 | ||||
-rw-r--r-- | libbb/unicode_wcwidth.c | 217 |
3 files changed, 372 insertions, 59 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c index b73f1d6da..c50b31d67 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c | |||
@@ -878,7 +878,7 @@ static void showfiles(void) | |||
878 | 878 | ||
879 | /* find the longest file name - use that as the column width */ | 879 | /* find the longest file name - use that as the column width */ |
880 | for (row = 0; row < nrows; row++) { | 880 | for (row = 0; row < nrows; row++) { |
881 | l = bb_mbstrlen(matches[row]); | 881 | l = unicode_strlen(matches[row]); |
882 | if (column_width < l) | 882 | if (column_width < l) |
883 | column_width = l; | 883 | column_width = l; |
884 | } | 884 | } |
@@ -898,7 +898,7 @@ static void showfiles(void) | |||
898 | 898 | ||
899 | for (nc = 1; nc < ncols && n+nrows < nfiles; n += nrows, nc++) { | 899 | for (nc = 1; nc < ncols && n+nrows < nfiles; n += nrows, nc++) { |
900 | printf("%s%-*s", matches[n], | 900 | printf("%s%-*s", matches[n], |
901 | (int)(column_width - bb_mbstrlen(matches[n])), "" | 901 | (int)(column_width - unicode_strlen(matches[n])), "" |
902 | ); | 902 | ); |
903 | } | 903 | } |
904 | puts(matches[n]); | 904 | puts(matches[n]); |
diff --git a/libbb/unicode.c b/libbb/unicode.c index 80042957c..844c154e0 100644 --- a/libbb/unicode.c +++ b/libbb/unicode.c | |||
@@ -9,22 +9,19 @@ | |||
9 | #include "libbb.h" | 9 | #include "libbb.h" |
10 | #include "unicode.h" | 10 | #include "unicode.h" |
11 | 11 | ||
12 | /* If it's not a constant... */ | 12 | /* If it's not #defined as a constant in unicode.h... */ |
13 | #ifndef unicode_status | 13 | #ifndef unicode_status |
14 | uint8_t unicode_status; | 14 | uint8_t unicode_status; |
15 | #endif | 15 | #endif |
16 | 16 | ||
17 | size_t FAST_FUNC bb_mbstrlen(const char *string) | 17 | /* This file is compiled only if FEATURE_ASSUME_UNICODE is on. |
18 | { | 18 | * We check other options and decide whether to use libc support |
19 | size_t width = mbstowcs(NULL, string, INT_MAX); | 19 | * via locale, or use our own logic: |
20 | if (width == (size_t)-1L) | 20 | */ |
21 | return strlen(string); | ||
22 | return width; | ||
23 | } | ||
24 | 21 | ||
25 | #if ENABLE_LOCALE_SUPPORT | 22 | #if ENABLE_LOCALE_SUPPORT |
26 | 23 | ||
27 | /* Unicode support using libc */ | 24 | /* Unicode support using libc locale support. */ |
28 | 25 | ||
29 | void FAST_FUNC init_unicode(void) | 26 | void FAST_FUNC init_unicode(void) |
30 | { | 27 | { |
@@ -34,12 +31,12 @@ void FAST_FUNC init_unicode(void) | |||
34 | if (unicode_status != UNICODE_UNKNOWN) | 31 | if (unicode_status != UNICODE_UNKNOWN) |
35 | return; | 32 | return; |
36 | 33 | ||
37 | unicode_status = bb_mbstrlen(unicode_0x394) == 1 ? UNICODE_ON : UNICODE_OFF; | 34 | unicode_status = unicode_strlen(unicode_0x394) == 1 ? UNICODE_ON : UNICODE_OFF; |
38 | } | 35 | } |
39 | 36 | ||
40 | #else | 37 | #else |
41 | 38 | ||
42 | /* Crude "locale support" which knows only C and Unicode locales */ | 39 | /* Homegrown Unicode support. It knows only C and Unicode locales. */ |
43 | 40 | ||
44 | # if ENABLE_FEATURE_CHECK_UNICODE_IN_ENV | 41 | # if ENABLE_FEATURE_CHECK_UNICODE_IN_ENV |
45 | void FAST_FUNC init_unicode(void) | 42 | void FAST_FUNC init_unicode(void) |
@@ -93,7 +90,6 @@ static size_t wcrtomb_internal(char *s, wchar_t wc) | |||
93 | s[0] = wc | (uint8_t)(0x3f00 >> n); | 90 | s[0] = wc | (uint8_t)(0x3f00 >> n); |
94 | return n; | 91 | return n; |
95 | } | 92 | } |
96 | |||
97 | size_t FAST_FUNC wcrtomb(char *s, wchar_t wc, mbstate_t *ps UNUSED_PARAM) | 93 | size_t FAST_FUNC wcrtomb(char *s, wchar_t wc, mbstate_t *ps UNUSED_PARAM) |
98 | { | 94 | { |
99 | if (unicode_status != UNICODE_ON) { | 95 | if (unicode_status != UNICODE_ON) { |
@@ -103,7 +99,6 @@ size_t FAST_FUNC wcrtomb(char *s, wchar_t wc, mbstate_t *ps UNUSED_PARAM) | |||
103 | 99 | ||
104 | return wcrtomb_internal(s, wc); | 100 | return wcrtomb_internal(s, wc); |
105 | } | 101 | } |
106 | |||
107 | size_t FAST_FUNC wcstombs(char *dest, const wchar_t *src, size_t n) | 102 | size_t FAST_FUNC wcstombs(char *dest, const wchar_t *src, size_t n) |
108 | { | 103 | { |
109 | size_t org_n = n; | 104 | size_t org_n = n; |
@@ -144,6 +139,51 @@ size_t FAST_FUNC wcstombs(char *dest, const wchar_t *src, size_t n) | |||
144 | return org_n - n; | 139 | return org_n - n; |
145 | } | 140 | } |
146 | 141 | ||
142 | static const char *mbstowc_internal(wchar_t *res, const char *src) | ||
143 | { | ||
144 | int bytes; | ||
145 | unsigned c = (unsigned char) *src++; | ||
146 | |||
147 | if (c <= 0x7f) { | ||
148 | *res = c; | ||
149 | return src; | ||
150 | } | ||
151 | |||
152 | /* 80-7FF -> 110yyyxx 10xxxxxx */ | ||
153 | /* 800-FFFF -> 1110yyyy 10yyyyxx 10xxxxxx */ | ||
154 | /* 10000-1FFFFF -> 11110zzz 10zzyyyy 10yyyyxx 10xxxxxx */ | ||
155 | /* 200000-3FFFFFF -> 111110tt 10zzzzzz 10zzyyyy 10yyyyxx 10xxxxxx */ | ||
156 | /* 4000000-FFFFFFFF -> 111111tt 10tttttt 10zzzzzz 10zzyyyy 10yyyyxx 10xxxxxx */ | ||
157 | bytes = 0; | ||
158 | do { | ||
159 | c <<= 1; | ||
160 | bytes++; | ||
161 | } while ((c & 0x80) && bytes < 6); | ||
162 | if (bytes == 1) | ||
163 | return NULL; | ||
164 | c = (uint8_t)(c) >> bytes; | ||
165 | |||
166 | while (--bytes) { | ||
167 | unsigned ch = (unsigned char) *src++; | ||
168 | if ((ch & 0xc0) != 0x80) { | ||
169 | return NULL; | ||
170 | } | ||
171 | c = (c << 6) + (ch & 0x3f); | ||
172 | } | ||
173 | |||
174 | /* TODO */ | ||
175 | /* Need to check that c isn't produced by overlong encoding */ | ||
176 | /* Example: 11000000 10000000 converts to NUL */ | ||
177 | /* 11110000 10000000 10000100 10000000 converts to 0x100 */ | ||
178 | /* correct encoding: 11000100 10000000 */ | ||
179 | if (c <= 0x7f) { /* crude check */ | ||
180 | return NULL; | ||
181 | //or maybe 0xfffd; /* replacement character */ | ||
182 | } | ||
183 | |||
184 | *res = c; | ||
185 | return src; | ||
186 | } | ||
147 | size_t FAST_FUNC mbstowcs(wchar_t *dest, const char *src, size_t n) | 187 | size_t FAST_FUNC mbstowcs(wchar_t *dest, const char *src, size_t n) |
148 | { | 188 | { |
149 | size_t org_n = n; | 189 | size_t org_n = n; |
@@ -162,58 +202,20 @@ size_t FAST_FUNC mbstowcs(wchar_t *dest, const char *src, size_t n) | |||
162 | } | 202 | } |
163 | 203 | ||
164 | while (n) { | 204 | while (n) { |
165 | int bytes; | 205 | wchar_t wc; |
166 | unsigned c = (unsigned char) *src++; | 206 | const char *rc = mbstowc_internal(dest ? dest : &wc, src); |
167 | 207 | if (rc == NULL) /* error */ | |
168 | if (c <= 0x7f) { | ||
169 | if (dest) | ||
170 | *dest++ = c; | ||
171 | if (c == '\0') | ||
172 | break; | ||
173 | n--; | ||
174 | continue; | ||
175 | } | ||
176 | |||
177 | /* 80-7FF -> 110yyyxx 10xxxxxx */ | ||
178 | /* 800-FFFF -> 1110yyyy 10yyyyxx 10xxxxxx */ | ||
179 | /* 10000-1FFFFF -> 11110zzz 10zzyyyy 10yyyyxx 10xxxxxx */ | ||
180 | /* 200000-3FFFFFF -> 111110tt 10zzzzzz 10zzyyyy 10yyyyxx 10xxxxxx */ | ||
181 | /* 4000000-FFFFFFFF -> 111111tt 10tttttt 10zzzzzz 10zzyyyy 10yyyyxx 10xxxxxx */ | ||
182 | bytes = 0; | ||
183 | do { | ||
184 | c <<= 1; | ||
185 | bytes++; | ||
186 | } while ((c & 0x80) && bytes < 6); | ||
187 | if (bytes == 1) | ||
188 | return (size_t) -1L; | 208 | return (size_t) -1L; |
189 | c = (uint8_t)(c) >> bytes; | ||
190 | |||
191 | while (--bytes) { | ||
192 | unsigned ch = (unsigned char) *src++; | ||
193 | if ((ch & 0xc0) != 0x80) { | ||
194 | return (size_t) -1L; | ||
195 | } | ||
196 | c = (c << 6) + (ch & 0x3f); | ||
197 | } | ||
198 | |||
199 | /* TODO */ | ||
200 | /* Need to check that c isn't produced by overlong encoding */ | ||
201 | /* Example: 11000000 10000000 converts to NUL */ | ||
202 | /* 11110000 10000000 10000100 10000000 converts to 0x100 */ | ||
203 | /* correct encoding: 11000100 10000000 */ | ||
204 | if (c <= 0x7f) { /* crude check */ | ||
205 | return (size_t) -1L; | ||
206 | //or maybe: c = 0xfffd; /* replacement character */ | ||
207 | } | ||
208 | |||
209 | if (dest) | 209 | if (dest) |
210 | *dest++ = c; | 210 | dest++; |
211 | n--; | 211 | n--; |
212 | } | 212 | } |
213 | 213 | ||
214 | return org_n - n; | 214 | return org_n - n; |
215 | } | 215 | } |
216 | 216 | ||
217 | #include "unicode_wcwidth.c" | ||
218 | |||
217 | int FAST_FUNC iswspace(wint_t wc) | 219 | int FAST_FUNC iswspace(wint_t wc) |
218 | { | 220 | { |
219 | return (unsigned)wc <= 0x7f && isspace(wc); | 221 | return (unsigned)wc <= 0x7f && isspace(wc); |
@@ -229,4 +231,98 @@ int FAST_FUNC iswpunct(wint_t wc) | |||
229 | return (unsigned)wc <= 0x7f && ispunct(wc); | 231 | return (unsigned)wc <= 0x7f && ispunct(wc); |
230 | } | 232 | } |
231 | 233 | ||
234 | #endif /* Homegrown Unicode support */ | ||
235 | |||
236 | |||
237 | /* The rest is mostly same for libc and for "homegrown" support */ | ||
238 | |||
239 | size_t FAST_FUNC unicode_strlen(const char *string) | ||
240 | { | ||
241 | size_t width = mbstowcs(NULL, string, INT_MAX); | ||
242 | if (width == (size_t)-1L) | ||
243 | return strlen(string); | ||
244 | return width; | ||
245 | } | ||
246 | |||
247 | char* FAST_FUNC unicode_cut_nchars(unsigned width, const char *src) | ||
248 | { | ||
249 | char *dst; | ||
250 | unsigned dst_len; | ||
251 | |||
252 | if (unicode_status != UNICODE_ON) | ||
253 | return xasprintf("%-*.*s", width, width, src); | ||
254 | |||
255 | dst = NULL; | ||
256 | dst_len = 0; | ||
257 | while (1) { | ||
258 | int w; | ||
259 | wchar_t wc; | ||
260 | |||
261 | dst = xrealloc(dst, dst_len + 2 * MB_CUR_MAX); | ||
262 | #if ENABLE_LOCALE_SUPPORT | ||
263 | { | ||
264 | mbstate_t mbst = { 0 }; | ||
265 | ssize_t rc = mbsrtowcs(&wc, &src, 1, &mbst); | ||
266 | if (rc <= 0) /* error, or end-of-string */ | ||
267 | break; | ||
268 | } | ||
269 | #else | ||
270 | src = mbstowc_internal(&wc, src); | ||
271 | if (!src || wc == 0) /* error, or end-of-string */ | ||
272 | break; | ||
232 | #endif | 273 | #endif |
274 | w = wcwidth(wc); | ||
275 | if (w < 0) /* non-printable wchar */ | ||
276 | break; | ||
277 | width -= w; | ||
278 | if ((int)width < 0) { /* string is longer than width */ | ||
279 | width += w; | ||
280 | while (width) { | ||
281 | dst[dst_len++] = ' '; | ||
282 | width--; | ||
283 | } | ||
284 | break; | ||
285 | } | ||
286 | #if ENABLE_LOCALE_SUPPORT | ||
287 | { | ||
288 | mbstate_t mbst = { 0 }; | ||
289 | dst_len += wcrtomb(&dst[dst_len], wc, &mbst); | ||
290 | } | ||
291 | #else | ||
292 | dst_len += wcrtomb_internal(&dst[dst_len], wc); | ||
293 | #endif | ||
294 | } | ||
295 | dst[dst_len] = '\0'; | ||
296 | return dst; | ||
297 | } | ||
298 | |||
299 | unsigned FAST_FUNC unicode_padding_to_width(unsigned width, const char *src) | ||
300 | { | ||
301 | if (unicode_status != UNICODE_ON) { | ||
302 | return width - strnlen(src, width); | ||
303 | } | ||
304 | |||
305 | while (1) { | ||
306 | int w; | ||
307 | wchar_t wc; | ||
308 | |||
309 | #if ENABLE_LOCALE_SUPPORT | ||
310 | { | ||
311 | mbstate_t mbst = { 0 }; | ||
312 | ssize_t rc = mbsrtowcs(&wc, &src, 1, &mbst); | ||
313 | if (rc <= 0) /* error, or end-of-string */ | ||
314 | return width; | ||
315 | } | ||
316 | #else | ||
317 | src = mbstowc_internal(&wc, src); | ||
318 | if (!src || wc == 0) /* error, or end-of-string */ | ||
319 | return width; | ||
320 | #endif | ||
321 | w = wcwidth(wc); | ||
322 | if (w < 0) /* non-printable wchar */ | ||
323 | return width; | ||
324 | width -= w; | ||
325 | if ((int)width <= 0) /* string is longer than width */ | ||
326 | return 0; | ||
327 | } | ||
328 | } | ||
diff --git a/libbb/unicode_wcwidth.c b/libbb/unicode_wcwidth.c new file mode 100644 index 000000000..515c084c1 --- /dev/null +++ b/libbb/unicode_wcwidth.c | |||
@@ -0,0 +1,217 @@ | |||
1 | /* | ||
2 | * This is an implementation of wcwidth() and wcswidth() (defined in | ||
3 | * IEEE Std 1002.1-2001) for Unicode. | ||
4 | * | ||
5 | * http://www.opengroup.org/onlinepubs/007904975/functions/wcwidth.html | ||
6 | * http://www.opengroup.org/onlinepubs/007904975/functions/wcswidth.html | ||
7 | * | ||
8 | * In fixed-width output devices, Latin characters all occupy a single | ||
9 | * "cell" position of equal width, whereas ideographic CJK characters | ||
10 | * occupy two such cells. Interoperability between terminal-line | ||
11 | * applications and (teletype-style) character terminals using the | ||
12 | * UTF-8 encoding requires agreement on which character should advance | ||
13 | * the cursor by how many cell positions. No established formal | ||
14 | * standards exist at present on which Unicode character shall occupy | ||
15 | * how many cell positions on character terminals. These routines are | ||
16 | * a first attempt of defining such behavior based on simple rules | ||
17 | * applied to data provided by the Unicode Consortium. | ||
18 | * | ||
19 | * For some graphical characters, the Unicode standard explicitly | ||
20 | * defines a character-cell width via the definition of the East Asian | ||
21 | * FullWidth (F), Wide (W), Half-width (H), and Narrow (Na) classes. | ||
22 | * In all these cases, there is no ambiguity about which width a | ||
23 | * terminal shall use. For characters in the East Asian Ambiguous (A) | ||
24 | * class, the width choice depends purely on a preference of backward | ||
25 | * compatibility with either historic CJK or Western practice. | ||
26 | * Choosing single-width for these characters is easy to justify as | ||
27 | * the appropriate long-term solution, as the CJK practice of | ||
28 | * displaying these characters as double-width comes from historic | ||
29 | * implementation simplicity (8-bit encoded characters were displayed | ||
30 | * single-width and 16-bit ones double-width, even for Greek, | ||
31 | * Cyrillic, etc.) and not any typographic considerations. | ||
32 | * | ||
33 | * Much less clear is the choice of width for the Not East Asian | ||
34 | * (Neutral) class. Existing practice does not dictate a width for any | ||
35 | * of these characters. It would nevertheless make sense | ||
36 | * typographically to allocate two character cells to characters such | ||
37 | * as for instance EM SPACE or VOLUME INTEGRAL, which cannot be | ||
38 | * represented adequately with a single-width glyph. The following | ||
39 | * routines at present merely assign a single-cell width to all | ||
40 | * neutral characters, in the interest of simplicity. This is not | ||
41 | * entirely satisfactory and should be reconsidered before | ||
42 | * establishing a formal standard in this area. At the moment, the | ||
43 | * decision which Not East Asian (Neutral) characters should be | ||
44 | * represented by double-width glyphs cannot yet be answered by | ||
45 | * applying a simple rule from the Unicode database content. Setting | ||
46 | * up a proper standard for the behavior of UTF-8 character terminals | ||
47 | * will require a careful analysis not only of each Unicode character, | ||
48 | * but also of each presentation form, something the author of these | ||
49 | * routines has avoided to do so far. | ||
50 | * | ||
51 | * http://www.unicode.org/unicode/reports/tr11/ | ||
52 | * | ||
53 | * Markus Kuhn -- 2007-05-26 (Unicode 5.0) | ||
54 | * | ||
55 | * Permission to use, copy, modify, and distribute this software | ||
56 | * for any purpose and without fee is hereby granted. The author | ||
57 | * disclaims all warranties with regard to this software. | ||
58 | * | ||
59 | * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c | ||
60 | */ | ||
61 | |||
62 | struct interval { | ||
63 | uint16_t first; | ||
64 | uint16_t last; | ||
65 | }; | ||
66 | |||
67 | /* auxiliary function for binary search in interval table */ | ||
68 | static int in_table(unsigned ucs, const struct interval *table, unsigned max) | ||
69 | { | ||
70 | unsigned min = 0; | ||
71 | unsigned mid; | ||
72 | |||
73 | if (ucs < table[0].first || ucs > table[max].last) | ||
74 | return 0; | ||
75 | |||
76 | while (max >= min) { | ||
77 | mid = (min + max) / 2; | ||
78 | if (ucs > table[mid].last) | ||
79 | min = mid + 1; | ||
80 | else if (ucs < table[mid].first) | ||
81 | max = mid - 1; | ||
82 | else | ||
83 | return 1; | ||
84 | } | ||
85 | return 0; | ||
86 | } | ||
87 | |||
88 | |||
89 | /* The following two functions define the column width of an ISO 10646 | ||
90 | * character as follows: | ||
91 | * | ||
92 | * - The null character (U+0000) has a column width of 0. | ||
93 | * | ||
94 | * - Other C0/C1 control characters and DEL will lead to a return | ||
95 | * value of -1. | ||
96 | * | ||
97 | * - Non-spacing and enclosing combining characters (general | ||
98 | * category code Mn or Me in the Unicode database) have a | ||
99 | * column width of 0. | ||
100 | * | ||
101 | * - SOFT HYPHEN (U+00AD) has a column width of 1. | ||
102 | * | ||
103 | * - Other format characters (general category code Cf in the Unicode | ||
104 | * database) and ZERO WIDTH SPACE (U+200B) have a column width of 0. | ||
105 | * | ||
106 | * - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF) | ||
107 | * have a column width of 0. | ||
108 | * | ||
109 | * - Spacing characters in the East Asian Wide (W) or East Asian | ||
110 | * Full-width (F) category as defined in Unicode Technical | ||
111 | * Report #11 have a column width of 2. | ||
112 | * | ||
113 | * - All remaining characters (including all printable | ||
114 | * ISO 8859-1 and WGL4 characters, Unicode control characters, | ||
115 | * etc.) have a column width of 1. | ||
116 | * | ||
117 | * This implementation assumes that wchar_t characters are encoded | ||
118 | * in ISO 10646. | ||
119 | */ | ||
120 | static int wcwidth(unsigned ucs) | ||
121 | { | ||
122 | /* sorted list of non-overlapping intervals of non-spacing characters */ | ||
123 | /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */ | ||
124 | static const struct interval combining[] = { | ||
125 | { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 }, | ||
126 | { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, | ||
127 | { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 }, | ||
128 | { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 }, | ||
129 | { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED }, | ||
130 | { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A }, | ||
131 | { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 }, | ||
132 | { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D }, | ||
133 | { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 }, | ||
134 | { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD }, | ||
135 | { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C }, | ||
136 | { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D }, | ||
137 | { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC }, | ||
138 | { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD }, | ||
139 | { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C }, | ||
140 | { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D }, | ||
141 | { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 }, | ||
142 | { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 }, | ||
143 | { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC }, | ||
144 | { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD }, | ||
145 | { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D }, | ||
146 | { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 }, | ||
147 | { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E }, | ||
148 | { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC }, | ||
149 | { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 }, | ||
150 | { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E }, | ||
151 | { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 }, | ||
152 | { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 }, | ||
153 | { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 }, | ||
154 | { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F }, | ||
155 | { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 }, | ||
156 | { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD }, | ||
157 | { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD }, | ||
158 | { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 }, | ||
159 | { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B }, | ||
160 | { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 }, | ||
161 | { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 }, | ||
162 | { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF }, | ||
163 | { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 }, | ||
164 | { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F }, | ||
165 | { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, | ||
166 | { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F }, | ||
167 | { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB } | ||
168 | }; | ||
169 | static const struct interval combining0x10000[] = { | ||
170 | { 0x0A01, 0x0A03 }, { 0x0A05, 0x0A06 }, { 0x0A0C, 0x0A0F }, | ||
171 | { 0x0A38, 0x0A3A }, { 0x0A3F, 0x0A3F }, { 0xD167, 0xD169 }, | ||
172 | { 0xD173, 0xD182 }, { 0xD185, 0xD18B }, { 0xD1AA, 0xD1AD }, | ||
173 | { 0xD242, 0xD244 } | ||
174 | }; | ||
175 | |||
176 | if (ucs == 0) | ||
177 | return 0; | ||
178 | /* test for 8-bit control characters (00-1f, 80-9f, 7f) */ | ||
179 | if ((ucs & ~0x80) < 0x20 || ucs == 0x7f) | ||
180 | return -1; | ||
181 | if (ucs < 0x0300) /* optimization */ | ||
182 | return 1; | ||
183 | |||
184 | /* binary search in table of non-spacing characters */ | ||
185 | if (in_table(ucs, combining, ARRAY_SIZE(combining) - 1)) | ||
186 | return 0; | ||
187 | |||
188 | if (ucs < 0x1100) /* optimization */ | ||
189 | return 1; | ||
190 | |||
191 | /* binary search in table of non-spacing characters, cont. */ | ||
192 | if (in_table(ucs ^ 0x10000, combining0x10000, ARRAY_SIZE(combining0x10000) - 1)) | ||
193 | return 0; | ||
194 | if (ucs == 0xE0001 | ||
195 | || (ucs >= 0xE0020 && ucs <= 0xE007F) | ||
196 | || (ucs >= 0xE0100 && ucs <= 0xE01EF) | ||
197 | ) { | ||
198 | return 0; | ||
199 | } | ||
200 | |||
201 | /* if we arrive here, ucs is not a combining or C0/C1 control character */ | ||
202 | |||
203 | return 1 + | ||
204 | ( (/*ucs >= 0x1100 &&*/ ucs <= 0x115f) /* Hangul Jamo init. consonants */ | ||
205 | || ucs == 0x2329 | ||
206 | || ucs == 0x232a | ||
207 | || (ucs >= 0x2e80 && ucs <= 0xa4cf && ucs != 0x303f) /* CJK ... Yi */ | ||
208 | || (ucs >= 0xac00 && ucs <= 0xd7a3) /* Hangul Syllables */ | ||
209 | || (ucs >= 0xf900 && ucs <= 0xfaff) /* CJK Compatibility Ideographs */ | ||
210 | || (ucs >= 0xfe10 && ucs <= 0xfe19) /* Vertical forms */ | ||
211 | || (ucs >= 0xfe30 && ucs <= 0xfe6f) /* CJK Compatibility Forms */ | ||
212 | || (ucs >= 0xff00 && ucs <= 0xff60) /* Fullwidth Forms */ | ||
213 | || (ucs >= 0xffe0 && ucs <= 0xffe6) | ||
214 | || (ucs >= 0x20000 && ucs <= 0x2fffd) | ||
215 | || (ucs >= 0x30000 && ucs <= 0x3fffd) | ||
216 | ); | ||
217 | } | ||