From: Kenichi Handa Date: Fri, 5 Dec 2008 12:26:58 +0000 (+0000) Subject: (ftfont_shape_by_flt): Use "combining" flt if the X-Git-Tag: emacs-pretest-23.0.90~1254 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7bf1bb2124e8991d62438e8ac06d34a628fa78fc;p=emacs.git (ftfont_shape_by_flt): Use "combining" flt if the second character is a combining character. --- diff --git a/src/ChangeLog b/src/ChangeLog index 6a40e75226c..c0797931289 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-12-05 Kenichi Handa + + * ftfont.c (ftfont_shape_by_flt): Use "combining" flt if the + second character is a combining character. + 2008-12-05 Eli Zaretskii * process.c (procfs_system_process_attributes): Don't use cmd, @@ -23,6 +28,7 @@ * coding.c (decode_coding_charset): Check type of an element of vector VALIDS. + (encode_coding_emacs_mule): Be sure to set `code'. * fontset.c (face_for_char): Handle invalid charset property correctly. diff --git a/src/ftfont.c b/src/ftfont.c index 23f6a3672d5..7d746ec2908 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -1866,7 +1866,8 @@ ftfont_shape_by_flt (lgstring, font, ft_face, otf) flt_font_ft.font = font; flt_font_ft.ft_face = ft_face; flt_font_ft.otf = otf; - if (ASCII_CHAR_P (gstring.glyphs[0].c)) + if (len > 1 + && gstring.glyphs[1].c >= 0x300 && gstring.glyphs[1].c <= 0x36F) /* A little bit ad hoc. Perhaps, shaper must get script and language information, and select a proper flt for them here. */