diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2018-12-29 16:35:09 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2018-12-29 16:35:09 +0200 |
| commit | 48776b70115edf3775df19d80f734048dadff198 (patch) | |
| tree | 10a7e72a45bbbdf8dbfed4afce59fc9a5b975110 /src/xftfont.c | |
| parent | 1a80b5d9b8cfa0e523b596db5d1e7e6074dbee46 (diff) | |
| download | emacs-48776b70115edf3775df19d80f734048dadff198.tar.gz | |
Provide text directionality and language to HarfBuzz shaper
* lisp/language/tv-util.el (tai-viet-composition-function):
* lisp/language/ethio-util.el (ethio-composition-function):
* lisp/language/japanese.el (compose-gstring-for-variation-glyph):
* lisp/language/thai-util.el (thai-composition-function):
* lisp/language/misc-lang.el (arabic-shape-gstring):
* lisp/language/lao-util.el (lao-composition-function):
* lisp/language/hebrew.el (hebrew-shape-gstring):
* lisp/composite.el (compose-gstring-for-graphic)
(compose-gstring-for-dotted-circle, auto-compose-chars)
(compose-gstring-for-terminal): Accept 2nd argument DIRECTION; all
callers changed.
* src/composite.c (composition_reseat_it): Call
auto-composition-function with one more argument DIRECTION.
(syms_of_composite) <auto-composition-function>: Update the doc
string.
* src/ftfont.c (ftfont_shape_by_hb): Compute language and
direction, and set buffer properties accordingly.
* src/composite.c (autocmp_chars):
* src/w32uniscribe.c (uniscribe_shape):
* src/xftfont.c (xftfont_shape):
* src/ftfont.c (ftfont_shape, ftfont_shape_by_hb):
* src/font.c (Ffont_shape_gstring): Accept an additional argument
DIRECTION.
* src/macfont.m (lgstring_direction): New enum.
(mac_font_shape_1, mac_screen_font_shape, mac_font_shape):
Accept an additional argument specifying text direction. All
callers changed.
* src/font.c (syms_of_font): New symbols QL2R and QR2L.
* src/font.h (shape): Accept new argument DIRECTION. All
implementations changed. (Bug#33729)
(ftfont_shape): Update prototype.
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 56d0e30e24c..6f56c053bb7 100644 --- a/src/xftfont.c +++ b/src/xftfont.c @@ -674,13 +674,13 @@ xftfont_draw (struct glyph_string *s, int from, int to, int x, int y, #if (defined HAVE_M17N_FLT && defined HAVE_LIBOTF) || defined HAVE_HARFBUZZ static Lisp_Object -xftfont_shape (Lisp_Object lgstring) +xftfont_shape (Lisp_Object lgstring, Lisp_Object direction) { struct font *font = CHECK_FONT_GET_OBJECT (LGSTRING_FONT (lgstring)); struct xftfont_info *xftfont_info = (struct xftfont_info *) font; FT_Face ft_face = XftLockFace (xftfont_info->xftfont); xftfont_info->ft_size = ft_face->size; - Lisp_Object val = ftfont_shape (lgstring); + Lisp_Object val = ftfont_shape (lgstring, direction); XftUnlockFace (xftfont_info->xftfont); return val; } |