diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-06-25 18:42:23 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-06-25 18:42:23 +0000 |
| commit | 0ff8f72a9d653269dd6127cc66322690c8a4b90f (patch) | |
| tree | 763b07ce52fc31a3fadb3388ce72c0081bd00c97 | |
| parent | doc: benchark: laptop results for 1.8.0 (diff) | |
vt: don’t reset utf8proc grapheme state when we’re not at a grapheme break
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | vt.c | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 01cf1fdc..3934dadf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,10 @@ ### Deprecated ### Removed ### Fixed + +* Grapheme cluster state being reset between codepoints. + + ### Security ### Contributors @@ -639,10 +639,10 @@ action_utf8_print(struct terminal *term, wchar_t wc) #if defined(FOOT_GRAPHEME_CLUSTERING) if (grapheme_clustering) { /* Check if we're on a grapheme cluster break */ - /* Note: utf8proc fails to ZWJ */ - if (utf8proc_grapheme_break_stateful(last, wc, &term->vt.grapheme_state) && - last != 0x200d /* ZWJ */) + if (utf8proc_grapheme_break_stateful( + last, wc, &term->vt.grapheme_state)) { + term_reset_grapheme_state(term); goto out; } } @@ -682,6 +682,7 @@ action_utf8_print(struct terminal *term, wchar_t wc) { wc = precomposed; width = precomposed_width; + term_reset_grapheme_state(term); goto out; } } @@ -746,6 +747,7 @@ action_utf8_print(struct terminal *term, wchar_t wc) * character chains. Fall through here and print the * current zero-width character to the current cell */ LOG_WARN("maximum number of composed characters reached"); + term_reset_grapheme_state(term); goto out; } @@ -780,10 +782,11 @@ action_utf8_print(struct terminal *term, wchar_t wc) xassert(wc <= CELL_COMB_CHARS_HI); goto out; } - } + } else + term_reset_grapheme_state(term); + out: - term_reset_grapheme_state(term); if (width > 0) term_print(term, wc, width); } |
