X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/c4ca0bd3e94a7978772dadaa3b941ecc84741407..HEAD:/keyboard/altgr/index.inc.pl

diff --git a/keyboard/altgr/index.inc.pl b/keyboard/altgr/index.inc.pl
index 30783f7..b864e13 100644
--- a/keyboard/altgr/index.inc.pl
+++ b/keyboard/altgr/index.inc.pl
@@ -4,10 +4,11 @@ use warnings;
 my %cat = (
 	default => [qw( euro latin science graph )],
 	euro => [qw( windows ukext macos macos-abc weur eurkey msx )],
-	latin => [qw( ipa olpc boyeg drix )],
+	ipa     => [qw( ipa-ucl xipa )],
+	latin   => [qw( ipa-ucl olpc boyeg drix )],
 	science => [qw( symbolics apl spacecadet )],
 	graph => [qw( unigraph emojiworks )],
-	extra => [qw( msx-graph p8scii zoo )],
+	extra => [qw( msx-graph c64 atari p8scii zoo )],
 );
 
 for my $name (map {@{$_}} values %cat) {
@@ -15,10 +16,18 @@ for my $name (map {@{$_}} values %cat) {
 	my %row = %{$keys}{qw( title category flag mode image imagealt )};
 	$cat{$name} = \%row;
 
-	$keys->{mode} //= {'' => undef};
-	for my $mode (keys %{ $keys->{mode} }) {
-		$row{def}{''}{$_} = $keys->{def}{''}{$_} for $mode || ();
-		$row{inventory}{$mode}{$_}++ for grep { /^g[2-9]/ } map { s/ (?!ext).*//r } map {$_->[0]}
+	$row{mode} //= {'' => undef};
+
+	if (($keys->{moderows} // '') =~ /^\d* [3-9] \d{2,}/x) {
+		# move root ^ctrl or +meta keys to distinct mode
+		$row{mode}{"\e"} = '+';
+		/^[+^]./ and $keys->{def}{"\e"}{$_} = delete $keys->{def}{''}{$_}
+			for keys %{ $keys->{def}{''} };
+	}
+
+	for my $mode (keys %{ $row{mode} }) {
+		$row{inventory}{$mode}{$_}++
+			for grep { /^g[2-9]/ } map { s/ (?!ext).*//r } map {$_->[0]}
 			values %{ $keys->{def}{$mode} };
 	}
 }