index: bump version to 1.6

[sheet.git] / countries.plp

diff --git a/countries.plp b/countries.plp
index 838a2886303d70ef867066a9c852ae5825819f1b..24be34802db88aea9b168d06b803cfeeceaafcc4 100644 (file)
--- a/countries.plp
+++ b/countries.plp
@@ -2,15 +2,15 @@
 
 Html({
        title => 'country code cheat sheet',
-       version => 'v1.0',
+       version => 'v1.1',
        description =>
-               "Table of ISO-3166-2 country codes with the names of reserved territories.",
-       keywords => [qw'country code cc tld territory land table'],
-       stylesheet => [qw'light dark mono red'],
+               "Table of ISO-3166-1 country codes with the names of reserved territories.",
+       keywords => [qw'country code cc tld cctld continent territory land table'],
+       stylesheet => [qw'light dark circus mono red'],
 });
 
 :>
-<h1>Country codes</h1>
+<h1>ISO-3166-1α2 Country codes</h1>
 
 <:
 my $cc = do 'countries.inc.pl';
@@ -36,26 +36,13 @@ my $cc = do 'countries.inc.pl';
                        $ref ||= $code;
                        local $_ = $ref;
                        if (exists $get{show}) {
-                               my $img = "flag/$ref.png";
+                               my $img = "data/flag/$ref.png";
                                $_ = sprintf '<img src="/%s" alt="%s">', $img, $ref if -e $img;
                        }
                        else {
-                               $_ = $short || $name;
-                               s/,.*//;
-                               s/(?<=.)\(.*\)\s*//;
-                               s/ republic\b//gi;
-                               s/ islands?\b//gi;
-                               s/\bthe //g;
-                               s/ and / & /g and s/(?<=.)[a-z ]+//g;
-                               s/\bsaint /st /gi;
-                               s/South(?:ern)? /S-/g;
-                               s/North(?:ern)? /N-/g;
-                               s/New /n./g;
-                               s/(\S)(\S+)-/$1-/g;  # strip most chars preceding dash
-                               s/(\S{4}[b-df-hj-np-tv-xz])((?<!Austr)(?!land)\w{2,})/$1./g;  # abbreviate (at consonant)
-                               $_ = EscapeHTML($_);
+                               $_ = EscapeHTML($short || $name);
+                               $name .= " → $ref" if $ref and $ref ne $code;
                        }
-                       $name =~ s/([^,]*), (.*)/$2 $1/;
                        printf "\n".'<td class="%s" title="%s">%s',
                                $_ ? 'X '.$class : '', EscapeHTML("$code: $name"), $_;
                }
@@ -72,11 +59,13 @@ my $cc = do 'countries.inc.pl';
        <td class="X c-af">africa
        <td class="X c-eu">europe
        <td class="X c-as">asia
-       <td class="X c-aa">antarctica
+       <td class="X c-an">antarctica
        <td class="X c-oc">oceania
        <td class="X c-sa">south america
        <td class="X c-na">north america
-       <td class="">reserved
+       <td class="X Xr">reserved
+       <td class="X Xi">org
+       <td class="">free
        <td class="X Co">user-assigned
        </table>