comparison src/ftfont.c @ 100552:d8bfaced209a

(ftfont_open): Genarate a multibyte string if given names are utf-8.
author Kenichi Handa <handa@m17n.org>
date Fri, 19 Dec 2008 05:39:44 +0000
parents 611f0256259c
children e829a2083df5
comparison
equal deleted inserted replaced
100551:42e9e426d886 100552:d8bfaced209a
1065 1065
1066 font_object = font_make_object (VECSIZE (struct ftfont_info), entity, size); 1066 font_object = font_make_object (VECSIZE (struct ftfont_info), entity, size);
1067 ASET (font_object, FONT_TYPE_INDEX, Qfreetype); 1067 ASET (font_object, FONT_TYPE_INDEX, Qfreetype);
1068 len = font_unparse_xlfd (entity, size, name, 256); 1068 len = font_unparse_xlfd (entity, size, name, 256);
1069 if (len > 0) 1069 if (len > 0)
1070 ASET (font_object, FONT_NAME_INDEX, make_unibyte_string (name, len)); 1070 ASET (font_object, FONT_NAME_INDEX, make_string (name, len));
1071 len = font_unparse_fcname (entity, size, name, 256); 1071 len = font_unparse_fcname (entity, size, name, 256);
1072 if (len > 0) 1072 if (len > 0)
1073 ASET (font_object, FONT_FULLNAME_INDEX, make_unibyte_string (name, len)); 1073 ASET (font_object, FONT_FULLNAME_INDEX, make_string (name, len));
1074 else 1074 else
1075 ASET (font_object, FONT_FULLNAME_INDEX, 1075 ASET (font_object, FONT_FULLNAME_INDEX,
1076 AREF (font_object, FONT_NAME_INDEX)); 1076 AREF (font_object, FONT_NAME_INDEX));
1077 ASET (font_object, FONT_FILE_INDEX, filename); 1077 ASET (font_object, FONT_FILE_INDEX, filename);
1078 ASET (font_object, FONT_FORMAT_INDEX, ftfont_font_format (NULL, filename)); 1078 ASET (font_object, FONT_FORMAT_INDEX, ftfont_font_format (NULL, filename));