summaryrefslogtreecommitdiff
path: root/src/ftfont.c
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2008-12-05 12:26:58 +0000
committerKenichi Handa <handa@m17n.org>2008-12-05 12:26:58 +0000
commit7bf1bb2124e8991d62438e8ac06d34a628fa78fc (patch)
treec87e2c5cb4acdaa7c6db85fa6d032589cab7f483 /src/ftfont.c
parent2fdc7d00310ccd6fc443ff14e60f6cca434fc657 (diff)
downloademacs-7bf1bb2124e8991d62438e8ac06d34a628fa78fc.tar.gz
emacs-7bf1bb2124e8991d62438e8ac06d34a628fa78fc.tar.bz2
emacs-7bf1bb2124e8991d62438e8ac06d34a628fa78fc.zip
(ftfont_shape_by_flt): Use "combining" flt if the
second character is a combining character.
Diffstat (limited to 'src/ftfont.c')
-rw-r--r--src/ftfont.c3
1 files changed, 2 insertions, 1 deletions
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. */