X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/79d144c6834749e1e61c8ed1a9a60c8e4cc30a0d..ad81ac24b07376ca3ca8899e2fa4eed19f7f32c7:/Shiar_Sheet/Keyboard.pm

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 936b811..6819236 100644
--- a/Shiar_Sheet/Keyboard.pm
+++ b/Shiar_Sheet/Keyboard.pm
@@ -84,18 +84,17 @@ sub print_key {
 	my $self = shift;
 	my ($mode, $key, $flags) = @_;
 
-	my $txt = $self->{key}->{$mode.$key};
-	my ($desc, $mnem) = defined $txt ? @$txt : ();
-
 	if (not defined $flags) {
-		$flags = $key eq '^0' ? 'ni' : 'no';
+		$flags = [$key eq '^0' ? 'ni' : 'no'];
 	}
 	elsif (not ref $flags) { # alias
-		$desc = $self->{sign}->{alias} . $flags;
-		$flags = $self->keyunalias($flags) . ' alias';
+		my $desc = $self->{sign}->{alias};
+		$desc .= $flags eq "\e" ? 'esc' : $flags;
+		$flags = [$self->keyunalias($flags) . ' alias', $desc];
 	}
-	else {
-		$flags = $flags->[0];
+	my ($flags, $desc, $mnem) = @{$flags};
+	if (my $txt = $self->{key}->{$mode.$key}) {
+		($desc, $mnem) = @{$txt};
 	}
 
 #	$key = $keytrans{$key} if defined $keytrans{$key};
@@ -127,12 +126,15 @@ sub print_rows {
 	my $defrows = shift || [2, 1, 0];
 	my @modes = sort keys %{ $self->{def} };
 
+	print '<ul id="rows">'."\n\n";
+
 	for (my $row = -1; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
 		my $keyrow = $row < 0 ? [["\e"]] : $keyrows{$self->{map}}->[$row];
 
 		printf qq{<li class="row row%d"><ul>\n}, $row+1;
-		for my $basemode ($row < 0 ? '' : @modes) {
+		for my $basemode (@modes) {
 			my @moderows = split /\s+/,
+				$row < 0 ? "0" :
 				defined $moderows{$basemode} ? $moderows{$basemode} : $moderows{-DEFAULT};
 
 		for my $submode (@moderows ? @moderows : '') {
@@ -167,6 +169,8 @@ sub print_rows {
 		} # basemode
 		print qq{\t</ul>\n};
 	} # row
+
+	print "</ul>\n";
 }
 
 sub print_legend {