unicode: distinguish proposed digraphs again

Parse digraphs.inc.pl classes for Xz for now.

diff --git a/font.plp b/font.plp
index 4cc99c9deee7ca639302c82ec96ddf91dcf9c59c..819bae7df4f5d9a9675c66e70c7708a67a327efa 100644 (file)
--- a/font.plp
+++ b/font.plp
@@ -129,7 +129,7 @@ for my $chr (@chars) {
        my ($class, $name, $mnem, $html, $string) = @$info;
        print "<td>$_" for sprintf('%X', $codepoint), EscapeHTML($name || '?');
        printf '<td class="%s">%s', @$_ for (
-               [$ascii ? 'l0' : defined $mnem ? 'l4' : 'l1', $mnem // ''],
+               [$ascii ? 'l0' : defined $mnem ? $class =~ /\bu-di\b/ ? 'l4' : 'l3' : 'l1', $mnem // ''],
                [$ascii ? 'l0' : defined $html ? 'l4' : 'l1', $html // ''],
                (map {
                        !$font{$_}->{-id} ? [l0 => '?'] :

diff --git a/tools/convert-unicode.pl b/tools/convert-unicode.pl
index 98c8ca77e3ec35b1525d056ec49e9a301be6a412..51e27cd20c27a156f99070f95dc3e59846d656e2 100755 (executable)
--- a/tools/convert-unicode.pl
+++ b/tools/convert-unicode.pl
@@ -47,9 +47,14 @@ for (keys %diinc) {
        my $di = do $_ or die "Error reading digraphs file $_: ", $@ || $!;
        while (my ($mnem, $cp) = each %$di) {
                length $mnem == 2 or next;  # limit to digraphs
-               $cp = chr $cp->[0] if ref $cp;  # old style array
+               my $class = $diinc{$_};
+               if (ref $cp) {
+                       # old style array
+                       $class = 'u-prop' if $cp->[2] and $cp->[2] =~ m/\bXz\b/;
+                       $cp = chr $cp->[0];
+               }
                $info{$cp}->{di} //= $mnem;
-               $info{$cp}->{class}->{$_}++ for $diinc{$_};
+               $info{$cp}->{class}->{$class}++;
        }
 }