Patch 8.2.0776
Problem: Libvterm code lags behind the upstream version.
Solution: Include revision 719.
Files: Filelist, src/libvterm/README, src/libvterm/Makefile,
src/libvterm/find-wide-chars.pl, src/libvterm/src/fullwidth.inc,
src/libvterm/src/unicode.c
*** ../vim-8.2.0775/Filelist 2020-05-01 16:08:08.054859320 +0200
--- Filelist 2020-05-17 14:57:40.471736029 +0200
***************
*** 305,310 ****
--- 305,311 ----
src/libvterm/vterm.pc.in \
src/libvterm/doc/URLs \
src/libvterm/doc/seqs.txt \
+ src/libvterm/find-wide-chars.pl \
src/libvterm/include/vterm.h \
src/libvterm/include/vterm_keycodes.h \
src/libvterm/src/encoding.c \
***************
*** 312,317 ****
--- 313,319 ----
src/libvterm/src/encoding/DECdrawing.tbl \
src/libvterm/src/encoding/uk.inc \
src/libvterm/src/encoding/uk.tbl \
+ src/libvterm/src/fullwidth.inc \
src/libvterm/src/keyboard.c \
src/libvterm/src/mouse.c \
src/libvterm/src/parser.c \
*** ../vim-8.2.0775/src/libvterm/README 2018-03-25 15:51:01.000000000 +0200
--- src/libvterm/README 2020-05-17 14:46:03.365949218 +0200
***************
*** 11,16 ****
--- 11,19 ----
- Convert from C99 to C90.
- Other changes to support embedding in Vim.
+ To find the diff of a libvterm patch edit this URL, changing "999" to the
patch
+ number:
+ https://bazaar.launchpad.net/~libvterm/libvterm/trunk/diff/999?context=3
To merge in changes from Github, do this:
- Commit any pending changes.
*** ../vim-8.2.0775/src/libvterm/Makefile 2019-10-23 22:26:08.000000000
+0200
--- src/libvterm/Makefile 2020-05-17 14:52:29.680716656 +0200
***************
*** 66,71 ****
--- 66,74 ----
src/encoding/%.inc: src/encoding/%.tbl
perl -CSD tbl2inc_c.pl $< >$@
+ src/fullwidth.inc:
+ @perl find-wide-chars.pl >$@
+
src/encoding.lo: $(INCFILES)
bin/%: bin/%.c $(LIBRARY)
*** ../vim-8.2.0775/src/libvterm/find-wide-chars.pl 2020-05-17
14:59:11.731449145 +0200
--- src/libvterm/find-wide-chars.pl 2020-05-17 14:52:29.680716656 +0200
***************
*** 0 ****
--- 1,34 ----
+ #!/usr/bin/perl
+
+ use strict;
+ use warnings;
+
+ use Unicode::UCD qw( charprop );
+
+ STDOUT->autoflush(1);
+
+ sub iswide
+ {
+ my ( $cp ) = @_;
+
+ my $width = charprop( $cp, "East_Asian_Width" ) or return;
+ return $width eq "Wide" || $width eq "Fullwidth";
+ }
+
+ my ( $start, $end );
+ foreach my $cp ( 0 .. 0x1FFFF ) {
+ iswide($cp) or next;
+
+ if( defined $end and $end == $cp-1 ) {
+ # extend the range
+ $end = $cp;
+ next;
+ }
+
+ # start a new range
+ printf " { %#04x, %#04x },\n", $start, $end if defined $start;
+
+ $start = $end = $cp;
+ }
+
+ printf " { %#04x, %#04x },\n", $start, $end if defined $start;
*** ../vim-8.2.0775/src/libvterm/src/fullwidth.inc 2020-05-17
14:59:11.739449120 +0200
--- src/libvterm/src/fullwidth.inc 2020-05-17 14:52:29.684716644 +0200
***************
*** 0 ****
--- 1,104 ----
+ { 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 },
*** ../vim-8.2.0775/src/libvterm/src/unicode.c 2019-12-04 22:08:30.000000000
+0100
--- src/libvterm/src/unicode.c 2020-05-17 14:55:34.748131951 +0200
***************
*** 591,598 ****
--- 591,605 ----
// ################################
// ### The rest added by Paul Evans
+ static const struct interval fullwidth[] = {
+ #include "fullwidth.inc"
+ };
+
INTERNAL int vterm_unicode_width(uint32_t codepoint)
{
+ if(bisearch(codepoint, fullwidth, sizeof(fullwidth) / sizeof(fullwidth[0])
- 1))
+ return 2;
+
return WCWIDTH_FUNCTION(codepoint);
}
*** ../vim-8.2.0775/src/version.c 2020-05-17 14:32:30.584490790 +0200
--- src/version.c 2020-05-17 14:58:49.535518882 +0200
***************
*** 748,749 ****
--- 748,751 ----
{ /* Add new patch number below this line */
+ /**/
+ 776,
/**/
--
Amnesia is one of my favorite words, but I forgot what it means.
/// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/202005171300.04HD0LvN014039%40masaka.moolenaar.net.
