From a7d9c63a4e6067cd0ce3061adcd7c03555bcd7f4 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 14 Jun 2018 10:27:42 +0530 Subject: [PATCH] wcwidth() for not assigned code points should be -4 That way, wcswidth() computes their width as 1, which matches how they are rendered --- gen-wcwidth.py | 2 +- kitty/wcwidth-std.h | 1300 +++++++++++++++++++++---------------------- 2 files changed, 651 insertions(+), 651 deletions(-) diff --git a/gen-wcwidth.py b/gen-wcwidth.py index 3443bd62c..30f3c64ca 100755 --- a/gen-wcwidth.py +++ b/gen-wcwidth.py @@ -400,7 +400,7 @@ def gen_wcwidth(): add(p, 'East Asian double width', doublewidth, 2) add(p, 'Emoji Presentation', emoji_categories['Emoji_Presentation'], 2) - add(p, 'Not assigned in the unicode character database', not_assigned, -1) + add(p, 'Not assigned in the unicode character database', not_assigned, -4) p('\t\tdefault: return 1;') p('\t}') diff --git a/kitty/wcwidth-std.h b/kitty/wcwidth-std.h index daeed7f17..605c914d2 100644 --- a/kitty/wcwidth-std.h +++ b/kitty/wcwidth-std.h @@ -1445,1305 +1445,1305 @@ wcwidth_std(int32_t code) { // Not assigned in the unicode character database (766881 codepoints) {{{ case 0x378 ... 0x379: - return -1; + return -4; case 0x380 ... 0x383: - return -1; + return -4; case 0x38b: - return -1; + return -4; case 0x38d: - return -1; + return -4; case 0x3a2: - return -1; + return -4; case 0x530: - return -1; + return -4; case 0x557 ... 0x558: - return -1; + return -4; case 0x58b ... 0x58c: - return -1; + return -4; case 0x590: - return -1; + return -4; case 0x5c8 ... 0x5cf: - return -1; + return -4; case 0x5eb ... 0x5ee: - return -1; + return -4; case 0x5f5 ... 0x5ff: - return -1; + return -4; case 0x61d: - return -1; + return -4; case 0x70e: - return -1; + return -4; case 0x74b ... 0x74c: - return -1; + return -4; case 0x7b2 ... 0x7bf: - return -1; + return -4; case 0x7fb ... 0x7fc: - return -1; + return -4; case 0x82e ... 0x82f: - return -1; + return -4; case 0x83f: - return -1; + return -4; case 0x85c ... 0x85d: - return -1; + return -4; case 0x85f: - return -1; + return -4; case 0x86b ... 0x89f: - return -1; + return -4; case 0x8b5: - return -1; + return -4; case 0x8be ... 0x8d2: - return -1; + return -4; case 0x984: - return -1; + return -4; case 0x98d ... 0x98e: - return -1; + return -4; case 0x991 ... 0x992: - return -1; + return -4; case 0x9a9: - return -1; + return -4; case 0x9b1: - return -1; + return -4; case 0x9b3 ... 0x9b5: - return -1; + return -4; case 0x9ba ... 0x9bb: - return -1; + return -4; case 0x9c5 ... 0x9c6: - return -1; + return -4; case 0x9c9 ... 0x9ca: - return -1; + return -4; case 0x9cf ... 0x9d6: - return -1; + return -4; case 0x9d8 ... 0x9db: - return -1; + return -4; case 0x9de: - return -1; + return -4; case 0x9e4 ... 0x9e5: - return -1; + return -4; case 0x9ff ... 0xa00: - return -1; + return -4; case 0xa04: - return -1; + return -4; case 0xa0b ... 0xa0e: - return -1; + return -4; case 0xa11 ... 0xa12: - return -1; + return -4; case 0xa29: - return -1; + return -4; case 0xa31: - return -1; + return -4; case 0xa34: - return -1; + return -4; case 0xa37: - return -1; + return -4; case 0xa3a ... 0xa3b: - return -1; + return -4; case 0xa3d: - return -1; + return -4; case 0xa43 ... 0xa46: - return -1; + return -4; case 0xa49 ... 0xa4a: - return -1; + return -4; case 0xa4e ... 0xa50: - return -1; + return -4; case 0xa52 ... 0xa58: - return -1; + return -4; case 0xa5d: - return -1; + return -4; case 0xa5f ... 0xa65: - return -1; + return -4; case 0xa77 ... 0xa80: - return -1; + return -4; case 0xa84: - return -1; + return -4; case 0xa8e: - return -1; + return -4; case 0xa92: - return -1; + return -4; case 0xaa9: - return -1; + return -4; case 0xab1: - return -1; + return -4; case 0xab4: - return -1; + return -4; case 0xaba ... 0xabb: - return -1; + return -4; case 0xac6: - return -1; + return -4; case 0xaca: - return -1; + return -4; case 0xace ... 0xacf: - return -1; + return -4; case 0xad1 ... 0xadf: - return -1; + return -4; case 0xae4 ... 0xae5: - return -1; + return -4; case 0xaf2 ... 0xaf8: - return -1; + return -4; case 0xb00: - return -1; + return -4; case 0xb04: - return -1; + return -4; case 0xb0d ... 0xb0e: - return -1; + return -4; case 0xb11 ... 0xb12: - return -1; + return -4; case 0xb29: - return -1; + return -4; case 0xb31: - return -1; + return -4; case 0xb34: - return -1; + return -4; case 0xb3a ... 0xb3b: - return -1; + return -4; case 0xb45 ... 0xb46: - return -1; + return -4; case 0xb49 ... 0xb4a: - return -1; + return -4; case 0xb4e ... 0xb55: - return -1; + return -4; case 0xb58 ... 0xb5b: - return -1; + return -4; case 0xb5e: - return -1; + return -4; case 0xb64 ... 0xb65: - return -1; + return -4; case 0xb78 ... 0xb81: - return -1; + return -4; case 0xb84: - return -1; + return -4; case 0xb8b ... 0xb8d: - return -1; + return -4; case 0xb91: - return -1; + return -4; case 0xb96 ... 0xb98: - return -1; + return -4; case 0xb9b: - return -1; + return -4; case 0xb9d: - return -1; + return -4; case 0xba0 ... 0xba2: - return -1; + return -4; case 0xba5 ... 0xba7: - return -1; + return -4; case 0xbab ... 0xbad: - return -1; + return -4; case 0xbba ... 0xbbd: - return -1; + return -4; case 0xbc3 ... 0xbc5: - return -1; + return -4; case 0xbc9: - return -1; + return -4; case 0xbce ... 0xbcf: - return -1; + return -4; case 0xbd1 ... 0xbd6: - return -1; + return -4; case 0xbd8 ... 0xbe5: - return -1; + return -4; case 0xbfb ... 0xbff: - return -1; + return -4; case 0xc0d: - return -1; + return -4; case 0xc11: - return -1; + return -4; case 0xc29: - return -1; + return -4; case 0xc3a ... 0xc3c: - return -1; + return -4; case 0xc45: - return -1; + return -4; case 0xc49: - return -1; + return -4; case 0xc4e ... 0xc54: - return -1; + return -4; case 0xc57: - return -1; + return -4; case 0xc5b ... 0xc5f: - return -1; + return -4; case 0xc64 ... 0xc65: - return -1; + return -4; case 0xc70 ... 0xc77: - return -1; + return -4; case 0xc8d: - return -1; + return -4; case 0xc91: - return -1; + return -4; case 0xca9: - return -1; + return -4; case 0xcb4: - return -1; + return -4; case 0xcba ... 0xcbb: - return -1; + return -4; case 0xcc5: - return -1; + return -4; case 0xcc9: - return -1; + return -4; case 0xcce ... 0xcd4: - return -1; + return -4; case 0xcd7 ... 0xcdd: - return -1; + return -4; case 0xcdf: - return -1; + return -4; case 0xce4 ... 0xce5: - return -1; + return -4; case 0xcf0: - return -1; + return -4; case 0xcf3 ... 0xcff: - return -1; + return -4; case 0xd04: - return -1; + return -4; case 0xd0d: - return -1; + return -4; case 0xd11: - return -1; + return -4; case 0xd45: - return -1; + return -4; case 0xd49: - return -1; + return -4; case 0xd50 ... 0xd53: - return -1; + return -4; case 0xd64 ... 0xd65: - return -1; + return -4; case 0xd80 ... 0xd81: - return -1; + return -4; case 0xd84: - return -1; + return -4; case 0xd97 ... 0xd99: - return -1; + return -4; case 0xdb2: - return -1; + return -4; case 0xdbc: - return -1; + return -4; case 0xdbe ... 0xdbf: - return -1; + return -4; case 0xdc7 ... 0xdc9: - return -1; + return -4; case 0xdcb ... 0xdce: - return -1; + return -4; case 0xdd5: - return -1; + return -4; case 0xdd7: - return -1; + return -4; case 0xde0 ... 0xde5: - return -1; + return -4; case 0xdf0 ... 0xdf1: - return -1; + return -4; case 0xdf5 ... 0xe00: - return -1; + return -4; case 0xe3b ... 0xe3e: - return -1; + return -4; case 0xe5c ... 0xe80: - return -1; + return -4; case 0xe83: - return -1; + return -4; case 0xe85 ... 0xe86: - return -1; + return -4; case 0xe89: - return -1; + return -4; case 0xe8b ... 0xe8c: - return -1; + return -4; case 0xe8e ... 0xe93: - return -1; + return -4; case 0xe98: - return -1; + return -4; case 0xea0: - return -1; + return -4; case 0xea4: - return -1; + return -4; case 0xea6: - return -1; + return -4; case 0xea8 ... 0xea9: - return -1; + return -4; case 0xeac: - return -1; + return -4; case 0xeba: - return -1; + return -4; case 0xebe ... 0xebf: - return -1; + return -4; case 0xec5: - return -1; + return -4; case 0xec7: - return -1; + return -4; case 0xece ... 0xecf: - return -1; + return -4; case 0xeda ... 0xedb: - return -1; + return -4; case 0xee0 ... 0xeff: - return -1; + return -4; case 0xf48: - return -1; + return -4; case 0xf6d ... 0xf70: - return -1; + return -4; case 0xf98: - return -1; + return -4; case 0xfbd: - return -1; + return -4; case 0xfcd: - return -1; + return -4; case 0xfdb ... 0xfff: - return -1; + return -4; case 0x10c6: - return -1; + return -4; case 0x10c8 ... 0x10cc: - return -1; + return -4; case 0x10ce ... 0x10cf: - return -1; + return -4; case 0x1249: - return -1; + return -4; case 0x124e ... 0x124f: - return -1; + return -4; case 0x1257: - return -1; + return -4; case 0x1259: - return -1; + return -4; case 0x125e ... 0x125f: - return -1; + return -4; case 0x1289: - return -1; + return -4; case 0x128e ... 0x128f: - return -1; + return -4; case 0x12b1: - return -1; + return -4; case 0x12b6 ... 0x12b7: - return -1; + return -4; case 0x12bf: - return -1; + return -4; case 0x12c1: - return -1; + return -4; case 0x12c6 ... 0x12c7: - return -1; + return -4; case 0x12d7: - return -1; + return -4; case 0x1311: - return -1; + return -4; case 0x1316 ... 0x1317: - return -1; + return -4; case 0x135b ... 0x135c: - return -1; + return -4; case 0x137d ... 0x137f: - return -1; + return -4; case 0x139a ... 0x139f: - return -1; + return -4; case 0x13f6 ... 0x13f7: - return -1; + return -4; case 0x13fe ... 0x13ff: - return -1; + return -4; case 0x169d ... 0x169f: - return -1; + return -4; case 0x16f9 ... 0x16ff: - return -1; + return -4; case 0x170d: - return -1; + return -4; case 0x1715 ... 0x171f: - return -1; + return -4; case 0x1737 ... 0x173f: - return -1; + return -4; case 0x1754 ... 0x175f: - return -1; + return -4; case 0x176d: - return -1; + return -4; case 0x1771: - return -1; + return -4; case 0x1774 ... 0x177f: - return -1; + return -4; case 0x17de ... 0x17df: - return -1; + return -4; case 0x17ea ... 0x17ef: - return -1; + return -4; case 0x17fa ... 0x17ff: - return -1; + return -4; case 0x180f: - return -1; + return -4; case 0x181a ... 0x181f: - return -1; + return -4; case 0x1879 ... 0x187f: - return -1; + return -4; case 0x18ab ... 0x18af: - return -1; + return -4; case 0x18f6 ... 0x18ff: - return -1; + return -4; case 0x191f: - return -1; + return -4; case 0x192c ... 0x192f: - return -1; + return -4; case 0x193c ... 0x193f: - return -1; + return -4; case 0x1941 ... 0x1943: - return -1; + return -4; case 0x196e ... 0x196f: - return -1; + return -4; case 0x1975 ... 0x197f: - return -1; + return -4; case 0x19ac ... 0x19af: - return -1; + return -4; case 0x19ca ... 0x19cf: - return -1; + return -4; case 0x19db ... 0x19dd: - return -1; + return -4; case 0x1a1c ... 0x1a1d: - return -1; + return -4; case 0x1a5f: - return -1; + return -4; case 0x1a7d ... 0x1a7e: - return -1; + return -4; case 0x1a8a ... 0x1a8f: - return -1; + return -4; case 0x1a9a ... 0x1a9f: - return -1; + return -4; case 0x1aae ... 0x1aaf: - return -1; + return -4; case 0x1abf ... 0x1aff: - return -1; + return -4; case 0x1b4c ... 0x1b4f: - return -1; + return -4; case 0x1b7d ... 0x1b7f: - return -1; + return -4; case 0x1bf4 ... 0x1bfb: - return -1; + return -4; case 0x1c38 ... 0x1c3a: - return -1; + return -4; case 0x1c4a ... 0x1c4c: - return -1; + return -4; case 0x1c89 ... 0x1c8f: - return -1; + return -4; case 0x1cbb ... 0x1cbc: - return -1; + return -4; case 0x1cc8 ... 0x1ccf: - return -1; + return -4; case 0x1cfa ... 0x1cff: - return -1; + return -4; case 0x1dfa: - return -1; + return -4; case 0x1f16 ... 0x1f17: - return -1; + return -4; case 0x1f1e ... 0x1f1f: - return -1; + return -4; case 0x1f46 ... 0x1f47: - return -1; + return -4; case 0x1f4e ... 0x1f4f: - return -1; + return -4; case 0x1f58: - return -1; + return -4; case 0x1f5a: - return -1; + return -4; case 0x1f5c: - return -1; + return -4; case 0x1f5e: - return -1; + return -4; case 0x1f7e ... 0x1f7f: - return -1; + return -4; case 0x1fb5: - return -1; + return -4; case 0x1fc5: - return -1; + return -4; case 0x1fd4 ... 0x1fd5: - return -1; + return -4; case 0x1fdc: - return -1; + return -4; case 0x1ff0 ... 0x1ff1: - return -1; + return -4; case 0x1ff5: - return -1; + return -4; case 0x1fff: - return -1; + return -4; case 0x2065: - return -1; + return -4; case 0x2072 ... 0x2073: - return -1; + return -4; case 0x208f: - return -1; + return -4; case 0x209d ... 0x209f: - return -1; + return -4; case 0x20c0 ... 0x20cf: - return -1; + return -4; case 0x20f1 ... 0x20ff: - return -1; + return -4; case 0x218c ... 0x218f: - return -1; + return -4; case 0x2427 ... 0x243f: - return -1; + return -4; case 0x244b ... 0x245f: - return -1; + return -4; case 0x2b74 ... 0x2b75: - return -1; + return -4; case 0x2b96 ... 0x2b97: - return -1; + return -4; case 0x2bc9: - return -1; + return -4; case 0x2bff: - return -1; + return -4; case 0x2c2f: - return -1; + return -4; case 0x2c5f: - return -1; + return -4; case 0x2cf4 ... 0x2cf8: - return -1; + return -4; case 0x2d26: - return -1; + return -4; case 0x2d28 ... 0x2d2c: - return -1; + return -4; case 0x2d2e ... 0x2d2f: - return -1; + return -4; case 0x2d68 ... 0x2d6e: - return -1; + return -4; case 0x2d71 ... 0x2d7e: - return -1; + return -4; case 0x2d97 ... 0x2d9f: - return -1; + return -4; case 0x2da7: - return -1; + return -4; case 0x2daf: - return -1; + return -4; case 0x2db7: - return -1; + return -4; case 0x2dbf: - return -1; + return -4; case 0x2dc7: - return -1; + return -4; case 0x2dcf: - return -1; + return -4; case 0x2dd7: - return -1; + return -4; case 0x2ddf: - return -1; + return -4; case 0x2e4f ... 0x2e7f: - return -1; + return -4; case 0x2e9a: - return -1; + return -4; case 0x2ef4 ... 0x2eff: - return -1; + return -4; case 0x2fd6 ... 0x2fef: - return -1; + return -4; case 0x2ffc ... 0x2fff: - return -1; + return -4; case 0x3040: - return -1; + return -4; case 0x3097 ... 0x3098: - return -1; + return -4; case 0x3100 ... 0x3104: - return -1; + return -4; case 0x3130: - return -1; + return -4; case 0x318f: - return -1; + return -4; case 0x31bb ... 0x31bf: - return -1; + return -4; case 0x31e4 ... 0x31ef: - return -1; + return -4; case 0x321f: - return -1; + return -4; case 0x32ff: - return -1; + return -4; case 0xa48d ... 0xa48f: - return -1; + return -4; case 0xa4c7 ... 0xa4cf: - return -1; + return -4; case 0xa62c ... 0xa63f: - return -1; + return -4; case 0xa6f8 ... 0xa6ff: - return -1; + return -4; case 0xa7ba ... 0xa7f6: - return -1; + return -4; case 0xa82c ... 0xa82f: - return -1; + return -4; case 0xa83a ... 0xa83f: - return -1; + return -4; case 0xa878 ... 0xa87f: - return -1; + return -4; case 0xa8c6 ... 0xa8cd: - return -1; + return -4; case 0xa8da ... 0xa8df: - return -1; + return -4; case 0xa954 ... 0xa95e: - return -1; + return -4; case 0xa97d ... 0xa97f: - return -1; + return -4; case 0xa9ce: - return -1; + return -4; case 0xa9da ... 0xa9dd: - return -1; + return -4; case 0xa9ff: - return -1; + return -4; case 0xaa37 ... 0xaa3f: - return -1; + return -4; case 0xaa4e ... 0xaa4f: - return -1; + return -4; case 0xaa5a ... 0xaa5b: - return -1; + return -4; case 0xaac3 ... 0xaada: - return -1; + return -4; case 0xaaf7 ... 0xab00: - return -1; + return -4; case 0xab07 ... 0xab08: - return -1; + return -4; case 0xab0f ... 0xab10: - return -1; + return -4; case 0xab17 ... 0xab1f: - return -1; + return -4; case 0xab27: - return -1; + return -4; case 0xab2f: - return -1; + return -4; case 0xab66 ... 0xab6f: - return -1; + return -4; case 0xabee ... 0xabef: - return -1; + return -4; case 0xabfa ... 0xabff: - return -1; + return -4; case 0xd7a4 ... 0xd7af: - return -1; + return -4; case 0xd7c7 ... 0xd7ca: - return -1; + return -4; case 0xd7fc ... 0xd7ff: - return -1; + return -4; case 0xfb07 ... 0xfb12: - return -1; + return -4; case 0xfb18 ... 0xfb1c: - return -1; + return -4; case 0xfb37: - return -1; + return -4; case 0xfb3d: - return -1; + return -4; case 0xfb3f: - return -1; + return -4; case 0xfb42: - return -1; + return -4; case 0xfb45: - return -1; + return -4; case 0xfbc2 ... 0xfbd2: - return -1; + return -4; case 0xfd40 ... 0xfd4f: - return -1; + return -4; case 0xfd90 ... 0xfd91: - return -1; + return -4; case 0xfdc8 ... 0xfdef: - return -1; + return -4; case 0xfdfe ... 0xfdff: - return -1; + return -4; case 0xfe1a ... 0xfe1f: - return -1; + return -4; case 0xfe53: - return -1; + return -4; case 0xfe67: - return -1; + return -4; case 0xfe6c ... 0xfe6f: - return -1; + return -4; case 0xfe75: - return -1; + return -4; case 0xfefd ... 0xfefe: - return -1; + return -4; case 0xff00: - return -1; + return -4; case 0xffbf ... 0xffc1: - return -1; + return -4; case 0xffc8 ... 0xffc9: - return -1; + return -4; case 0xffd0 ... 0xffd1: - return -1; + return -4; case 0xffd8 ... 0xffd9: - return -1; + return -4; case 0xffdd ... 0xffdf: - return -1; + return -4; case 0xffe7: - return -1; + return -4; case 0xffef ... 0xfff8: - return -1; + return -4; case 0xfffe ... 0xffff: - return -1; + return -4; case 0x1000c: - return -1; + return -4; case 0x10027: - return -1; + return -4; case 0x1003b: - return -1; + return -4; case 0x1003e: - return -1; + return -4; case 0x1004e ... 0x1004f: - return -1; + return -4; case 0x1005e ... 0x1007f: - return -1; + return -4; case 0x100fb ... 0x100ff: - return -1; + return -4; case 0x10103 ... 0x10106: - return -1; + return -4; case 0x10134 ... 0x10136: - return -1; + return -4; case 0x1018f: - return -1; + return -4; case 0x1019c ... 0x1019f: - return -1; + return -4; case 0x101a1 ... 0x101cf: - return -1; + return -4; case 0x101fe ... 0x1027f: - return -1; + return -4; case 0x1029d ... 0x1029f: - return -1; + return -4; case 0x102d1 ... 0x102df: - return -1; + return -4; case 0x102fc ... 0x102ff: - return -1; + return -4; case 0x10324 ... 0x1032c: - return -1; + return -4; case 0x1034b ... 0x1034f: - return -1; + return -4; case 0x1037b ... 0x1037f: - return -1; + return -4; case 0x1039e: - return -1; + return -4; case 0x103c4 ... 0x103c7: - return -1; + return -4; case 0x103d6 ... 0x103ff: - return -1; + return -4; case 0x1049e ... 0x1049f: - return -1; + return -4; case 0x104aa ... 0x104af: - return -1; + return -4; case 0x104d4 ... 0x104d7: - return -1; + return -4; case 0x104fc ... 0x104ff: - return -1; + return -4; case 0x10528 ... 0x1052f: - return -1; + return -4; case 0x10564 ... 0x1056e: - return -1; + return -4; case 0x10570 ... 0x105ff: - return -1; + return -4; case 0x10737 ... 0x1073f: - return -1; + return -4; case 0x10756 ... 0x1075f: - return -1; + return -4; case 0x10768 ... 0x107ff: - return -1; + return -4; case 0x10806 ... 0x10807: - return -1; + return -4; case 0x10809: - return -1; + return -4; case 0x10836: - return -1; + return -4; case 0x10839 ... 0x1083b: - return -1; + return -4; case 0x1083d ... 0x1083e: - return -1; + return -4; case 0x10856: - return -1; + return -4; case 0x1089f ... 0x108a6: - return -1; + return -4; case 0x108b0 ... 0x108df: - return -1; + return -4; case 0x108f3: - return -1; + return -4; case 0x108f6 ... 0x108fa: - return -1; + return -4; case 0x1091c ... 0x1091e: - return -1; + return -4; case 0x1093a ... 0x1093e: - return -1; + return -4; case 0x10940 ... 0x1097f: - return -1; + return -4; case 0x109b8 ... 0x109bb: - return -1; + return -4; case 0x109d0 ... 0x109d1: - return -1; + return -4; case 0x10a04: - return -1; + return -4; case 0x10a07 ... 0x10a0b: - return -1; + return -4; case 0x10a14: - return -1; + return -4; case 0x10a18: - return -1; + return -4; case 0x10a36 ... 0x10a37: - return -1; + return -4; case 0x10a3b ... 0x10a3e: - return -1; + return -4; case 0x10a49 ... 0x10a4f: - return -1; + return -4; case 0x10a59 ... 0x10a5f: - return -1; + return -4; case 0x10aa0 ... 0x10abf: - return -1; + return -4; case 0x10ae7 ... 0x10aea: - return -1; + return -4; case 0x10af7 ... 0x10aff: - return -1; + return -4; case 0x10b36 ... 0x10b38: - return -1; + return -4; case 0x10b56 ... 0x10b57: - return -1; + return -4; case 0x10b73 ... 0x10b77: - return -1; + return -4; case 0x10b92 ... 0x10b98: - return -1; + return -4; case 0x10b9d ... 0x10ba8: - return -1; + return -4; case 0x10bb0 ... 0x10bff: - return -1; + return -4; case 0x10c49 ... 0x10c7f: - return -1; + return -4; case 0x10cb3 ... 0x10cbf: - return -1; + return -4; case 0x10cf3 ... 0x10cf9: - return -1; + return -4; case 0x10d28 ... 0x10d2f: - return -1; + return -4; case 0x10d3a ... 0x10e5f: - return -1; + return -4; case 0x10e7f ... 0x10eff: - return -1; + return -4; case 0x10f28 ... 0x10f2f: - return -1; + return -4; case 0x10f5a ... 0x10fff: - return -1; + return -4; case 0x1104e ... 0x11051: - return -1; + return -4; case 0x11070 ... 0x1107e: - return -1; + return -4; case 0x110c2 ... 0x110cc: - return -1; + return -4; case 0x110ce ... 0x110cf: - return -1; + return -4; case 0x110e9 ... 0x110ef: - return -1; + return -4; case 0x110fa ... 0x110ff: - return -1; + return -4; case 0x11135: - return -1; + return -4; case 0x11147 ... 0x1114f: - return -1; + return -4; case 0x11177 ... 0x1117f: - return -1; + return -4; case 0x111ce ... 0x111cf: - return -1; + return -4; case 0x111e0: - return -1; + return -4; case 0x111f5 ... 0x111ff: - return -1; + return -4; case 0x11212: - return -1; + return -4; case 0x1123f ... 0x1127f: - return -1; + return -4; case 0x11287: - return -1; + return -4; case 0x11289: - return -1; + return -4; case 0x1128e: - return -1; + return -4; case 0x1129e: - return -1; + return -4; case 0x112aa ... 0x112af: - return -1; + return -4; case 0x112eb ... 0x112ef: - return -1; + return -4; case 0x112fa ... 0x112ff: - return -1; + return -4; case 0x11304: - return -1; + return -4; case 0x1130d ... 0x1130e: - return -1; + return -4; case 0x11311 ... 0x11312: - return -1; + return -4; case 0x11329: - return -1; + return -4; case 0x11331: - return -1; + return -4; case 0x11334: - return -1; + return -4; case 0x1133a: - return -1; + return -4; case 0x11345 ... 0x11346: - return -1; + return -4; case 0x11349 ... 0x1134a: - return -1; + return -4; case 0x1134e ... 0x1134f: - return -1; + return -4; case 0x11351 ... 0x11356: - return -1; + return -4; case 0x11358 ... 0x1135c: - return -1; + return -4; case 0x11364 ... 0x11365: - return -1; + return -4; case 0x1136d ... 0x1136f: - return -1; + return -4; case 0x11375 ... 0x113ff: - return -1; + return -4; case 0x1145a: - return -1; + return -4; case 0x1145c: - return -1; + return -4; case 0x1145f ... 0x1147f: - return -1; + return -4; case 0x114c8 ... 0x114cf: - return -1; + return -4; case 0x114da ... 0x1157f: - return -1; + return -4; case 0x115b6 ... 0x115b7: - return -1; + return -4; case 0x115de ... 0x115ff: - return -1; + return -4; case 0x11645 ... 0x1164f: - return -1; + return -4; case 0x1165a ... 0x1165f: - return -1; + return -4; case 0x1166d ... 0x1167f: - return -1; + return -4; case 0x116b8 ... 0x116bf: - return -1; + return -4; case 0x116ca ... 0x116ff: - return -1; + return -4; case 0x1171b ... 0x1171c: - return -1; + return -4; case 0x1172c ... 0x1172f: - return -1; + return -4; case 0x11740 ... 0x117ff: - return -1; + return -4; case 0x1183c ... 0x1189f: - return -1; + return -4; case 0x118f3 ... 0x118fe: - return -1; + return -4; case 0x11900 ... 0x119ff: - return -1; + return -4; case 0x11a48 ... 0x11a4f: - return -1; + return -4; case 0x11a84 ... 0x11a85: - return -1; + return -4; case 0x11aa3 ... 0x11abf: - return -1; + return -4; case 0x11af9 ... 0x11bff: - return -1; + return -4; case 0x11c09: - return -1; + return -4; case 0x11c37: - return -1; + return -4; case 0x11c46 ... 0x11c4f: - return -1; + return -4; case 0x11c6d ... 0x11c6f: - return -1; + return -4; case 0x11c90 ... 0x11c91: - return -1; + return -4; case 0x11ca8: - return -1; + return -4; case 0x11cb7 ... 0x11cff: - return -1; + return -4; case 0x11d07: - return -1; + return -4; case 0x11d0a: - return -1; + return -4; case 0x11d37 ... 0x11d39: - return -1; + return -4; case 0x11d3b: - return -1; + return -4; case 0x11d3e: - return -1; + return -4; case 0x11d48 ... 0x11d4f: - return -1; + return -4; case 0x11d5a ... 0x11d5f: - return -1; + return -4; case 0x11d66: - return -1; + return -4; case 0x11d69: - return -1; + return -4; case 0x11d8f: - return -1; + return -4; case 0x11d92: - return -1; + return -4; case 0x11d99 ... 0x11d9f: - return -1; + return -4; case 0x11daa ... 0x11edf: - return -1; + return -4; case 0x11ef9 ... 0x11fff: - return -1; + return -4; case 0x1239a ... 0x123ff: - return -1; + return -4; case 0x1246f: - return -1; + return -4; case 0x12475 ... 0x1247f: - return -1; + return -4; case 0x12544 ... 0x12fff: - return -1; + return -4; case 0x1342f ... 0x143ff: - return -1; + return -4; case 0x14647 ... 0x167ff: - return -1; + return -4; case 0x16a39 ... 0x16a3f: - return -1; + return -4; case 0x16a5f: - return -1; + return -4; case 0x16a6a ... 0x16a6d: - return -1; + return -4; case 0x16a70 ... 0x16acf: - return -1; + return -4; case 0x16aee ... 0x16aef: - return -1; + return -4; case 0x16af6 ... 0x16aff: - return -1; + return -4; case 0x16b46 ... 0x16b4f: - return -1; + return -4; case 0x16b5a: - return -1; + return -4; case 0x16b62: - return -1; + return -4; case 0x16b78 ... 0x16b7c: - return -1; + return -4; case 0x16b90 ... 0x16e3f: - return -1; + return -4; case 0x16e9b ... 0x16eff: - return -1; + return -4; case 0x16f45 ... 0x16f4f: - return -1; + return -4; case 0x16f7f ... 0x16f8e: - return -1; + return -4; case 0x16fa0 ... 0x16fdf: - return -1; + return -4; case 0x16fe2 ... 0x16fff: - return -1; + return -4; case 0x187f2 ... 0x187ff: - return -1; + return -4; case 0x18af3 ... 0x1afff: - return -1; + return -4; case 0x1b11f ... 0x1b16f: - return -1; + return -4; case 0x1b2fc ... 0x1bbff: - return -1; + return -4; case 0x1bc6b ... 0x1bc6f: - return -1; + return -4; case 0x1bc7d ... 0x1bc7f: - return -1; + return -4; case 0x1bc89 ... 0x1bc8f: - return -1; + return -4; case 0x1bc9a ... 0x1bc9b: - return -1; + return -4; case 0x1bca4 ... 0x1cfff: - return -1; + return -4; case 0x1d0f6 ... 0x1d0ff: - return -1; + return -4; case 0x1d127 ... 0x1d128: - return -1; + return -4; case 0x1d1e9 ... 0x1d1ff: - return -1; + return -4; case 0x1d246 ... 0x1d2df: - return -1; + return -4; case 0x1d2f4 ... 0x1d2ff: - return -1; + return -4; case 0x1d357 ... 0x1d35f: - return -1; + return -4; case 0x1d379 ... 0x1d3ff: - return -1; + return -4; case 0x1d455: - return -1; + return -4; case 0x1d49d: - return -1; + return -4; case 0x1d4a0 ... 0x1d4a1: - return -1; + return -4; case 0x1d4a3 ... 0x1d4a4: - return -1; + return -4; case 0x1d4a7 ... 0x1d4a8: - return -1; + return -4; case 0x1d4ad: - return -1; + return -4; case 0x1d4ba: - return -1; + return -4; case 0x1d4bc: - return -1; + return -4; case 0x1d4c4: - return -1; + return -4; case 0x1d506: - return -1; + return -4; case 0x1d50b ... 0x1d50c: - return -1; + return -4; case 0x1d515: - return -1; + return -4; case 0x1d51d: - return -1; + return -4; case 0x1d53a: - return -1; + return -4; case 0x1d53f: - return -1; + return -4; case 0x1d545: - return -1; + return -4; case 0x1d547 ... 0x1d549: - return -1; + return -4; case 0x1d551: - return -1; + return -4; case 0x1d6a6 ... 0x1d6a7: - return -1; + return -4; case 0x1d7cc ... 0x1d7cd: - return -1; + return -4; case 0x1da8c ... 0x1da9a: - return -1; + return -4; case 0x1daa0: - return -1; + return -4; case 0x1dab0 ... 0x1dfff: - return -1; + return -4; case 0x1e007: - return -1; + return -4; case 0x1e019 ... 0x1e01a: - return -1; + return -4; case 0x1e022: - return -1; + return -4; case 0x1e025: - return -1; + return -4; case 0x1e02b ... 0x1e7ff: - return -1; + return -4; case 0x1e8c5 ... 0x1e8c6: - return -1; + return -4; case 0x1e8d7 ... 0x1e8ff: - return -1; + return -4; case 0x1e94b ... 0x1e94f: - return -1; + return -4; case 0x1e95a ... 0x1e95d: - return -1; + return -4; case 0x1e960 ... 0x1ec70: - return -1; + return -4; case 0x1ecb5 ... 0x1edff: - return -1; + return -4; case 0x1ee04: - return -1; + return -4; case 0x1ee20: - return -1; + return -4; case 0x1ee23: - return -1; + return -4; case 0x1ee25 ... 0x1ee26: - return -1; + return -4; case 0x1ee28: - return -1; + return -4; case 0x1ee33: - return -1; + return -4; case 0x1ee38: - return -1; + return -4; case 0x1ee3a: - return -1; + return -4; case 0x1ee3c ... 0x1ee41: - return -1; + return -4; case 0x1ee43 ... 0x1ee46: - return -1; + return -4; case 0x1ee48: - return -1; + return -4; case 0x1ee4a: - return -1; + return -4; case 0x1ee4c: - return -1; + return -4; case 0x1ee50: - return -1; + return -4; case 0x1ee53: - return -1; + return -4; case 0x1ee55 ... 0x1ee56: - return -1; + return -4; case 0x1ee58: - return -1; + return -4; case 0x1ee5a: - return -1; + return -4; case 0x1ee5c: - return -1; + return -4; case 0x1ee5e: - return -1; + return -4; case 0x1ee60: - return -1; + return -4; case 0x1ee63: - return -1; + return -4; case 0x1ee65 ... 0x1ee66: - return -1; + return -4; case 0x1ee6b: - return -1; + return -4; case 0x1ee73: - return -1; + return -4; case 0x1ee78: - return -1; + return -4; case 0x1ee7d: - return -1; + return -4; case 0x1ee7f: - return -1; + return -4; case 0x1ee8a: - return -1; + return -4; case 0x1ee9c ... 0x1eea0: - return -1; + return -4; case 0x1eea4: - return -1; + return -4; case 0x1eeaa: - return -1; + return -4; case 0x1eebc ... 0x1eeef: - return -1; + return -4; case 0x1eef2 ... 0x1efff: - return -1; + return -4; case 0x1f02c ... 0x1f02f: - return -1; + return -4; case 0x1f094 ... 0x1f09f: - return -1; + return -4; case 0x1f0af ... 0x1f0b0: - return -1; + return -4; case 0x1f0c0: - return -1; + return -4; case 0x1f0d0: - return -1; + return -4; case 0x1f0f6 ... 0x1f0ff: - return -1; + return -4; case 0x1f10d ... 0x1f10f: - return -1; + return -4; case 0x1f16c ... 0x1f16f: - return -1; + return -4; case 0x1f1ad ... 0x1f1e5: - return -1; + return -4; case 0x1f203 ... 0x1f20f: - return -1; + return -4; case 0x1f23c ... 0x1f23f: - return -1; + return -4; case 0x1f249 ... 0x1f24f: - return -1; + return -4; case 0x1f252 ... 0x1f25f: - return -1; + return -4; case 0x1f266 ... 0x1f2ff: - return -1; + return -4; case 0x1f6d5 ... 0x1f6df: - return -1; + return -4; case 0x1f6ed ... 0x1f6ef: - return -1; + return -4; case 0x1f6fa ... 0x1f6ff: - return -1; + return -4; case 0x1f774 ... 0x1f77f: - return -1; + return -4; case 0x1f7d9 ... 0x1f7ff: - return -1; + return -4; case 0x1f80c ... 0x1f80f: - return -1; + return -4; case 0x1f848 ... 0x1f84f: - return -1; + return -4; case 0x1f85a ... 0x1f85f: - return -1; + return -4; case 0x1f888 ... 0x1f88f: - return -1; + return -4; case 0x1f8ae ... 0x1f8ff: - return -1; + return -4; case 0x1f90c ... 0x1f90f: - return -1; + return -4; case 0x1f93f: - return -1; + return -4; case 0x1f971 ... 0x1f972: - return -1; + return -4; case 0x1f977 ... 0x1f979: - return -1; + return -4; case 0x1f97b: - return -1; + return -4; case 0x1f9a3 ... 0x1f9af: - return -1; + return -4; case 0x1f9ba ... 0x1f9bf: - return -1; + return -4; case 0x1f9c3 ... 0x1f9cf: - return -1; + return -4; case 0x1fa00 ... 0x1fa5f: - return -1; + return -4; case 0x1fa6e ... 0x1ffff: - return -1; + return -4; case 0x2fffe ... 0x2ffff: - return -1; + return -4; case 0x3fffe ... 0xe0000: - return -1; + return -4; case 0xe0002 ... 0xe001f: - return -1; + return -4; case 0xe0080 ... 0xe00ff: - return -1; + return -4; case 0xe01f0 ... 0xeffff: - return -1; + return -4; case 0xffffe ... 0xfffff: - return -1; + return -4; case 0x10fffe: - return -1; + return -4; // }}} default: return 1;