X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/f6ae52898e175c06356e7a847f5f0f69d16f0fd0..78535a7725d2dbf3c0377b9d8069773349ca8c12:/tools/mkcharinfo

diff --git a/tools/mkcharinfo b/tools/mkcharinfo
index 8bf3d54..8f762fa 100755
--- a/tools/mkcharinfo
+++ b/tools/mkcharinfo
@@ -2,7 +2,6 @@
 use 5.014;
 use warnings;
 use utf8;
-no if $] >= 5.018, warnings => 'experimental::smartmatch';
 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 $@ || $!;
-		$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: $@";
 }