X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/bd2329060230590cb612232ec5309e288204f91d..4cccd0f03b54ed366c5de96fb40cea688c6482e9:/digraphs.plp

diff --git a/digraphs.plp b/digraphs.plp
index 937228c..b62b577 100644
--- a/digraphs.plp
+++ b/digraphs.plp
@@ -32,38 +32,46 @@ sub quote {
 	return $_;
 }
 
-my @chars = ((map {chr} ord '!' .. ord 'Z'), 'a'..'z');
-splice @chars, $_, 1, () for 2, 3-1, 5-2, 31-3;  # remove character exceptions # $ & @
-my @chars2 = (@chars, '_');  # trailing character (extended set)
+my @chars = (
+	[qw{! " % ' ( ) * + , - . /}],
+	['0'..'9'], [qw{: ; < = > ?}],
+	['A'..'M'], ['N'..'Z'],
+	['a'..'m'], ['n'..'z'],
+);
+my @chars2 = (@chars, ['_']);  # trailing character (extended set)
 
-print '<table>';
+print '<table><col>';
+print qq'<colgroup span="$_">' for map {scalar @$_} @chars2;
+print "\n";
 for my $section (qw{thead tfoot}) {
 	print "<$section><tr><th>&nbsp;";
-	print "<th>$_" for @chars2;
+	print "<th>$_" for map {@$_} @chars2;
 }
-print '<tbody>';
-for my $c1 (@chars) {
-	print "<tr><th>$c1";
-	for my $c2 (@chars2) {
-		my $mnem = $c1 . $c2;
-		if (not defined $di->{$mnem}) {
-			print '<td>';
-			next;
-		}
-		my ($codepoint, $name, $prop, $script) = @{ $di->{$mnem} };
+for my $c1group (@chars) {
+	print '<tbody>';
+	for my $c1 (@$c1group) {
+		print "<tr><th>$c1";
+		for my $c2 (map {@$_} @chars2) {
+			my $mnem = $c1 . $c2;
+			if (not defined $di->{$mnem}) {
+				print '<td>';
+				next;
+			}
+			my ($codepoint, $name, $prop, $script) = @{ $di->{$mnem} };
 
-		my $glyph = chr $codepoint;
-		utf8::upgrade($glyph);  # prevent latin1 output
-		my $desc = $mnem . ($name && " ($name)");
-		my @class = ('X', grep {$_} $prop, $script);
+			my $glyph = chr $codepoint;
+			utf8::upgrade($glyph);  # prevent latin1 output
+			my $desc = $mnem . ($name && " ($name)");
+			my @class = ('X', grep {$_} $prop, $script);
 
-		$glyph = quote($glyph);
-		$glyph = "<span>$glyph</span>" if $prop eq 'Zs';
+			$glyph = quote($glyph);
+			$glyph = "<span>$glyph</span>" if $prop eq 'Zs';
 
-		printf "\n".'<td class="%s" title="%s">%s',
-			join(' ', @class), quote($desc), $glyph;
+			printf "\n".'<td class="%s" title="%s">%s',
+				join(' ', @class), quote($desc), $glyph;
+		}
+		print "\n<th>$c1\n";
 	}
-	print "\n<th>$c1\n";
 }
 print "</table>\n";
 :>
@@ -97,4 +105,16 @@ print "</table>\n";
 	</table>
 </div>
 
+<p id="footer">
+	<a href="http://vi.shiar.net/digraphs">vi.<strong>shiar.net</strong>/digraphs</a>
+	<a href="git://dev.shiar.net/vi-cheat"><:= "v$VERSION" :></a>
+	created by Shiar •
+	<a title="Licensed under the GNU Affero General Public License, version 3"
+	   href="http://www.fsf.org/licensing/licenses/agpl-3.0.html">AGPLv3</a> •
+	last update <:
+		use Time::Format qw(time_format);
+		print time_format('yyyy-mm-dd', (stat 'digraphs.inc.pl')[9]);
+	:>
+</p>
+
 </html>