Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 10:27:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

(ftfont_shape_by_flt): Use "combining" flt if the

Browse source 
second character is a combining character.
This commit is contained in:
Kenichi Handa 2008-12-05 12:26:58 +00:00
parent 2fdc7d0031
commit 7bf1bb2124
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,8 @@
2008-12-05 Kenichi Handa <handa@m17n.org>
* ftfont.c (ftfont_shape_by_flt): Use "combining" flt if the
second character is a combining character.
2008-12-05 Eli Zaretskii <eliz@gnu.org>
* 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.

3
src/ftfont.c
View file

@ -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. */