sc: lotv patch v5.0.12 (2023-09-29)

[sheet.git] / tools / mkcharinfo

diff --git a/tools/mkcharinfo b/tools/mkcharinfo
index 8bf3d54fb62bea78a537947f7360209a7031ea34..8f762fad6d2fc06d921750b216bb2267b12cf634 100755 (executable)
--- a/tools/mkcharinfo
+++ b/tools/mkcharinfo
@@ -2,7 +2,6 @@
 use 5.014;
 use warnings;
 use utf8;
 use 5.014;
 use warnings;
 use utf8;

-no if $] >= 5.018, warnings => 'experimental::smartmatch';

 use lib '.';
 
 use open OUT => ':encoding(utf-8)', ':std';
 use lib '.';
 
 use open OUT => ':encoding(utf-8)', ':std';


@@ -41,7 +40,9 @@ eval {
 for my $layout ('macos-abc', 'windows') {
        eval {
                my $kbd = do "./keyboard/altgr/$layout.eng.inc.pl" or die $@ || $!;
 for my $layout ('macos-abc', 'windows') {
        eval {
                my $kbd = do "./keyboard/altgr/$layout.eng.inc.pl" or die $@ || $!;

-               $info{$_} //= {} for map {s/◌//g; m/\A./g} values %{ $kbd->{key} };
+               my @def = map { values %{$_} } values %{ $kbd->{def} }
+                       or die 'missing key definitions';
+               $info{$_} //= {} for map {s/◌//g; m/\A./g} map { $_->[1] // () } @def;

                1;
        } or warn "Failed reading additional keyboard map $layout: $@";
 }
                1;
        } or warn "Failed reading additional keyboard map $layout: $@";
 }