/*
- * $XFree86: xc/lib/fontconfig/src/fcmatch.c,v 1.15 2002/06/29 20:31:02 keithp Exp $
+ * $XFree86: xc/lib/fontconfig/src/fcmatch.c,v 1.17 2002/08/11 18:10:42 keithp Exp $
*
* Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
*
pe = FcPatternFindElt (pat, fe->object);
if (pe)
{
- int j;
- double score[NUM_MATCH_VALUES];
-
- for (j = 0; j < NUM_MATCH_VALUES; j++)
- score[j] = 0;
if (!FcCompareValueList (pe->object, pe->values,
- fe->values, &v, score, &result))
+ fe->values, &v, 0, &result))
{
FcPatternDestroy (new);
return 0;
}
- for (j = 0; j < NUM_MATCH_VALUES; j++)
- if (score[j] >= 100.0)
- {
- FcValueList *pv;
-
- for (pv = pe->values; pv; pv = pv->next)
- FcPatternAdd (new, fe->object, pv->value, FcTrue);
- break;
- }
}
else
v = fe->values->value;
if (!fe)
FcPatternAdd (new, pe->object, pe->values->value, FcTrue);
}
- FcConfigSubstitute (config, new, FcMatchFont);
+ FcConfigSubstituteWithPat (config, new, pat, FcMatchFont);
return new;
}