matching, fix family->generic mapping
- * $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.
*
*
* Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
*
static FcValueList *
FcConfigMatchValueList (FcPattern *p,
FcTest *t,
static FcValueList *
FcConfigMatchValueList (FcPattern *p,
FcTest *t,
{
FcValueList *ret = 0;
FcExpr *e = t->expr;
FcValue value;
{
FcValueList *ret = 0;
FcExpr *e = t->expr;
FcValue value;
+ for (v = values; v; v = v->next)
{
if (FcConfigCompareValue (v->value, t->op, value))
{
{
if (FcConfigCompareValue (v->value, t->op, value))
{
- * $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.
*
*
* Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
*
{ FC_CHARSET, FcCompareCharSet },
#define MATCH_CHARSET 1
{ FC_CHARSET, FcCompareCharSet },
#define MATCH_CHARSET 1
- { FC_ANTIALIAS, FcCompareBool, },
-#define MATCH_ANTIALIAS 2
-
{ FC_LANG, FcCompareString },
{ FC_LANG, FcCompareString },
{ FC_FAMILY, FcCompareString, },
{ FC_FAMILY, FcCompareString, },
{ FC_SPACING, FcCompareInteger, },
{ FC_SPACING, FcCompareInteger, },
{ FC_PIXEL_SIZE, FcCompareSize, },
{ FC_PIXEL_SIZE, FcCompareSize, },
-#define MATCH_PIXEL_SIZE 6
+#define MATCH_PIXEL_SIZE 5
{ FC_STYLE, FcCompareString, },
{ FC_STYLE, FcCompareString, },
{ FC_SLANT, FcCompareInteger, },
{ FC_SLANT, FcCompareInteger, },
{ FC_WEIGHT, FcCompareInteger, },
{ FC_WEIGHT, FcCompareInteger, },
+#define MATCH_WEIGHT 8
+
+ { FC_ANTIALIAS, FcCompareBool, },
+#define MATCH_ANTIALIAS 9
{ FC_RASTERIZER, FcCompareString, },
#define MATCH_RASTERIZER 10
{ FC_RASTERIZER, FcCompareString, },
#define MATCH_RASTERIZER 10