X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/cedae5e24d6b2e849262c4a921570fdc7cb8a44a..e41fa43a164e0932a2f8fe9efa5ff6f74b6b7de0:/tools/mkcharinfo

diff --git a/tools/mkcharinfo b/tools/mkcharinfo
index 1cac30a..2c006c5 100755
--- a/tools/mkcharinfo
+++ b/tools/mkcharinfo
@@ -48,9 +48,10 @@ eval {
 
 my %diinc = (
 	'data/digraphs-rfc.inc.pl' => 'u-di',
-	'data/digraphs-shiar.inc.pl' => 'u-prop Xz',
+	'data/digraphs-shiar.inc.pl' => 'u-prop ex',
+	'data/digraphs-vim.inc.pl' => 'u-prop',
 );
-for (keys %diinc) {
+for (sort keys %diinc) {
 	-e $_ or next;
 	my $di = do $_ or die "Error reading digraphs file $_: ", $@ || $!;
 	while (my ($mnem, $cp) = each %$di) {
@@ -82,6 +83,10 @@ for my $chr (keys %info) {
 
 	$info->{$_} = $info{$chr}->{$_} for keys %{ $info{$chr} };
 
+	# official digraphs either lose vim flag or gain experimental
+	delete $info->{class}->{'u-prop'} or $info->{class}->{ex}++
+		if $info->{class}->{'u-di'};
+
 	# categorise by unicode types and writing script
 	$info->{class}->{$_}++ for $info->{category};
 	$info->{class}->{$_}++ for $info->{script} || ();