diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-21 14:40:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-21 14:40:39 +0200 |
| commit | 8a49ff701cfa50f9dcb237051e2ba7ac0302a515 (patch) | |
| tree | 033ceda857988a1f0ca49e35eb848e37e281631f /fontconfig/src | |
| parent | 4703c93aaecf0d5794eca723cd5b1b72b04d04ee (diff) | |
| download | vcxsrv-8a49ff701cfa50f9dcb237051e2ba7ac0302a515.tar.gz vcxsrv-8a49ff701cfa50f9dcb237051e2ba7ac0302a515.tar.bz2 vcxsrv-8a49ff701cfa50f9dcb237051e2ba7ac0302a515.zip | |
fontconfig mesa git update 21 June 2011
Diffstat (limited to 'fontconfig/src')
| -rw-r--r-- | fontconfig/src/fcdir.c | 7 | ||||
| -rw-r--r-- | fontconfig/src/fcformat.c | 7 | ||||
| -rw-r--r-- | fontconfig/src/fcname.c | 3 |
3 files changed, 8 insertions, 9 deletions
diff --git a/fontconfig/src/fcdir.c b/fontconfig/src/fcdir.c index 359446c36..8a2b97625 100644 --- a/fontconfig/src/fcdir.c +++ b/fontconfig/src/fcdir.c @@ -65,7 +65,7 @@ FcFileScanFontConfig (FcFontSet *set, /* * Edit pattern with user-defined rules */ - if (font && config && !FcConfigSubstituteWithPat (config, font, NULL, FcMatchScan)) + if (font && config && !FcConfigSubstitute (config, font, FcMatchScan)) { FcPatternDestroy (font); font = NULL; @@ -75,7 +75,7 @@ FcFileScanFontConfig (FcFontSet *set, /* * Add the font */ - if (font && (!config || FcConfigAcceptFont (config, font))) + if (font) { if (FcDebug() & FC_DBG_SCANV) { @@ -304,9 +304,6 @@ FcDirCacheRead (const FcChar8 *dir, FcBool force, FcConfig *config) { FcCache *cache = NULL; - if (config && !FcConfigAcceptFilename (config, dir)) - return NULL; - /* Try to use existing cache file */ if (!force) cache = FcDirCacheLoad (dir, config, NULL); diff --git a/fontconfig/src/fcformat.c b/fontconfig/src/fcformat.c index 1368b7186..d8518f458 100644 --- a/fontconfig/src/fcformat.c +++ b/fontconfig/src/fcformat.c @@ -62,6 +62,7 @@ * unparse FcNameUnparse * fcmatch fc-match default * fclist fc-list default + * fccat fc-cat default * pkgkit PackageKit package tag format * * @@ -74,8 +75,9 @@ */ +#define FCCAT_FORMAT "\"%{file|basename|cescape}\" %{index} \"%{-file{%{=unparse|cescape}}}\"" #define FCMATCH_FORMAT "%{file:-<unknown filename>|basename}: \"%{family[0]:-<unknown family>}\" \"%{style[0]:-<unknown style>}\"" -#define FCLIST_FORMAT "%{?file{%{file}: }}%{=unparse}" +#define FCLIST_FORMAT "%{?file{%{file}: }}%{-file{%{=unparse}}}" #define PKGKIT_FORMAT "%{[]family{font(%{family|downcase|delete( )})\n}}%{[]lang{font(:lang=%{lang|downcase|translate(_,-)})\n}}" @@ -304,6 +306,7 @@ interpret_builtin (FcFormatContext *c, #define BUILTIN(name, format) \ else if (0 == strcmp ((const char *) c->word, name))\ ret = FcPatternFormatToBuf (pat, (const FcChar8 *) format, buf) + BUILTIN ("fccat", FCCAT_FORMAT); BUILTIN ("fcmatch", FCMATCH_FORMAT); BUILTIN ("fclist", FCLIST_FORMAT); BUILTIN ("pkgkit", PKGKIT_FORMAT); @@ -732,7 +735,7 @@ interpret_simple (FcFormatContext *c, c->word = c->word + strlen ((const char *) c->word) + 1; /* for now we just support 'default value' */ if (!expect_char (c, '-') || - !read_chars (c, '\0')) + !read_chars (c, '|')) { c->word = orig; return FcFalse; diff --git a/fontconfig/src/fcname.c b/fontconfig/src/fcname.c index 86c10b65e..d77eff6f7 100644 --- a/fontconfig/src/fcname.c +++ b/fontconfig/src/fcname.c @@ -874,8 +874,7 @@ FcNameUnparseEscaped (FcPattern *pat, FcBool escape) { o = &l->types[i]; if (!strcmp (o->object, FC_FAMILY) || - !strcmp (o->object, FC_SIZE) || - !strcmp (o->object, FC_FILE)) + !strcmp (o->object, FC_SIZE)) continue; e = FcPatternObjectFindElt (pat, FcObjectFromName (o->object)); |