Commit ab1d5d40 authored by YAMAMOTO Mitsuharu's avatar YAMAMOTO Mitsuharu

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.
parent fd380b4f
......@@ -928,9 +928,7 @@ extern void ftfont_filter_properties (Lisp_Object, Lisp_Object);
extern void ftfont_text_extents (struct font *, const unsigned *, int,
struct font_metrics *);
#ifdef HAVE_HARFBUZZ
extern Lisp_Object fthbfont_combining_capability (struct font *);
extern hb_font_t *fthbfont_begin_hb_font (struct font *, double *);
extern Lisp_Object fthbfont_shape (Lisp_Object, Lisp_Object);
#endif /* HAVE_HARFBUZZ */
extern void syms_of_ftfont (void);
#endif /* HAVE_FREETYPE */
......
......@@ -612,8 +612,8 @@ syms_of_ftcrfont_for_pdumper (void)
ftcrhbfont_driver.type = Qftcrhb;
ftcrhbfont_driver.list = ftcrhbfont_list;
ftcrhbfont_driver.match = ftcrhbfont_match;
ftcrhbfont_driver.shape = fthbfont_shape;
ftcrhbfont_driver.combining_capability = fthbfont_combining_capability;
ftcrhbfont_driver.shape = hbfont_shape;
ftcrhbfont_driver.combining_capability = hbfont_combining_capability;
ftcrhbfont_driver.begin_hb_font = ftcrhbfont_begin_hb_font;
ftcrhbfont_driver.end_hb_font = ftcrhbfont_end_hb_font;
register_font_driver (&ftcrhbfont_driver, NULL);
......
This diff is collapsed.
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment