charset: drop experimental class for digraph proposals

Distinguish only u-di and u-prop for supported and proposed digraphs,
without overloading ex for unofficial entries.

Fixes unwanted styling if digraphs are otherwise unmarked (charset tables)
without affecting other pages (unicode, chars, writing) where it's already
ignored.

diff --git a/tools/mkcharinfo b/tools/mkcharinfo
index 988d7b151ec86b4835849d124745fbb8373ec123..6f58efff660394b6e375f6a42ab1ccf14557574d 100755 (executable)
--- a/tools/mkcharinfo
+++ b/tools/mkcharinfo
@@ -8,7 +8,7 @@ no if $] >= 5.018, warnings => 'experimental::smartmatch';
 use open OUT => ':utf8', ':std';
 use Data::Dump 'pp';
 
-our $VERSION = '1.01';
+our $VERSION = '1.02';
 
 my %info = (
        # prepare presentational string for some control(lish) entries
@@ -48,8 +48,8 @@ eval {
 
 my %diinc = (
        'data/digraphs-rfc.inc.pl' => 'u-di',
-       'data/digraphs-shiar.inc.pl' => 'u-prop ex',
-       'data/digraphs-vim.inc.pl' => 'u-prop',
+       'data/digraphs-shiar.inc.pl' => 'u-prop',
+       'data/digraphs-vim.inc.pl' => 'u-vim',
 );
 for (sort keys %diinc) {
        -e $_ or next;
@@ -84,9 +84,9 @@ 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'};
+       # ignore vim flag in addition to rfc support, replace otherwise
+       $info->{class}->{'u-di'} or $info->{class}->{'u-prop'}++
+               if delete $info->{class}->{'u-vim'};
 
        # categorise by unicode types and writing script
        $info->{class}->{$_}++ for $info->{category};