X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/d22e7febda8720bc38069f7061adb43b98143c48..HEAD:/latin.plp

diff --git a/latin.plp b/latin.plp
index 199a49c..578d858 100644
--- a/latin.plp
+++ b/latin.plp
@@ -2,7 +2,7 @@
 
 Html({
 	title => 'latin alphabet cheat sheet',
-	version => '1.5',
+	version => '1.7',
 	description => [
 	],
 	keywords => [qw'
@@ -47,33 +47,36 @@ or <span title="fuck yeah!">'mercan</span>) letters A–Z.
 Also see <a href="/writing">related alphabets</a>
 and <a href="/chars/abc">font comparison</a>.</p>
 
-<div>
-
 <:
-use List::Util qw( pairs );
-
-my @table = do 'writing-latn.inc.pl';
-if ($! or $@) {
-	Alert("Table data not found", $@ || $!);
-}
-else {
+my $table = Data('writing-latn');
+{
+	say '<div>';
 	say '<style>';
-	for my $row (pairs @table) {
-		my ($id, $info) = @{$row};
+	while (my ($id, $info) = each %$table) {
+		ref $info eq 'HASH' or next;
 		my $style = $info->{style} or next;
 		ref $style or $style = [$style];
 		say "\t", !/^@/ && "#$id ", $_ for @{$style};
 	}
 	say "</style>\n";
+}
 
-	my %VOWELCOLS = (map { ($_ => 1) } 0, 4, 8, 14, 20, 24);
-	say '<table class="glyphs">';
-	say '<thead><tr><th># <small>ASCII − 64</small>';
-	print '<td>', $_ for 1 .. 26;
-	say '</thead>';
-
-	for my $row (pairs @table) {
-		my ($id, $info) = @{$row};
+my %VOWELCOLS = (map { ($_ => 1) } 0, 4, 8, 14, 20, 24);
+say '<table class="glyphs">';
+say '<thead>';
+printtr('order');
+say '</thead>';
+printtr('default');
+say "</table></div>";
+
+sub printtr {
+	for my $id (@_) {
+		my $info = $table->{$id};
+
+		if (ref $info eq 'ARRAY') {
+			printtr(@{$info});
+			next;
+		}
 
 		printf '<tr id="%s">', $id;
 		my $th = 'th';
@@ -109,11 +112,9 @@ else {
 			say;
 		}
 	}
-	say "</table>\n";
 }
 
-:></div>
-
+:>
 <script type="text/javascript" src="/latinsample.js"></script>
 <script type="text/javascript"><!--
 	prependinput(document.getElementById('intro'));