keyboard/altgr: proper function to convert char maps

[sheet.git] / keyboard / altgr / apl.eng.inc.pl

diff --git a/keyboard/altgr/apl.eng.inc.pl b/keyboard/altgr/apl.eng.inc.pl
index a2459967cae39a5d83959b5cbcf762282ae60366..45acbd52a9ac19fff04da3d3d6ebd8469becf7b6 100644 (file)
--- a/keyboard/altgr/apl.eng.inc.pl
+++ b/keyboard/altgr/apl.eng.inc.pl
@@ -1,6 +1,7 @@
 use utf8;
 use strict;
 use warnings;
+do './keyboard/altgr/groups.inc.pl';
 
 my %dyalogx = (
        'Q' => '⍰',
@@ -10,7 +11,7 @@ my %dyalogx = (
        'N' => '⍡',
        'M' => '∥',
 );
-our %rows = (
+my %rows = (
        '~' => '⌺',
        '!' => '⌶',
        '@' => '⍫',
@@ -91,7 +92,7 @@ our %rows = (
        %dyalogx,
 );
 
-my $groups = do 'keyboard/altgr/groups.inc.pl';
+my $groups = kbchars(\%rows);
 $groups->{def}{''}{$_} = 'g4' for split //,'weEriIoOa/*'; # lookalikes
 $groups->{def}{''}{$_} .= ' ext' for keys %dyalogx;
 $groups->{flag}{ext} = ['extended', 'optional operators not available in all variants'];