From 55fccedff787f05a5950ff827b5bbd41ba597e3f Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Thu, 25 Jan 2024 20:00:13 +0100
Subject: [PATCH] keyboard/altgr: mkcharinfo from updated include structure

Derive from returned object as intermediate key data was replaced in commit
v1.16-32-g23f7b10a84 (2024-01-01) [proper function to convert char maps].
---
 tools/mkcharinfo | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/mkcharinfo b/tools/mkcharinfo
index c04ca8a..61f674f 100755
--- a/tools/mkcharinfo
+++ b/tools/mkcharinfo
@@ -3,11 +3,12 @@ use 5.014;
 use warnings;
 use utf8;
 no if $] >= 5.018, warnings => 'experimental::smartmatch';
+use lib '.';
 
 use open OUT => ':encoding(utf-8)', ':std';
 use Data::Dump 'pp';
 
-our $VERSION = '1.02';
+our $VERSION = '1.03';
 
 my %info = (
 	# prepare presentational string for some control(lish) entries
@@ -35,9 +36,8 @@ eval {
 } or warn "Failed reading unicode tables: $@";
 
 eval {
-	do './keyboard/altgr/macos-abc.eng.inc.pl' or die $@ || $!;
-	our %rows;
-	$info{$_} //= {} for values %rows;
+	my $kbd = do './keyboard/altgr/macos-abc.eng.inc.pl' or die $@ || $!;
+	$info{$_} //= {} for map {s/◌//g; m/\A./g} values %{ $kbd->{key} };
 	1;
 } or warn "Failed reading additional keyboard map: $@";
 
-- 
2.30.0