X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/211543b923759291c93630472bae959c6e8fb652..b97ebd969b2e520d3e65509c0f892edacae70520:/charset.plp

diff --git a/charset.plp b/charset.plp
index b0d3b83..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,37 +66,37 @@ 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 {
-			print "<p>Encoding $input unknown</p>\n";
+			Alert("Encoding <q>$input</q> unknown");
 		}
-		\%row;
+		$row{set} ? \%row : ();
 	}
 	else {
 		();
 	}
 } map { defined $ALIAS{$_} ? @{ $ALIAS{$_} } : $_ }
-	$ENV{PATH_INFO} =~ /\w/ ? split(m{[/+\s]}, $ENV{PATH_INFO}) : 'default';
+	$Request =~ /\w/ ? split(m{[/+\s]}, $Request) : 'default';
 my $NOCHAR = chr 0xFFFD;
 
 for my $cp437 (grep {$request[$_]->{set} eq 'cp437'} 0 .. $#request) {
@@ -123,7 +122,7 @@ sub range_cell {
 		$cols = $len if $len < $cols; #TODO: optimise
 		if ($len -= $cols) {
 			# continued on new row
-			$table->{$offset + $nibsize*$cols} = [$len*$nibsize, "$class joinu", $name, $title];
+			$table->{$offset + $nibsize*$cols} //= [$len*$nibsize, "$class joinu", $name, $title];
 			$name = '';
 			$class .= ' joind';
 		}
@@ -133,7 +132,7 @@ sub range_cell {
 		# multiple full rows
 		if ($len -= $rows << 4) {
 			# partial row remains
-			$table->{$offset + $nibsize*$rows * 16} = [$len*$nibsize, "$class joinu", '', $title];
+			$table->{$offset + $nibsize*$rows * 16} //= [$len*$nibsize, "$class joinu", '', $title];
 			$class .= ' joind';
 		}
 		$attr .= sprintf ' rowspan=%d', $rows;
@@ -182,7 +181,7 @@ for my $row (@request) {
 		}
 		print "\n";
 	}
-	print "</table></div>\n";
+	say '</table></div>';
 }
 
 :>