X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/108d13f833e9daeff4ea1552e2e1bee1e0ed8c22..ccc4981ff62e695908a9855041b9669800a733ed:/charset.plp

diff --git a/charset.plp b/charset.plp
index 4c01b78..d3b27b5 100644
--- a/charset.plp
+++ b/charset.plp
@@ -24,7 +24,6 @@ my $glyphs = Shiar_Sheet::FormatChar->new;
 my @nibble = (0..9, 'A'..'F');
 my $nibsize = 1;
 
-use Encode qw(decode resolve_alias);
 # generate character table(s)
 # (~16x faster than decoding in loop;
 #  substr strings is twice as fast as splitting to an array)
@@ -67,29 +66,29 @@ my @request = map {
 			$row{table} = ' ' x 1024;
 			$row{set} = 'Unicode planes';
 			$row{cell} = do 'charset-ucplanes.inc.pl'
-				or printf "<p class=error>Table data could not be read: <em>%s</em>.</p>\n", $@ || $!;
+				or Alert('Table data could not be read', $@ || $!);
 			@nibble = (map { $_.0, $_.8 } 0 .. 7);
 			$nibsize = 8;
 		}
-		elsif ($row{set} = resolve_alias($input)) {
+		elsif ($row{set} = Encode::resolve_alias($input)) {
 			if ($row{set} eq 'Internal') {
 				$row{table} = ' ' x ($endpoint < 255 ? 640 : 8192);
 				$row{set} = 'Unicode BMP';
 				$row{cell} = do 'charset-unicode.inc.pl'
-					or printf "<p class=error>Table data could not be read: <em>%s</em>.</p>\n", $@ || $!;
+					or Alert('Table data could not be read', $@ || $!);
 			}
 			elsif ($row{set} eq 'utf-8-strict') {
 				$row{table} = undef;
 				$row{set} = 'UTF-8';
 				$row{cell} = do 'charset-utf8.inc.pl'
-					or printf "<p class=error>Table data could not be read: <em>%s</em>.</p>\n", $@ || $!;
+					or Alert('Table data could not be read', $@ || $!);
 			}
 			else {
-				$row{table} = decode($row{set}, pack 'C*', $row{offset} .. $endpoint);
+				$row{table} = Encode::decode($row{set}, pack 'C*', $row{offset} .. $endpoint);
 			}
 		}
 		else {
-			say "<p class=error>Encoding <q>$input</q> unknown</p>";
+			Alert("Encoding <q>$input</q> unknown");
 		}
 		$row{set} ? \%row : ();
 	}