Skip to content

Fix: PUA/Nerd Font character width #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jelso13 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: PUA/Nerd Font character width #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/utf8.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,10 @@ int mk_wcwidth(wchar_t ucs)
if (width == widechar_ambiguous)
return 1;

// Interpret Private Use Area (PUA) characters as 1 char for Nerd Fonts
if (width == widechar_private_use)
return 1;

// Emoji pictographs (U+1F300+) — width 2 in modern terminals
if ((ucs >= 0x1F300 && ucs <= 0x1F9FF) || // Misc Symbols, Pictographs, Emoticons, Supplemental
(ucs >= 0x1FA00 && ucs <= 0x1FAFF)) // Symbols and Pictographs Extended-A
Expand Down
5 changes: 5 additions & 0 deletions test/utf8.t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,11 @@ int main (int, char**)
t.is (mk_wcwidth (0x1F602), 2, "mk_wcwidth U+1F602 '😂' --> 2");
t.is (mk_wcwidth (0x1F64F), 2, "mk_wcwidth U+1F64F '🙏' --> 2");

// Nerd Fonts
t.is (mk_wcwidth (0xF023), 1, "mk_wcwidth U+F023'' --> 1");
t.is (mk_wcwidth (0xF023), 1, "mk_wcwidth U+F023'' --> 1");
t.is (mk_wcwidth (0xF023), 1, "mk_wcwidth U+F023'' --> 1");

t.is (mk_wcwidth (0x5149), 2, "mk_wcwidth U+5149 --> 2");
t.is (mk_wcwidth (0x9a8c), 2, "mk_wcwidth U+9a8c --> 2");
t.is (mk_wcwidth (0x4e70), 2, "mk_wcwidth U+4e70 --> 2");
Expand Down