Don't kill fonts because they don't declare an element that's being matched

    on.
reviewed by: plam

diff --git a/ChangeLog b/ChangeLog
index d5224a790fefdb3456cb166a180690a01363d054..23e74e2dffbfcc1158d999c08bebb4f506a5b04d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-10  Takashi Iwai  <tiwai@suse.de>
+       reviewed by: plam
+       * src/fcmatch.c (FcFontSetMatch):
+
+       Don't kill fonts because they don't declare an element that's
+       being matched on.
+
 2006-02-09  Patrick Lam  <plam@mit.edu>
        * src/fccache.c (FcGlobalCacheLoad, FcGlobalCacheSave,
                         FcDirCacheUnlink, FcDirCacheOpen, FcDirCacheWrite):

diff --git a/src/fcmatch.c b/src/fcmatch.c
index cf702c65db2ce008679160ab57ab078448c3a0bd..30336ffdd4ab4e51d97593215fe0eded2b0e0c79 100644 (file)
--- a/src/fcmatch.c
+++ b/src/fcmatch.c
@@ -673,6 +673,10 @@ FcFontSetMatch (FcConfig    *config,
                        }
                    }
 
+                   /* We had no matching, just try the next one */
+                   if (score == 1e99)
+                       continue;
+
                    /* If there's a previous champion, and current score
                     * beats previous best score, on this element, then
                     * knock out the previous champion and anything