digraphs: mkdigraphlist: inline conversion of character details

[sheet.git] / tools / mkcharinfo

diff --git a/tools/mkcharinfo b/tools/mkcharinfo
index 1cac30ad7ee597fe4f288b7418f5f09e591db184..2c006c5d34fd202cc8aec19648953516796116be 100755 (executable)
--- 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} || ();