keyboard/altgr: build precomposed macos-abc characters

diff --git a/keyboard/altgr/macos-abc.eng.inc.pl b/keyboard/altgr/macos-abc.eng.inc.pl
index 57d6146480e18e405960a729b967f8b6596a7032..18c7bed1d05369b0a7d60f6a3b3cc4c67d89c2e3 100644 (file)
--- 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 4d51ff8b249391d432fc5518f53ed130290edfb3..f110c863fe728bd8262819f9337c4ad2a0f24766 100644 (file)
--- 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 6d08f9e868004b87b649e150f943eea04f51590b..c04ca8a3a5cd5c314d0eca115bb783f28c71d8ba 100755 (executable)
--- 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;