KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '4721-lig-check-fallback' of https://github.com/nickwynja/kitty

Browse Source
This commit is contained in:
Kovid Goyal 2022-02-23 07:57:36 +05:30
commit 3c6766ff06
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kitty/fonts.c
View File

@ -851,6 +851,19 @@ detect_spacer_strategy(hb_font_t *hbf, Font *font) {
} }
} }
} }
// If spacer_strategy is still default, check ### glyph to to confirm strategy
// https://github.com/kovidgoyal/kitty/issues/4721
if (font->spacer_strategy == SPACERS_BEFORE) {
CPUCell cpu_cells[3] = {{.ch = '#'}, {.ch = '#'}, {.ch = '#'}};
shape(cpu_cells, gpu_cells, arraysz(cpu_cells), hbf, font, false);
if (G(num_glyphs) > 1) {
glyph_index glyph_id = G(info)[G(num_glyphs) - 1].codepoint;
bool is_special = is_special_glyph(glyph_id, font, &G(current_cell_data));
bool is_empty = is_special && is_empty_glyph(glyph_id, font);
if (is_empty) font->spacer_strategy = SPACERS_AFTER;
}
}
} }
static LigatureType static LigatureType
@ -962,7 +975,7 @@ group_normal(Font *font, hb_font_t *hbf) {
* *
* We rely on the cluster numbers from harfbuzz to tell us how many unicode codepoints a glyph corresponds to. * We rely on the cluster numbers from harfbuzz to tell us how many unicode codepoints a glyph corresponds to.
* Then we check if the glyph is a ligature glyph (is_special_glyph) and if it is an empty glyph. * Then we check if the glyph is a ligature glyph (is_special_glyph) and if it is an empty glyph.
* We detect if the font uses EMPTY glyphs before or after ligature glyphs (1. or 3. above) by checking what it does for ===. * We detect if the font uses EMPTY glyphs before or after ligature glyphs (1. or 3. above) by checking what it does for === and ###.
* Finally we look at the glyph name. These five datapoints give us enough information to satisfy the constraint above, * Finally we look at the glyph name. These five datapoints give us enough information to satisfy the constraint above,
* for a wide variety of fonts. * for a wide variety of fonts.
*/ */