diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2022-09-23 14:56:54 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2022-09-23 14:56:54 +0200 |
| commit | 7aa771a4824c389c114796e3f318f9f5809f9c5f (patch) | |
| tree | a9f093f24adf57e2ec9c0b3d740a3b41110db3ea /src/ftcrfont.c | |
| parent | e359df4217a392bb3185ff7449656c0a8953a6f4 (diff) | |
| parent | 60ac12d21f9b5a97c33efc639c8204c39367292b (diff) | |
| download | emacs-7aa771a4824c389c114796e3f318f9f5809f9c5f.tar.gz | |
Merge from origin/emacs-28
60ac12d21f Fix shaping with bitmap-only fonts on HarfBuzz 5.2.0 (Bug#...
9f65e52362 ; Minor copyedits of elisp.texi
Diffstat (limited to 'src/ftcrfont.c')
| -rw-r--r-- | src/ftcrfont.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/ftcrfont.c b/src/ftcrfont.c index e089f9dea85..a02ff99870e 100644 --- a/src/ftcrfont.c +++ b/src/ftcrfont.c @@ -679,8 +679,12 @@ ftcrhbfont_begin_hb_font (struct font *font, double *position_unit) hb_font_t *hb_font = fthbfont_begin_hb_font (font, position_unit); /* HarfBuzz 5 correctly scales bitmap-only fonts without position unit adjustment. - (https://github.com/harfbuzz/harfbuzz/issues/489) */ - if (!hb_version_atleast (5, 0, 0) + (https://github.com/harfbuzz/harfbuzz/issues/489) + + Update: HarfBuzz 5.2.0 no longer does this for an hb_font_t font + object created from a given FT_Face. + (https://github.com/harfbuzz/harfbuzz/issues/3788) */ + if ((hb_version_atleast (5, 2, 0) || !hb_version_atleast (5, 0, 0)) && ftcrfont_info->bitmap_position_unit) *position_unit = ftcrfont_info->bitmap_position_unit; |