From d018b1fcc5e1035c2302b2417480003aca64fa5e Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sun, 4 Mar 2018 21:34:18 +0100
Subject: [PATCH] keys: separate method to format key letters

Move code to improve maintainability.
---
 Shiar_Sheet/Keyboard.pm | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 44ecc4d..846a2a2 100644
--- a/Shiar_Sheet/Keyboard.pm
+++ b/Shiar_Sheet/Keyboard.pm
@@ -89,6 +89,19 @@ sub keyunalias {
 	return $self->keyunalias($keyinfo, $ancestry);
 }
 
+sub print_letter {
+	my $self = shift;
+	my ($key, $mode) = @_;
+
+	return if $key eq '^0';
+	return 'Esc' if $key eq "\e";
+#	return $keytrans{$key} if defined $keytrans{$key};
+	my $html = $self->{def}{$mode}{lead} . escapehtml($key);
+	   $html =~ s{\^(?=.)}{<small>^</small>};  # element around ctrl-identifier
+	   $html =~ s{\+(?=.)}{<small>+</small>};  # meta
+	return $html;
+}
+
 sub print_key {
 	my $self = shift;
 	my ($mode, $key, $flags) = @_;
@@ -106,12 +119,9 @@ sub print_key {
 		($desc, $mnem) = split /\n/, $self->escapedesc($txt);
 	}
 
-#	$key = $keytrans{$key} if defined $keytrans{$key};
-	my $keytxt = $key eq "\e" ? 'Esc' : $self->{def}{$mode}{lead} . escapehtml($key) if $key ne '^0';
+	my $keytxt = $self->print_letter($key, $mode);
 	   $keytxt .= $self->{sign}->{$1} while $flags =~ s/(?:^| )(arg[a-ln-z]?)\b//;  # arguments
 	   $keytxt .= "<small>$self->{sign}->{motion}</small>" if $flags =~ s/ ?\bargm\b//;  # motion argument
-	   $keytxt =~ s{\^(?=.)}{<small>^</small>};  # element around ctrl-identifier
-	   $keytxt =~ s{\+(?=.)}{<small>+</small>};  # meta
 	my $keyhint = defined($mnem) && qq{ title="$mnem"};
 	   $keytxt  = "<b$keyhint>$keytxt</b>";
 	   $keytxt .= ' '.$desc if defined $desc;
-- 
2.30.0