X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/f1bebae9f4ca77ef3e1b4d3036933f29a0da1ac0..HEAD:/keyboard.plp

diff --git a/keyboard.plp b/keyboard.plp
index d40c434..fa2aaf2 100644
--- a/keyboard.plp
+++ b/keyboard.plp
@@ -1,23 +1,41 @@
 <(common.inc.plp)><:
 
-my $mode = lc($Request || 'altgr');
-my $include = "$mode.eng";
+$Request ||= 'altgr/windows';
+my $mode = lc $Request;
+my $include = "keyboard/$mode.eng";
+
+if (-e (my $page = "keyboard/$Request/index.inc.plp")) {
+	Include $page;
+	exit;
+}
 
 my $info = eval { Data($include) } || {};
 warn "error in $include: ", @{$@} if ref $@;
 $mode = $info->{title} // $mode;
 
+my $showkeys //= !exists $get{keys} ? undef :
+	($get{keys} ne '0' && ($get{keys} || 'always'));
+my @keystyle = (
+	'<!--[if lte IE 6]><style> .help dl.legend dt {margin:0 0 1px} </style><![endif]-->',
+	'<!--[if lte IE 7]><style> .help dl.legend dd {float:none} </style><![endif]-->',
+	!$showkeys ? '<style> .no {visibility:hidden} </style>' :
+	$showkeys eq 'ghost' ? '<style> .no, .alias {opacity:.5} </style>' : (),
+	'<script type="text/javascript" src="/keys.js?1.6" async></script>',
+);
+
 Html({
 	title => "\L$mode\E keyboard cheat sheet",
 	version => $info->{version} || '0.1',
+	canonical => -e "$Request.plp" ? "/$Request" : undef, # historic shorthand
 	description => $info->{description} //
 		["Keyboard cheat sheet for the default controls of $mode."],
 	keywords => [@{ $info->{keywords} // [] }, qw'
 		sheet cheat reference overview keyboard control commands shortkey
 	'],
+	image => $info->{image},
 	stylesheet => [qw( light dark circus mono red )],
-	keys => 1,
 	data => ["$include.inc.pl"],
+	raw => \@keystyle,
 });
 
 %{$info} or Abort(
@@ -25,7 +43,7 @@ Html({
 	'404 request not found',
 );
 
-say "<h1>$mode cheat sheet</h1>";
+say "<h1>$mode keyboard</h1>";
 say "<p>$_</p>" for $info->{intro} // ();
 say "<h2>", $info->{mode}->{''}, " (default)</h2>"
 	if $info->{mode} and %{ $info->{mode} } > 1;
@@ -33,20 +51,21 @@ say "<h2>", $info->{mode}->{''}, " (default)</h2>"
 use Shiar_Sheet::Keyboard 2.08;
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
-$keys->print_rows($get{rows}, $info->{rows});
+$keys->print_rows($get{rows} || $info->{moderows}, $info->{rows});
 
 {
 	say "<hr/>\n";
 	say '<div class="help">';
 
+	use List::MoreUtils qw( part );
+	my @gflags = part {/^g\d/} sort keys %{ $keys->{flag} };
+
 	say "\t", '<div class="left">';
-	my @groups = sort grep {/^g\d/} keys %{ $keys->{flag} };
-	$keys->print_legend('legend-types', \@groups);
+	$keys->print_legend('legend-types', $gflags[1]);
 	say "\t</div>\n";
 
 	say "\t", '<div class="right">';
-	my @attr = sort grep {!/^g\d/} keys %{ $keys->{flag} };
-	$keys->print_legend('legend-options', \@attr);
+	$keys->print_legend('legend-options', $gflags[0]);
 	say '';
 
 	say "\t\t", '<ul class="legend legend-set">';