keyboard/altgr: proper function to convert char maps

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

diff --git a/keyboard/altgr/windows.eng.inc.pl b/keyboard/altgr/windows.eng.inc.pl
index f110c863fe728bd8262819f9337c4ad2a0f24766..d575e81a732fdc3fd2a9a53e5c30a2eb9892fe93 100644 (file)
--- a/keyboard/altgr/windows.eng.inc.pl
+++ b/keyboard/altgr/windows.eng.inc.pl
@@ -1,6 +1,7 @@
 use utf8;
 use strict;
 use warnings;
+do './keyboard/altgr/groups.inc.pl';
 
 my @az = ('A'..'Z', 'a'..'z');
 my @letters = qw(
@@ -21,7 +22,7 @@ my %xkb = (
        '?' => "\N{COMBINING HOOK ABOVE}",
 );
 
-our %rows = (
+my %rows = (
        '~' => "\N{COMBINING TILDE}",
        '`' => "\N{COMBINING GRAVE ACCENT}",
        '!' => '¹',
@@ -60,7 +61,7 @@ our %rows = (
        } 0 .. $#az
 );
 
-my $groups = do './keyboard/altgr/groups.inc.pl';
+my $groups = kbchars(\%rows);
 $groups->{def}{''}{$_} .= ' ext' for keys %xkb;
 $groups->{flag}{ext} = ['xkb', 'unofficial extensions added in Linux (Gnome, KDE)'];