X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/15119838e45242461fa24a14f1243f751d62321f..0a4467b6f8bba70f70d3e6f439db55b507a416ea:/countries.plp

diff --git a/countries.plp b/countries.plp
index 972e312..3019a29 100644
--- a/countries.plp
+++ b/countries.plp
@@ -40,22 +40,8 @@ my $cc = do 'countries.inc.pl';
 				$_ = 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 =~ s/([^,]*), (.*)/$2 $1/;
 			printf "\n".'<td class="%s" title="%s">%s',
 				$_ ? 'X '.$class : '', EscapeHTML("$code: $name"), $_;
 		}
@@ -76,7 +62,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="">reserved
+	<td class="Xr">reserved
+	<td class="">free
+	<td class="X Xi">unused
 	<td class="X Co">user-assigned
 	</table>