X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=src%2Ffcmatch.c;h=0d84704b51abfff52eba73837ebf11aebbe8b3cd;hb=d9741a7f1a73f718ab20b0582fff8aebeba01077;hp=93e3860a98dbdaf28c813dd3ed89663ca375c877;hpb=1ed98a0c87931ae93ea3d46f3d0367a99218679c;p=fontconfig.git diff --git a/src/fcmatch.c b/src/fcmatch.c index 93e3860..0d84704 100644 --- a/src/fcmatch.c +++ b/src/fcmatch.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/src/fcmatch.c,v 1.20 2002/08/31 22:17:32 keithp Exp $ + * fontconfig/src/fcmatch.c * * Copyright © 2000 Keith Packard * @@ -13,18 +13,18 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ +#include "fcint.h" #include #include -#include "fcint.h" #include static double @@ -72,7 +72,8 @@ FcCompareFamily (FcValue *v1, FcValue *v2) const FcChar8* v1_string = fc_value_string(v1); const FcChar8* v2_string = fc_value_string(v2); - if (FcToLower(*v1_string) != FcToLower(*v2_string)) + if (FcToLower(*v1_string) != FcToLower(*v2_string) && + *v1_string != ' ' && *v2_string != ' ') return 1.0; return (double) FcStrCmpIgnoreBlanksAndCase (v1_string, v2_string) != 0; @@ -173,8 +174,7 @@ FcCompareSize (FcValue *value1, FcValue *value2) } typedef struct _FcMatcher { - const char *object; - FcObjectPtr objectPtr; + FcObject object; double (*compare) (FcValue *value1, FcValue *value2); int strong, weak; } FcMatcher; @@ -184,157 +184,89 @@ typedef struct _FcMatcher { * each value, earlier values are more significant than * later values */ -static FcMatcher _FcMatchers [] = { - { FC_FOUNDRY, 0, FcCompareString, 0, 0 }, +static const FcMatcher _FcMatchers [] = { + { FC_FOUNDRY_OBJECT, FcCompareString, 0, 0 }, #define MATCH_FOUNDRY 0 -#define MATCH_FOUNDRY_INDEX 0 - - { FC_CHARSET, 0, FcCompareCharSet, 1, 1 }, + { FC_CHARSET_OBJECT, FcCompareCharSet, 1, 1 }, #define MATCH_CHARSET 1 -#define MATCH_CHARSET_INDEX 1 - - { FC_FAMILY, 0, FcCompareFamily, 2, 4 }, + { FC_FAMILY_OBJECT, FcCompareFamily, 2, 4 }, #define MATCH_FAMILY 2 -#define MATCH_FAMILY_STRONG_INDEX 2 -#define MATCH_FAMILY_WEAK_INDEX 4 - - { FC_LANG, 0, FcCompareLang, 3, 3 }, + { FC_LANG_OBJECT, FcCompareLang, 3, 3 }, #define MATCH_LANG 3 #define MATCH_LANG_INDEX 3 - - { FC_SPACING, 0, FcCompareNumber, 5, 5 }, + { FC_SPACING_OBJECT, FcCompareNumber, 5, 5 }, #define MATCH_SPACING 4 -#define MATCH_SPACING_INDEX 5 - - { FC_PIXEL_SIZE, 0, FcCompareSize, 6, 6 }, + { FC_PIXEL_SIZE_OBJECT, FcCompareSize, 6, 6 }, #define MATCH_PIXEL_SIZE 5 -#define MATCH_PIXEL_SIZE_INDEX 6 - - { FC_STYLE, 0, FcCompareString, 7, 7 }, + { FC_STYLE_OBJECT, FcCompareString, 7, 7 }, #define MATCH_STYLE 6 -#define MATCH_STYLE_INDEX 7 - - { FC_SLANT, 0, FcCompareNumber, 8, 8 }, + { FC_SLANT_OBJECT, FcCompareNumber, 8, 8 }, #define MATCH_SLANT 7 -#define MATCH_SLANT_INDEX 8 - - { FC_WEIGHT, 0, FcCompareNumber, 9, 9 }, + { FC_WEIGHT_OBJECT, FcCompareNumber, 9, 9 }, #define MATCH_WEIGHT 8 -#define MATCH_WEIGHT_INDEX 9 - - { FC_WIDTH, 0, FcCompareNumber, 10, 10 }, + { FC_WIDTH_OBJECT, FcCompareNumber, 10, 10 }, #define MATCH_WIDTH 9 -#define MATCH_WIDTH_INDEX 10 - - { FC_ANTIALIAS, 0, FcCompareBool, 11, 11 }, -#define MATCH_ANTIALIAS 10 -#define MATCH_ANTIALIAS_INDEX 11 - - { FC_RASTERIZER, 0, FcCompareString, 12, 12 }, -#define MATCH_RASTERIZER 11 -#define MATCH_RASTERIZER_INDEX 12 - - { FC_OUTLINE, 0, FcCompareBool, 13, 13 }, -#define MATCH_OUTLINE 12 -#define MATCH_OUTLINE_INDEX 13 - - { FC_FONTVERSION, 0, FcCompareNumber, 14, 14 }, -#define MATCH_FONTVERSION 13 -#define MATCH_FONTVERSION_INDEX 14 + { FC_DECORATIVE_OBJECT, FcCompareBool, 11, 11 }, +#define MATCH_DECORATIVE 10 + { FC_ANTIALIAS_OBJECT, FcCompareBool, 12, 12 }, +#define MATCH_ANTIALIAS 11 + { FC_RASTERIZER_OBJECT, FcCompareString, 13, 13 }, +#define MATCH_RASTERIZER 12 + { FC_OUTLINE_OBJECT, FcCompareBool, 14, 14 }, +#define MATCH_OUTLINE 13 + { FC_FONTVERSION_OBJECT, FcCompareNumber, 15, 15 }, +#define MATCH_FONTVERSION 14 }; -#define NUM_MATCH_VALUES 15 - -static FcBool matchObjectPtrsInit = FcFalse; - -static void -FcMatchObjectPtrsInit (void) -{ - _FcMatchers[MATCH_FOUNDRY].objectPtr = FcObjectToPtr(FC_FOUNDRY); - _FcMatchers[MATCH_CHARSET].objectPtr = FcObjectToPtr(FC_CHARSET); - _FcMatchers[MATCH_FAMILY].objectPtr = FcObjectToPtr(FC_FAMILY); - _FcMatchers[MATCH_LANG].objectPtr = FcObjectToPtr(FC_LANG); - _FcMatchers[MATCH_SPACING].objectPtr = FcObjectToPtr(FC_SPACING); - _FcMatchers[MATCH_PIXEL_SIZE].objectPtr = FcObjectToPtr(FC_PIXEL_SIZE); - _FcMatchers[MATCH_STYLE].objectPtr = FcObjectToPtr(FC_STYLE); - _FcMatchers[MATCH_SLANT].objectPtr = FcObjectToPtr(FC_SLANT); - _FcMatchers[MATCH_WEIGHT].objectPtr = FcObjectToPtr(FC_WEIGHT); - _FcMatchers[MATCH_WIDTH].objectPtr = FcObjectToPtr(FC_WIDTH); - _FcMatchers[MATCH_ANTIALIAS].objectPtr = FcObjectToPtr(FC_ANTIALIAS); - _FcMatchers[MATCH_RASTERIZER].objectPtr = FcObjectToPtr(FC_RASTERIZER); - _FcMatchers[MATCH_OUTLINE].objectPtr = FcObjectToPtr(FC_OUTLINE); - _FcMatchers[MATCH_FONTVERSION].objectPtr = FcObjectToPtr(FC_FONTVERSION); - matchObjectPtrsInit = FcTrue; -} +#define NUM_MATCH_VALUES 16 -static FcMatcher* -FcObjectPtrToMatcher (FcObjectPtr o) +static const FcMatcher* +FcObjectToMatcher (FcObject object) { int i; - const char *object = FcObjectPtrU(o); i = -1; - switch (object[0]) { - case 'f': - switch (object[1]) { - case 'o': - switch (object[2]) { - case 'u': - i = MATCH_FOUNDRY; break; - case 'n': - i = MATCH_FONTVERSION; break; - } - break; - case 'a': - i = MATCH_FAMILY; break; - } - break; - case 'c': + switch (object) { + case FC_FOUNDRY_OBJECT: + i = MATCH_FOUNDRY; break; + case FC_FONTVERSION_OBJECT: + i = MATCH_FONTVERSION; break; + case FC_FAMILY_OBJECT: + i = MATCH_FAMILY; break; + case FC_CHARSET_OBJECT: i = MATCH_CHARSET; break; - case 'a': + case FC_ANTIALIAS_OBJECT: i = MATCH_ANTIALIAS; break; - case 'l': + case FC_LANG_OBJECT: i = MATCH_LANG; break; - case 's': - switch (object[1]) { - case 'p': - i = MATCH_SPACING; break; - case 't': - i = MATCH_STYLE; break; - case 'l': - i = MATCH_SLANT; break; - } - break; - case 'p': + case FC_SPACING_OBJECT: + i = MATCH_SPACING; break; + case FC_STYLE_OBJECT: + i = MATCH_STYLE; break; + case FC_SLANT_OBJECT: + i = MATCH_SLANT; break; + case FC_PIXEL_SIZE_OBJECT: i = MATCH_PIXEL_SIZE; break; - case 'w': - switch (object[1]) { - case 'i': - i = MATCH_WIDTH; break; - case 'e': - i = MATCH_WEIGHT; break; - } - break; - case 'r': + case FC_WIDTH_OBJECT: + i = MATCH_WIDTH; break; + case FC_WEIGHT_OBJECT: + i = MATCH_WEIGHT; break; + case FC_RASTERIZER_OBJECT: i = MATCH_RASTERIZER; break; - case 'o': + case FC_OUTLINE_OBJECT: i = MATCH_OUTLINE; break; + case FC_DECORATIVE_OBJECT: + i = MATCH_DECORATIVE; break; } if (i < 0) - return 0; - - if (!matchObjectPtrsInit) - FcMatchObjectPtrsInit(); - - if (o != _FcMatchers[i].objectPtr) - return 0; + return NULL; return _FcMatchers+i; } static FcBool -FcCompareValueList (FcObjectPtr o, +FcCompareValueList (FcObject object, FcValueListPtr v1orig, /* pattern */ FcValueListPtr v2orig, /* target */ FcValue *bestValue, @@ -342,43 +274,39 @@ FcCompareValueList (FcObjectPtr o, FcResult *result) { FcValueListPtr v1, v2; - FcValueList *v1_ptrU, *v2_ptrU; double v, best, bestStrong, bestWeak; int j; - const char *object = FcObjectPtrU(o); - FcMatcher *match = FcObjectPtrToMatcher(o); + const FcMatcher *match = FcObjectToMatcher(object); if (!match) { if (bestValue) - *bestValue = FcValueCanonicalize(&FcValueListPtrU(v2orig)->value); + *bestValue = FcValueCanonicalize(&v2orig->value); return FcTrue; } best = 1e99; bestStrong = 1e99; bestWeak = 1e99; - j = 0; - for (v1 = v1orig, v1_ptrU = FcValueListPtrU(v1); v1_ptrU; - v1 = v1_ptrU->next, v1_ptrU = FcValueListPtrU(v1)) + j = 1; + for (v1 = v1orig; v1; v1 = FcValueListNext(v1)) { - for (v2 = v2orig, v2_ptrU = FcValueListPtrU(v2); v2_ptrU; - v2 = v2_ptrU->next, v2_ptrU = FcValueListPtrU(v2)) + for (v2 = v2orig; v2; v2 = FcValueListNext(v2)) { - v = (match->compare) (&v1_ptrU->value, &v2_ptrU->value); + v = (match->compare) (&v1->value, &v2->value); if (v < 0) { *result = FcResultTypeMismatch; return FcFalse; } - v = v * 100 + j; + v = v * 1000 + j; if (v < best) { if (bestValue) - *bestValue = FcValueCanonicalize(&v2_ptrU->value); + *bestValue = FcValueCanonicalize(&v2->value); best = v; } - if (v1_ptrU->binding == FcValueBindingStrong) + if (v1->binding == FcValueBindingStrong) { if (v < bestStrong) bestStrong = v; @@ -393,7 +321,7 @@ FcCompareValueList (FcObjectPtr o, } if (FcDebug () & FC_DBG_MATCHV) { - printf (" %s: %g ", object, best); + printf (" %s: %g ", FcObjectName (object), best); FcValueListPrint (v1orig); printf (", "); FcValueListPrint (v2orig); @@ -434,10 +362,10 @@ FcCompare (FcPattern *pat, i2 = 0; while (i1 < pat->num && i2 < fnt->num) { - FcPatternElt *elt_i1 = FcPatternEltU(pat->elts)+i1; - FcPatternElt *elt_i2 = FcPatternEltU(fnt->elts)+i2; + FcPatternElt *elt_i1 = &FcPatternElts(pat)[i1]; + FcPatternElt *elt_i2 = &FcPatternElts(fnt)[i2]; - i = FcObjectPtrCompare(elt_i1->object, elt_i2->object); + i = FcObjectCompare(elt_i1->object, elt_i2->object); if (i > 0) i2++; else if (i < 0) @@ -445,7 +373,8 @@ FcCompare (FcPattern *pat, else { if (!FcCompareValueList (elt_i1->object, - elt_i1->values, elt_i2->values, + FcPatternEltValues(elt_i1), + FcPatternEltValues(elt_i2), 0, value, result)) return FcFalse; i1++; @@ -471,221 +400,101 @@ FcFontRenderPrepare (FcConfig *config, return 0; for (i = 0; i < font->num; i++) { - fe = FcPatternEltU(font->elts)+i; - pe = FcPatternFindElt (pat, FcObjectPtrU(fe->object)); + fe = &FcPatternElts(font)[i]; + pe = FcPatternObjectFindElt (pat, fe->object); if (pe) { - if (!FcCompareValueList (pe->object, pe->values, - fe->values, &v, 0, &result)) + if (!FcCompareValueList (pe->object, FcPatternEltValues(pe), + FcPatternEltValues(fe), &v, 0, &result)) { FcPatternDestroy (new); return 0; } } else - v = FcValueCanonicalize(&FcValueListPtrU(fe->values)->value); - FcPatternAdd (new, FcObjectPtrU(fe->object), v, FcFalse); + v = FcValueCanonicalize(&FcPatternEltValues (fe)->value); + FcPatternObjectAdd (new, fe->object, v, FcFalse); } for (i = 0; i < pat->num; i++) { - pe = FcPatternEltU(pat->elts)+i; - fe = FcPatternFindElt (font, FcObjectPtrU(pe->object)); + pe = &FcPatternElts(pat)[i]; + fe = FcPatternObjectFindElt (font, pe->object); if (!fe) - FcPatternAdd (new, FcObjectPtrU(pe->object), - FcValueCanonicalize(&FcValueListPtrU(pe->values)->value), FcTrue); + { + v = FcValueCanonicalize(&FcPatternEltValues(pe)->value); + FcPatternObjectAdd (new, pe->object, v, FcTrue); + } } - if (FcPatternFindElt (font, FC_FILE)) - FcPatternTransferFullFname (new, font); - FcConfigSubstituteWithPat (config, new, pat, FcMatchFont); return new; } -FcPattern * -FcFontSetMatch (FcConfig *config, - FcFontSet **sets, - int nsets, - FcPattern *p, - FcResult *result) +static FcPattern * +FcFontSetMatchInternal (FcConfig *config, + FcFontSet **sets, + int nsets, + FcPattern *p, + FcResult *result) { - double score; - double bestscore; + double score[NUM_MATCH_VALUES], bestscore[NUM_MATCH_VALUES]; int f; FcFontSet *s; FcPattern *best; - int scoring_index; + int i; int set; + for (i = 0; i < NUM_MATCH_VALUES; i++) + bestscore[i] = 0; best = 0; if (FcDebug () & FC_DBG_MATCH) { printf ("Match "); FcPatternPrint (p); } - if (!config) - { - config = FcConfigGetCurrent (); - if (!config) - { - *result = FcResultOutOfMemory; - return 0; - } - } for (set = 0; set < nsets; set++) { - FcBool *matchBlocked; - int blockStart; - s = sets[set]; if (!s) continue; - - matchBlocked = (FcBool*)calloc(s->nfont, sizeof(FcBool)); - blockStart = 0; - - /* The old algorithm checked if each font beat 'best', - * scanning all of the value lists for all of the pattern elts. */ - /* This algorithm checks each font on a element-by-element basis - * and blocks fonts that have already lost on some element from - * further consideration from being best. Basically, we've - * swapped the order of loops and short-circuited fonts that - * are out of contention right away. - * This saves a lot of time! */ - for (scoring_index = 0; scoring_index < NUM_MATCH_VALUES; - scoring_index++) - { - int pat_elt; - FcPatternElt *pat_elts = FcPatternEltU(p->elts); - FcMatcher *match = 0; - FcValueListPtr v1; - FcValueList *v1_ptrU; - int v1_offset = 0; - - - for (pat_elt = 0; pat_elt < p->num; pat_elt++) - { - match = FcObjectPtrToMatcher - ((FcPatternEltU(p->elts)+pat_elt)->object); - - if (match && - (match->strong == scoring_index || - match->weak == scoring_index)) - break; - else - match = 0; + for (f = 0; f < s->nfont; f++) + { + if (FcDebug () & FC_DBG_MATCHV) + { + printf ("Font %d ", f); + FcPatternPrint (s->fonts[f]); } - - if (!match) - continue; - - for (v1 = pat_elts[pat_elt].values, v1_ptrU = FcValueListPtrU(v1); - v1_ptrU; - v1 = FcValueListPtrU(v1)->next, - v1_ptrU = FcValueListPtrU(v1), v1_offset++) - { - if ((v1_ptrU->binding == FcValueBindingWeak - && scoring_index != match->weak) - || (v1_ptrU->binding == FcValueBindingStrong - && scoring_index != match->strong) - ) - continue; - - bestscore = 1e99; - - if (FcDebug () & FC_DBG_MATCHV) - { - int blocked_fonts = 0; - for (f = 0; f < s->nfont; f++) - blocked_fonts += matchBlocked[f] ? 1 : 0; - printf("Scoring Index %d, Value %d: %d(%d) fonts left\n", - scoring_index, v1_offset, s->nfont - blocked_fonts, s->nfont); - } - - for (f = 0; f < s->nfont; f++) - { - int cand_elt; - FcPatternElt *cand_elts; - - if (matchBlocked[f]) - continue; - - score = 0.0; - cand_elts = FcPatternEltU(s->fonts[f]->elts); - - /* Look for the appropriate element in this candidate - * pattern 'f' and evaluate its score wrt 'p'. */ - for (cand_elt = 0; cand_elt < s->fonts[f]->num; cand_elt++) - { - if (cand_elts[cand_elt].object == - pat_elts[pat_elt].object) - { - FcValueListPtr v2; - FcValueList *v2_ptrU; - double v2_best_score = 1e99; - - for (v2 = cand_elts[cand_elt].values, - v2_ptrU = FcValueListPtrU(v2); - FcValueListPtrU(v2); - v2 = FcValueListPtrU(v2)->next) - { - double v = (match->compare) - (&v1_ptrU->value, &v2_ptrU->value); - - if (v < 0) - { - *result = FcResultTypeMismatch; - return 0; - } - /* I'm actually kind of surprised that - * this isn't v + 100 * v1_offset. -PL */ - v = v * 100 + v1_offset; - if (v < v2_best_score) - v2_best_score = v; - } - score += v2_best_score; - } - } - - /* If there's a previous champion, and current score - * beats previous best score, on this element, then - * knock out the previous champion and anything - * else that we would have visited previous to f; - * clearly anything previous to f would have been - * less than f on this score. */ - if (!best || score < bestscore) - { - if (best) - { - int b; - for (b = blockStart; b < f; ++b) - matchBlocked[b] = FcTrue; - } - - bestscore = score; - best = s->fonts[f]; - blockStart = f; - } - - /* If f loses, then it's out too. */ - if (best && score > bestscore) - matchBlocked[f] = FcTrue; - - /* Otherwise, f is equal to best on this element. - * Carry on to next pattern element. */ + if (!FcCompare (p, s->fonts[f], score, result)) + return 0; + if (FcDebug () & FC_DBG_MATCHV) + { + printf ("Score"); + for (i = 0; i < NUM_MATCH_VALUES; i++) + { + printf (" %g", score[i]); } - if ((FcDebug () & FC_DBG_MATCHV) && best) + printf ("\n"); + } + for (i = 0; i < NUM_MATCH_VALUES; i++) + { + if (best && bestscore[i] < score[i]) + break; + if (!best || score[i] < bestscore[i]) { - printf ("Best match (scoring index %d) candidate ", scoring_index); - FcPatternPrint (best); + for (i = 0; i < NUM_MATCH_VALUES; i++) + bestscore[i] = score[i]; + best = s->fonts[f]; + break; } - } - } - free (matchBlocked); + } + } } - if ((FcDebug () & FC_DBG_MATCH) && best) + if (FcDebug () & FC_DBG_MATCH) { - printf ("Best match "); + printf ("Best score"); + for (i = 0; i < NUM_MATCH_VALUES; i++) + printf (" %g", bestscore[i]); + printf ("\n"); FcPatternPrint (best); } if (!best) @@ -693,7 +502,29 @@ FcFontSetMatch (FcConfig *config, *result = FcResultNoMatch; return 0; } - return FcFontRenderPrepare (config, p, best); + return best; +} + +FcPattern * +FcFontSetMatch (FcConfig *config, + FcFontSet **sets, + int nsets, + FcPattern *p, + FcResult *result) +{ + FcPattern *best; + + if (!config) + { + config = FcConfigGetCurrent (); + if (!config) + return 0; + } + best = FcFontSetMatchInternal (config, sets, nsets, p, result); + if (best) + return FcFontRenderPrepare (config, p, best); + else + return NULL; } FcPattern * @@ -703,6 +534,7 @@ FcFontMatch (FcConfig *config, { FcFontSet *sets[2]; int nsets; + FcPattern *best; if (!config) { @@ -715,7 +547,12 @@ FcFontMatch (FcConfig *config, sets[nsets++] = config->fonts[FcSetSystem]; if (config->fonts[FcSetApplication]) sets[nsets++] = config->fonts[FcSetApplication]; - return FcFontSetMatch (config, sets, nsets, p, result); + + best = FcFontSetMatchInternal (config, sets, nsets, p, result); + if (best) + return FcFontRenderPrepare (config, p, best); + else + return NULL; } typedef struct _FcSortNode { @@ -740,48 +577,71 @@ FcSortCompare (const void *aa, const void *ab) } static FcBool -FcSortWalk (FcSortNode **n, int nnode, FcFontSet *fs, FcCharSet **cs, FcBool trim) +FcSortWalk (FcSortNode **n, int nnode, FcFontSet *fs, FcCharSet **csp, FcBool trim) { - FcCharSet *ncs; - FcSortNode *node; + FcBool ret = FcFalse; + FcCharSet *cs; + + cs = 0; + if (trim || csp) + { + cs = FcCharSetCreate (); + if (cs == NULL) + goto bail; + } while (nnode--) { - node = *n++; - if (FcPatternGetCharSet (node->pattern, FC_CHARSET, 0, &ncs) == - FcResultMatch) + FcSortNode *node = *n++; + FcBool adds_chars = FcFalse; + + /* + * Only fetch node charset if we'd need it + */ + if (cs) { - /* - * If this font isn't a subset of the previous fonts, - * add it to the list - */ - if (!trim || !*cs || !FcCharSetIsSubset (ncs, *cs)) + FcCharSet *ncs; + + if (FcPatternGetCharSet (node->pattern, FC_CHARSET, 0, &ncs) != + FcResultMatch) + continue; + + if (!FcCharSetMerge (cs, ncs, &adds_chars)) + goto bail; + } + + /* + * If this font isn't a subset of the previous fonts, + * add it to the list + */ + if (!trim || adds_chars) + { + FcPatternReference (node->pattern); + if (FcDebug () & FC_DBG_MATCHV) { - if (*cs) - { - ncs = FcCharSetUnion (ncs, *cs); - if (!ncs) - return FcFalse; - FcCharSetDestroy (*cs); - } - 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; - } + printf ("Add "); + FcPatternPrint (node->pattern); + } + if (!FcFontSetAdd (fs, node->pattern)) + { + FcPatternDestroy (node->pattern); + goto bail; } } } - return FcTrue; + if (csp) + { + *csp = cs; + cs = 0; + } + + ret = FcTrue; + +bail: + if (cs) + FcCharSetDestroy (cs); + + return ret; } void @@ -805,7 +665,6 @@ FcFontSetSort (FcConfig *config, FcSortNode **nodeps, **nodep; int nnodes; FcSortNode *new; - FcCharSet *cs; int set; int f; int i; @@ -890,7 +749,7 @@ FcFontSetSort (FcConfig *config, * If this node matches any language, go check * which ones and satisfy those entries */ - if (nodeps[f]->score[MATCH_LANG_INDEX] < nPatternLang) + if (nodeps[f]->score[MATCH_LANG_INDEX] < 200) { for (i = 0; i < nPatternLang; i++) { @@ -920,7 +779,7 @@ FcFontSetSort (FcConfig *config, } } if (!satisfies) - nodeps[f]->score[MATCH_LANG_INDEX] = 1000.0; + nodeps[f]->score[MATCH_LANG_INDEX] = 10000.0; } /* @@ -933,23 +792,19 @@ FcFontSetSort (FcConfig *config, if (!ret) goto bail1; - cs = 0; - - if (!FcSortWalk (nodeps, nnodes, ret, &cs, trim)) + if (!FcSortWalk (nodeps, nnodes, ret, csp, trim)) goto bail2; - if (csp) - *csp = cs; - else - FcCharSetDestroy (cs); - free (nodes); + if (FcDebug() & FC_DBG_MATCH) + { + printf ("First font "); + FcPatternPrint (ret->fonts[0]); + } return ret; bail2: - if (cs) - FcCharSetDestroy (cs); FcFontSetDestroy (ret); bail1: free (nodes); @@ -980,3 +835,6 @@ FcFontSort (FcConfig *config, sets[nsets++] = config->fonts[FcSetApplication]; return FcFontSetSort (config, sets, nsets, p, trim, csp, result); } +#define __fcmatch__ +#include "fcaliastail.h" +#undef __fcmatch__