[Fontconfig] fontconfig: Branch 'master'

[Behdad Esfahbod]

 fc-lang/fc-lang.c     |    5 +++++
 fc-lang/und_zsye.orth |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 9978203bf16a0dfc1aa1c599989945d561628790
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Aug 2 15:31:15 2017 +0100

    [fc-lang] Allow using ".." instead of "-" in ranges
    
    Allows copying emoji-data.txt and other Unicode data files intact.

diff --git a/fc-lang/fc-lang.c b/fc-lang/fc-lang.c
index 3443f51..4a650e0 100644
--- a/fc-lang/fc-lang.c
+++ b/fc-lang/fc-lang.c
@@ -174,6 +174,11 @@ scan (FILE *f, char *file, FcCharSetFreezer *freezer)
 	    if (sscanf (line, "%x-%x", &start, &end) != 2)
 		fatal (file, lineno, "parse error");
 	}
+	else if (strstr (line, ".."))
+	{
+	    if (sscanf (line, "%x..%x", &start, &end) != 2)
+		fatal (file, lineno, "parse error");
+	}
 	else
 	{
 	    if (sscanf (line, "%x", &start) != 1)
diff --git a/fc-lang/und_zsye.orth b/fc-lang/und_zsye.orth
index 7e24731..6a5c0b9 100644
--- a/fc-lang/und_zsye.orth
+++ b/fc-lang/und_zsye.orth
@@ -28,7 +28,7 @@
 #
 0023	#  1.1  [1] (#️)       number sign
 002A	#  1.1  [1] (*️)       asterisk
-0030-0039	#  1.1 [10] (0️-9️)    digit zero-digit nine
+0030..0039	#  1.1 [10] (0️-9️)    digit zero-digit nine
 00A9	#  1.1  [1] (©️)       copyright
 00AE	#  1.1  [1] (®️)       registered
 203C	#  1.1  [1] (‼️)       double exclamation mark