* [PATCH] add build-time option to use unicode9 character widths
2016-11-29 7:42 ` [PATCH] add build-time option to use unicode9 character widths Joshua Rubin
@ 2016-11-29 7:42 ` Joshua Rubin
2016-11-30 10:49 ` Jun T.
2016-11-29 17:21 ` Peter Stephenson
1 sibling, 1 reply; 8+ messages in thread
From: Joshua Rubin @ 2016-11-29 7:42 UTC (permalink / raw)
To: zsh-workers; +Cc: Joshua Rubin
---
Src/compat.c | 13 +-
Src/wcwidth9.h | 1321 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Src/zsh.h | 4 +-
configure.ac | 12 +
4 files changed, 1348 insertions(+), 2 deletions(-)
create mode 100644 Src/wcwidth9.h
diff --git a/Src/compat.c b/Src/compat.c
index 81afd4d..02412b3 100644
--- a/Src/compat.c
+++ b/Src/compat.c
@@ -635,7 +635,18 @@ strtoul(nptr, endptr, base)
#endif /* HAVE_STRTOUL */
/**/
-#if defined(BROKEN_WCWIDTH) && (defined(__STDC_ISO_10646__) || defined(__APPLE__))
+#ifdef ENABLE_UNICODE9
+#include "./wcwidth9.h"
+int
+mk_wcwidth(wchar_t ucs)
+{
+ int w = wcwidth9(ucs);
+ if (w < -1)
+ return 1;
+ return w;
+}
+
+#elif defined(BROKEN_WCWIDTH) && (defined(__STDC_ISO_10646__) || defined(__APPLE__))
/*
* This is an implementation of wcwidth() and wcswidth() (defined in
diff --git a/Src/wcwidth9.h b/Src/wcwidth9.h
new file mode 100644
index 0000000..07e6bae
--- /dev/null
+++ b/Src/wcwidth9.h
@@ -0,0 +1,1321 @@
+#ifndef WCWIDTH9_H
+#define WCWIDTH9_H
+
+#include <stdlib.h>
+#include <stdbool.h>
+
+struct wcwidth9_interval {
+ long first;
+ long last;
+};
+
+static const struct wcwidth9_interval wcwidth9_private[] = {
+ {0x00e000, 0x00f8ff},
+ {0x0f0000, 0x0ffffd},
+ {0x100000, 0x10fffd},
+};
+
+static const struct wcwidth9_interval wcwidth9_nonprint[] = {
+ {0x0000, 0x001f},
+ {0x007f, 0x009f},
+ {0x00ad, 0x00ad},
+ {0x070f, 0x070f},
+ {0x180b, 0x180e},
+ {0x200b, 0x200f},
+ {0x202a, 0x202e},
+ {0x206a, 0x206f},
+ {0xd800, 0xdfff},
+ {0xfeff, 0xfeff},
+ {0xfff9, 0xfffb},
+ {0xfffe, 0xffff},
+};
+
+static const struct wcwidth9_interval wcwidth9_combining[] = {
+ {0x0300, 0x036f},
+ {0x0483, 0x0489},
+ {0x0591, 0x05bd},
+ {0x05bf, 0x05bf},
+ {0x05c1, 0x05c2},
+ {0x05c4, 0x05c5},
+ {0x05c7, 0x05c7},
+ {0x0610, 0x061a},
+ {0x064b, 0x065f},
+ {0x0670, 0x0670},
+ {0x06d6, 0x06dc},
+ {0x06df, 0x06e4},
+ {0x06e7, 0x06e8},
+ {0x06ea, 0x06ed},
+ {0x0711, 0x0711},
+ {0x0730, 0x074a},
+ {0x07a6, 0x07b0},
+ {0x07eb, 0x07f3},
+ {0x0816, 0x0819},
+ {0x081b, 0x0823},
+ {0x0825, 0x0827},
+ {0x0829, 0x082d},
+ {0x0859, 0x085b},
+ {0x08d4, 0x08e1},
+ {0x08e3, 0x0903},
+ {0x093a, 0x093c},
+ {0x093e, 0x094f},
+ {0x0951, 0x0957},
+ {0x0962, 0x0963},
+ {0x0981, 0x0983},
+ {0x09bc, 0x09bc},
+ {0x09be, 0x09c4},
+ {0x09c7, 0x09c8},
+ {0x09cb, 0x09cd},
+ {0x09d7, 0x09d7},
+ {0x09e2, 0x09e3},
+ {0x0a01, 0x0a03},
+ {0x0a3c, 0x0a3c},
+ {0x0a3e, 0x0a42},
+ {0x0a47, 0x0a48},
+ {0x0a4b, 0x0a4d},
+ {0x0a51, 0x0a51},
+ {0x0a70, 0x0a71},
+ {0x0a75, 0x0a75},
+ {0x0a81, 0x0a83},
+ {0x0abc, 0x0abc},
+ {0x0abe, 0x0ac5},
+ {0x0ac7, 0x0ac9},
+ {0x0acb, 0x0acd},
+ {0x0ae2, 0x0ae3},
+ {0x0b01, 0x0b03},
+ {0x0b3c, 0x0b3c},
+ {0x0b3e, 0x0b44},
+ {0x0b47, 0x0b48},
+ {0x0b4b, 0x0b4d},
+ {0x0b56, 0x0b57},
+ {0x0b62, 0x0b63},
+ {0x0b82, 0x0b82},
+ {0x0bbe, 0x0bc2},
+ {0x0bc6, 0x0bc8},
+ {0x0bca, 0x0bcd},
+ {0x0bd7, 0x0bd7},
+ {0x0c00, 0x0c03},
+ {0x0c3e, 0x0c44},
+ {0x0c46, 0x0c48},
+ {0x0c4a, 0x0c4d},
+ {0x0c55, 0x0c56},
+ {0x0c62, 0x0c63},
+ {0x0c81, 0x0c83},
+ {0x0cbc, 0x0cbc},
+ {0x0cbe, 0x0cc4},
+ {0x0cc6, 0x0cc8},
+ {0x0cca, 0x0ccd},
+ {0x0cd5, 0x0cd6},
+ {0x0ce2, 0x0ce3},
+ {0x0d01, 0x0d03},
+ {0x0d3e, 0x0d44},
+ {0x0d46, 0x0d48},
+ {0x0d4a, 0x0d4d},
+ {0x0d57, 0x0d57},
+ {0x0d62, 0x0d63},
+ {0x0d82, 0x0d83},
+ {0x0dca, 0x0dca},
+ {0x0dcf, 0x0dd4},
+ {0x0dd6, 0x0dd6},
+ {0x0dd8, 0x0ddf},
+ {0x0df2, 0x0df3},
+ {0x0e31, 0x0e31},
+ {0x0e34, 0x0e3a},
+ {0x0e47, 0x0e4e},
+ {0x0eb1, 0x0eb1},
+ {0x0eb4, 0x0eb9},
+ {0x0ebb, 0x0ebc},
+ {0x0ec8, 0x0ecd},
+ {0x0f18, 0x0f19},
+ {0x0f35, 0x0f35},
+ {0x0f37, 0x0f37},
+ {0x0f39, 0x0f39},
+ {0x0f3e, 0x0f3f},
+ {0x0f71, 0x0f84},
+ {0x0f86, 0x0f87},
+ {0x0f8d, 0x0f97},
+ {0x0f99, 0x0fbc},
+ {0x0fc6, 0x0fc6},
+ {0x102b, 0x103e},
+ {0x1056, 0x1059},
+ {0x105e, 0x1060},
+ {0x1062, 0x1064},
+ {0x1067, 0x106d},
+ {0x1071, 0x1074},
+ {0x1082, 0x108d},
+ {0x108f, 0x108f},
+ {0x109a, 0x109d},
+ {0x135d, 0x135f},
+ {0x1712, 0x1714},
+ {0x1732, 0x1734},
+ {0x1752, 0x1753},
+ {0x1772, 0x1773},
+ {0x17b4, 0x17d3},
+ {0x17dd, 0x17dd},
+ {0x180b, 0x180d},
+ {0x1885, 0x1886},
+ {0x18a9, 0x18a9},
+ {0x1920, 0x192b},
+ {0x1930, 0x193b},
+ {0x1a17, 0x1a1b},
+ {0x1a55, 0x1a5e},
+ {0x1a60, 0x1a7c},
+ {0x1a7f, 0x1a7f},
+ {0x1ab0, 0x1abe},
+ {0x1b00, 0x1b04},
+ {0x1b34, 0x1b44},
+ {0x1b6b, 0x1b73},
+ {0x1b80, 0x1b82},
+ {0x1ba1, 0x1bad},
+ {0x1be6, 0x1bf3},
+ {0x1c24, 0x1c37},
+ {0x1cd0, 0x1cd2},
+ {0x1cd4, 0x1ce8},
+ {0x1ced, 0x1ced},
+ {0x1cf2, 0x1cf4},
+ {0x1cf8, 0x1cf9},
+ {0x1dc0, 0x1df5},
+ {0x1dfb, 0x1dff},
+ {0x20d0, 0x20f0},
+ {0x2cef, 0x2cf1},
+ {0x2d7f, 0x2d7f},
+ {0x2de0, 0x2dff},
+ {0x302a, 0x302f},
+ {0x3099, 0x309a},
+ {0xa66f, 0xa672},
+ {0xa674, 0xa67d},
+ {0xa69e, 0xa69f},
+ {0xa6f0, 0xa6f1},
+ {0xa802, 0xa802},
+ {0xa806, 0xa806},
+ {0xa80b, 0xa80b},
+ {0xa823, 0xa827},
+ {0xa880, 0xa881},
+ {0xa8b4, 0xa8c5},
+ {0xa8e0, 0xa8f1},
+ {0xa926, 0xa92d},
+ {0xa947, 0xa953},
+ {0xa980, 0xa983},
+ {0xa9b3, 0xa9c0},
+ {0xa9e5, 0xa9e5},
+ {0xaa29, 0xaa36},
+ {0xaa43, 0xaa43},
+ {0xaa4c, 0xaa4d},
+ {0xaa7b, 0xaa7d},
+ {0xaab0, 0xaab0},
+ {0xaab2, 0xaab4},
+ {0xaab7, 0xaab8},
+ {0xaabe, 0xaabf},
+ {0xaac1, 0xaac1},
+ {0xaaeb, 0xaaef},
+ {0xaaf5, 0xaaf6},
+ {0xabe3, 0xabea},
+ {0xabec, 0xabed},
+ {0xfb1e, 0xfb1e},
+ {0xfe00, 0xfe0f},
+ {0xfe20, 0xfe2f},
+ {0x101fd, 0x101fd},
+ {0x102e0, 0x102e0},
+ {0x10376, 0x1037a},
+ {0x10a01, 0x10a03},
+ {0x10a05, 0x10a06},
+ {0x10a0c, 0x10a0f},
+ {0x10a38, 0x10a3a},
+ {0x10a3f, 0x10a3f},
+ {0x10ae5, 0x10ae6},
+ {0x11000, 0x11002},
+ {0x11038, 0x11046},
+ {0x1107f, 0x11082},
+ {0x110b0, 0x110ba},
+ {0x11100, 0x11102},
+ {0x11127, 0x11134},
+ {0x11173, 0x11173},
+ {0x11180, 0x11182},
+ {0x111b3, 0x111c0},
+ {0x111ca, 0x111cc},
+ {0x1122c, 0x11237},
+ {0x1123e, 0x1123e},
+ {0x112df, 0x112ea},
+ {0x11300, 0x11303},
+ {0x1133c, 0x1133c},
+ {0x1133e, 0x11344},
+ {0x11347, 0x11348},
+ {0x1134b, 0x1134d},
+ {0x11357, 0x11357},
+ {0x11362, 0x11363},
+ {0x11366, 0x1136c},
+ {0x11370, 0x11374},
+ {0x11435, 0x11446},
+ {0x114b0, 0x114c3},
+ {0x115af, 0x115b5},
+ {0x115b8, 0x115c0},
+ {0x115dc, 0x115dd},
+ {0x11630, 0x11640},
+ {0x116ab, 0x116b7},
+ {0x1171d, 0x1172b},
+ {0x11c2f, 0x11c36},
+ {0x11c38, 0x11c3f},
+ {0x11c92, 0x11ca7},
+ {0x11ca9, 0x11cb6},
+ {0x16af0, 0x16af4},
+ {0x16b30, 0x16b36},
+ {0x16f51, 0x16f7e},
+ {0x16f8f, 0x16f92},
+ {0x1bc9d, 0x1bc9e},
+ {0x1d165, 0x1d169},
+ {0x1d16d, 0x1d172},
+ {0x1d17b, 0x1d182},
+ {0x1d185, 0x1d18b},
+ {0x1d1aa, 0x1d1ad},
+ {0x1d242, 0x1d244},
+ {0x1da00, 0x1da36},
+ {0x1da3b, 0x1da6c},
+ {0x1da75, 0x1da75},
+ {0x1da84, 0x1da84},
+ {0x1da9b, 0x1da9f},
+ {0x1daa1, 0x1daaf},
+ {0x1e000, 0x1e006},
+ {0x1e008, 0x1e018},
+ {0x1e01b, 0x1e021},
+ {0x1e023, 0x1e024},
+ {0x1e026, 0x1e02a},
+ {0x1e8d0, 0x1e8d6},
+ {0x1e944, 0x1e94a},
+ {0xe0100, 0xe01ef},
+};
+
+static const struct wcwidth9_interval wcwidth9_doublewidth[] = {
+ {0x1100, 0x115f},
+ {0x231a, 0x231b},
+ {0x2329, 0x232a},
+ {0x23e9, 0x23ec},
+ {0x23f0, 0x23f0},
+ {0x23f3, 0x23f3},
+ {0x25fd, 0x25fe},
+ {0x2614, 0x2615},
+ {0x2648, 0x2653},
+ {0x267f, 0x267f},
+ {0x2693, 0x2693},
+ {0x26a1, 0x26a1},
+ {0x26aa, 0x26ab},
+ {0x26bd, 0x26be},
+ {0x26c4, 0x26c5},
+ {0x26ce, 0x26ce},
+ {0x26d4, 0x26d4},
+ {0x26ea, 0x26ea},
+ {0x26f2, 0x26f3},
+ {0x26f5, 0x26f5},
+ {0x26fa, 0x26fa},
+ {0x26fd, 0x26fd},
+ {0x2705, 0x2705},
+ {0x270a, 0x270b},
+ {0x2728, 0x2728},
+ {0x274c, 0x274c},
+ {0x274e, 0x274e},
+ {0x2753, 0x2755},
+ {0x2757, 0x2757},
+ {0x2795, 0x2797},
+ {0x27b0, 0x27b0},
+ {0x27bf, 0x27bf},
+ {0x2b1b, 0x2b1c},
+ {0x2b50, 0x2b50},
+ {0x2b55, 0x2b55},
+ {0x2e80, 0x2e99},
+ {0x2e9b, 0x2ef3},
+ {0x2f00, 0x2fd5},
+ {0x2ff0, 0x2ffb},
+ {0x3000, 0x303e},
+ {0x3041, 0x3096},
+ {0x3099, 0x30ff},
+ {0x3105, 0x312d},
+ {0x3131, 0x318e},
+ {0x3190, 0x31ba},
+ {0x31c0, 0x31e3},
+ {0x31f0, 0x321e},
+ {0x3220, 0x3247},
+ {0x3250, 0x32fe},
+ {0x3300, 0x4dbf},
+ {0x4e00, 0xa48c},
+ {0xa490, 0xa4c6},
+ {0xa960, 0xa97c},
+ {0xac00, 0xd7a3},
+ {0xf900, 0xfaff},
+ {0xfe10, 0xfe19},
+ {0xfe30, 0xfe52},
+ {0xfe54, 0xfe66},
+ {0xfe68, 0xfe6b},
+ {0xff01, 0xff60},
+ {0xffe0, 0xffe6},
+ {0x16fe0, 0x16fe0},
+ {0x17000, 0x187ec},
+ {0x18800, 0x18af2},
+ {0x1b000, 0x1b001},
+ {0x1f004, 0x1f004},
+ {0x1f0cf, 0x1f0cf},
+ {0x1f18e, 0x1f18e},
+ {0x1f191, 0x1f19a},
+ {0x1f200, 0x1f202},
+ {0x1f210, 0x1f23b},
+ {0x1f240, 0x1f248},
+ {0x1f250, 0x1f251},
+ {0x1f300, 0x1f320},
+ {0x1f32d, 0x1f335},
+ {0x1f337, 0x1f37c},
+ {0x1f37e, 0x1f393},
+ {0x1f3a0, 0x1f3ca},
+ {0x1f3cf, 0x1f3d3},
+ {0x1f3e0, 0x1f3f0},
+ {0x1f3f4, 0x1f3f4},
+ {0x1f3f8, 0x1f43e},
+ {0x1f440, 0x1f440},
+ {0x1f442, 0x1f4fc},
+ {0x1f4ff, 0x1f53d},
+ {0x1f54b, 0x1f54e},
+ {0x1f550, 0x1f567},
+ {0x1f57a, 0x1f57a},
+ {0x1f595, 0x1f596},
+ {0x1f5a4, 0x1f5a4},
+ {0x1f5fb, 0x1f64f},
+ {0x1f680, 0x1f6c5},
+ {0x1f6cc, 0x1f6cc},
+ {0x1f6d0, 0x1f6d2},
+ {0x1f6eb, 0x1f6ec},
+ {0x1f6f4, 0x1f6f6},
+ {0x1f910, 0x1f91e},
+ {0x1f920, 0x1f927},
+ {0x1f930, 0x1f930},
+ {0x1f933, 0x1f93e},
+ {0x1f940, 0x1f94b},
+ {0x1f950, 0x1f95e},
+ {0x1f980, 0x1f991},
+ {0x1f9c0, 0x1f9c0},
+ {0x20000, 0x2fffd},
+ {0x30000, 0x3fffd},
+};
+
+static const struct wcwidth9_interval wcwidth9_ambiguous[] = {
+ {0x00a1, 0x00a1},
+ {0x00a4, 0x00a4},
+ {0x00a7, 0x00a8},
+ {0x00aa, 0x00aa},
+ {0x00ad, 0x00ae},
+ {0x00b0, 0x00b4},
+ {0x00b6, 0x00ba},
+ {0x00bc, 0x00bf},
+ {0x00c6, 0x00c6},
+ {0x00d0, 0x00d0},
+ {0x00d7, 0x00d8},
+ {0x00de, 0x00e1},
+ {0x00e6, 0x00e6},
+ {0x00e8, 0x00ea},
+ {0x00ec, 0x00ed},
+ {0x00f0, 0x00f0},
+ {0x00f2, 0x00f3},
+ {0x00f7, 0x00fa},
+ {0x00fc, 0x00fc},
+ {0x00fe, 0x00fe},
+ {0x0101, 0x0101},
+ {0x0111, 0x0111},
+ {0x0113, 0x0113},
+ {0x011b, 0x011b},
+ {0x0126, 0x0127},
+ {0x012b, 0x012b},
+ {0x0131, 0x0133},
+ {0x0138, 0x0138},
+ {0x013f, 0x0142},
+ {0x0144, 0x0144},
+ {0x0148, 0x014b},
+ {0x014d, 0x014d},
+ {0x0152, 0x0153},
+ {0x0166, 0x0167},
+ {0x016b, 0x016b},
+ {0x01ce, 0x01ce},
+ {0x01d0, 0x01d0},
+ {0x01d2, 0x01d2},
+ {0x01d4, 0x01d4},
+ {0x01d6, 0x01d6},
+ {0x01d8, 0x01d8},
+ {0x01da, 0x01da},
+ {0x01dc, 0x01dc},
+ {0x0251, 0x0251},
+ {0x0261, 0x0261},
+ {0x02c4, 0x02c4},
+ {0x02c7, 0x02c7},
+ {0x02c9, 0x02cb},
+ {0x02cd, 0x02cd},
+ {0x02d0, 0x02d0},
+ {0x02d8, 0x02db},
+ {0x02dd, 0x02dd},
+ {0x02df, 0x02df},
+ {0x0300, 0x036f},
+ {0x0391, 0x03a1},
+ {0x03a3, 0x03a9},
+ {0x03b1, 0x03c1},
+ {0x03c3, 0x03c9},
+ {0x0401, 0x0401},
+ {0x0410, 0x044f},
+ {0x0451, 0x0451},
+ {0x2010, 0x2010},
+ {0x2013, 0x2016},
+ {0x2018, 0x2019},
+ {0x201c, 0x201d},
+ {0x2020, 0x2022},
+ {0x2024, 0x2027},
+ {0x2030, 0x2030},
+ {0x2032, 0x2033},
+ {0x2035, 0x2035},
+ {0x203b, 0x203b},
+ {0x203e, 0x203e},
+ {0x2074, 0x2074},
+ {0x207f, 0x207f},
+ {0x2081, 0x2084},
+ {0x20ac, 0x20ac},
+ {0x2103, 0x2103},
+ {0x2105, 0x2105},
+ {0x2109, 0x2109},
+ {0x2113, 0x2113},
+ {0x2116, 0x2116},
+ {0x2121, 0x2122},
+ {0x2126, 0x2126},
+ {0x212b, 0x212b},
+ {0x2153, 0x2154},
+ {0x215b, 0x215e},
+ {0x2160, 0x216b},
+ {0x2170, 0x2179},
+ {0x2189, 0x2189},
+ {0x2190, 0x2199},
+ {0x21b8, 0x21b9},
+ {0x21d2, 0x21d2},
+ {0x21d4, 0x21d4},
+ {0x21e7, 0x21e7},
+ {0x2200, 0x2200},
+ {0x2202, 0x2203},
+ {0x2207, 0x2208},
+ {0x220b, 0x220b},
+ {0x220f, 0x220f},
+ {0x2211, 0x2211},
+ {0x2215, 0x2215},
+ {0x221a, 0x221a},
+ {0x221d, 0x2220},
+ {0x2223, 0x2223},
+ {0x2225, 0x2225},
+ {0x2227, 0x222c},
+ {0x222e, 0x222e},
+ {0x2234, 0x2237},
+ {0x223c, 0x223d},
+ {0x2248, 0x2248},
+ {0x224c, 0x224c},
+ {0x2252, 0x2252},
+ {0x2260, 0x2261},
+ {0x2264, 0x2267},
+ {0x226a, 0x226b},
+ {0x226e, 0x226f},
+ {0x2282, 0x2283},
+ {0x2286, 0x2287},
+ {0x2295, 0x2295},
+ {0x2299, 0x2299},
+ {0x22a5, 0x22a5},
+ {0x22bf, 0x22bf},
+ {0x2312, 0x2312},
+ {0x2460, 0x24e9},
+ {0x24eb, 0x254b},
+ {0x2550, 0x2573},
+ {0x2580, 0x258f},
+ {0x2592, 0x2595},
+ {0x25a0, 0x25a1},
+ {0x25a3, 0x25a9},
+ {0x25b2, 0x25b3},
+ {0x25b6, 0x25b7},
+ {0x25bc, 0x25bd},
+ {0x25c0, 0x25c1},
+ {0x25c6, 0x25c8},
+ {0x25cb, 0x25cb},
+ {0x25ce, 0x25d1},
+ {0x25e2, 0x25e5},
+ {0x25ef, 0x25ef},
+ {0x2605, 0x2606},
+ {0x2609, 0x2609},
+ {0x260e, 0x260f},
+ {0x261c, 0x261c},
+ {0x261e, 0x261e},
+ {0x2640, 0x2640},
+ {0x2642, 0x2642},
+ {0x2660, 0x2661},
+ {0x2663, 0x2665},
+ {0x2667, 0x266a},
+ {0x266c, 0x266d},
+ {0x266f, 0x266f},
+ {0x269e, 0x269f},
+ {0x26bf, 0x26bf},
+ {0x26c6, 0x26cd},
+ {0x26cf, 0x26d3},
+ {0x26d5, 0x26e1},
+ {0x26e3, 0x26e3},
+ {0x26e8, 0x26e9},
+ {0x26eb, 0x26f1},
+ {0x26f4, 0x26f4},
+ {0x26f6, 0x26f9},
+ {0x26fb, 0x26fc},
+ {0x26fe, 0x26ff},
+ {0x273d, 0x273d},
+ {0x2776, 0x277f},
+ {0x2b56, 0x2b59},
+ {0x3248, 0x324f},
+ {0xe000, 0xf8ff},
+ {0xfe00, 0xfe0f},
+ {0xfffd, 0xfffd},
+ {0x1f100, 0x1f10a},
+ {0x1f110, 0x1f12d},
+ {0x1f130, 0x1f169},
+ {0x1f170, 0x1f18d},
+ {0x1f18f, 0x1f190},
+ {0x1f19b, 0x1f1ac},
+ {0xe0100, 0xe01ef},
+ {0xf0000, 0xffffd},
+ {0x100000, 0x10fffd},
+};
+
+static const struct wcwidth9_interval wcwidth9_emoji_width[] = {
+ {0x1f1e6, 0x1f1ff},
+ {0x1f321, 0x1f321},
+ {0x1f324, 0x1f32c},
+ {0x1f336, 0x1f336},
+ {0x1f37d, 0x1f37d},
+ {0x1f396, 0x1f397},
+ {0x1f399, 0x1f39b},
+ {0x1f39e, 0x1f39f},
+ {0x1f3cb, 0x1f3ce},
+ {0x1f3d4, 0x1f3df},
+ {0x1f3f3, 0x1f3f5},
+ {0x1f3f7, 0x1f3f7},
+ {0x1f43f, 0x1f43f},
+ {0x1f441, 0x1f441},
+ {0x1f4fd, 0x1f4fd},
+ {0x1f549, 0x1f54a},
+ {0x1f56f, 0x1f570},
+ {0x1f573, 0x1f579},
+ {0x1f587, 0x1f587},
+ {0x1f58a, 0x1f58d},
+ {0x1f590, 0x1f590},
+ {0x1f5a5, 0x1f5a5},
+ {0x1f5a8, 0x1f5a8},
+ {0x1f5b1, 0x1f5b2},
+ {0x1f5bc, 0x1f5bc},
+ {0x1f5c2, 0x1f5c4},
+ {0x1f5d1, 0x1f5d3},
+ {0x1f5dc, 0x1f5de},
+ {0x1f5e1, 0x1f5e1},
+ {0x1f5e3, 0x1f5e3},
+ {0x1f5e8, 0x1f5e8},
+ {0x1f5ef, 0x1f5ef},
+ {0x1f5f3, 0x1f5f3},
+ {0x1f5fa, 0x1f5fa},
+ {0x1f6cb, 0x1f6cf},
+ {0x1f6e0, 0x1f6e5},
+ {0x1f6e9, 0x1f6e9},
+ {0x1f6f0, 0x1f6f0},
+ {0x1f6f3, 0x1f6f3},
+};
+
+static const struct wcwidth9_interval wcwidth9_not_assigned[] = {
+ {0x0378, 0x0379},
+ {0x0380, 0x0383},
+ {0x038b, 0x038b},
+ {0x038d, 0x038d},
+ {0x03a2, 0x03a2},
+ {0x0530, 0x0530},
+ {0x0557, 0x0558},
+ {0x0560, 0x0560},
+ {0x0588, 0x0588},
+ {0x058b, 0x058c},
+ {0x0590, 0x0590},
+ {0x05c8, 0x05cf},
+ {0x05eb, 0x05ef},
+ {0x05f5, 0x05ff},
+ {0x061d, 0x061d},
+ {0x070e, 0x070e},
+ {0x074b, 0x074c},
+ {0x07b2, 0x07bf},
+ {0x07fb, 0x07ff},
+ {0x082e, 0x082f},
+ {0x083f, 0x083f},
+ {0x085c, 0x085d},
+ {0x085f, 0x089f},
+ {0x08b5, 0x08b5},
+ {0x08be, 0x08d3},
+ {0x0984, 0x0984},
+ {0x098d, 0x098e},
+ {0x0991, 0x0992},
+ {0x09a9, 0x09a9},
+ {0x09b1, 0x09b1},
+ {0x09b3, 0x09b5},
+ {0x09ba, 0x09bb},
+ {0x09c5, 0x09c6},
+ {0x09c9, 0x09ca},
+ {0x09cf, 0x09d6},
+ {0x09d8, 0x09db},
+ {0x09de, 0x09de},
+ {0x09e4, 0x09e5},
+ {0x09fc, 0x0a00},
+ {0x0a04, 0x0a04},
+ {0x0a0b, 0x0a0e},
+ {0x0a11, 0x0a12},
+ {0x0a29, 0x0a29},
+ {0x0a31, 0x0a31},
+ {0x0a34, 0x0a34},
+ {0x0a37, 0x0a37},
+ {0x0a3a, 0x0a3b},
+ {0x0a3d, 0x0a3d},
+ {0x0a43, 0x0a46},
+ {0x0a49, 0x0a4a},
+ {0x0a4e, 0x0a50},
+ {0x0a52, 0x0a58},
+ {0x0a5d, 0x0a5d},
+ {0x0a5f, 0x0a65},
+ {0x0a76, 0x0a80},
+ {0x0a84, 0x0a84},
+ {0x0a8e, 0x0a8e},
+ {0x0a92, 0x0a92},
+ {0x0aa9, 0x0aa9},
+ {0x0ab1, 0x0ab1},
+ {0x0ab4, 0x0ab4},
+ {0x0aba, 0x0abb},
+ {0x0ac6, 0x0ac6},
+ {0x0aca, 0x0aca},
+ {0x0ace, 0x0acf},
+ {0x0ad1, 0x0adf},
+ {0x0ae4, 0x0ae5},
+ {0x0af2, 0x0af8},
+ {0x0afa, 0x0b00},
+ {0x0b04, 0x0b04},
+ {0x0b0d, 0x0b0e},
+ {0x0b11, 0x0b12},
+ {0x0b29, 0x0b29},
+ {0x0b31, 0x0b31},
+ {0x0b34, 0x0b34},
+ {0x0b3a, 0x0b3b},
+ {0x0b45, 0x0b46},
+ {0x0b49, 0x0b4a},
+ {0x0b4e, 0x0b55},
+ {0x0b58, 0x0b5b},
+ {0x0b5e, 0x0b5e},
+ {0x0b64, 0x0b65},
+ {0x0b78, 0x0b81},
+ {0x0b84, 0x0b84},
+ {0x0b8b, 0x0b8d},
+ {0x0b91, 0x0b91},
+ {0x0b96, 0x0b98},
+ {0x0b9b, 0x0b9b},
+ {0x0b9d, 0x0b9d},
+ {0x0ba0, 0x0ba2},
+ {0x0ba5, 0x0ba7},
+ {0x0bab, 0x0bad},
+ {0x0bba, 0x0bbd},
+ {0x0bc3, 0x0bc5},
+ {0x0bc9, 0x0bc9},
+ {0x0bce, 0x0bcf},
+ {0x0bd1, 0x0bd6},
+ {0x0bd8, 0x0be5},
+ {0x0bfb, 0x0bff},
+ {0x0c04, 0x0c04},
+ {0x0c0d, 0x0c0d},
+ {0x0c11, 0x0c11},
+ {0x0c29, 0x0c29},
+ {0x0c3a, 0x0c3c},
+ {0x0c45, 0x0c45},
+ {0x0c49, 0x0c49},
+ {0x0c4e, 0x0c54},
+ {0x0c57, 0x0c57},
+ {0x0c5b, 0x0c5f},
+ {0x0c64, 0x0c65},
+ {0x0c70, 0x0c77},
+ {0x0c84, 0x0c84},
+ {0x0c8d, 0x0c8d},
+ {0x0c91, 0x0c91},
+ {0x0ca9, 0x0ca9},
+ {0x0cb4, 0x0cb4},
+ {0x0cba, 0x0cbb},
+ {0x0cc5, 0x0cc5},
+ {0x0cc9, 0x0cc9},
+ {0x0cce, 0x0cd4},
+ {0x0cd7, 0x0cdd},
+ {0x0cdf, 0x0cdf},
+ {0x0ce4, 0x0ce5},
+ {0x0cf0, 0x0cf0},
+ {0x0cf3, 0x0d00},
+ {0x0d04, 0x0d04},
+ {0x0d0d, 0x0d0d},
+ {0x0d11, 0x0d11},
+ {0x0d3b, 0x0d3c},
+ {0x0d45, 0x0d45},
+ {0x0d49, 0x0d49},
+ {0x0d50, 0x0d53},
+ {0x0d64, 0x0d65},
+ {0x0d80, 0x0d81},
+ {0x0d84, 0x0d84},
+ {0x0d97, 0x0d99},
+ {0x0db2, 0x0db2},
+ {0x0dbc, 0x0dbc},
+ {0x0dbe, 0x0dbf},
+ {0x0dc7, 0x0dc9},
+ {0x0dcb, 0x0dce},
+ {0x0dd5, 0x0dd5},
+ {0x0dd7, 0x0dd7},
+ {0x0de0, 0x0de5},
+ {0x0df0, 0x0df1},
+ {0x0df5, 0x0e00},
+ {0x0e3b, 0x0e3e},
+ {0x0e5c, 0x0e80},
+ {0x0e83, 0x0e83},
+ {0x0e85, 0x0e86},
+ {0x0e89, 0x0e89},
+ {0x0e8b, 0x0e8c},
+ {0x0e8e, 0x0e93},
+ {0x0e98, 0x0e98},
+ {0x0ea0, 0x0ea0},
+ {0x0ea4, 0x0ea4},
+ {0x0ea6, 0x0ea6},
+ {0x0ea8, 0x0ea9},
+ {0x0eac, 0x0eac},
+ {0x0eba, 0x0eba},
+ {0x0ebe, 0x0ebf},
+ {0x0ec5, 0x0ec5},
+ {0x0ec7, 0x0ec7},
+ {0x0ece, 0x0ecf},
+ {0x0eda, 0x0edb},
+ {0x0ee0, 0x0eff},
+ {0x0f48, 0x0f48},
+ {0x0f6d, 0x0f70},
+ {0x0f98, 0x0f98},
+ {0x0fbd, 0x0fbd},
+ {0x0fcd, 0x0fcd},
+ {0x0fdb, 0x0fff},
+ {0x10c6, 0x10c6},
+ {0x10c8, 0x10cc},
+ {0x10ce, 0x10cf},
+ {0x1249, 0x1249},
+ {0x124e, 0x124f},
+ {0x1257, 0x1257},
+ {0x1259, 0x1259},
+ {0x125e, 0x125f},
+ {0x1289, 0x1289},
+ {0x128e, 0x128f},
+ {0x12b1, 0x12b1},
+ {0x12b6, 0x12b7},
+ {0x12bf, 0x12bf},
+ {0x12c1, 0x12c1},
+ {0x12c6, 0x12c7},
+ {0x12d7, 0x12d7},
+ {0x1311, 0x1311},
+ {0x1316, 0x1317},
+ {0x135b, 0x135c},
+ {0x137d, 0x137f},
+ {0x139a, 0x139f},
+ {0x13f6, 0x13f7},
+ {0x13fe, 0x13ff},
+ {0x169d, 0x169f},
+ {0x16f9, 0x16ff},
+ {0x170d, 0x170d},
+ {0x1715, 0x171f},
+ {0x1737, 0x173f},
+ {0x1754, 0x175f},
+ {0x176d, 0x176d},
+ {0x1771, 0x1771},
+ {0x1774, 0x177f},
+ {0x17de, 0x17df},
+ {0x17ea, 0x17ef},
+ {0x17fa, 0x17ff},
+ {0x180f, 0x180f},
+ {0x181a, 0x181f},
+ {0x1878, 0x187f},
+ {0x18ab, 0x18af},
+ {0x18f6, 0x18ff},
+ {0x191f, 0x191f},
+ {0x192c, 0x192f},
+ {0x193c, 0x193f},
+ {0x1941, 0x1943},
+ {0x196e, 0x196f},
+ {0x1975, 0x197f},
+ {0x19ac, 0x19af},
+ {0x19ca, 0x19cf},
+ {0x19db, 0x19dd},
+ {0x1a1c, 0x1a1d},
+ {0x1a5f, 0x1a5f},
+ {0x1a7d, 0x1a7e},
+ {0x1a8a, 0x1a8f},
+ {0x1a9a, 0x1a9f},
+ {0x1aae, 0x1aaf},
+ {0x1abf, 0x1aff},
+ {0x1b4c, 0x1b4f},
+ {0x1b7d, 0x1b7f},
+ {0x1bf4, 0x1bfb},
+ {0x1c38, 0x1c3a},
+ {0x1c4a, 0x1c4c},
+ {0x1c89, 0x1cbf},
+ {0x1cc8, 0x1ccf},
+ {0x1cf7, 0x1cf7},
+ {0x1cfa, 0x1cff},
+ {0x1df6, 0x1dfa},
+ {0x1f16, 0x1f17},
+ {0x1f1e, 0x1f1f},
+ {0x1f46, 0x1f47},
+ {0x1f4e, 0x1f4f},
+ {0x1f58, 0x1f58},
+ {0x1f5a, 0x1f5a},
+ {0x1f5c, 0x1f5c},
+ {0x1f5e, 0x1f5e},
+ {0x1f7e, 0x1f7f},
+ {0x1fb5, 0x1fb5},
+ {0x1fc5, 0x1fc5},
+ {0x1fd4, 0x1fd5},
+ {0x1fdc, 0x1fdc},
+ {0x1ff0, 0x1ff1},
+ {0x1ff5, 0x1ff5},
+ {0x1fff, 0x1fff},
+ {0x2065, 0x2065},
+ {0x2072, 0x2073},
+ {0x208f, 0x208f},
+ {0x209d, 0x209f},
+ {0x20bf, 0x20cf},
+ {0x20f1, 0x20ff},
+ {0x218c, 0x218f},
+ {0x23ff, 0x23ff},
+ {0x2427, 0x243f},
+ {0x244b, 0x245f},
+ {0x2b74, 0x2b75},
+ {0x2b96, 0x2b97},
+ {0x2bba, 0x2bbc},
+ {0x2bc9, 0x2bc9},
+ {0x2bd2, 0x2beb},
+ {0x2bf0, 0x2bff},
+ {0x2c2f, 0x2c2f},
+ {0x2c5f, 0x2c5f},
+ {0x2cf4, 0x2cf8},
+ {0x2d26, 0x2d26},
+ {0x2d28, 0x2d2c},
+ {0x2d2e, 0x2d2f},
+ {0x2d68, 0x2d6e},
+ {0x2d71, 0x2d7e},
+ {0x2d97, 0x2d9f},
+ {0x2da7, 0x2da7},
+ {0x2daf, 0x2daf},
+ {0x2db7, 0x2db7},
+ {0x2dbf, 0x2dbf},
+ {0x2dc7, 0x2dc7},
+ {0x2dcf, 0x2dcf},
+ {0x2dd7, 0x2dd7},
+ {0x2ddf, 0x2ddf},
+ {0x2e45, 0x2e7f},
+ {0x2e9a, 0x2e9a},
+ {0x2ef4, 0x2eff},
+ {0x2fd6, 0x2fef},
+ {0x2ffc, 0x2fff},
+ {0x3040, 0x3040},
+ {0x3097, 0x3098},
+ {0x3100, 0x3104},
+ {0x312e, 0x3130},
+ {0x318f, 0x318f},
+ {0x31bb, 0x31bf},
+ {0x31e4, 0x31ef},
+ {0x321f, 0x321f},
+ {0x32ff, 0x32ff},
+ {0x4db6, 0x4dbf},
+ {0x9fd6, 0x9fff},
+ {0xa48d, 0xa48f},
+ {0xa4c7, 0xa4cf},
+ {0xa62c, 0xa63f},
+ {0xa6f8, 0xa6ff},
+ {0xa7af, 0xa7af},
+ {0xa7b8, 0xa7f6},
+ {0xa82c, 0xa82f},
+ {0xa83a, 0xa83f},
+ {0xa878, 0xa87f},
+ {0xa8c6, 0xa8cd},
+ {0xa8da, 0xa8df},
+ {0xa8fe, 0xa8ff},
+ {0xa954, 0xa95e},
+ {0xa97d, 0xa97f},
+ {0xa9ce, 0xa9ce},
+ {0xa9da, 0xa9dd},
+ {0xa9ff, 0xa9ff},
+ {0xaa37, 0xaa3f},
+ {0xaa4e, 0xaa4f},
+ {0xaa5a, 0xaa5b},
+ {0xaac3, 0xaada},
+ {0xaaf7, 0xab00},
+ {0xab07, 0xab08},
+ {0xab0f, 0xab10},
+ {0xab17, 0xab1f},
+ {0xab27, 0xab27},
+ {0xab2f, 0xab2f},
+ {0xab66, 0xab6f},
+ {0xabee, 0xabef},
+ {0xabfa, 0xabff},
+ {0xd7a4, 0xd7af},
+ {0xd7c7, 0xd7ca},
+ {0xd7fc, 0xd7ff},
+ {0xfa6e, 0xfa6f},
+ {0xfada, 0xfaff},
+ {0xfb07, 0xfb12},
+ {0xfb18, 0xfb1c},
+ {0xfb37, 0xfb37},
+ {0xfb3d, 0xfb3d},
+ {0xfb3f, 0xfb3f},
+ {0xfb42, 0xfb42},
+ {0xfb45, 0xfb45},
+ {0xfbc2, 0xfbd2},
+ {0xfd40, 0xfd4f},
+ {0xfd90, 0xfd91},
+ {0xfdc8, 0xfdef},
+ {0xfdfe, 0xfdff},
+ {0xfe1a, 0xfe1f},
+ {0xfe53, 0xfe53},
+ {0xfe67, 0xfe67},
+ {0xfe6c, 0xfe6f},
+ {0xfe75, 0xfe75},
+ {0xfefd, 0xfefe},
+ {0xff00, 0xff00},
+ {0xffbf, 0xffc1},
+ {0xffc8, 0xffc9},
+ {0xffd0, 0xffd1},
+ {0xffd8, 0xffd9},
+ {0xffdd, 0xffdf},
+ {0xffe7, 0xffe7},
+ {0xffef, 0xfff8},
+ {0xfffe, 0xffff},
+ {0x1000c, 0x1000c},
+ {0x10027, 0x10027},
+ {0x1003b, 0x1003b},
+ {0x1003e, 0x1003e},
+ {0x1004e, 0x1004f},
+ {0x1005e, 0x1007f},
+ {0x100fb, 0x100ff},
+ {0x10103, 0x10106},
+ {0x10134, 0x10136},
+ {0x1018f, 0x1018f},
+ {0x1019c, 0x1019f},
+ {0x101a1, 0x101cf},
+ {0x101fe, 0x1027f},
+ {0x1029d, 0x1029f},
+ {0x102d1, 0x102df},
+ {0x102fc, 0x102ff},
+ {0x10324, 0x1032f},
+ {0x1034b, 0x1034f},
+ {0x1037b, 0x1037f},
+ {0x1039e, 0x1039e},
+ {0x103c4, 0x103c7},
+ {0x103d6, 0x103ff},
+ {0x1049e, 0x1049f},
+ {0x104aa, 0x104af},
+ {0x104d4, 0x104d7},
+ {0x104fc, 0x104ff},
+ {0x10528, 0x1052f},
+ {0x10564, 0x1056e},
+ {0x10570, 0x105ff},
+ {0x10737, 0x1073f},
+ {0x10756, 0x1075f},
+ {0x10768, 0x107ff},
+ {0x10806, 0x10807},
+ {0x10809, 0x10809},
+ {0x10836, 0x10836},
+ {0x10839, 0x1083b},
+ {0x1083d, 0x1083e},
+ {0x10856, 0x10856},
+ {0x1089f, 0x108a6},
+ {0x108b0, 0x108df},
+ {0x108f3, 0x108f3},
+ {0x108f6, 0x108fa},
+ {0x1091c, 0x1091e},
+ {0x1093a, 0x1093e},
+ {0x10940, 0x1097f},
+ {0x109b8, 0x109bb},
+ {0x109d0, 0x109d1},
+ {0x10a04, 0x10a04},
+ {0x10a07, 0x10a0b},
+ {0x10a14, 0x10a14},
+ {0x10a18, 0x10a18},
+ {0x10a34, 0x10a37},
+ {0x10a3b, 0x10a3e},
+ {0x10a48, 0x10a4f},
+ {0x10a59, 0x10a5f},
+ {0x10aa0, 0x10abf},
+ {0x10ae7, 0x10aea},
+ {0x10af7, 0x10aff},
+ {0x10b36, 0x10b38},
+ {0x10b56, 0x10b57},
+ {0x10b73, 0x10b77},
+ {0x10b92, 0x10b98},
+ {0x10b9d, 0x10ba8},
+ {0x10bb0, 0x10bff},
+ {0x10c49, 0x10c7f},
+ {0x10cb3, 0x10cbf},
+ {0x10cf3, 0x10cf9},
+ {0x10d00, 0x10e5f},
+ {0x10e7f, 0x10fff},
+ {0x1104e, 0x11051},
+ {0x11070, 0x1107e},
+ {0x110c2, 0x110cf},
+ {0x110e9, 0x110ef},
+ {0x110fa, 0x110ff},
+ {0x11135, 0x11135},
+ {0x11144, 0x1114f},
+ {0x11177, 0x1117f},
+ {0x111ce, 0x111cf},
+ {0x111e0, 0x111e0},
+ {0x111f5, 0x111ff},
+ {0x11212, 0x11212},
+ {0x1123f, 0x1127f},
+ {0x11287, 0x11287},
+ {0x11289, 0x11289},
+ {0x1128e, 0x1128e},
+ {0x1129e, 0x1129e},
+ {0x112aa, 0x112af},
+ {0x112eb, 0x112ef},
+ {0x112fa, 0x112ff},
+ {0x11304, 0x11304},
+ {0x1130d, 0x1130e},
+ {0x11311, 0x11312},
+ {0x11329, 0x11329},
+ {0x11331, 0x11331},
+ {0x11334, 0x11334},
+ {0x1133a, 0x1133b},
+ {0x11345, 0x11346},
+ {0x11349, 0x1134a},
+ {0x1134e, 0x1134f},
+ {0x11351, 0x11356},
+ {0x11358, 0x1135c},
+ {0x11364, 0x11365},
+ {0x1136d, 0x1136f},
+ {0x11375, 0x113ff},
+ {0x1145a, 0x1145a},
+ {0x1145c, 0x1145c},
+ {0x1145e, 0x1147f},
+ {0x114c8, 0x114cf},
+ {0x114da, 0x1157f},
+ {0x115b6, 0x115b7},
+ {0x115de, 0x115ff},
+ {0x11645, 0x1164f},
+ {0x1165a, 0x1165f},
+ {0x1166d, 0x1167f},
+ {0x116b8, 0x116bf},
+ {0x116ca, 0x116ff},
+ {0x1171a, 0x1171c},
+ {0x1172c, 0x1172f},
+ {0x11740, 0x1189f},
+ {0x118f3, 0x118fe},
+ {0x11900, 0x11abf},
+ {0x11af9, 0x11bff},
+ {0x11c09, 0x11c09},
+ {0x11c37, 0x11c37},
+ {0x11c46, 0x11c4f},
+ {0x11c6d, 0x11c6f},
+ {0x11c90, 0x11c91},
+ {0x11ca8, 0x11ca8},
+ {0x11cb7, 0x11fff},
+ {0x1239a, 0x123ff},
+ {0x1246f, 0x1246f},
+ {0x12475, 0x1247f},
+ {0x12544, 0x12fff},
+ {0x1342f, 0x143ff},
+ {0x14647, 0x167ff},
+ {0x16a39, 0x16a3f},
+ {0x16a5f, 0x16a5f},
+ {0x16a6a, 0x16a6d},
+ {0x16a70, 0x16acf},
+ {0x16aee, 0x16aef},
+ {0x16af6, 0x16aff},
+ {0x16b46, 0x16b4f},
+ {0x16b5a, 0x16b5a},
+ {0x16b62, 0x16b62},
+ {0x16b78, 0x16b7c},
+ {0x16b90, 0x16eff},
+ {0x16f45, 0x16f4f},
+ {0x16f7f, 0x16f8e},
+ {0x16fa0, 0x16fdf},
+ {0x16fe1, 0x16fff},
+ {0x187ed, 0x187ff},
+ {0x18af3, 0x1afff},
+ {0x1b002, 0x1bbff},
+ {0x1bc6b, 0x1bc6f},
+ {0x1bc7d, 0x1bc7f},
+ {0x1bc89, 0x1bc8f},
+ {0x1bc9a, 0x1bc9b},
+ {0x1bca4, 0x1cfff},
+ {0x1d0f6, 0x1d0ff},
+ {0x1d127, 0x1d128},
+ {0x1d1e9, 0x1d1ff},
+ {0x1d246, 0x1d2ff},
+ {0x1d357, 0x1d35f},
+ {0x1d372, 0x1d3ff},
+ {0x1d455, 0x1d455},
+ {0x1d49d, 0x1d49d},
+ {0x1d4a0, 0x1d4a1},
+ {0x1d4a3, 0x1d4a4},
+ {0x1d4a7, 0x1d4a8},
+ {0x1d4ad, 0x1d4ad},
+ {0x1d4ba, 0x1d4ba},
+ {0x1d4bc, 0x1d4bc},
+ {0x1d4c4, 0x1d4c4},
+ {0x1d506, 0x1d506},
+ {0x1d50b, 0x1d50c},
+ {0x1d515, 0x1d515},
+ {0x1d51d, 0x1d51d},
+ {0x1d53a, 0x1d53a},
+ {0x1d53f, 0x1d53f},
+ {0x1d545, 0x1d545},
+ {0x1d547, 0x1d549},
+ {0x1d551, 0x1d551},
+ {0x1d6a6, 0x1d6a7},
+ {0x1d7cc, 0x1d7cd},
+ {0x1da8c, 0x1da9a},
+ {0x1daa0, 0x1daa0},
+ {0x1dab0, 0x1dfff},
+ {0x1e007, 0x1e007},
+ {0x1e019, 0x1e01a},
+ {0x1e022, 0x1e022},
+ {0x1e025, 0x1e025},
+ {0x1e02b, 0x1e7ff},
+ {0x1e8c5, 0x1e8c6},
+ {0x1e8d7, 0x1e8ff},
+ {0x1e94b, 0x1e94f},
+ {0x1e95a, 0x1e95d},
+ {0x1e960, 0x1edff},
+ {0x1ee04, 0x1ee04},
+ {0x1ee20, 0x1ee20},
+ {0x1ee23, 0x1ee23},
+ {0x1ee25, 0x1ee26},
+ {0x1ee28, 0x1ee28},
+ {0x1ee33, 0x1ee33},
+ {0x1ee38, 0x1ee38},
+ {0x1ee3a, 0x1ee3a},
+ {0x1ee3c, 0x1ee41},
+ {0x1ee43, 0x1ee46},
+ {0x1ee48, 0x1ee48},
+ {0x1ee4a, 0x1ee4a},
+ {0x1ee4c, 0x1ee4c},
+ {0x1ee50, 0x1ee50},
+ {0x1ee53, 0x1ee53},
+ {0x1ee55, 0x1ee56},
+ {0x1ee58, 0x1ee58},
+ {0x1ee5a, 0x1ee5a},
+ {0x1ee5c, 0x1ee5c},
+ {0x1ee5e, 0x1ee5e},
+ {0x1ee60, 0x1ee60},
+ {0x1ee63, 0x1ee63},
+ {0x1ee65, 0x1ee66},
+ {0x1ee6b, 0x1ee6b},
+ {0x1ee73, 0x1ee73},
+ {0x1ee78, 0x1ee78},
+ {0x1ee7d, 0x1ee7d},
+ {0x1ee7f, 0x1ee7f},
+ {0x1ee8a, 0x1ee8a},
+ {0x1ee9c, 0x1eea0},
+ {0x1eea4, 0x1eea4},
+ {0x1eeaa, 0x1eeaa},
+ {0x1eebc, 0x1eeef},
+ {0x1eef2, 0x1efff},
+ {0x1f02c, 0x1f02f},
+ {0x1f094, 0x1f09f},
+ {0x1f0af, 0x1f0b0},
+ {0x1f0c0, 0x1f0c0},
+ {0x1f0d0, 0x1f0d0},
+ {0x1f0f6, 0x1f0ff},
+ {0x1f10d, 0x1f10f},
+ {0x1f12f, 0x1f12f},
+ {0x1f16c, 0x1f16f},
+ {0x1f1ad, 0x1f1e5},
+ {0x1f203, 0x1f20f},
+ {0x1f23c, 0x1f23f},
+ {0x1f249, 0x1f24f},
+ {0x1f252, 0x1f2ff},
+ {0x1f6d3, 0x1f6df},
+ {0x1f6ed, 0x1f6ef},
+ {0x1f6f7, 0x1f6ff},
+ {0x1f774, 0x1f77f},
+ {0x1f7d5, 0x1f7ff},
+ {0x1f80c, 0x1f80f},
+ {0x1f848, 0x1f84f},
+ {0x1f85a, 0x1f85f},
+ {0x1f888, 0x1f88f},
+ {0x1f8ae, 0x1f90f},
+ {0x1f91f, 0x1f91f},
+ {0x1f928, 0x1f92f},
+ {0x1f931, 0x1f932},
+ {0x1f93f, 0x1f93f},
+ {0x1f94c, 0x1f94f},
+ {0x1f95f, 0x1f97f},
+ {0x1f992, 0x1f9bf},
+ {0x1f9c1, 0x1ffff},
+ {0x2a6d7, 0x2a6ff},
+ {0x2b735, 0x2b73f},
+ {0x2b81e, 0x2b81f},
+ {0x2cea2, 0x2f7ff},
+ {0x2fa1e, 0xe0000},
+ {0xe0002, 0xe001f},
+ {0xe0080, 0xe00ff},
+ {0xe01f0, 0xeffff},
+ {0xffffe, 0xfffff},
+};
+
+#define WCWIDTH9_ARRAY_SIZE(arr) ((sizeof(arr)/sizeof((arr)[0])) / ((size_t)(!(sizeof(arr) % sizeof((arr)[0])))))
+
+static inline bool wcwidth9_intable(const struct wcwidth9_interval *table, size_t n_items, int c) {
+ int mid, bot, top;
+
+ if (c < table[0].first) {
+ return false;
+ }
+
+ bot = 0;
+ top = (int)(n_items - 1);
+ while (top >= bot) {
+ mid = (bot + top) / 2;
+
+ if (table[mid].last < c) {
+ bot = mid + 1;
+ } else if (table[mid].first > c) {
+ top = mid - 1;
+ } else {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+static inline int wcwidth9(int c) {
+ if (c < 0|| c > 0x10ffff) {
+ return -1;
+ }
+
+ if (wcwidth9_intable(wcwidth9_nonprint, WCWIDTH9_ARRAY_SIZE(wcwidth9_nonprint), c)) {
+ return -1;
+ }
+
+ if (wcwidth9_intable(wcwidth9_combining, WCWIDTH9_ARRAY_SIZE(wcwidth9_combining), c)) {
+ return -1;
+ }
+
+ if (wcwidth9_intable(wcwidth9_not_assigned, WCWIDTH9_ARRAY_SIZE(wcwidth9_not_assigned), c)) {
+ return -1;
+ }
+
+ if (wcwidth9_intable(wcwidth9_private, WCWIDTH9_ARRAY_SIZE(wcwidth9_private), c)) {
+ return -3;
+ }
+
+ if (wcwidth9_intable(wcwidth9_ambiguous, WCWIDTH9_ARRAY_SIZE(wcwidth9_ambiguous), c)) {
+ return -2;
+ }
+
+ if (wcwidth9_intable(wcwidth9_doublewidth, WCWIDTH9_ARRAY_SIZE(wcwidth9_doublewidth), c)) {
+ return 2;
+ }
+
+ if (wcwidth9_intable(wcwidth9_emoji_width, WCWIDTH9_ARRAY_SIZE(wcwidth9_emoji_width), c)) {
+ return 2;
+ }
+
+ return 1;
+}
+
+#endif /* WCWIDTH9_H */
diff --git a/Src/zsh.h b/Src/zsh.h
index a5d4455..3e93d01 100644
--- a/Src/zsh.h
+++ b/Src/zsh.h
@@ -3131,7 +3131,9 @@ typedef wint_t convchar_t;
* much what the definition tells us. However, we happen to know this
* works on MacOS which doesn't define that.
*/
-#if defined(BROKEN_WCWIDTH) && (defined(__STDC_ISO_10646__) || defined(__APPLE__))
+#ifdef ENABLE_UNICODE9
+#define WCWIDTH(wc) mk_wcwidth(wc)
+#elif defined(BROKEN_WCWIDTH) && (defined(__STDC_ISO_10646__) || defined(__APPLE__))
#define WCWIDTH(wc) mk_wcwidth(wc)
#else
#define WCWIDTH(wc) wcwidth(wc)
diff --git a/configure.ac b/configure.ac
index e0eb320..920c2fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2591,6 +2591,18 @@ wmemcpy wmemmove wmemset; do
])
AH_TEMPLATE([MULTIBYTE_SUPPORT],
[Define to 1 if you want support for multibyte character sets.])
+
+dnl
+dnl unicode9 support
+dnl
+AH_TEMPLATE([ENABLE_UNICODE9],
+[Define to 1 if you want use unicode9 character widths.])
+AC_ARG_ENABLE(unicode9,
+AC_HELP_STRING([--enable-unicode9], [compile with unicode9 character widths]),
+[if test x$enableval = xyes; then
+ AC_DEFINE(ENABLE_UNICODE9)
+fi])
+
AH_TEMPLATE([BROKEN_WCWIDTH],
[Define to 1 if the wcwidth() function is present but broken.])
AH_TEMPLATE([BROKEN_ISPRINT],
--
2.10.2
^ permalink raw reply [flat|nested] 8+ messages in thread