X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/6311c65d7397e07947d6cf38df772545a3fa296d..18ff65229f85952af3cc3f0646ee55e6a2dcd00a:/dieren.plp

diff --git a/dieren.plp b/dieren.plp
index deb2ac3..f7935fe 100644
--- a/dieren.plp
+++ b/dieren.plp
@@ -16,7 +16,7 @@ my %subpages = (
 		title => 'uitgebreid dieren',
 		intro => "$intro.. en dergelijke.",
 		altlink => 'Zie het <a href="/dieren">populaire overzicht</a> voor minder.',
-		prefix => qr/^[#+]*/, # optional # or +
+		prefix => qr/.*?[#]|^[#+]*/, # after optional # or +
 		secrets => 1,
 	},
 	beknopt => {
@@ -32,16 +32,21 @@ $Request ||= 'standaard';
 my $pageinfo = $subpages{$Request}
 	or Html(), Abort("Onbekende dierenpagina <q>$Request</q>", '404 request not found');
 
+my $proto = sprintf('http%s://', !!$ENV{HTTPS} && 's');
+my $preview = "$proto$ENV{HTTP_HOST}/dieren.jpg";
+
 Html({
 	title => $pageinfo->{title}.' cheat sheet',
-	version => '1.0',
+	version => '1.1',
+	lang => 'nl',
 	description => "Tabeloverzicht met afbeeldingen van $pageinfo->{intro}",
 	keywords => [qw'
 		dier beest naam naamgeving woord taal nederlands gerelateerd
 		relatie vernoemd vernoeming combinatie samenstelling voorvoegsel onverwant
 		land zee lucht  animals dutch language
 	'],
-	raw => <<'EOT',
+	raw => <<"EOT",
+<meta property="og:image" content="$preview" />
 <style>
 figure[hidden] {
 	opacity: 0; /* secret */
@@ -56,7 +61,7 @@ figure[hidden]:hover > figcaption {
 	transition-delay: 2s;
 }
 
-@media (max-width: 60em) {
+\@media (max-width: 60em) {
 	td, th {
 		font-size: 50%;
 	}
@@ -72,7 +77,7 @@ EOT
 });
 
 :>
-<h1>Dierennamen <small>(Dutch animal names)</small></h1>
+<h1>Dierennamen <small lang=en>(Dutch animal names)</small></h1>
 
 <p>
 <:
@@ -82,11 +87,7 @@ say $pageinfo->{altlink};
 </p>
 
 <:
-my $table = readdata('dieren');
-if ($Request eq 'standaard') {
-	$table->[ 9][4] = '?grasmodderpaard=草泥马'; # replace turnpaard
-	$table->[18][1] = 'draak_'; # irl animal
-}
+my $table = Data('dieren');
 
 if (exists $get{r}) {
 	use List::MoreUtils qw( part );
@@ -113,6 +114,7 @@ for my $row (@{$table}) {
 	print '<tr>';
 	for my $name (@{$row}) {
 		my $hidden = $name =~ s/^\?//;
+		$name =~ s/#.*//; # ignore prefixed part
 		$name =~ s/^-$//;
 		my ($img) = $name =~ /([\w-]+)/;
 		$name =~ y/_/ /;