X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/2b09a029e9c61ee24caaab28accb6a44e7125ba7..HEAD:/Shiar_Sheet/Keyboard.pm

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index c5fdb09..4d1c54e 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.06';
+our $VERSION = '3.01';
 
 my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
 my @rowdesc = qw(numeric top home bottom);
@@ -14,12 +14,12 @@ my %keyrows = do 'keys.inc.pl';
 # add first two cases of each row again with each char prepended by + (alt)
 push @$_, map { [map {"+$_"} @$_] } @$_[0,1] for map {@$_} values %keyrows;
 
-my %keytrans = qw(
-	^@ NUL ^a SOH ^b STX ^c ETX  ^d EOT ^e ENQ ^f ACK ^g BEL
-	^h BS  ^i tab ^j LF  ^k VT   ^l FF  ^m CR  ^n SO  ^o SI
-	^p DLE ^q DC1 ^r DC2 ^s DC3  ^t DC4 ^u NAK ^v SYN ^w ETB
-	^x CAN ^y EM  ^z SUB ^[ ESC  ^\ FS  ^] GS  ^^ RS  ^_ US
-	^? DEL
+my %keytrans = (
+	'^h' => "\x{232B}", # BS
+	'^i' => "\x{21E5}", # TAB
+	'^m' => "\x{21B5}", # CR
+	'^?' => "\x{2326}", # DEL
+	'^[' => "\x{238B}", # ESC
 );
 
 sub new {
@@ -36,6 +36,9 @@ sub new {
 		\%Shiar_Sheet::KeySigns::sign;
 	};
 
+	$self->{showkeys} = $PLP::Script::showkeys;
+	$self->{style   } = $PLP::Script::style;
+
 	bless $self, $class;
 }
 
@@ -53,6 +56,7 @@ sub escapeclass {
 	s/\+/_m/g;
 	s/\[/_sbo/g;
 	s/\]/_sbc/g;
+	s/\\/_b/g;
 	s/^$/_/;
 	return $_;
 }
@@ -76,47 +80,72 @@ sub keyunalias {
 	my $self = shift;
 	my ($key, $ancestry) = @_;
 
-	$key =~ s/(\S*?)(\+?\^?\S)($|\s.*)/$2/;
+	$key =~ s/(\S*?)(\+?\^?\S$)/$2/;
 	my $mode = $1;
 	my $keyinfo = $self->{def}->{$mode}->{$key};
 
 	return unless defined $keyinfo;
-	$keyinfo =~ s/^=// or return $keyinfo;
+	return $keyinfo unless ref $keyinfo eq 'SCALAR';
+	$keyinfo = ${$keyinfo};
 	return '' if $ancestry->{$key}++;  # endless loop failsafe
 	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) = @_;
-	my ($desc, $mnem);
+	my ($mode, $key, $def) = @_;
 
-	if (not defined $flags) {
-		$flags = $key eq '^0' ? 'ni' : 'no';
+	if (not defined $def) {
+		$def = [$key eq '^0' ? 'ni' : 'no'];
+	}
+	elsif (ref $def eq 'SCALAR') {
+		$def = [undef, $def];
 	}
-	elsif ($flags =~ s/^=//) { # alias
-		$desc = $self->{sign}->{alias};
-		$desc .= $flags eq "\e" ? 'esc' : $flags;
-		$flags = $self->keyunalias($flags) . ' alias';
+	if (ref $def ne 'ARRAY') {
+		carp "print_key: invalid definition for $mode$key: $def";
+		return;
 	}
-	if (my $txt = $self->{key}->{$mode.$key}) {
-		($desc, $mnem) = split /\n/, $self->escapedesc($txt);
+	my ($flags, $txt) = @{$def};
+	if (ref $txt eq 'SCALAR') {
+		my $ref = ${$txt};
+		$def = $self->keyunalias($ref);
+		$ref = 'esc' if $ref eq "\e";
+		$flags //= $def->[0] if ref $def eq 'ARRAY';
+		$txt = $self->{sign}->{alias} . $ref;
+		$flags .= ' alias';
 	}
+	my ($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';
-	   $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;
-	   $keytxt = qq{<a href="/$1">$keytxt</a>} if $flags =~ s/ ?\blink(\S*)//;
 	my $onclick = $flags =~ s/ ?\bmode(\S*)// && defined $self->{def}{$1} && sprintf(
 		' onclick="setmode(%s)"',
 		$1 eq '' ? '' : sprintf(q{'mode%s'}, escapeclass($1))
 	);
+	my $keyhint = defined($mnem) && qq{ title="$mnem"};
+	if ($self->{tableclass} =~ /\bbig\b/) {
+		$onclick .= $keyhint;
+		$keyhint = '';
+	}
+	my $keytxt = $self->print_letter($key, $mode);
+	   $keytxt .= "<small>$self->{sign}->{motion}</small>" if $flags =~ s/ ?\bargm\b//;  # motion argument
+	   $keytxt .= $self->{sign}->{$1} while $flags =~ s/(?:^| )(arg[a-ln-z]?)\b//;  # arguments
+	   $keytxt  = "<b$keyhint>$keytxt</b>";
+	   $keytxt .= ' '.$desc if defined $desc;
+	   $keytxt = qq{<a href="/$1">$keytxt</a>} if $flags =~ s/ ?\blink(\S*)//;
+	$flags =~ s/\bx\w+/ext/;
+	$flags =~ s/\bv\d+/new/;
 	$flags .= ' chr'.ord(substr $key, -1) if $key ne '^0';
 
 	print qq{\t\t<td class="$flags"$onclick>$keytxt};
@@ -134,11 +163,16 @@ sub print_rows {
 	);
 	my @modes = sort keys %{ $self->{def} };
 
-	print '<table id="rows" class="keys">'."\n\n";
+	printf '<table id="rows" class="%s">'."\n\n", $self->{tableclass} // 'keys';
 
+print_row:
 	for (my $row = -1; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
 		my $keyrow = $row < 0 ? [["\e"]] : $keyrows{$self->{map}}->[$row];
 
+#		grep {
+#			defined $self->{def}->{''}->{$_} or defined $self->{def}->{g}->{$_}
+#		} map { @{$_} } @{$keyrow} or next;
+
 		printf qq{<tbody class="row row%d">\n}, $row+1;
 		for my $basemode (@modes) {
 			my @moderows = split /\s+/,
@@ -147,8 +181,8 @@ sub print_rows {
 
 		for my $submode (@moderows ? @moderows : '') {
 			my $mode = $basemode . $submode;
-			my @caserows = $mode =~ s/(\d+)(?:-(\d+))?$//
-				? (map {$_ - 1} split //, $row == 0 && $2 || $1)  # user override
+			my @caserows = $mode =~ s/(\d+)(?:-(\d*))?$//
+				? (map {$_ - 1} split //, $row == 0 ? $2 // $1 : $1)  # user override
 				: @$defrows;  # default
 			my $modekeys = $self->{def}{$mode};
 
@@ -185,11 +219,11 @@ sub print_legend {
 	my $self = shift;
 	my ($class, $flags) = @_;
 
-	print qq{\t\t<dl class="legend $class">\n};
-	printf("\t\t".'<dt class="%s">%s'."\n\t\t\t".'<dd>%s'."\n",
+	say qq{\t\t<dl class="legend $class">};
+	printf("\t\t".'<dt class="%s">%s'."\n\t\t\t".'<dd>%s</dd>'."\n",
 		$_, map { $self->escapedesc($_) } @{ $self->{flag}->{$_} || ["($_)", '...'] }
 	) for @$flags;
-	print "\t\t</dl>";
+	say "\t\t</dl>";
 }
 
 1;
@@ -205,13 +239,10 @@ 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', 'description', 'hover comments'],
 			},
 		},
-		key => {
-			'leada' => ['description', 'comments (on hover)'],
-		},
 		mode => {
 			'lead' => 'mode description',
 		},
@@ -222,7 +253,7 @@ Shiar_Sheet::Keyboard - Output HTML for key sheets
 
 =head1 DESCRIPTION
 
-Used by http://sheet.shiar.nl to display keyboard sheets.
+Used by https://sheet.shiar.nl to display keyboard sheets.
 Assumes specific stylesheets and javascript from this site,
 so probably not of much use elsewhere.