# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1397707073 -10800
# Node ID e12e0bdfa7f160c257c11e304579b221f493ceaa
# Parent  1dce395c2a3fb3f18b73e861c1bbb87768a5568b# Parent  7b5910925ce36e7a640ba98274e021aabf44d6e6
merged font2glyphmap changes

diff -r 1dce395c2a3f -r e12e0bdfa7f1 tools/font2glyphmap/src/font2glyphmap.c
--- a/tools/font2glyphmap/src/font2glyphmap.c	Thu Apr 17 06:57:15 2014 +0300
+++ b/tools/font2glyphmap/src/font2glyphmap.c	Thu Apr 17 06:57:53 2014 +0300
@@ -23,7 +23,7 @@
 				struct coderange *node;
 				int start, end;
 
-				if(sscanf(argv[++i], "%d-%d", &start, &end) != 2) {
+				if(sscanf(argv[++i], "%i-%i", &start, &end) != 2) {
 					fprintf(stderr, "-range must be followed by a range of the form: START-END\n");
 					return 1;
 				}
@@ -71,7 +71,7 @@
 					struct coderange *r = clist;
 					clist = clist->next;
 
-					sprintf(outfile, "%s_s%d_r%d-%d.%s", basename, font_size, r->start, r->end, SUFFIX);
+					sprintf(outfile, "%s_s%d_r%04x-%04x.%s", basename, font_size, r->start, r->end, SUFFIX);
 					font2glyphmap(font, argv[i], outfile, font_size, r->start, r->end);
 
 					free(r);