X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/378d119f5791fea807f36749ce9ecb5a5c60952e..130c94fc7747fd586b677f48fbabd2ecf10297c5:/charset.plp

diff --git a/charset.plp b/charset.plp
index e5fdd45..6577f4c 100644
--- a/charset.plp
+++ b/charset.plp
@@ -12,6 +12,7 @@ Html({
 		reference common overview table
 	'],
 	stylesheet => [qw'light'],
+	data => [qw'charset-unicode.inc.pl charset-utf8.inc.pl'],
 });
 
 :>
@@ -20,6 +21,8 @@ Html({
 <:
 use Shiar_Sheet::FormatChar;
 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)
@@ -60,10 +63,12 @@ my @request = map {
 			$row{table} = ' ' x 512;
 			$row{set} = 'Unicode planes';
 			$row{cell} = do 'charset-ucplanes.inc.pl';
+			@nibble = (map { $_.0, $_.8 } 0 .. 7);
+			$nibsize = 8;
 		}
 		elsif ($row{set} = resolve_alias($input)) {
 			if ($row{set} eq 'Internal') {
-				$row{table} = ' ' x ($endpoint < 255 ? 640 : 4096);
+				$row{table} = ' ' x ($endpoint < 255 ? 640 : 8192);
 				$row{set} = 'Unicode BMP';
 				$row{cell} = do 'charset-unicode.inc.pl';
 			}
@@ -96,7 +101,6 @@ for my $cp437 (grep {$request[$_]->{set} eq 'cp437'} 0 .. $#request) {
 	);
 }
 
-my @nibble = (0..9, 'A'..'F');
 for my $row (@request) {
 	printf '<div class="section"><table class="glyphs%s">', !$row->{cell} && ' charmap';
 	printf '<caption>%s</caption>', $row->{set};
@@ -110,12 +114,13 @@ for my $row (@request) {
 	for my $msb (0 .. (length($row->{table}) || 256) - 1 >> 4) {
 		printf '<tr><th>%X', $msb + ($row->{offset} >> 4);
 		for my $lsb (0 .. $#nibble) {
+			my $val = ( ($msb<<4) + $lsb ) * $nibsize;
 			if ($row->{cell}) {
-				print $row->{cell}->(($msb<<4) + $lsb);
+				print $row->{cell}->($val);
 				next;
 			}
 
-			my $glyph = substr $row->{table}, ($msb<<4) + $lsb, 1;
+			my $glyph = substr $row->{table}, $val, 1;
 			if ($glyph eq $NOCHAR) {
 				print '<td>';
 				next;
@@ -164,7 +169,7 @@ for my $row (@request) {
 	</table>
 
 	<table class="glyphs"><tr>
-	<td class="X">unicode 5.0
+	<td class="X">unicode 7.0
 	<td class="X Xr">proposed
 	<td class="X Xd">deprecated
 	<td class="">unassigned