From 864adbb0287dc16f05e41f612a0f2835c9848d7b Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Thu, 7 Aug 2008 23:27:42 +0000
Subject: [PATCH] key formatting code in seperate print_key function

---
 index.plp | 47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/index.plp b/index.plp
index 602eefc..ed49475 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};
 
@@ -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
 
-- 
2.30.0