X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/d0b79daa05d1341a6ca18cfb4c074047d694268e..ef1048178fa3bc0d43f4e2bbbee58530f8b0e55c:/unicode.plp

diff --git a/unicode.plp b/unicode.plp
index c7b85c2..7c05183 100644
--- a/unicode.plp
+++ b/unicode.plp
@@ -15,41 +15,54 @@ $header{content_type} = 'text/html; charset=utf-8';
 <head>
 <title>digraph cheat sheet</title>
 <meta http-equiv="content-type" content="utf-8">
-<!-- link rel="stylesheet" type="text/css" media="all" href="unicode.css" -->
+<link rel="stylesheet" type="text/css" media="all" href="/digraphs.css">
 <style>
 table {
-	border-collapse: collapse;
-	margin: 1ex;
+	margin: 1ex 1ex 2ex;
+	float: left;
+	table-layout: auto;
+}
+thead td {
+	width: auto;
+}
+tbody {
+	border-width: 0;
+}
+h2, h3 {
+	clear: both;
+}
+
+th {
+	text-align: left;
+	font-size: 50%;
+	background: #888;
+	color: #FFF;
+	padding: 0 0.2em;
 }
-tbody td, th {
-	border: 1px solid #888;
+thead td {
+	border: 0;
 }
+
 td {
-	text-align: center;
+	background: transparent;
 	vertical-align: top;
 	margin: 0;
 	padding: 0;
+	width: 1.6em;
 }
 small {
 	font-size: 50%;
 	display: block;
-	width: 3.2em;
-	background: #888;
-	color: #FFF;
 }
-table {
-	float: left;
-}
-h2, h3 {
-	clear: both;
-}
-th {
-	text-align: left;
-	font-size: 50%;
+small.digraph {
 	background: #888;
 	color: #FFF;
-	padding: 0 0.5em;
 }
+small.value {
+	background: #CCC;
+	color: #666;
+}
+
 td.empty {
 	background: #DDD;
 }
@@ -81,79 +94,100 @@ sub quote {
 sub table {
 	my ($width, $digraphs, $rowheads, $colheads) = @_;
 
-	my @cells;
-	push @cells, sprintf '<td title="%s"%s>%s%s',
-		$di{ord $_} && $diinfo->{$di{ord $_}}->[1],
-		$_ eq '-' ? ' class="empty"' : $_ eq '=' ? ' class="reserved"' : '',
-		$_ eq '-' || $_ eq '=' ? '&nbsp;' : quote($_),
-		$di{ord $_} && sprintf(' <small>%s</small>', $di{ord $_})
-			for @$digraphs;
-
-	if ($rowheads) {
-		splice @cells, $_ * $width, 0, '<th>'.($rowheads->[$_] || '&nbsp;')
-			for reverse 0 .. $#cells / $width;
-		$width++;
-	}
-
 	my @rows;
-	push @rows, sprintf '<tr>%s', join '', splice @cells, 0, $width, ()
-		while @cells;
+
+	my $colspan = 1;
+	for my $cell (@$digraphs) {
+		my $class;
+		if ($cell eq '.') {
+			push @rows, '';
+			$rows[-1] .= '<th>'.(shift @$rowheads || '&nbsp;') if $rowheads;
+			next;
+		}
+		elsif ($cell eq '>') {
+			$colspan++;
+			next;
+		}
+		elsif ($cell =~ s/^-//) {
+			$class = 'empty';
+		}
+		elsif ($cell eq '=') {
+			$class = 'reserved';
+			$cell = '';
+		}
+
+		my $code = join '', map { $di{ord $_} || '' } split //, $cell;
+		my $name = $diinfo->{$code}->[1];
+
+		$rows[-1] .= sprintf('<td%s%s%s>%s%s',
+			defined $name  ? qq{ title="$name"}  : '',
+			defined $class ? qq{ class="$class"} : '',
+			$colspan > 1 && qq{ colspan="$colspan"},
+			$cell eq '' ? '&nbsp;' : quote($cell),
+			$code ne '' ? sprintf(' <small class="digraph">%s</small>', quote($code))
+				: length($cell) == 1 && $cell !~ /[a-z]/
+					? sprintf(' <small class="%s">%04X</small>', 'value', ord $cell)
+					: '',
+		);
+
+		$colspan = 1;
+	}
 
 	if ($colheads) {
 		unshift @rows, sprintf '<thead><tr><td>%s<tbody>', join '',
-			map { sprintf '<th title="%2$s">%s', split(/:/, $colheads->[$_], 2) }
-			0 .. $width-2;
+			map { sprintf '<th title="%2$s">%s', split(/:/, $_, 2) }
+			@$colheads
 	}
 
-	return sprintf "<table>%s</table>\n", join '', @rows;
+	return sprintf "<table>\n%s</table>\n", join '', map {"<tr>$_\n"} @rows;
 }
 
 print "<h2>Arrows</h2>\n\n";
 print table(@$_) for (
-	[ 4 => [qw{â â â â  â - â â  â â â -}]],
-	[ 4 => [qw{â â â â  â - â â  â â â -}]],
-	[ 3 => [qw{â¤ â² â¥  â â â¶  â£ â¼ â¢}]],
-	[ 3 => [qw{â¸ â³ â¹  â â â·  âº â½ â¿}]],
+	[ 4 => [qw{. â â â â . â - â â . â â â -}]],
+	[ 4 => [qw{. â â â â . â - â â . â â â -}]],
+	[ 3 => [qw{. â¤ â² â¥ . â â â¶ . â£ â¼ â¢}]],
+	[ 3 => [qw{. â¸ â³ â¹ . â â â· . âº â½ â¿}]],
 );
 
 print "<h2>Line drawing</h2>\n\n";
 print table(@$_) for (
-	[ 4 => [qw{â â¬ â â  â â¼ â¤ â  â â´ â -}]],
-	[ 4 => [qw{â â³ â â  â£ â â« â  â â» â -}]],
-	[ 3 => [qw{â â¯ â  â â¿ â¥  â â· â}]],
-	[ 3 => [qw{â â° â  â  â â¨  â â¸ â}]],
-#	[ 4 => [qw{â â¦ â â  â  â¬ â£ â  â â© â -}]],
-#	[ 3 => [qw{â â¤ â  â âª â¡  â â§ â}]],
-#	[ 3 => [qw{â â¥ â  â â« â¢  â â¨ â}]],
+	[ 4 => [qw{. â â¬ â â . â â¼ â¤ â . â â´ â -}]],
+	[ 4 => [qw{. â â³ â â . â£ â â« â . â â» â -}]],
+	[ 3 => [qw{. â â¯ â . â â¿ â¥ . â â· â}]],
+	[ 3 => [qw{. â â° â . â  â â¨ . â â¸ â}]],
+#	[ 4 => [qw{. â â¦ â â . â  â¬ â£ â . â â© â -}]],
+#	[ 3 => [qw{. â â¤ â . â âª â¡ . â â§ â}]],
+#	[ 3 => [qw{. â â¥ â . â â« â¢ . â â¨ â}]],
 );
 
 print "<h2>Signs</h2>\n\n";
 print table(@$_) for (
-	[ 3 => [qw{â â â  â â â  â â â  â â â}]],
-	[ 3 => [qw{â¡ â£ â   â¤ â¦ â¥  â§ â© â¨}]],
-	[ 4 => [qw{â  â¡ â¢ â£  â¤ â¥ â¦ â§}]],
-	[10 => [qw{â¼ â¿ â â â â â â â â}]],  # solar
-#	[12 => [qw{â â â â â â â â â â â â}]],  # zodiac
-	[ 8 => [qw{Â¤ Â¢ â¥ â¬ Â£ â¨ $ Â¥  â« â­ â¦ â± â§ â® â© âª}]],
+	[ 3 => [qw{. â â â . â â â . â â â . â â â}]],
+	[ 3 => [qw{. â¡ â£ â  . â¤ â¦ â¥ . â§ â© â¨}]],
+	[ 4 => [qw{. â  â¡ â¢ â£ . â¤ â¥ â¦ â§}]],
+	[ 5 => [qw{. â¼ â¿ â â â â â â â â}]],  # solar
+#	[12 => [qw{. â â â â â â â â â â â â}]],  # zodiac
+	[ 8 => [qw{. Â¤ Â¢ â¥ â¬ Â£ â¨ $ Â¥ . â« â­ â¦ â± â§ â® â© âª}]],
 );
 
 print "<h2>IPA</h2>\n\n";
 print table(@$_) for (
 	[
 		12 => [qw{
-			p t - Ê - c k q - = Ê¡ Ê
-			b d - É - É É¡ É¢ - = - =
-			m É± - n - É³ É² Å É´ = = =
-			Ê - - r - - - = Ê = Ñ =
-			- â±± - É¾ - É½ - = É¢Ì = - =
-			É¸ f Î¸ s Ê Ê Ã§ x Ï Ä§ Ê h
-			Î² v Ã° z Ê Ê Ê É£ Ê Ê Ê¢ É¦
-			= = - É¬ - - - - - = = =
-			= = - É® - - - - - = = =
-			- Ê - É¹ - É» j É° - - - =
-			= = - l - É­ Ê Ê - = = =
-			Ê - Ç Ç Ç - Ç - - = = =
-			É - É - - - Ê É  Ê - - -
+			. p  pÌª  >  >  t  Ê  c  k  q  =  Ê¡  Ê
+			. b  bÌª  >  >  d  É  É  É¡  É¢  =  -  =
+			. m  É±  >  >  n  É³  É²  Å  É´  =  =  =
+			. Ê  -  >  >  r  -  -  =  Ê  =  -Ñ =
+			. -  â±±  >  >  É¾  É½  -  =  É¢Ì  =  -  =
+			. É¸  f  Î¸  s  Ê  Ê  Ã§  x  Ï  Ä§  Ê  h
+			. Î²  v  Ã°  z  Ê  Ê  Ê  É£  Ê  Ê  Ê¢  É¦
+			. =  =  >  >  É¬  -  -  -  -  =  =  =
+			. =  =  >  >  É®  -  -  -  -  =  =  =
+			. -  Ê  >  >  É¹  É»  j  É°  -  -  -  =
+			. =  =  >  >  l  É­  Ê  Ê  -  =  =  =
+			. Ê  -  Ç  Ç  Ç  -â¼ Ç  -  -  =  =  =
+			. É  ÉÌª  >  >  É  -á¶ Ê  É   Ê  =  =  =
 		}],
 		[
 			'Plosive',
@@ -176,13 +210,13 @@ print table(@$_) for (
 	],
 	[
 		6 => [qw{
-			i y  É¨ Ê  É¯ u
-			- Éª  Ê -  Ê -
-			e Ã¸  É Éµ  É¤ o
-			- -  É -  - -
-			É Å  É É  Ê É
-			Ã¦ -  É -  - -
-			a É¶  - -  É É
+			. i y  É¨ Ê  É¯ u
+			. - Éª  Ê -  Ê -
+			. e Ã¸  É Éµ  É¤ o
+			. - -  É -  - -
+			. É Å  É É  Ê É
+			. Ã¦ -  É -  - -
+			. a É¶  - -  É É
 		}],
 		[qw{Close Near-close Close-mid Mid Open-mid Near-open Open}],
 		[map {substr($_, 0, 1).':'.$_, substr($_, 0, 1)." r:$_ rounded"} qw{Front Central Back}]
