common: global Data() to parse perl code includes

[sheet.git] / word.plp

diff --git a/word.plp b/word.plp
index aed42fd57b997f08f6b1904c587df1f91de3b5d3..6b42866629fa8fccc8cda75e26252604868767a7 100644 (file)
--- a/word.plp
+++ b/word.plp
@@ -1,19 +1,19 @@
 <(common.inc.plp)><:
 
 our $lang = $get{lang} || 'en';
-our $wordlistbase = "data/wordlist.$lang";
+our $wordlistbase = "data/wordlist";
 
 if ($Request and $Request =~ m{\A([^/]+)}) {
        my $page = "word/$1.plp";
        utf8::downgrade($page); # unicode filename breaks contents encoding
        if (-e $page) {
+               $wordlistbase .= ".$lang";
                Include $page;
                exit;
        }
 }
 
-my $wordlist = "$wordlistbase.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',
@@ -22,8 +22,8 @@ Html({
        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;
@@ -43,13 +43,6 @@ Html({
        font-size: 175% !important;
 }
 </style>
-EOT
-               . <<'EOT',
-<style>
-body {
-       margin: 8px 1px;
-}
-</style>
 EOT
 });
 
@@ -68,7 +61,7 @@ Zie ook <a href="/dieren">dieren</a>.
 </p>
 
 <:
-my $table = do $wordlist or die $@ // $!;
+my $table = Data($wordlistbase);
 
 sub showimg {
        my ($id, $name) = @_;
@@ -81,7 +74,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;