charset: extend inheritance to generic metadata hashes

[sheet.git] / tools / mkdigraphs-shiar

diff --git a/tools/mkdigraphs-shiar b/tools/mkdigraphs-shiar
index 4f2b75abb88a65879f8ee2e10324859ef59c5065..55134b4bb7487b4a52ff8a790a6fa6d89c16b9b6 100755 (executable)
--- a/tools/mkdigraphs-shiar
+++ b/tools/mkdigraphs-shiar
@@ -1,10 +1,9 @@
 #!/usr/bin/env perl
-use 5.010;
-use strict;
+use 5.014;
 use warnings;
 use open IN => ':utf8', ':std';
 
-our $VERSION = '1.00';
+our $VERSION = '1.03';
 
 my $di = do "data/digraphs-rfc.inc.pl"
        or warn "official digraphs not included for comparison: ", $@ // $!;
@@ -12,10 +11,10 @@ my $di = do "data/digraphs-rfc.inc.pl"
 say "# automatically generated by $0";
 say '+{';
 for (readline) {
-       my ($mnem, $chr) = m{^([!"%'-Z_a-z]{2}) (.)} or next;
+       my ($mnem, $cp, $chr) = m{^([!"%'-Z_a-z]{2}) (?:\\(\d+)|(.))} or next;
        warn("$mnem already defined"), next if defined $di->{$mnem};
-       my $chrnum = ord $chr;
-       say "q{$1} => $chrnum,";
+       my $chrstr = sprintf '"\x{%x}"', $cp // ord $chr;
+       say "q{$mnem} => $chrstr,";
 }
 say '}';