diff options
| author | marha <marha@users.sourceforge.net> | 2013-03-25 10:23:25 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-03-25 10:23:25 +0100 |
| commit | 30ac3efa02bbd1aecff4a0aa2da17bc886bdd5ea (patch) | |
| tree | 7ae924e3fb64c93a0f59e55fd08a914db9bb551b /fontconfig/src/fcmatch.c | |
| parent | 55a9a54c65cd0ff58966408ea4d7879a3d9c749c (diff) | |
| parent | 176eab9e8277db1549bfc6c9ae805c4e1858f0b0 (diff) | |
| download | vcxsrv-30ac3efa02bbd1aecff4a0aa2da17bc886bdd5ea.tar.gz vcxsrv-30ac3efa02bbd1aecff4a0aa2da17bc886bdd5ea.tar.bz2 vcxsrv-30ac3efa02bbd1aecff4a0aa2da17bc886bdd5ea.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman xserver git update 25 Mar 2013
Diffstat (limited to 'fontconfig/src/fcmatch.c')
| -rw-r--r-- | fontconfig/src/fcmatch.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/fontconfig/src/fcmatch.c b/fontconfig/src/fcmatch.c index 7993b81de..68f39aef5 100644 --- a/fontconfig/src/fcmatch.c +++ b/fontconfig/src/fcmatch.c @@ -77,6 +77,24 @@ FcCompareFamily (FcValue *v1, FcValue *v2) } static double +FcComparePostScript (FcValue *v1, FcValue *v2) +{ + const FcChar8 *v1_string = FcValueString (v1); + const FcChar8 *v2_string = FcValueString (v2); + int n; + size_t len; + + if (FcToLower (*v1_string) != FcToLower (*v2_string) && + *v1_string != ' ' && *v2_string != ' ') + return 1.0; + + n = FcStrMatchIgnoreCaseAndDelims (v1_string, v2_string, (const FcChar8 *)" -"); + len = strlen ((const char *)v1_string); + + return (double)(len - n) / (double)len; +} + +static double FcCompareLang (FcValue *v1, FcValue *v2) { FcLangResult result; @@ -198,6 +216,7 @@ FcCompareFilename (FcValue *v1, FcValue *v2) #define PRI_FcCompareFilename(n) PRI1(n) #define PRI_FcCompareCharSet(n) PRI1(n) #define PRI_FcCompareLang(n) PRI1(n) +#define PRI_FcComparePostScript(n) PRI1(n) #define FC_OBJECT(NAME, Type, Cmp) PRI_##Cmp(NAME) @@ -219,8 +238,10 @@ typedef enum _FcMatcherPriority { PRI1(CHARSET), PRI_FAMILY_STRONG, PRI_LANG_STRONG, + PRI_POSTSCRIPT_NAME_STRONG, PRI_LANG_WEAK, PRI_FAMILY_WEAK, + PRI_POSTSCRIPT_NAME_WEAK, PRI1(SPACING), PRI1(PIXEL_SIZE), PRI1(STYLE), |