X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/137be49b9a79623be00aa0cb1f416599949b1cf9..4db6b29c6105b1db1b04d9177eab261d2d2e57f4:/unicode.plp

diff --git a/unicode.plp b/unicode.plp
index 3173cfd..0ec6374 100644
--- a/unicode.plp
+++ b/unicode.plp
@@ -2,7 +2,7 @@
 
 Html({
 	title => 'unicode glyph cheat sheet',
-	version => 'v1.0',
+	version => '1.1',
 	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'digraphs.inc.pl unicode.inc.pl'],
+	data => [qw'unicode-table.inc.pl unicode-char.inc.pl'],
 });
 
 :>
@@ -26,7 +26,6 @@ i^k or i^vu respectively in <a href="/vi">Vim</a>.
 <div class="diinfo">
 
 <:
-use 5.010;
 use Shiar_Sheet::FormatChar;
 my $glyphs = Shiar_Sheet::FormatChar->new;
 
@@ -38,69 +37,42 @@ if (exists $get{q}) {
 }
 if (exists $get{html}) {
 	$glyphs->{anno} = ['html', 'xml'];
+	$glyphs->{style} = 'html';
 }
 
 our $verbose = exists $get{v};
 
-my $tables = do 'unicode.inc.pl' or die $@ || $!;
-
-$glyphs->print(map {
-	my $_ = /(.*)\?(.*)/ ? ($verbose ? $2 : $1) : $_;
-	if (!$_) {
-		();
-	}
-	elsif (/[A-Z]/) {
-		tr/_/ /;
-		$_;
-	}
-	else {
-		state $group;
-		$group = $1 if s{^([^/]+)/}{};
-		my @select = s/=(.*)// ? split(/=/, $1) : ();
-		my $table = $tables->{$group}->{$_}
-			or die "Unknown table specified: $group/$_";
-
-		if (@select) {
-			my $rowlen;
-			for ($rowlen = 1; $rowlen++; $rowlen <= $#$table) {
-				last if $table->[$rowlen] =~ /\./;
-			}
-			my @cells = map {
-				my $end = (s/-(.+)?// ? ($1 // @$table / $rowlen - 1) : $_) + 1;
-				$_ * $rowlen .. $end * $rowlen - 1;
-			} @select;
-			$table = [ @$table[@cells] ];
-		}
-		$table;
-	}
-} qw{
+my @config = qw(
 	Popular
 		punctuation/quoting
-			common
+			common=-5?common
 		symbols/binary?symbols/binary=-5
 		latin/sample=-1
-			sample=2-
+			?sample=2-
 			?uncommon
 		punctuation/version
 		punctuation/marks
 			spacing
 	Symbols
 		symbols/currency
-			cards
+			cards=-3?cards
 			?chess
+			harvey
 			signs1
 			communic=0?communic
 			trinity=0?trinity
 			signs2
 	Signs
 			solar
-			zodiac=0?zodiac
+			zodiac=0-1=3?zodiac
 	Key_commands
 		keys/spacing
 			editing
 			modifier
 			control
 			command
+			android=0
+			ps
 			?player
 	Mathematics
 		math/size
@@ -143,15 +115,57 @@ $glyphs->print(map {
 			?hiraderiv
 			?kata
 			?kataderiv
-});
+);
+
+splice @config, 4, 2, qw(
+		latin/vowels=-5?latin/vowels
+			 westeuro
+			?easteuro
+) if exists $get{html};
+
+$_ and m{/*+(.+)} and @config = split /[ ]/, $1 for $Request, $get{q};
+
+my $tables = do 'unicode-table.inc.pl' or die $@ || $!;
+
+$glyphs->print(map {
+	my $_ = /(.*)\?(.*)/ ? ($verbose ? $2 : $1) : $_;
+	if (!$_) {
+		();
+	}
+	elsif (/[A-Z]/) {
+		tr/_/ /;
+		$_;
+	}
+	else {
+		state $group;
+		$group = $1 if s{^([^/]+)/}{};
+		my @select = s/=(.*)// ? split(/=/, $1) : ();
+		my $table = $tables->{$group}->{$_}
+			or die "Unknown table specified: $group/$_";
+
+		if (@select) {
+			my $rowlen;
+			for ($rowlen = 1; $rowlen++; $rowlen <= $#$table) {
+				last if $table->[$rowlen] =~ /\./;
+			}
+			my @cells = map {
+				my $end = (s/-(.+)?// ? ($1 // @$table / $rowlen - 1) : $_) + 1;
+				$_ * $rowlen .. $end * $rowlen - 1;
+			} @select;
+			$table = [ @$table[@cells] ];
+		}
+		$table;
+	}
+} @config);
 
 :></div>
 
 <div class="legend">
 	<table class="glyphs"><tr>
-	<td class="X l4">ascii
-	<td class="X l3"><:= $glyphs->{style} eq 'di' ? 'digraph' : 'latin1' :>
-	<td class="X l2"><:= $glyphs->{style} eq 'di' ? 'proposed' : 'BMP' :>
+	<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>