diff options
| -rw-r--r-- | scripts/genunicodetables.lua | 71 | ||||
| -rw-r--r-- | src/nvim/mbyte.c | 4 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 62 insertions, 15 deletions
diff --git a/scripts/genunicodetables.lua b/scripts/genunicodetables.lua index 75adb36a8f..d5fcb56566 100644 --- a/scripts/genunicodetables.lua +++ b/scripts/genunicodetables.lua @@ -175,6 +175,7 @@ local build_width_table = function(ut_fp, dataprops, widthprops, widths, local start = -1 local end_ = -1 local dataidx = 1 + local ret = {} for _, p in ipairs(widthprops) do if widths[p[2]:sub(1, 1)] then local rng_start, rng_end = p[1]:find('%.%.') @@ -207,6 +208,7 @@ local build_width_table = function(ut_fp, dataprops, widthprops, widths, else if start >= 0 then ut_fp:write(make_range(start, end_)) + table.insert(ret, {start, end_}) end start = n end @@ -216,25 +218,68 @@ local build_width_table = function(ut_fp, dataprops, widthprops, widths, end if start >= 0 then ut_fp:write(make_range(start, end_)) + table.insert(ret, {start, end_}) end ut_fp:write('};\n') + return ret end -local build_emoji_table = function(ut_fp, emojiprops) - ut_fp:write('static const struct interval emoji_tab[] = {\n') +local build_emoji_table = function(ut_fp, emojiprops, doublewidth, ambiwidth) + local emojiwidth = {} + local emoji = {} for _, p in ipairs(emojiprops) do if p[2]:match('Emoji%s+#') then - local start, end_ = p[1]:find('%.%.') - if start then - local n = tonumber(p[1]:sub(1, start - 1), 16) - local nl = tonumber(p[1]:sub(end_ + 1), 16) - ut_fp:write(make_range(n, nl)) + local rng_start, rng_end = p[1]:find('%.%.') + if rng_start then + n = tonumber(p[1]:sub(1, rng_start - 1), 16) + n_last = tonumber(p[1]:sub(rng_end + 1), 16) else - local n = tonumber(p[1], 16) - ut_fp:write(make_range(n, n)) + n = tonumber(p[1], 16) + n_last = n + end + if #emoji > 0 and n - 1 == emoji[#emoji][2] then + emoji[#emoji][2] = n_last + else + table.insert(emoji, { n, n_last }) + end + -- exclude characters that are in the ambiguous/doublewidth table + for _, ambi in ipairs(ambiwidth) do + if n >= ambi[1] and n <= ambi[2] then + n = ambi[2] + 1 + end + if n_last >= ambi[1] and n_last <= ambi[2] then + n_last = ambi[1] - 1 + end + end + for _, double in ipairs(doublewidth) do + if n >= double[1] and n <= double[2] then + n = double[2] + 1 + end + if n_last >= double[1] and n_last <= double[2] then + n_last = double[1] - 1 + end + end + + if n <= n_last then + if #emojiwidth > 0 and n - 1 == emojiwidth[#emojiwidth][2] then + emojiwidth[#emojiwidth][2] = n_last + else + table.insert(emojiwidth, { n, n_last }) + end end end end + + ut_fp:write('static const struct interval emoji_all[] = {\n') + for _, p in ipairs(emoji) do + ut_fp:write(make_range(p[1], p[2])) + end + ut_fp:write('};\n') + + ut_fp:write('static const struct interval emoji_width[] = {\n') + for _, p in ipairs(emojiwidth) do + ut_fp:write(make_range(p[1], p[2])) + end ut_fp:write('};\n') end @@ -258,13 +303,15 @@ local eaw_fp = io.open(eastasianwidth_fname, 'r') local widthprops = parse_width_props(eaw_fp) eaw_fp:close() -build_width_table(ut_fp, dataprops, widthprops, {W=true, F=true}, 'doublewidth') -build_width_table(ut_fp, dataprops, widthprops, {A=true}, 'ambiguous') +local doublewidth = build_width_table(ut_fp, dataprops, widthprops, + {W=true, F=true}, 'doublewidth') +local ambiwidth = build_width_table(ut_fp, dataprops, widthprops, + {A=true}, 'ambiguous') local emoji_fp = io.open(emoji_fname, 'r') local emojiprops = parse_emoji_props(emoji_fp) emoji_fp:close() -build_emoji_table(ut_fp, emojiprops) +build_emoji_table(ut_fp, emojiprops, doublewidth, ambiwidth) ut_fp:close() diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c index e4ed46208b..2978171051 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -949,7 +949,7 @@ int utf_char2cells(int c) if (intable(doublewidth, ARRAY_SIZE(doublewidth), c)) return 2; #endif - if (p_emoji && intable(emoji_tab, ARRAY_SIZE(emoji_tab), c)) { + if (p_emoji && intable(emoji_width, ARRAY_SIZE(emoji_width), c)) { return 2; } } @@ -1716,7 +1716,7 @@ int utf_class(int c) } // emoji - if (intable(emoji_tab, ARRAY_SIZE(emoji_tab), c)) { + if (intable(emoji_all, ARRAY_SIZE(emoji_all), c)) { return 3; } diff --git a/src/nvim/version.c b/src/nvim/version.c index 43aaa6b1ed..02ee2113b9 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -814,7 +814,7 @@ static int included_patches[] = { // 1632 NA // 1631 NA // 1630, - // 1629, + 1629, // 1628 NA // 1627 NA // 1626 NA |