X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/f16c93d413b32cb2b7c44d1255e4533fcbcf1bcc..HEAD:/emoji.plp

diff --git a/emoji.plp b/emoji.plp
index 60aaf0d..63572c7 100644
--- a/emoji.plp
+++ b/emoji.plp
@@ -2,7 +2,7 @@
 
 Html({
 	title => 'emoji cheat sheet',
-	version => 'v1.0',
+	version => '1.1',
 	description => [
 		"Emoticons overview and Unicode equivalents"
 		. " of MSN, Y!M, and Gmail icons.",
@@ -12,39 +12,40 @@ Html({
 		chat im messenger msn yahoo ym gmail google
 	'],
 	stylesheet => [qw'light'],
+	data => ['emoji-gmail.inc.pl'],
 });
 
 :>
 <h1>IM emoticons</h1>
 
 <:
-print "<ul>\n";
+say '<div class="section">';
 
 for my $system (qw'gmail msn yahoo') {
-	my @info = do "emoji-$system.inc.pl";
-	my $meta = shift @info or die $@;
-	ref $meta eq 'HASH' or die "invalid $system definitions";
+	my @info = Data("emoji-$system");
+	my $meta = shift @info;
+	ref $meta eq 'HASH' or Abort("Invalid $system definitions", 404);
 	my $title = $meta->{name} // $system;
-	$title = qq{<a href="$_">$title</a>} for $meta->{source} || ();
+	$title = showlink($title, $_) for $meta->{source} || ();
 
-	printf '<div class="section"><h3>%s</h3>'."\n\n", $meta->{name} // $system;
-	print '<table><tbody>'."\n";
-	for (my $i = 0; $i <= $#info; $i++) {
-		my $name = $info[$i];
-		unless (ref $info[$i+1] eq 'ARRAY') {
-			printf '</table><table><tbody>'."\n", $name;
+	say sprintf '<div class="section"><h2>%s</h2>', $meta->{name} // $system;
+	say '<table><tbody>';
+	for my $row (@info) {
+		unless (ref $row eq 'ARRAY') {
+			say '</table><table><tbody>';
 			next;
 		}
-		my ($input, $flags, $char, $desc) = @{ $info[++$i] };
-		printf('<tr><th><img src="%s" alt="%s"><td><kbd>%s</kbd><td>%s%s'."\n",
-			sprintf($meta->{icon} // '%s', $name), EscapeHTML($name),
+		my ($name, $input, $flags, $char, $desc) = @{$row};
+		say sprintf('<tr><th><img src="%s" alt="%s"><td><kbd>%s</kbd><td>%s%s',
+			sprintf($meta->{ $flags =~ /\bext\b/ ? 'iconext' : 'icon' } // '%s', $name),
+			EscapeHTML($name),
 			EscapeHTML($input),
 			$desc // $name,
 			$char ? '<td>'.chr($char) : '',
 		);
 	}
-	print "</table></div>\n\n";
+	say "</table></div>\n";
 }
 
-print "</ul><hr>\n\n";
+say "</div><hr>\n";