[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 src/fclang.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5efa1137b41e20bfaef7346f79079f38add25572
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Aug 22 17:47:14 2017 +0900

    Accept 4 digit script tag in FcLangNormalize().

diff --git a/src/fclang.c b/src/fclang.c
index fc0620c..bbdce2c 100644
--- a/src/fclang.c
+++ b/src/fclang.c
@@ -259,7 +259,8 @@ FcLangNormalize (const FcChar8 *lang)
 		 lang);
 	goto bail0;
     }
-    if (territory && (tlen < 2 || tlen > 3))
+    if (territory && (tlen < 2 || tlen > 3) &&
+	!(territory[0] == 'z' && tlen < 5))
     {
 	fprintf (stderr, "Fontconfig warning: ignoring %s: not a valid region tag\n",
 		 lang);