X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/601c737a133afc2884c7e88d293268918d26f315..ec70841119a49ebeed4e14ce682f29d15e1ed27d:/Shiar_Sheet/Keyboard.pm

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 30b73bf..2b3cc86 100644
--- a/Shiar_Sheet/Keyboard.pm
+++ b/Shiar_Sheet/Keyboard.pm
@@ -6,7 +6,7 @@ use warnings;
 no  warnings 'uninitialized';  # save some useless checks for more legible code
 use Carp;
 
-our $VERSION = 'v2.04';
+our $VERSION = 'v2.05';
 
 my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
 my @rowdesc = qw(numeric top home bottom);
@@ -81,7 +81,7 @@ sub keyunalias {
 	my $keyinfo = $self->{def}->{$mode}->{$key};
 
 	return unless defined $keyinfo;
-	return $keyinfo->[0] if ref $keyinfo;
+	$keyinfo =~ s/^=// or return $keyinfo;
 	return '' if $ancestry->{$key}++;  # endless loop failsafe
 	return $self->keyunalias($keyinfo, $ancestry);
 }
@@ -89,16 +89,16 @@ sub keyunalias {
 sub print_key {
 	my $self = shift;
 	my ($mode, $key, $flags) = @_;
+	my ($desc, $mnem);
 
 	if (not defined $flags) {
-		$flags = [$key eq '^0' ? 'ni' : 'no'];
+		$flags = $key eq '^0' ? 'ni' : 'no';
 	}
-	elsif (not ref $flags) { # alias
-		my $desc = $self->{sign}->{alias};
+	elsif ($flags =~ s/^=//) { # alias
+		$desc = $self->{sign}->{alias};
 		$desc .= $flags eq "\e" ? 'esc' : $flags;
-		$flags = [$self->keyunalias($flags) . ' alias', $desc];
+		$flags = $self->keyunalias($flags) . ' alias';
 	}
-	my ($flags, $desc, $mnem) = @{$flags};
 	if (my $txt = $self->{key}->{$mode.$key}) {
 		($desc, $mnem) = split /\n/, $self->escapedesc($txt);
 	}
@@ -126,7 +126,7 @@ sub print_key {
 sub print_rows {
 	my $self = shift;
 	my %moderows = (
-		-DEFAULT => !@_ ? '' : split(/(?:\s*([^=\s]*)=\s*)/, shift),
+		-DEFAULT => !!@_ && $_[0] ne '' && split(/(?:\s*([^=\s]*)=\s*)/, shift),
 		# plus specific mode overrides prefixed by '='
 	);
 	my $defrows = shift || [2, 1, 0];
@@ -203,8 +203,8 @@ Shiar_Sheet::Keyboard - Output HTML for key sheets
 	my $keys = Shiar_Sheet::Keyboard({
 		def => {
 			'lead' => {
-				'A' => 'a', # alias
-				'a' => ['classes'],
+				'A' => '=a', # alias
+				'a' => 'classes',
 			},
 		},
 		key => {