X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/f850d8bca38d6f025cd26b62b6e5504dd4d77ad1..c11640facf0c976140547ef1b58971ec8a661dd3:/cc.plp

diff --git a/cc.plp b/cc.plp
index 8473241..7138c3b 100644
--- a/cc.plp
+++ b/cc.plp
@@ -17,14 +17,6 @@
 <:
 my $cc = do 'cc.inc.pl';
 
-sub quote {
-	local $_ = shift;
-	s/"/&quot;/g;
-	s/</&lt;/g;
-	s/>/&gt;/g;
-	return $_;
-}
-
 {
 	printf '<table class="mcmap">';
 	print '<col><colgroup span="26">';
@@ -62,12 +54,12 @@ sub quote {
 				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])(\w{2,})/$1./g;  # abbreviate (at consonant)
-				$_ = quote($_);
+				s/(\S{4}[b-df-hj-np-tv-xz])((?<!Austr)(?!land)\w{2,})/$1./g;  # abbreviate (at consonant)
+				$_ = EscapeHTML($_);
 			}
 			$name =~ s/([^,]*), (.*)/$2 $1/;
 			printf "\n".'<td class="%s" title="%s">%s',
-				$_ ? 'X '.$class : '', quote("$code: $name"), $_;
+				$_ ? 'X '.$class : '', EscapeHTML("$code: $name"), $_;
 		}
 		print "\n";
 	}