diff options
author | Patrick Lam <plam@MIT.EDU> | 2005-12-20 20:35:47 +0000 |
---|---|---|
committer | Patrick Lam <plam@MIT.EDU> | 2005-12-20 20:35:47 +0000 |
commit | 6f767cec491d354150a11491905ba59cc77a2659 (patch) | |
tree | a45681725e8fe7264f2a6622d70e020208d3b1b4 | |
parent | ec760b178a7bb1a60fe2fe5e205ef82922fde5b6 (diff) |
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.)
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | conf.d/10LohitGujarati.conf | 5 | ||||
-rw-r--r-- | src/fcfreetype.c | 9 |
3 files changed, 19 insertions, 3 deletions
@@ -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> * src/fccache.c (FcDirCacheOpen, FcDirCacheWrite): diff --git a/conf.d/10LohitGujarati.conf b/conf.d/10LohitGujarati.conf new file mode 100644 index 0000000..eb51f86 --- /dev/null +++ b/conf.d/10LohitGujarati.conf @@ -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>
\ No newline at end of file diff --git a/src/fcfreetype.c b/src/fcfreetype.c index 8cdc647..0b976f7 100644 --- a/src/fcfreetype.c +++ b/src/fcfreetype.c @@ -1555,17 +1555,20 @@ FcFreeTypeQuery (const FcChar8 *file, } #endif -#if 0 /* * Skip over PCF fonts that have no encoded characters; they're * 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 (!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; - } #endif + } if (!FcPatternAddCharSet (pat, FC_CHARSET, cs)) goto bail2; |