keyboard: drop unrelated vi legends

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index 612695e69dcb91db6072d45ab569c920b53cf9a2..3437f8f4aca51ce2da337d4f36f10682a47a93ab 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -9,7 +9,7 @@ my %scver = (
        major => 1,
 );
 
-if ($ENV{PATH_INFO} and $ENV{PATH_INFO} eq '/2') {
+if ($Request and $Request eq '2') {
        %scver = (
                id => 'hots',
                name => 'Heart of the Swarm',
@@ -22,7 +22,7 @@ my $datafile = "sc-units-$scver{id}.inc.pl";
 
 Html({
        title => "$scver{title} unit cheat sheet",
-       version => 'v1.1',
+       version => '1.1',
        description => [
                "Reference of $scver{game} unit properties,"
                . " comparing various statistics of all the units in $scver{name}"
@@ -40,19 +40,19 @@ Html({
        data => [$datafile],
 });
 
-print "<h1>$scver{game} units</h1>\n\n";
+say "<h1>$scver{game} units</h1>\n";
 
 my $units = do $datafile;
 die "Cannot open unit data: $_\n" for $@ || $! || ();
 my $patch = shift @{$units}
        or die "Cannot open unit data: metadata not found\n";
 
-print "<p>Unit properties as seen or measured in $scver{name}\n$patch.\n";
-print "Also see the $_ table.\n" for join(', ',
-       ('<a href="/sc/2">StarCraft 2: HotS</a>')    x ($scver{major} < 2),
-       ('<a href="/sc">original SC: Brood War</a>') x ($scver{major} > 1),
+say "<p>Unit properties as seen or measured in $scver{name}\n$patch.";
+say "Also see the $_ table." for join(', ',
+       (showlink('StarCraft 2: HotS', '/sc/2'))    x ($scver{major} < 2),
+       (showlink('original SC: Brood War', '/sc')) x ($scver{major} > 1),
 );
-print "</p>\n\n";
+say "</p>\n";
 
 sub addupgrade {
        my ($ref, $increase, $org) = @_;
@@ -85,11 +85,9 @@ for my $unit (@{$units}) {
 
 sub coltoggle {
        my ($name, $id, $nolink) = @_;
-       return sprintf(
-               (defined $get{order} ? $get{order} eq $id : !$id) ? '%2$s ▼'
-                       : $nolink ? '%2$s' : '<a href="?%s">%s</a>',
-               $id && "order=$id", $name
-       );
+       return "$name ▼" if defined $get{order} ? $get{order} eq $id : !$id;
+       return $name if $nolink;
+       return showlink($name, '?'.($id && "order=$id"));
 }
 :><table class="units">
 <thead><tr>
@@ -376,7 +374,7 @@ sub showrangeint {
        my ($race, $cat) = ('', '');
        for (@rows) {
                if ($grouped) {
-                       printf '<tbody id="%s"><tr class="race"><th colspan="20"><h2>%s</h2>'."\n",
+                       say sprintf '<tbody id="%s"><tr class="race"><th colspan="20"><h2>%s</h2>',
                                $race = $_->{race}, ucfirst $race
                                        unless $race eq $_->{race};
                }