blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-10 01:29:05 -04:00
Code Issues Projects Releases Wiki Activity

[EGCcore] property variation is 0 columns, as is ZWJ #2315

Browse Source
This commit is contained in:
nick black 2021-11-02 10:10:15 -05:00
parent 8872cf73ab
commit 8d08e14912
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/egcpool.h
View File

@ -9,8 +9,9 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unigbrk.h>
#include <stdbool.h> #include <stdbool.h>
#include <unigbrk.h>
#include <unictype.h>
#include "notcurses/notcurses.h" #include "notcurses/notcurses.h"
#include "compat/compat.h" #include "compat/compat.h"
#include "logging.h" #include "logging.h"
@ -109,23 +110,34 @@ utf8_egc_len(const char* gcluster, int* colcount){
if(prevw && !injoin && uc_is_grapheme_break(prevw, wc)){ if(prevw && !injoin && uc_is_grapheme_break(prevw, wc)){
break; // starts a new EGC, exit and do not claim break; // starts a new EGC, exit and do not claim
} }
if(uc_is_property_variation_selector(wc)){ // ends EGC
ret += r;
break;
}
int cols = wcwidth(wc); int cols = wcwidth(wc);
if(cols < 0){ if(cols < 0){
injoin = false;
if(iswspace(wc)){ // newline or tab if(iswspace(wc)){ // newline or tab
return ret + 1; return ret + 1;
} }
if(iswcntrl(wc)){ cols = 1;
if(wc == L'\u200d'){ // ZWJ is iswcntrl, so check it first
injoin = true;
cols = 0;
}else if(iswcntrl(wc)){
logerror("prohibited or invalid Unicode: 0x%x\n", wc); logerror("prohibited or invalid Unicode: 0x%x\n", wc);
return -1; return -1;
} }
cols = 1; }else if(injoin){
cols = 0;
injoin = false;
} }
injoin = (wc == L'\u200d');
*colcount += cols; *colcount += cols;
ret += r; ret += r;
gcluster += r; gcluster += r;
prevw = wc; prevw = wc;
}while(r); }while(r);
// FIXME what if injoin is set? incomplete EGC!
return ret; return ret;
} }