X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/cb45c5967530d4c2207f1c1f5d19553ec7c0de7a..290c85c0f46c87ae95eeece911bdd3f57ba51dfd:/tools/mkfontinfo

diff --git a/tools/mkfontinfo b/tools/mkfontinfo
index 84e7a25..ed328cf 100755
--- a/tools/mkfontinfo
+++ b/tools/mkfontinfo
@@ -64,12 +64,17 @@ eval {
 } or warn "Could not include count for html entities: $@";
 
 eval {
+	my $agemap = do 'unicode-age.inc.pl'
+		or warn "Could not include unicode version data: $!";
+
 	use Unicode::UCD 'charinfo';
 	for my $code (0 .. 256**2*2) {
 		my $charinfo = charinfo($code) or next;
 		next if $charinfo->{category} =~ /^[MC]/;  # ignore Marks and "other" Control chars
 		push @{ $charlist{$_}->{ $charinfo->{$_} } }, chr $code
 			for qw( script category block );
+		push @{ $charlist{version}->{$_} }, (chr $code) x ($agemap->{$code} <= $_)
+			for 11, 30, 63;
 	}
 	1;
 } or warn "Could not include unicode groups: $@";
@@ -130,7 +135,7 @@ $charlist{osdefault} = [qw( win95 win8 mac109 android oss )];
 say "# automatically generated by $0";
 say 'use utf8;';
 say '+', pp(\%charlist) =~ s{
-	( \[ \s* \d [^]]* ) ,\s*  # arrays of numbers, excluding trailing comma
+	( \[ \s* \d [^]]* ) ,\s* (?= \] )  # arrays of numbers, excluding trailing comma
 }{ $1 =~ s/\s+//gr }msxgre;  # strip whitespace
 
 __END__