(ftfont_resolve_generic_family): Remove foundry from

pattern before matching the generic family.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9ad4e8558591ef48f1785d4afd89f1bfb29b1c28..a7578f2fe655c40dd4bd151337fbe9b8881a075c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-10  Andreas Schwab  <schwab@suse.de>
+
+       * ftfont.c (ftfont_resolve_generic_family): Remove foundry from
+       pattern before matching the generic family.
+
 2008-07-10  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * unexec.c:

diff --git a/src/ftfont.c b/src/ftfont.c
index 31286a182c59fa69ffca197ef67f41f60c1eeba7..131e4b8aed16f02713546a240edacd35bc57060a 100644 (file)
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -221,6 +221,7 @@ ftfont_resolve_generic_family (family, pattern)
   pattern = FcPatternDuplicate (pattern);
   if (! pattern)
     goto err;
+  FcPatternDel (pattern, FC_FOUNDRY);
   FcPatternDel (pattern, FC_FAMILY);
   FcPatternAddString (pattern, FC_FAMILY, SYMBOL_FcChar8 (family));
   FcConfigSubstitute (NULL, pattern, FcMatchPattern);