diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-10 16:56:50 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-10 16:56:50 -0800 |
commit | 8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (patch) | |
tree | c8129448cbbf387fe82667ccac02983592c688f1 /src/ftfont.c | |
parent | 85a83e2e2585a1906dec5168ed96ad521b5849ed (diff) | |
parent | 7b9d523a07395ecea505be88f45c33d73aea7038 (diff) |
Merge from trunk.
Diffstat (limited to 'src/ftfont.c')
-rw-r--r-- | src/ftfont.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 9da4a98d692..2f0643a31e0 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -164,6 +164,13 @@ get_adstyle_property (FcPattern *p) char *str, *end; Lisp_Object adstyle; +#ifdef FC_FONTFORMAT + if ((FcPatternGetString (p, FC_FONTFORMAT, 0, &fcstr) == FcResultMatch) + && xstrcasecmp ((char *) fcstr, "bdf") != 0 + && xstrcasecmp ((char *) fcstr, "pcf") != 0) + /* Not a BDF nor PCF font. */ + return Qnil; +#endif if (FcPatternGetString (p, FC_STYLE, 0, &fcstr) != FcResultMatch) return Qnil; str = (char *) fcstr; @@ -272,7 +279,7 @@ ftfont_pattern_entity (FcPattern *p, Lisp_Object extra) } else { - /* As this font is not scalable, parhaps this is a BDF or PCF + /* As this font is not scalable, perhaps this is a BDF or PCF font. */ FT_Face ft_face; @@ -730,7 +737,7 @@ ftfont_spec_pattern (Lisp_Object spec, char *otlayout, struct OpenTypeSpec **ots if ((n = FONT_SLANT_NUMERIC (spec)) >= 0 && n < 100) - /* Fontconfig doesn't support reverse-italic/obligue. */ + /* Fontconfig doesn't support reverse-italic/oblique. */ return NULL; if (INTEGERP (AREF (spec, FONT_DPI_INDEX))) @@ -1462,7 +1469,7 @@ ftfont_get_bitmap (struct font *font, unsigned int code, struct font_bitmap *bit : ft_face->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_LCD_V ? 8 : -1); if (bitmap->bits_per_pixel < 0) - /* We don't suport that kind of pixel mode. */ + /* We don't support that kind of pixel mode. */ return -1; bitmap->rows = ft_face->glyph->bitmap.rows; bitmap->width = ft_face->glyph->bitmap.width; |