From 94583703e12fc46a1ca16718a18579f8db2be0f8 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 24 Jun 2024 20:21:46 +0200 Subject: vt: don't ignore VS-15 (text presentation) When we encounter either VS-15 or VS-16, set the grapheme width to 1 or 2 explicitly. --- vt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'vt.c') diff --git a/vt.c b/vt.c index a8a0f0fb..41bb305d 100644 --- a/vt.c +++ b/vt.c @@ -852,9 +852,11 @@ action_utf8_print(struct terminal *term, char32_t wc) break; case GRAPHEME_WIDTH_DOUBLE: + new_cc->width = min(grapheme_width + width, 2); + #if defined(FOOT_GRAPHEME_CLUSTERING) if (unlikely(grapheme_clustering && - wc == 0xfe0f && + (wc == 0xfe0e || wc == 0xfe0f) && new_cc->count == 2)) { /* Only emojis should be affected by VS16 */ @@ -862,11 +864,10 @@ action_utf8_print(struct terminal *term, char32_t wc) utf8proc_get_property(new_cc->chars[0]); if (props->boundclass == UTF8PROC_BOUNDCLASS_EXTENDED_PICTOGRAPHIC) - width = 2; + new_cc->width = wc - 0xfe0d; /* 1 for VS-15, 2 for VS-16 */ } #endif - new_cc->width = min(grapheme_width + width, 2); break; case GRAPHEME_WIDTH_WCSWIDTH: -- cgit v1.3