Mercurial > emacs

comparison src/ftfont.c @ 95745:bea43f586395

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(ftfont_pattern_entity): Adjusted for the change of font_intern_prop.
author Kenichi Handa <handa@m17n.org>
date Tue, 10 Jun 2008 02:07:53 +0000
parents d87a51f8851f
children dc8b6f0d85e8
comparison
equal deleted inserted replaced
95744:abc12b93e2dd 95745:bea43f586395
146 146
147 ASET (entity, FONT_TYPE_INDEX, Qfreetype); 147 ASET (entity, FONT_TYPE_INDEX, Qfreetype);
148 ASET (entity, FONT_REGISTRY_INDEX, registry); 148 ASET (entity, FONT_REGISTRY_INDEX, registry);
149 149
150 if (FcPatternGetString (p, FC_FOUNDRY, 0, (FcChar8 **) &str) == FcResultMatch) 150 if (FcPatternGetString (p, FC_FOUNDRY, 0, (FcChar8 **) &str) == FcResultMatch)
151 ASET (entity, FONT_FOUNDRY_INDEX, font_intern_prop (str, strlen (str))); 151 ASET (entity, FONT_FOUNDRY_INDEX, font_intern_prop (str, strlen (str), 1));
152 if (FcPatternGetString (p, FC_FAMILY, 0, (FcChar8 **) &str) == FcResultMatch) 152 if (FcPatternGetString (p, FC_FAMILY, 0, (FcChar8 **) &str) == FcResultMatch)
153 ASET (entity, FONT_FAMILY_INDEX, font_intern_prop (str, strlen (str))); 153 ASET (entity, FONT_FAMILY_INDEX, font_intern_prop (str, strlen (str), 1));
154 if (FcPatternGetInteger (p, FC_WEIGHT, 0, &numeric) == FcResultMatch) 154 if (FcPatternGetInteger (p, FC_WEIGHT, 0, &numeric) == FcResultMatch)
155 { 155 {
156 if (numeric >= FC_WEIGHT_REGULAR && numeric < FC_WEIGHT_MEDIUM) 156 if (numeric >= FC_WEIGHT_REGULAR && numeric < FC_WEIGHT_MEDIUM)
157 numeric = FC_WEIGHT_MEDIUM; 157 numeric = FC_WEIGHT_MEDIUM;
158 FONT_SET_STYLE (entity, FONT_WEIGHT_INDEX, make_number (numeric)); 158 FONT_SET_STYLE (entity, FONT_WEIGHT_INDEX, make_number (numeric));