X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/c1b893b857c7f9a001c401cf45deec6daa2a9aa4..a4ce539e586a1397b116dfbe6abfad6a0481454c:/tools/mkdigraphlist

diff --git a/tools/mkdigraphlist b/tools/mkdigraphlist
index e472ce0..216be6a 100755
--- a/tools/mkdigraphlist
+++ b/tools/mkdigraphlist
@@ -6,7 +6,7 @@ use utf8;
 
 use open OUT => ':utf8', ':std';
 
-our $VERSION = '1.04';
+our $VERSION = '1.05';
 
 # import and combine various digraph data
 my $rfc = do 'data/digraphs-rfc.inc.pl'
@@ -30,15 +30,15 @@ printf '(map {$_=>0} qw{%s}),'."\n", join(' ',
 	grep { !defined $di->{$_} }
 	map { substr($_, 1, 1).substr($_, 0, 1) } sort keys %{$di}
 );
-printf "q{%s}=>[%s],\n", $_, join(',',
-	$di->{$_},   # original code point
+printf "q{%s}=>[%s],\n", s/(?=[\\}])/\\/gr, join(',',
+	ord $di->{$_},   # original code point
 	map {"'$_'"}
-	$uninfo->{ chr $di->{$_} }->[1],  # name
+	$uninfo->{ $di->{$_} }->[1] // '',  # name
 	$vim->{$_}
-		? $rfc->{$_} ? 'u-di' : 'u-prop'  # vim+rfc or vim-only
-		:              'u-prop ex',  # neither
-	$uninfo->{ chr $di->{$_} }->[0] =~ s/ u-di| u-prop| ex//gr,  # class
-	$uninfo->{ chr $di->{$_} }->[4] // (),  # string
+		? $rfc->{$_} ? 'u-di' : 'u-prop'  # vim+rfc or vim only
+		: $rfc->{$_} ? 'ex'   : 'u-prop ex',  # rfc only or neither
+	($uninfo->{ $di->{$_} }->[0] // '') =~ s/ u-di| u-prop| ex//gr,  # class
+	$uninfo->{ $di->{$_} }->[4] // (),  # string
 ) for sort keys %{$di};
 print "}\n";