From f63baf9f0bba1088c2b12866226bf36d7b0c4474 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 19 Nov 2026 16:14:08 +0530 Subject: [PATCH] Fix shaping ignoring variation axes of fonts loaded from descriptors The HarfBuzz font was created before the named instance or axis coordinates were applied to the FreeType face and was only resynced if the face had a transform matrix. So shaping used the default variation coordinates, which broke fonts that substitute glyphs based on axis values via GSUB FeatureVariations, such as the cursive (CRSV) axis of Annotation Mono. Adds a test using a small subset of Annotation Mono (SIL OFL 1.1). Fixes #10897 --- docs/changelog.rst | 2 ++ kitty/fonts/render.py | 16 +++++++++++++--- kitty/freetype.c | 6 ++++++ kitty_tests/AnnotationMono-VF-subset.ttf | Bin 0 -> 18512 bytes kitty_tests/fonts.py | 22 ++++++++++++++++++++++ 5 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 kitty_tests/AnnotationMono-VF-subset.ttf diff --git a/docs/changelog.rst b/docs/changelog.rst index 29087fa0d..bfa4a04fc 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -131,6 +131,8 @@ Detailed list of changes - Fix animated images stopping when switching to a tab without animations and then back (:iss:`10894`) +- Linux: Fix variable fonts that use axis values to substitute glyphs, such as the cursive axis of Annotation Mono, not rendering the substituted glyphs (:iss:`10897`) + 0.51.0 [2026-11-18] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/kitty/fonts/render.py b/kitty/fonts/render.py index 84efd5935..34ff60e11 100644 --- a/kitty/fonts/render.py +++ b/kitty/fonts/render.py @@ -164,7 +164,7 @@ def create_narrow_symbols(opts: Options) -> tuple[tuple[int, int, int], ...]: return tuple((a, b, v) for (a, b), v in coalesce_symbol_maps(opts.narrow_symbols).items()) -descriptor_overrides: dict[int, tuple[str, bool, bool]] = {} +descriptor_overrides: dict[int, tuple[FontObject | str, bool, bool]] = {} def descriptor_for_idx(idx: int) -> tuple[FontObject | str, bool, bool]: @@ -236,9 +236,17 @@ class setup_for_testing: ynum = 100 baseline = 0 - def __init__(self, family: str = 'monospace', size: float = 11.0, dpi: float = 96.0, main_face_path: str = ''): + def __init__( + self, + family: str = 'monospace', + size: float = 11.0, + dpi: float = 96.0, + main_face_path: str = '', + main_face_descriptor: FontObject | None = None, + ): self.family, self.size, self.dpi = family, size, dpi self.main_face_path = main_face_path + self.main_face_descriptor = main_face_descriptor def __enter__(self) -> tuple[dict[tuple[int, int, int], bytes], int, int]: global descriptor_overrides @@ -253,7 +261,9 @@ class setup_for_testing: set_send_sprite_to_gpu(send_to_gpu) self.orig_desc_overrides = descriptor_overrides descriptor_overrides = {} - if self.main_face_path: + if self.main_face_descriptor is not None: + descriptor_overrides[0] = self.main_face_descriptor, False, False + elif self.main_face_path: descriptor_overrides[0] = self.main_face_path, False, False try: set_font_family(opts) diff --git a/kitty/freetype.c b/kitty/freetype.c index 9f3e5f9bf..9ee6136bb 100644 --- a/kitty/freetype.c +++ b/kitty/freetype.c @@ -417,6 +417,12 @@ face_from_descriptor(PyObject *descriptor, FONTS_DATA_HANDLE fg) { } if ((error = FT_Set_Var_Design_Coordinates(self->face, sz, coords))) return set_load_error(path, error); } + // The HarfBuzz font was created in init_ft_face() using the default + // variation coordinates, sync it with the ones set above, otherwise + // shaping ignores them, which breaks fonts that substitute glyphs based + // on axis values via GSUB FeatureVariations, see + // https://github.com/kovidgoyal/kitty/issues/10897 + if ((ns || axes) && self->harfbuzz_font) hb_ft_font_changed(self->harfbuzz_font); if (!create_features_for_face(postscript_name_for_face((PyObject *)self), PyDict_GetItemString(descriptor, "features"), &self->font_features)) return NULL; if (!read_matrix_from_descriptor(descriptor, &self->matrix, &self->has_matrix)) return NULL; diff --git a/kitty_tests/AnnotationMono-VF-subset.ttf b/kitty_tests/AnnotationMono-VF-subset.ttf new file mode 100644 index 0000000000000000000000000000000000000000..be2bbccc527d8bbeb8a2b584e3ad8bacac4c8147 GIT binary patch literal 18512 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