common: bump version to 1.8

[sheet.git] / countries.plp

diff --git a/countries.plp b/countries.plp
index 6ad015b29a597eaba50073a0bf54e5e96de2c32a..734a13397728c089efd94b33612b727366340ba0 100644 (file)
--- a/countries.plp
+++ b/countries.plp
@@ -2,11 +2,12 @@
 
 Html({
        title => 'country code cheat sheet',
-       version => 'v1.0',
+       version => '1.2',
        description =>
                "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'],
+       data => ['countries.inc.pl'],
 });
 
 :>
@@ -33,17 +34,26 @@ my $cc = do 'countries.inc.pl';
                                next;
                        };
                        my ($name, $class, $short, $ref) = @$country;
+                       $name .= " → $ref" if $ref;
                        $ref ||= $code;
-                       local $_ = $ref;
+                       my $cell;
                        if (exists $get{show}) {
-                               my $img = "flag/$ref.png";
-                               $_ = sprintf '<img src="/%s" alt="%s">', $img, $ref if -e $img;
+                               sub showflag {
+                                       my ($cc) = @_;
+                                       my $img = "data/flag/$cc.png";
+                                       return -e $img &&
+                                               sprintf '<img src="/%s" alt="%s">', $img, $cc;
+                               }
+
+                               $cell = showflag($code) // join(' ',
+                                       map { showflag($_) || $_ } split / /, $ref
+                               );
                        }
                        else {
-                               $_ = EscapeHTML($short || $name);
+                               $cell = EscapeHTML($short || $name);
                        }
                        printf "\n".'<td class="%s" title="%s">%s',
-                               $_ ? 'X '.$class : '', EscapeHTML("$code: $name"), $_;
+                               $cell ? 'X '.$class : '', EscapeHTML("$code: $name"), $cell;
                }
                print "\n";
        }
@@ -62,9 +72,9 @@ my $cc = do 'countries.inc.pl';
        <td class="X c-oc">oceania
        <td class="X c-sa">south america
        <td class="X c-na">north america
-       <td class="Xr">reserved
+       <td class="X Xr">reserved
+       <td class="X Xi">org
        <td class="">free
-       <td class="X Xi">unused
        <td class="X Co">user-assigned
        </table>