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.)

diff --git a/ChangeLog b/ChangeLog
index c6d79dd316f3e47b7f01d1a22bf6c188a8846c88..f296a88ddbf4561a35e9b38eddb5b3c3d7b80305 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 (file)
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 8cdc647c2cd6fd419049ec3b4e94cd3246e933dc..0b976f70c85f763abb238fe876083ea702132e86 100644 (file)
--- 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;