From 188e91fb65773982a7ddb08cc1ce672c3dde59c0 Mon Sep 17 00:00:00 2001 From: handa Date: Mon, 2 Oct 2006 12:33:08 +0000 Subject: [PATCH] *** empty log message *** --- src/ChangeLog | 21 +++++++++++++++++++++ src/font-ft.c | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index c9b0d04..93539a0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,24 @@ +2006-10-02 Kenichi Handa + + * font.h (struct MFont): New member `multiple_sizes'. Bit-size of + `size' changed to 24. + + * font.c (xlfd_unparse_name): Adjusted for the change of + MFont->size. + (font_score): Likewise. + (mfont__set_spec_from_face): Set spec->multiple_sizes to 0. + + * m17n-X.c (MFontX, _MFontX): Deleted. + (SET_SIZE, HAVE_SIZE): Deleted. + (free_display_info): Adjusted for the change of + disp_info->font_list format. + (xfont_registry_list): Likewise. + (xfont_open): Likewise. + (xfont_list): Likewise. + (xfont_encode_char): Ignore size to find a realized font. + (MRealizedFontXft): Change the order of members to make it + compatible with MRealizedFontFT. + 2006-09-27 Kenichi Handa * font.c (mfont_match_p, mfont_open, mfont_encapsulate) diff --git a/src/font-ft.c b/src/font-ft.c index fb1c783..e49399b 100644 --- a/src/font-ft.c +++ b/src/font-ft.c @@ -83,7 +83,7 @@ typedef struct typedef struct { M17NObject control; - FT_Face ft_face; + FT_Face ft_face; /* This must be the 2nd member. */ MPlist *charmap_list; int face_encapsulated; } MRealizedFontFT; -- 1.7.10.4