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

diff --git a/latin.plp b/latin.plp
index 7f94ebf..578d858 100644
--- a/latin.plp
+++ b/latin.plp
@@ -2,7 +2,7 @@
 
 Html({
 	title => 'latin alphabet cheat sheet',
-	version => '1.3',
+	version => '1.7',
 	description => [
 	],
 	keywords => [qw'
@@ -17,76 +17,9 @@ Html({
 
 :>
 <style>
-	@font-face {
-		font-family: Suetterlin; /* R. G. Arens */
-		src: url("/suetterlin.ttf");
-	}
-	#sütterlin td { font-family: Suetterlin }
-	#ita2 td,
-	#tap-code td,
-	#tap-simplified td {
-		white-space: normal;
-		word-spacing: 5em; /* force line break between words */
-	}
-	#tap-code td,
-	#tap-simplified td {
-		line-height: 1ex;
-	}
-	#ita2 td {
-		font-size: 50%;
-	}
-	#cards td {
-		font-family: Symbola, "DejaVu Sans", serif, sans;
-	}
-	#pigpen {
-		stroke-linecap: square;
-	}
-	#nyctographs,
-	#old-roman-cursive {
-		stroke-linecap: round;
-		stroke-linejoin: round;
-	}
-	td {
-		white-space: nowrap;
-	}
-
-	.sample {
+	td svg {
 		vertical-align: middle;
-		text-align: left;
-		padding: 1px 0.3em;
-	}
-	#old-roman-cursive .sample span {
-		margin-right: -10px;
-	}
-	#tap-code .sample,
-	#tap-simplified .sample {
-		font-size: 80%;
-	}
-	#ita2 .sample,
-	#tap-code .sample,
-	#tap-simplified .sample {
-		word-spacing: 0;
-	}
-	#ita2 .sample span,
-	#tap-code .sample span,
-	#tap-simplified .sample span {
-		margin-right: 1ex;
-		white-space: nowrap;
-	}
-	#sutton-asl .sample span,
-	#maritime-flags .sample span,
-	#morse .sample span {
-		margin-right: 0.5ex;
-	}
-	#pigpen .sample svg {
-		margin-right: 0.1em;
-	}
-	#nyctographs .sample svg {
-		background: rgba(0,0,0, .1);
-		padding: 0.1em;
-		margin-right: 0.2em;
 	}
-
 	svg path:not([fill]) {
 		stroke: currentColor;
 		fill: none;
@@ -95,11 +28,15 @@ Html({
 		fill: currentColor;
 	}
 
-	td {
-		vertical-align: top;
+	.sample {
+		text-align: left;
+		padding: 1px 0.3em;
 	}
-	td > svg {
-		vertical-align: middle;
+	td.sample {
+		width: auto;
+	}
+	th {
+		white-space: nowrap; /* prevent resize by sample */
 	}
 </style>
 
@@ -110,45 +47,76 @@ 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", $@ || $!);
+my $table = Data('writing-latn');
+{
+	say '<div>';
+	say '<style>';
+	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";
 }
-else {
-	say '<table class="glyphs">';
-	for my $row (pairs @table) {
-		my ($title, $cells) = @{$row};
-		printf '<tr id="%s">', (lc $title) =~ s/<[^>]+>//gr =~ s/\s+/-/gr;
-		say '<th>', $title;
+
+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';
+		$th .= sprintf ' title="%s"', $_ for $info->{title} || ();
+		say "<$th>", $info->{name} // ucfirst $id;
+
 		my $colspan = 1;
 		my $col = 0;
-		for (@{$cells}) {
+		for (@{ $info->{list} }) {
 			$col++;
 			if ($_ eq '>') {
 				$colspan++;
 				next;
 			}
+			my @class;
+			push @class ,'l0' if $VOWELCOLS{$col - $colspan};
+			push @class, $_ ? 'ex' : 'u-invalid' if s/^-//;
+
 			print "\t<td";
+			if ($col > 26) {
+				# special character for sample generation
+				print ' hidden';  # sample only
+			}
+			else {
+				print ' title=', chr($col + ord('A') - $colspan);
+			}
 			if ($colspan > 1) {
 				print " colspan=$colspan";
 				$colspan = 1;
 			}
-			print ' hidden' if $col > 26;  # sample only
-			print ' class=', $_ ? 'ex' : 'u-invalid' if s/^-//;
+			printf ' class="%s"', "@class" if @class;
 			print '>';
 			say;
 		}
 	}
-	say "</table>\n";
 }
 
-:></div>
-
+:>
 <script type="text/javascript" src="/latinsample.js"></script>
-<script type="text/javascript"> prependinput(document.getElementById('intro')) </script>
+<script type="text/javascript"><!--
+	prependinput(document.getElementById('intro'));
+//--></script>