[Fontconfig] fontconfig: Branch 'master'

[Behdad Esfahbod]

 src/fcfreetype.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 83f679ce558de736ef1a095a362397da0ac3417f
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Feb 15 09:48:38 2013 -0500

    Accept digits as part of OpenType script tags
    
    They've been used since 2005.

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 267df87..9bd789c 100644
--- a/src/fcfreetype.c
+++ b/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);
     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]) ||