X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/643b24914332240284adb01359c55406405a7e89..ebbfbfbb295d4268eba729b0cee0b85679a04e3f:/word.plp

diff --git a/word.plp b/word.plp
index d1c0241..5571299 100644
--- a/word.plp
+++ b/word.plp
@@ -1,27 +1,41 @@
 <(common.inc.plp)><:
 
+our $lang = $get{lang} || 'en';
+our $wordlistbase = "data/wordlist";
+
 if ($Request and $Request =~ m{\A([^/]+)}) {
-	my $page = "word/$1.plp";
-	utf8::downgrade($page); # unicode filename breaks contents encoding
+	my $name = $1;
+	my $page = "word/$name.plp";
 	if (-e $page) {
+		utf8::downgrade($page); # unicode filename breaks contents encoding
 		Include $page;
-		exit;
 	}
+	else {
+		Html({
+			raw => join("\n", map qq(<script src="/word/$_"></script>),
+				'put.min.js', 'quiz.js', "$name.js",
+			),
+			lang => $lang,
+		});
+		say '<h1>Words</h1>';
+		say '<section id="gallery"></section>';
+		say "<script>new Word\u$name()</script>";
+	}
+	exit;
 }
 
-my $lang = $get{lang} || 'en';
-my $wordlist = "data/wordlist.$lang.inc.pl";
-my $limit = $get{v} // (exists $get{v} ? 4 : 3);
+my $limit = $get{v} // (exists $get{v} ? 5 : 3);
 
 Html({
 	title => 'words cheat sheet',
 	version => '1.0',
+	lang => $lang,
 	description => "Visual words",
 	keywords => [qw'
 		language
 	'],
-	data => [$wordlist],
-	raw => (exists $get{q} && <<'EOT')
+	data => ["$wordlistbase.inc.pl"],
+	raw => exists $get{q} ? <<'EOT' : undef,
 <style>
 .gallery figure {
 	grid-row: span 1 !important;
@@ -41,13 +55,6 @@ Html({
 	font-size: 175% !important;
 }
 </style>
-EOT
-		. <<'EOT',
-<style>
-body {
-	margin: 8px 1px;
-}
-</style>
 EOT
 });
 
@@ -66,12 +73,11 @@ Zie ook <a href="/dieren">dieren</a>.
 </p>
 
 <:
-my $table = do $wordlist or die $@ // $!;
+my $table = Data($wordlistbase);
 
 sub showimg {
 	my ($id, $name) = @_;
 	my ($imgname) = $name =~ m{^([^/]+)};
-	$name =~ s/\w{4} [^aoeuiyc\W] [rl]?+ \K (?= [^aoeuiy\W] [rl]? [aoeuiy] \w)/&shy;/gx;
 	($name, my @morenames) = split m{/}, $name;
 	$name =~ s{\( ([^/]+) \)}{<small>$1</small>}x;
 	$name .= " <small>($_)</small>" for @morenames;
@@ -79,7 +85,7 @@ sub showimg {
 	$name = "<q>$name</q>" if $name =~ s/\?$//;
 	$name = "<figcaption>$name</figcaption>";
 
-	if ($id and -e (my $img = "data/word/en/$id.jpg")) {
+	if ($id and -e (my $img = "data/word/32/$id.jpg")) {
 		$name .= sprintf '<img src="/%s" alt="%s" />', $img, $imgname;
 	}
 	return sprintf '<figure%s>%s</figure>', $hidden && !exists $get{v} && ' hidden', $name;
@@ -88,7 +94,8 @@ sub showimg {
 sub printimgs {
 	say '<ul>';
 	for my $row (@_) {
-		my ($id, $level, $title) = split /:/, $row, 3;
+		my ($id, $level, $title) = @{$row};
+		$id or die "empty reference"; # assertion to prevent loops
 		my @type;
 		push @type, 'parent' if defined $table->{$id};
 		push @type, 'large'  if $level =~ s/c$//;
@@ -107,8 +114,8 @@ if (exists $get{q}) {
 	if ($Request) {
 		my @query = $Request;
 		while (@query) {
-			push @rows, grep { (split /:/)[1] <= $limit } @query;
-			s/:.*// for @query;
+			push @rows, grep { $_->[1] <= $limit } @query;
+			$_ = $_->[0] for @query;
 			@query = map {$_ ? @{$_} : ()} @{$table}{@query};
 		}
 	}
@@ -119,7 +126,10 @@ if (exists $get{q}) {
 	$table = {};
 	printimgs(@rows);
 }
+elsif ($Request and $Request =~ /^\d+$/) {
+	printimgs([$Request]);
+}
 else {
-	printimgs($Request || $table->{''}->[0]);
+	printimgs($table->{''}->[0]);
 }
 say '</section>';