diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-18 09:53:00 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-18 09:53:00 +0100 |
| commit | b14c3b05e45201bbbbb3a4beba260c3d6ff31003 (patch) | |
| tree | 0c431930528bbc4eedea72763955cf4cb423bb07 /fontconfig/src | |
| parent | 2baf3a927a61d2a268fa4202683f193fa7ba2d14 (diff) | |
| parent | f51268259621a21d14e40b8a41c5803a5c2ce706 (diff) | |
| download | vcxsrv-b14c3b05e45201bbbbb3a4beba260c3d6ff31003.tar.gz vcxsrv-b14c3b05e45201bbbbb3a4beba260c3d6ff31003.tar.bz2 vcxsrv-b14c3b05e45201bbbbb3a4beba260c3d6ff31003.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
git update fontconfig libX11 mesa xkeyboard-config 18 Feb 2013
Diffstat (limited to 'fontconfig/src')
| -rw-r--r-- | fontconfig/src/fcfreetype.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fontconfig/src/fcfreetype.c b/fontconfig/src/fcfreetype.c index 62ce59b4e..29ed23aef 100644 --- a/fontconfig/src/fcfreetype.c +++ b/fontconfig/src/fcfreetype.c @@ -2561,7 +2561,8 @@ FcFreeTypeCharSet (FT_Face face, FcBlanks *blanks) * except for 'DFLT'. */ #define FcIsSpace(x) (040 == (x)) -#define FcIsValidScript(x) (FcIsLower(x) || FcIsUpper (x) || FcIsSpace(x)) +#define FcIsDigit(c) (('0' <= (c) && (c) <= '9')) +#define FcIsValidScript(x) (FcIsLower(x) || FcIsUpper (x) || FcIsDigit(x) || FcIsSpace(x)) static void addtag(FcChar8 *complex_, FT_ULong tag) @@ -2574,7 +2575,7 @@ addtag(FcChar8 *complex_, FT_ULong tag) tagstring[3] = (FcChar8)((tag)&0xff); tagstring[4] = '\0'; - /* skip tags which aren't alphabetic, under the assumption that + /* skip tags which aren't alphanumeric, under the assumption that * they're probably broken */ if (!FcIsValidScript(tagstring[0]) || |