diff options
| author | YAMAMOTO Mitsuharu | 2019-06-02 13:02:09 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2019-06-02 13:17:11 +0900 |
| commit | ab1d5d400536f83a43b65c9bcc347a900f6008b4 (patch) | |
| tree | b0a4ee4d142be9b3c171f933c43233ae303d6c0f /src/font.h | |
| parent | fd380b4f5503a1d7b9d98fa4e69be61e93b52758 (diff) | |
| download | emacs-ab1d5d400536f83a43b65c9bcc347a900f6008b4.tar.gz emacs-ab1d5d400536f83a43b65c9bcc347a900f6008b4.zip | |
Make fthbfont and derivatives use common HarfBuzz code in hbfont.c
* src/font.h (fthbfont_shape, fthbfont_combining_capability)
[HAVE_HARFBUZZ]: Remove prototypes.
* src/ftfont.c: Don't include math.h.
(uni_combining, uni_general, uni_mirroring, get_hb_unicode_funcs)
(fthbfont_shape_by_hb, fthbfont_combining_capability, fthbfont_shape)
[HAVE_HARFBUZZ]: Remove functions.
* src/ftfont.c (syms_of_ftfont_for_pdumper) [HAVE_HARFBUZZ]:
* src/xftfont.c (syms_of_xftfont_for_pdumper) [HAVE_HARFBUZZ]:
* src/ftcrfont.c (syms_of_ftcrfont_for_pdumper) [HAVE_HARFBUZZ]: Use
hbfont_shape and hbfont_combining_capability instead of fthbfont_shape
and fthbfont_combining_capability, respectively.
Diffstat (limited to 'src/font.h')
| -rw-r--r-- | src/font.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/font.h b/src/font.h index 99b95836d7a..1f35744642b 100644 --- a/src/font.h +++ b/src/font.h | |||
| @@ -928,9 +928,7 @@ extern void ftfont_filter_properties (Lisp_Object, Lisp_Object); | |||
| 928 | extern void ftfont_text_extents (struct font *, const unsigned *, int, | 928 | extern void ftfont_text_extents (struct font *, const unsigned *, int, |
| 929 | struct font_metrics *); | 929 | struct font_metrics *); |
| 930 | #ifdef HAVE_HARFBUZZ | 930 | #ifdef HAVE_HARFBUZZ |
| 931 | extern Lisp_Object fthbfont_combining_capability (struct font *); | ||
| 932 | extern hb_font_t *fthbfont_begin_hb_font (struct font *, double *); | 931 | extern hb_font_t *fthbfont_begin_hb_font (struct font *, double *); |
| 933 | extern Lisp_Object fthbfont_shape (Lisp_Object, Lisp_Object); | ||
| 934 | #endif /* HAVE_HARFBUZZ */ | 932 | #endif /* HAVE_HARFBUZZ */ |
| 935 | extern void syms_of_ftfont (void); | 933 | extern void syms_of_ftfont (void); |
| 936 | #endif /* HAVE_FREETYPE */ | 934 | #endif /* HAVE_FREETYPE */ |