From 1fffc8ba4ed48b9cc9a8fd76532ef7396f3d27b6 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sat, 30 Dec 2023 06:48:48 +0100
Subject: [PATCH] keyboard/altgr: build precomposed macos-abc characters

---
 keyboard/altgr/macos-abc.eng.inc.pl | 2 +-
 keyboard/altgr/windows.eng.inc.pl   | 2 +-
 tools/mkcharinfo                    | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/keyboard/altgr/macos-abc.eng.inc.pl b/keyboard/altgr/macos-abc.eng.inc.pl
index 57d6146..18c7bed 100644
--- a/keyboard/altgr/macos-abc.eng.inc.pl
+++ b/keyboard/altgr/macos-abc.eng.inc.pl
@@ -181,7 +181,7 @@ our %rows = (
 	'>b' => 'ɓ',
 );
 
-my $groups = do 'keyboard/altgr/groups.inc.pl';
+my $groups = do './keyboard/altgr/groups.inc.pl';
 $groups->{mode} = {
 	''  => 'option-shifted ⌥',
 	':' => '№ number prefix ⌥:',
diff --git a/keyboard/altgr/windows.eng.inc.pl b/keyboard/altgr/windows.eng.inc.pl
index 4d51ff8..f110c86 100644
--- a/keyboard/altgr/windows.eng.inc.pl
+++ b/keyboard/altgr/windows.eng.inc.pl
@@ -60,7 +60,7 @@ our %rows = (
 	} 0 .. $#az
 );
 
-my $groups = do 'keyboard/altgr/groups.inc.pl';
+my $groups = do './keyboard/altgr/groups.inc.pl';
 $groups->{def}{''}{$_} .= ' ext' for keys %xkb;
 $groups->{flag}{ext} = ['xkb', 'unofficial extensions added in Linux (Gnome, KDE)'];
 
diff --git a/tools/mkcharinfo b/tools/mkcharinfo
index 6d08f9e..c04ca8a 100755
--- a/tools/mkcharinfo
+++ b/tools/mkcharinfo
@@ -34,6 +34,13 @@ eval {
 	1;
 } or warn "Failed reading unicode tables: $@";
 
+eval {
+	do './keyboard/altgr/macos-abc.eng.inc.pl' or die $@ || $!;
+	our %rows;
+	$info{$_} //= {} for values %rows;
+	1;
+} or warn "Failed reading additional keyboard map: $@";
+
 eval {
 	require HTML::Entities;
 	our %char2entity;
-- 
2.30.0