/*
- * $XFree86: xc/lib/fontconfig/src/fcmatch.c,v 1.7 2002/05/29 22:07:33 keithp Exp $
+ * $XFree86: xc/lib/fontconfig/src/fcmatch.c,v 1.16 2002/07/06 23:47:44 keithp Exp $
*
* Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
*
return (double) FcStrCmpIgnoreCase (value1.u.s, value2.u.s) != 0;
}
+static double
+FcCompareFamily (char *object, FcValue value1, FcValue value2)
+{
+ if (value2.type != FcTypeString || value1.type != FcTypeString)
+ return -1.0;
+ return (double) FcStrCmpIgnoreBlanksAndCase (value1.u.s, value2.u.s) != 0;
+}
+
+static double
+FcCompareLang (char *object, FcValue value1, FcValue value2)
+{
+ FcLangResult result;
+
+ if (value2.type != FcTypeString || value1.type != FcTypeString)
+ return -1.0;
+ result = FcLangCompare (value1.u.s, value2.u.s);
+ switch (result) {
+ case FcLangEqual:
+ return 0;
+ case FcLangDifferentCountry:
+ return 1;
+ case FcLangDifferentLang:
+ default:
+ return 2;
+ }
+}
+
static double
FcCompareBool (char *object, FcValue value1, FcValue value2)
{
return v;
}
+typedef struct _FcMatcher {
+ char *object;
+ double (*compare) (char *object, FcValue value1, FcValue value2);
+ int strong, weak;
+} FcMatcher;
+
/*
* Order is significant, it defines the precedence of
* each value, earlier values are more significant than
* later values
*/
static FcMatcher _FcMatchers [] = {
- { FC_FOUNDRY, FcCompareString, },
-#define MATCH_FOUNDRY 0
+ { FC_FOUNDRY, FcCompareString, 0, 0 },
+#define MATCH_FOUNDRY 0
- { FC_CHARSET, FcCompareCharSet },
-#define MATCH_CHARSET 1
+ { FC_CHARSET, FcCompareCharSet, 1, 1 },
+#define MATCH_CHARSET 1
- { FC_ANTIALIAS, FcCompareBool, },
-#define MATCH_ANTIALIAS 2
+ { FC_FAMILY, FcCompareFamily, 2, 4 },
+#define MATCH_FAMILY 2
- { FC_LANG, FcCompareString },
-#define MATCH_LANG 3
+ { FC_LANG, FcCompareLang, 3, 3 },
+#define MATCH_LANG 3
- { FC_FAMILY, FcCompareString, },
-#define MATCH_FAMILY 4
+ { FC_SPACING, FcCompareInteger, 5, 5 },
+#define MATCH_SPACING 4
- { FC_SPACING, FcCompareInteger, },
-#define MATCH_SPACING 5
+ { FC_PIXEL_SIZE, FcCompareSize, 6, 6 },
+#define MATCH_PIXEL_SIZE 5
- { FC_PIXEL_SIZE, FcCompareSize, },
-#define MATCH_PIXEL_SIZE 6
+ { FC_STYLE, FcCompareString, 7, 7 },
+#define MATCH_STYLE 6
- { FC_STYLE, FcCompareString, },
-#define MATCH_STYLE 7
+ { FC_SLANT, FcCompareInteger, 8, 8 },
+#define MATCH_SLANT 7
- { FC_SLANT, FcCompareInteger, },
-#define MATCH_SLANT 8
+ { FC_WEIGHT, FcCompareInteger, 9, 9 },
+#define MATCH_WEIGHT 8
- { FC_WEIGHT, FcCompareInteger, },
-#define MATCH_WEIGHT 9
+ { FC_ANTIALIAS, FcCompareBool, 10, 10 },
+#define MATCH_ANTIALIAS 9
- { FC_RASTERIZER, FcCompareString, },
-#define MATCH_RASTERIZER 10
+ { FC_RASTERIZER, FcCompareString, 11, 11 },
+#define MATCH_RASTERIZER 10
- { FC_OUTLINE, FcCompareBool, },
-#define MATCH_OUTLINE 11
+ { FC_OUTLINE, FcCompareBool, 12, 12 },
+#define MATCH_OUTLINE 11
};
-#define NUM_MATCHER (sizeof _FcMatchers / sizeof _FcMatchers[0])
+#define NUM_MATCH_VALUES 13
static FcBool
FcCompareValueList (const char *object,
FcResult *result)
{
FcValueList *v1, *v2;
- double v, best;
- int j;
+ double v, best, bestStrong, bestWeak;
int i;
+ int j;
/*
* Locate the possible matching entry by examining the
}
#endif
best = 1e99;
+ bestStrong = 1e99;
+ bestWeak = 1e99;
j = 0;
for (v1 = v1orig; v1; v1 = v1->next)
{
*bestValue = v2->value;
best = v;
}
+ if (v1->binding == FcValueBindingStrong)
+ {
+ if (v < bestStrong)
+ bestStrong = v;
+ }
+ else
+ {
+ if (v < bestWeak)
+ bestWeak = v;
+ }
}
j++;
}
FcValueListPrint (v2orig);
printf ("\n");
}
- value[i] += best;
+ if (value)
+ {
+ int weak = _FcMatchers[i].weak;
+ int strong = _FcMatchers[i].strong;
+ if (weak == strong)
+ value[strong] += best;
+ else
+ {
+ value[weak] += bestWeak;
+ value[strong] += bestStrong;
+ }
+ }
return FcTrue;
}
{
int i, i1, i2;
- for (i = 0; i < NUM_MATCHER; i++)
+ for (i = 0; i < NUM_MATCH_VALUES; i++)
value[i] = 0.0;
i1 = 0;
int i;
FcPatternElt *fe, *pe;
FcValue v;
- double score[NUM_MATCHER];
FcResult result;
new = FcPatternCreate ();
for (i = 0; i < font->num; i++)
{
fe = &font->elts[i];
- pe = FcPatternFind (pat, fe->object, FcFalse);
+ pe = FcPatternFindElt (pat, fe->object);
if (pe)
{
if (!FcCompareValueList (pe->object, pe->values,
- fe->values, &v, score, &result))
+ fe->values, &v, 0, &result))
{
FcPatternDestroy (new);
return 0;
}
else
v = fe->values->value;
- FcPatternAdd (new, fe->object, v, FcTrue);
+ FcPatternAdd (new, fe->object, v, FcFalse);
}
for (i = 0; i < pat->num; i++)
{
pe = &pat->elts[i];
- fe = FcPatternFind (font, pe->object, FcFalse);
+ fe = FcPatternFindElt (font, pe->object);
if (!fe)
FcPatternAdd (new, pe->object, pe->values->value, FcTrue);
}
+ FcPatternAddPattern (new, FC_PATTERN, pat);
FcConfigSubstitute (config, new, FcMatchFont);
return new;
}
FcPattern *p,
FcResult *result)
{
- double score[NUM_MATCHER], bestscore[NUM_MATCHER];
+ double score[NUM_MATCH_VALUES], bestscore[NUM_MATCH_VALUES];
int f;
FcFontSet *s;
FcPattern *best;
int i;
int set;
- for (i = 0; i < NUM_MATCHER; i++)
+ for (i = 0; i < NUM_MATCH_VALUES; i++)
bestscore[i] = 0;
best = 0;
if (FcDebug () & FC_DBG_MATCH)
if (FcDebug () & FC_DBG_MATCHV)
{
printf ("Score");
- for (i = 0; i < NUM_MATCHER; i++)
+ for (i = 0; i < NUM_MATCH_VALUES; i++)
{
printf (" %g", score[i]);
}
printf ("\n");
}
- for (i = 0; i < NUM_MATCHER; i++)
+ for (i = 0; i < NUM_MATCH_VALUES; i++)
{
if (best && bestscore[i] < score[i])
break;
if (!best || score[i] < bestscore[i])
{
- for (i = 0; i < NUM_MATCHER; i++)
+ for (i = 0; i < NUM_MATCH_VALUES; i++)
bestscore[i] = score[i];
best = s->fonts[f];
break;
if (FcDebug () & FC_DBG_MATCH)
{
printf ("Best score");
- for (i = 0; i < NUM_MATCHER; i++)
+ for (i = 0; i < NUM_MATCH_VALUES; i++)
printf (" %g", bestscore[i]);
FcPatternPrint (best);
}
typedef struct _FcSortNode {
FcPattern *pattern;
- double score[NUM_MATCHER];
+ double score[NUM_MATCH_VALUES];
} FcSortNode;
static int
FcSortNode *b = *(FcSortNode **) ab;
double *as = &a->score[0];
double *bs = &b->score[0];
- double ad, bd;
+ double ad = 0, bd = 0;
int i;
- i = NUM_MATCHER;
+ i = NUM_MATCH_VALUES;
while (i-- && (ad = *as++) == (bd = *bs++))
;
return ad < bd ? -1 : ad > bd ? 1 : 0;
else
ncs = FcCharSetCopy (ncs);
*cs = ncs;
+ FcPatternReference (node->pattern);
+ if (FcDebug () & FC_DBG_MATCH)
+ {
+ printf ("Add ");
+ FcPatternPrint (node->pattern);
+ }
if (!FcFontSetAdd (fs, node->pattern))
+ {
+ FcPatternDestroy (node->pattern);
return FcFalse;
+ }
}
}
}
void
FcFontSetSortDestroy (FcFontSet *fs)
{
- fs->nfont = 0;
FcFontSetDestroy (fs);
}
int f;
int i;
+ if (FcDebug () & FC_DBG_MATCH)
+ {
+ printf ("Sort ");
+ FcPatternPrint (p);
+ }
nnodes = 0;
for (set = 0; set < nsets; set++)
{
if (FcDebug () & FC_DBG_MATCHV)
{
printf ("Score");
- for (i = 0; i < NUM_MATCHER; i++)
+ for (i = 0; i < NUM_MATCH_VALUES; i++)
{
printf (" %g", new->score[i]);
}
if (!FcSortWalk (nodeps, nnodes, ret, &cs, trim))
goto bail2;
- *csp = cs;
+ if (csp)
+ *csp = cs;
+ else
+ FcCharSetDestroy (cs);
free (nodes);
git.wh0rd.org / fontconfig.git / blobdiff