diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-06-02 13:02:09 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-06-02 13:17:11 +0900 |
| commit | ab1d5d400536f83a43b65c9bcc347a900f6008b4 (patch) | |
| tree | b0a4ee4d142be9b3c171f933c43233ae303d6c0f /src/xftfont.c | |
| parent | fd380b4f5503a1d7b9d98fa4e69be61e93b52758 (diff) | |
| download | emacs-ab1d5d400536f83a43b65c9bcc347a900f6008b4.tar.gz emacs-ab1d5d400536f83a43b65c9bcc347a900f6008b4.tar.bz2 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/xftfont.c')
| -rw-r--r-- | src/xftfont.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xftfont.c b/src/xftfont.c index 08e4edb535a..c1b93b76f57 100644 --- a/src/xftfont.c +++ b/src/xftfont.c @@ -699,8 +699,8 @@ syms_of_xftfont_for_pdumper (void) xfthbfont_driver.type = Qxfthb; xfthbfont_driver.list = xfthbfont_list; xfthbfont_driver.match = xfthbfont_match; - xfthbfont_driver.shape = fthbfont_shape; - xfthbfont_driver.combining_capability = fthbfont_combining_capability; + xfthbfont_driver.shape = hbfont_shape; + xfthbfont_driver.combining_capability = hbfont_combining_capability; xfthbfont_driver.begin_hb_font = xfthbfont_begin_hb_font; xfthbfont_driver.end_hb_font = xfthbfont_end_hb_font; register_font_driver (&xfthbfont_driver, NULL); |