X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/d16b2e5239f51485e63e27b1b8700611377e0d9f..ff9e3ed9324334426d82f411422efd5480692dff:/index.plp

diff --git a/index.plp b/index.plp
index 602eefc..01a3bf2 100644
--- a/index.plp
+++ b/index.plp
@@ -125,6 +125,29 @@ sub escapeclass {
 	return $_;
 }
 
+sub print_key {
+	my ($mode, $key, $keyinfo) = @_;
+
+	$keyinfo = [ $sign{alias}.$keyinfo, keyunalias($keyinfo)->[1] . ' alias' ]
+		if defined $keyinfo and not ref $keyinfo;  # alias
+	my ($desc, $flags, $mnem) = @$keyinfo if defined $keyinfo;
+	defined $desc or $flags = $key eq '^0' ? 'ni' : 'no';
+
+	my $keytxt = $mode . Entity($key) if $key ne '^0';
+	   $keytxt .= $sign{arg} while $flags =~ s/ ?\barg\b//;  # argument
+	   $keytxt .= "<small>$sign{motion}</small>" if $flags =~ s/ ?\bargm\b//;  # motion argument
+	   $keytxt =~ s{\^(?=.)}{<small>^</small>};  # element around ctrl-identifier
+	my $onclick = $flags =~ s/ ?\bmode(\S*)// && defined $keys{$1} && sprintf(
+		' onclick="setmode(%s)"',
+		$1 eq '' ? '' : sprintf(q{'mode%s'}, escapeclass($1))
+	);
+	my $keyhint = defined($mnem) && qq{ title="$mnem"};
+
+	print qq{\t\t<li class="$flags"$onclick><b$keyhint>$keytxt</b>};
+	print ' ', $desc if defined $desc;
+	print "\n";
+}
+
 our $map = defined $keyrows{$get{map}} ? $get{map} : 'qwerty';
 my $keyrows = $keyrows{$map};
 
@@ -137,7 +160,7 @@ for (my $row = 0; $row <= $#$keyrows; $row++) {
 			  @$keycase or next;
 
 			printf(qq{\t<li%s><h3>%s</h3>\n}, # XXX insert &nbsp; here to fix msie<=6
-				$mode eq '' ? '' : sprintf(
+				$mode ne '' && sprintf(
 					' class="%s"', 'mode mode' . escapeclass($mode)
 				),
 				sprintf('%s<small>: %s</small>',
@@ -149,29 +172,7 @@ for (my $row = 0; $row <= $#$keyrows; $row++) {
 			   $modeclass .= ' lead' if defined $modekeys->{lead};  # leading command key shown
 			   $modeclass .= " $casedesc[$case]" if defined $casedesc[$case];
 			print qq{\t\t<ul class="$modeclass">\n};
-
-			for my $key (@$keycase) {
-				my $keyinfo = $modekeys->{$key};
-				$keyinfo = [ $sign{alias}.$keyinfo, keyunalias($keyinfo)->[1] . ' alias' ]
-					if defined $keyinfo and not ref $keyinfo;  # alias
-				my ($desc, $flags, $mnem) = @$keyinfo if defined $keyinfo;
-				defined $desc or $flags = $key eq '^0' ? 'ni' : 'no';
-
-				my $keytxt = $modekeys->{lead} . Entity($key) if $key ne '^0';
-				   $keytxt .= $sign{arg} while $flags =~ s/ ?\barg\b//;  # argument
-				   $keytxt .= "<small>$sign{motion}</small>" if $flags =~ s/ ?\bargm\b//;  # motion argument
-				   $keytxt =~ s{\^(?=.)}{<small>^</small>};  # element around ctrl-identifier
-				my $onclick = $flags =~ s/ ?\bmode(\S*)// && defined $keys{$1} && sprintf(
-					' onclick="setmode(%s)"',
-					$1 eq '' ? '' : sprintf(q{'mode%s'}, escapeclass($1))
-				);
-				my $keyhint = defined($mnem) && qq{ title="$mnem"};
-
-				print qq{\t\t<li class="$flags"$onclick><b$keyhint>$keytxt</b>};
-				print ' ', $desc if defined $desc;
-				print "\n";
-			} # key
-
+			print_key($modekeys->{lead}, $_, $modekeys->{$_}) for @$keycase;
 			print qq{\t\t</ul>\n};
 		} # case
 
@@ -222,13 +223,13 @@ for (my $row = 0; $row <= $#$keyrows; $row++) {
 		<li>keyboard <strong>map</strong> is
 			<:= $get{map} ? 'set to ' : '' :><em><:= $map :></em>
 		<li><strong>ascii</strong> mode is
-			<:= exists $get{ascii} ? 'forced ' : '' :><em><:=
+			<:= exists $get{ascii} && 'forced ' :><em><:=
 				$ascii ? 'on' : 'off' :></em>
 		<li><strong>keys</strong> are
 			<em><:= $showkeys ? 'always shown' : 'hidden if unassigned' :></em><:=
-				exists $get{keys} ? '' : ' by default' :>
+				exists $get{keys} || ' by default' :>
 		<li>default <strong>style</strong> is
-			<:= defined $get{style} ? 'set to ' : '' :><em><:= $style :></em>
+			<:= defined $get{style} && 'set to ' :><em><:= $style :></em>
 		</ul>
 	</div>
 </div>