X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/aed75298b5098f135ff8159c96775e1ab5e2dad0..02426ec29034d2ab8cd0cf1b11276ebc93c719ff:/Shiar_Sheet/KeyboardChars.pm

diff --git a/Shiar_Sheet/KeyboardChars.pm b/Shiar_Sheet/KeyboardChars.pm
index d406459..e2822cd 100644
--- a/Shiar_Sheet/KeyboardChars.pm
+++ b/Shiar_Sheet/KeyboardChars.pm
@@ -47,9 +47,10 @@ sub kbmodes ($modes) {
 			$info{mode}->{$lead} //= "mode $lead";
 			$info{def}->{$lead}{$lead} = 'g1 mode'; # back
 		}
-		while (my ($c, $v) = each %{ $modes->{$lead} }) {
+		while (my ($k, $v) = each %{ $modes->{$lead} }) {
 			my ($glyph, $title) = $uc->glyph_html($v);
-			$info{key}{$lead.$c} = join "\n", $glyph, $title;
+			$info{key}{$lead.$k} = join "\n", $glyph, $title;
+			my $c = $k =~ s/\A[+^](?=.)//r;  # trim modifier indicator
 
 			my $class = 'g'.(
 				  !defined $v || $c eq $v ? 1 # identical
@@ -62,7 +63,7 @@ sub kbmodes ($modes) {
 				: 6
 			);
 			$g{$class} = 1;
-			$info{def}{$lead}{$c} //= $class;
+			$info{def}{$lead}{$k} //= $class;
 		}
 	}
 	$info{flag} = {%{{