aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2008-09-17 11:48:15 +0000
committerKenichi Handa2008-09-17 11:48:15 +0000
commitfdf906797df515a2e03fc974eb1a8525dd105b59 (patch)
tree6fb2cc16828245f799cad82aea02413b8a26fc88 /src
parent2cf7c3d1677012bff79e9a5128d095f3f9d70191 (diff)
downloademacs-fdf906797df515a2e03fc974eb1a8525dd105b59.tar.gz
emacs-fdf906797df515a2e03fc974eb1a8525dd105b59.zip
(ftfont_shape_by_flt): Downcase family name.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/ftfont.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6dc57c60af7..4b4e4cfe089 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12008-09-17 Kenichi Handa <handa@m17n.org> 12008-09-17 Kenichi Handa <handa@m17n.org>
2 2
3 * ftfont.c (ftfont_shape_by_flt): Downcase family name.
4
3 * composite.c (Fcomposition_get_gstring): Make bigger gstring_work 5 * composite.c (Fcomposition_get_gstring): Make bigger gstring_work
4 if necessary. 6 if necessary.
5 7
diff --git a/src/ftfont.c b/src/ftfont.c
index d6fabf8a86b..b81a066a164 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1850,7 +1850,7 @@ ftfont_shape_by_flt (lgstring, font, ft_face, otf)
1850 flt_font_ft.flt_font.family = Mnil; 1850 flt_font_ft.flt_font.family = Mnil;
1851 else 1851 else
1852 flt_font_ft.flt_font.family 1852 flt_font_ft.flt_font.family
1853 = msymbol ((char *) SDATA (SYMBOL_NAME (family))); 1853 = msymbol ((char *) SDATA (Fdowncase (SYMBOL_NAME (family))));
1854 } 1854 }
1855 flt_font_ft.flt_font.x_ppem = ft_face->size->metrics.x_ppem; 1855 flt_font_ft.flt_font.x_ppem = ft_face->size->metrics.x_ppem;
1856 flt_font_ft.flt_font.y_ppem = ft_face->size->metrics.y_ppem; 1856 flt_font_ft.flt_font.y_ppem = ft_face->size->metrics.y_ppem;