From f534109f5aa44ffeb43acbe06b409e6a15239ac9 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 18 Jun 2002 22:23:05 +0000
Subject: [PATCH] Add a few more families to fonts.conf, make FC_ANTIALIAS less
 important for     matching, fix family->generic mapping

---
 src/fccfg.c   |  7 ++++---
 src/fcmatch.c | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/fccfg.c b/src/fccfg.c
index baa1cbc..e073b85 100644
--- 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 a95e5f6..0b7f7d4 100644
--- 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
-- 
2.39.2