walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

matching, fix family->generic mapping
This commit is contained in:
Keith Packard 2002-06-18 22:23:05 +00:00
parent 2623c1ebee
commit f534109f5a
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/fccfg.c
View File

@ -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. * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
* *
@ -866,11 +866,12 @@ FcConfigEvaluate (FcPattern *p, FcExpr *e)
static FcValueList * static FcValueList *
FcConfigMatchValueList (FcPattern *p, FcConfigMatchValueList (FcPattern *p,
FcTest *t, FcTest *t,
FcValueList *v) FcValueList *values)
{ {
FcValueList *ret = 0; FcValueList *ret = 0;
FcExpr *e = t->expr; FcExpr *e = t->expr;
FcValue value; FcValue value;
FcValueList *v;
while (e) while (e)
{ {
@ -885,7 +886,7 @@ FcConfigMatchValueList (FcPattern *p,
e = 0; e = 0;
} }
for (; v; v = v->next) for (v = values; v; v = v->next)
{ {
if (FcConfigCompareValue (v->value, t->op, value)) if (FcConfigCompareValue (v->value, t->op, value))
{ {

22
src/fcmatch.c
View File

@ -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. * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
* *
@ -109,29 +109,29 @@ static FcMatcher _FcMatchers [] = {
{ FC_CHARSET, FcCompareCharSet }, { FC_CHARSET, FcCompareCharSet },
#define MATCH_CHARSET 1 #define MATCH_CHARSET 1
{ FC_ANTIALIAS, FcCompareBool, },
#define MATCH_ANTIALIAS 2
{ FC_LANG, FcCompareString }, { FC_LANG, FcCompareString },
#define MATCH_LANG 3 #define MATCH_LANG 2
{ FC_FAMILY, FcCompareString, }, { FC_FAMILY, FcCompareString, },
#define MATCH_FAMILY 4 #define MATCH_FAMILY 3
{ FC_SPACING, FcCompareInteger, }, { FC_SPACING, FcCompareInteger, },
#define MATCH_SPACING 5 #define MATCH_SPACING 4
{ FC_PIXEL_SIZE, FcCompareSize, }, { FC_PIXEL_SIZE, FcCompareSize, },
#define MATCH_PIXEL_SIZE 6 #define MATCH_PIXEL_SIZE 5
{ FC_STYLE, FcCompareString, }, { FC_STYLE, FcCompareString, },
#define MATCH_STYLE 7 #define MATCH_STYLE 6
{ FC_SLANT, FcCompareInteger, }, { FC_SLANT, FcCompareInteger, },
#define MATCH_SLANT 8 #define MATCH_SLANT 7
{ FC_WEIGHT, FcCompareInteger, }, { FC_WEIGHT, FcCompareInteger, },
#define MATCH_WEIGHT 9 #define MATCH_WEIGHT 8
{ FC_ANTIALIAS, FcCompareBool, },
#define MATCH_ANTIALIAS 9
{ FC_RASTERIZER, FcCompareString, }, { FC_RASTERIZER, FcCompareString, },
#define MATCH_RASTERIZER 10 #define MATCH_RASTERIZER 10