X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/bac74b5934f22cc3d0e971d26fe0275f7f5db7b3..HEAD:/unicode.plp

diff --git a/unicode.plp b/unicode.plp
index 4d28dbd..a7d5459 100644
--- a/unicode.plp
+++ b/unicode.plp
@@ -2,7 +2,7 @@
 
 Html({
 	title => 'unicode glyph cheat sheet',
-	version => '1.1',
+	version => '1.4',
 	description => [
 		"Common Unicode characters with digraph or code point, layed out for quick location.",
 		"Includes general symbols, arrows, drawing characters, and IPA letters.",
@@ -11,7 +11,7 @@ Html({
 		unicode glyph char character reference common ipa symbol sign mark table digraph
 	'],
 	stylesheet => [qw'light dark mono circus red'],
-	data => [qw'unicode-table.inc.pl unicode-char.inc.pl'],
+	data => [qw( unicode-table.inc.pl data/unicode-char.inc.pl )],
 });
 
 :>
@@ -64,6 +64,7 @@ my @config = qw(
 			signs2
 	Signs
 			solar
+			?minorplanets
 			zodiac=0-1=3?zodiac
 	Key_commands
 		keys/spacing
@@ -72,7 +73,7 @@ my @config = qw(
 			control
 			command
 			android=0
-			ps
+			ps=0
 			?player
 	Mathematics
 		math/size
@@ -84,11 +85,11 @@ my @config = qw(
 			double
 			white
 			black
+			triangle
+			barb
 			block
 			blacktri
 			whitetri
-			?-large
-			?-heavy
 	Line_drawing
 		lines/double
 			doubleh
@@ -106,10 +107,13 @@ my @config = qw(
 			fill4
 			fill4i
 			fill8
+			colour
 	IPA
 		ipa/cons
 			consco
 			vowels
+			tones
+			contours
 	?Japanese
 		?japanese/hira
 			?hiraderiv
@@ -123,12 +127,12 @@ splice @config, 4, 2, qw(
 			?easteuro
 ) if exists $get{html};
 
-$_ and m{/*+(.+)} and @config = split /[ ]/, $1 for $ENV{PATH_INFO}, $get{q};
+$_ and m{/*+(.+)} and @config = split /[ ]/, $1 for $Request, $get{q};
 
-my $tables = do 'unicode-table.inc.pl' or die $@ || $!;
+my $tables = Data('unicode-table');
 
 $glyphs->print(map {
-	my $_ = /(.*)\?(.*)/ ? ($verbose ? $2 : $1) : $_;
+	$_ = /(.*)\?(.*)/ ? ($verbose ? $2 : $1) : $_;
 	if (!$_) {
 		();
 	}
@@ -141,11 +145,11 @@ $glyphs->print(map {
 		$group = $1 if s{^([^/]+)/}{};
 		my @select = s/=(.*)// ? split(/=/, $1) : ();
 		my $table = $tables->{$group}->{$_}
-			or die "Unknown table specified: $group/$_";
+			or Abort("Unknown table specified: $group/$_", 404);
 
 		if (@select) {
 			my $rowlen;
-			for ($rowlen = 1; $rowlen++; $rowlen <= $#$table) {
+			for ($rowlen = 1; $rowlen <= $#$table; $rowlen++) {
 				last if $table->[$rowlen] =~ /\./;
 			}
 			my @cells = map {
@@ -158,18 +162,10 @@ $glyphs->print(map {
 	}
 } @config);
 
-:></div>
+say "</div>\n";
 
-<div class="legend">
-	<table class="glyphs"><tr>
-	<td class="X l5">ascii
-	<td class="X l4"><:= $glyphs->{style} eq 'di' ? 'digraph' : 'latin1' :>
-	<td class="X l3"><:= $glyphs->{style} eq 'di' ? 'proposed' : 'HTML4' :>
-	<td class="X l2">unicode ≤6.0
-	<td class="X l1">other unicode
-	<td class="X ex">discouraged
-	</table>
-</div>
+say for $glyphs->legend;
 
+:>
 <script type="text/javascript" src="/clipboard.js"></script>