X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/999b31f165d86bb9faf5f743cefd0f5fc60ae28b..075927fba20a8170940e71f88f1cb1b7a2d4ef77:/unicode.plp

diff --git a/unicode.plp b/unicode.plp
index e3d7402..ab2e217 100644
--- a/unicode.plp
+++ b/unicode.plp
@@ -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'],
 });
 
 :>
@@ -38,42 +38,12 @@ 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
@@ -83,6 +53,7 @@ $glyphs->print(map {
 			?uncommon
 		punctuation/version
 		punctuation/marks
+			spacing
 	Symbols
 		symbols/currency
 			cards
@@ -100,6 +71,8 @@ $glyphs->print(map {
 			modifier
 			control
 			command
+			android
+			ps
 			?player
 	Mathematics
 		math/size
@@ -142,7 +115,42 @@ $glyphs->print(map {
 			?hiraderiv
 			?kata
 			?kataderiv
-});
+);
+
+$_ and m{/*+(.+)} and @config = split /[ ]/, $1 for $ENV{PATH_INFO}, $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>