Add a few more families to fonts.conf, make FC_ANTIALIAS less important for

    matching, fix family->generic mapping

diff --git a/src/fccfg.c b/src/fccfg.c
index baa1cbcc364c2c7924c9a4be37c45481adcc0b3c..e073b85098746a9ad880fe7cb8ca6baa33a61bfa 100644 (file)
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/fontconfig/src/fccfg.c,v 1.7 2002/05/29 08:21:33 keithp Exp $
+ * $XFree86: xc/lib/fontconfig/src/fccfg.c,v 1.11 2002/06/08 17:32:04 keithp Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -866,11 +866,12 @@ FcConfigEvaluate (FcPattern *p, FcExpr *e)
 static FcValueList *
 FcConfigMatchValueList (FcPattern      *p,
                        FcTest          *t,
-                       FcValueList     *v)
+                       FcValueList     *values)
 {
     FcValueList            *ret = 0;
     FcExpr         *e = t->expr;
     FcValue        value;
+    FcValueList            *v;
     
     while (e)
     {
@@ -885,7 +886,7 @@ FcConfigMatchValueList (FcPattern   *p,
            e = 0;
        }
 
-       for (; v; v = v->next)
+       for (v = values; v; v = v->next)
        {
            if (FcConfigCompareValue (v->value, t->op, value))
            {

diff --git a/src/fcmatch.c b/src/fcmatch.c
index a95e5f6c37d422d975ce6fbbb9d389b5ee271039..0b7f7d4c4db7b878a4001d1bf4c87d7d4281258d 100644 (file)
--- a/src/fcmatch.c
+++ b/src/fcmatch.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/fontconfig/src/fcmatch.c,v 1.9 2002/06/02 21:07:56 keithp Exp $
+ * $XFree86: xc/lib/fontconfig/src/fcmatch.c,v 1.11 2002/06/08 17:32:04 keithp Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -109,29 +109,29 @@ static FcMatcher _FcMatchers [] = {
     { FC_CHARSET,      FcCompareCharSet },
 #define MATCH_CHARSET  1
     
-    { FC_ANTIALIAS,    FcCompareBool, },
-#define MATCH_ANTIALIAS        2
-    
     { FC_LANG,         FcCompareString },
-#define MATCH_LANG     3
+#define MATCH_LANG     2
     
     { FC_FAMILY,       FcCompareString, },
-#define MATCH_FAMILY   4
+#define MATCH_FAMILY   3
     
     { FC_SPACING,      FcCompareInteger, },
-#define MATCH_SPACING  5
+#define MATCH_SPACING  4
     
     { FC_PIXEL_SIZE,   FcCompareSize, },
-#define MATCH_PIXEL_SIZE       6
+#define MATCH_PIXEL_SIZE       5
     
     { FC_STYLE,                FcCompareString, },
-#define MATCH_STYLE    7
+#define MATCH_STYLE    6
     
     { FC_SLANT,                FcCompareInteger, },
-#define MATCH_SLANT    8
+#define MATCH_SLANT    7
     
     { FC_WEIGHT,       FcCompareInteger, },
-#define MATCH_WEIGHT   9
+#define MATCH_WEIGHT   8
+    
+    { FC_ANTIALIAS,    FcCompareBool, },
+#define MATCH_ANTIALIAS        9
     
     { FC_RASTERIZER,   FcCompareString, },
 #define MATCH_RASTERIZER       10