digraphs: account for vim extensions in proposals

[sheet.git] / tools / mkdigraphlist

diff --git a/tools/mkdigraphlist b/tools/mkdigraphlist
index 4af35901004c4fb1d57d681d70bc7dc1ee26ce3f..17b26a441810cf4b954074f2e7611bacfeb77713 100755 (executable)
--- a/tools/mkdigraphlist
+++ b/tools/mkdigraphlist
@@ -16,7 +16,9 @@ my $di = do 'data/digraphs-rfc.inc.pl'
 # personal addendums
 my $extra = do 'data/digraphs-shiar.inc.pl'
        or warn "could not include shiar proposals: ", $@ // $!;
-$di = { %{$di}, %{$extra // {}} };
+my $vim = do 'data/digraphs-vim.inc.pl'
+       or warn "could not include vim extensions ", $@ // $!;
+$di = { %{$vim // {}}, %{$di}, %{$extra // {}} };
 
 # optionally get unicode character information
 my $uninfo = do 'unicode-char.inc.pl'
@@ -35,6 +37,7 @@ print "# automatically generated by $0\n";
 print "use utf8;\n";
 print "+{\n";
 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(',',