Restore code to skip over PCF fonts that have no encoded characters. (We

guess that a font is PCF by presence of the PIXEL_SIZE BDF property.)
This commit is contained in:
Patrick Lam 2005-12-20 20:35:47 +00:00
parent ec760b178a
commit 6f767cec49
3 changed files with 19 additions and 3 deletions

View File

@ -1,3 +1,11 @@
2005-12-20 Patrick Lam <plam@mit.edu>
* src/fcfreetype.c (FcFreeTypeQuery):
Restore code to skip over PCF fonts that have no encoded
characters.
(We guess that a font is PCF by presence of the PIXEL_SIZE
BDF property.)
2005-12-12 Patrick Lam <plam@mit.edu> 2005-12-12 Patrick Lam <plam@mit.edu>
* src/fccache.c (FcDirCacheOpen, FcDirCacheWrite): * src/fccache.c (FcDirCacheOpen, FcDirCacheWrite):

View File

@ -0,0 +1,5 @@
<!-- Available Gujarti fonts look much better without hinting -->
<match target="font">
<test name="family"><string>Lohit Gujarati</string></test>
<edit name="hinting"><bool>false</bool></edit>
</match>

View File

@ -1555,17 +1555,20 @@ FcFreeTypeQuery (const FcChar8 *file,
} }
#endif #endif
#if 0
/* /*
* Skip over PCF fonts that have no encoded characters; they're * Skip over PCF fonts that have no encoded characters; they're
* usually just Unicode fonts transcoded to some legacy encoding * usually just Unicode fonts transcoded to some legacy encoding
* ftglue.c forces us to approximate whether a font is a PCF font
* or not by whether it has any BDF properties. Try PIXEL_SIZE;
* I don't know how to get a list of BDF properties on the font. -PL
*/ */
if (FcCharSetCount (cs) == 0) if (FcCharSetCount (cs) == 0)
{ {
if (!strcmp(FT_MODULE_CLASS(&face->driver->root)->module_name, "pcf")) #if HAVE_FT_GET_BDF_PROPERTY
if(FT_Get_BDF_Property(face, "PIXEL_SIZE", &prop) == 0)
goto bail2; goto bail2;
}
#endif #endif
}
if (!FcPatternAddCharSet (pat, FC_CHARSET, cs)) if (!FcPatternAddCharSet (pat, FC_CHARSET, cs))
goto bail2; goto bail2;