From 5b166c668eeba6da9e7d73e25e7fd4faeecd1db1 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Thu, 28 May 2020 06:51:01 +0200
Subject: [PATCH] word: form synonyms from alt column

Support any number of alternatives (for now all shown in small font).
---
 tools/word.pg.sql | 11 +++++++++--
 word.plp          |  7 +++++--
 writer.plp        |  1 +
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/tools/word.pg.sql b/tools/word.pg.sql
index da22b55..c1aa3c8 100644
--- a/tools/word.pg.sql
+++ b/tools/word.pg.sql
@@ -1,5 +1,6 @@
 CREATE TABLE word (
 	form       text        NOT NULL,
+	alt        text[],
 	lang       text        NOT NULL DEFAULT 'eng',
 	cat        integer              REFERENCES word (id),
 	ref        integer              REFERENCES word (id),
@@ -12,6 +13,7 @@ CREATE TABLE word (
 );
 
 COMMENT ON COLUMN word.form       IS 'preferred textual representation';
+COMMENT ON COLUMN word.alt        IS 'alternate forms with equivalent meaning';
 COMMENT ON COLUMN word.lang       IS 'ISO 639-3 language code';
 COMMENT ON COLUMN word.cat        IS 'hierarchical classification';
 COMMENT ON COLUMN word.ref        IS 'reference to equivalent eng translation';
@@ -20,8 +22,13 @@ COMMENT ON COLUMN word.source     IS 'URI of downloaded image';
 COMMENT ON COLUMN word.thumb      IS 'ImageMagick convert options to create thumbnail from source image';
 COMMENT ON COLUMN word.wptitle    IS 'reference Wikipedia article';
 
+CREATE OR REPLACE FUNCTION exportform(word) RETURNS text AS $$
+	SELECT array_to_string($1.form || $1.alt, '/');
+$$ LANGUAGE SQL IMMUTABLE;
+
 CREATE OR REPLACE VIEW _cat_words AS
-	SELECT * FROM word RIGHT JOIN (
-		SELECT cat id, array_agg(form ORDER BY form) forms
+	SELECT exportform(word.*) form, sub.*, word.lang, word.ref
+	FROM word RIGHT JOIN (
+		SELECT cat id, array_agg(exportform(word.*) ORDER BY form) forms
 			FROM word WHERE ref IS NULL GROUP BY cat
 	) sub USING (id);
diff --git a/word.plp b/word.plp
index 0e03f45..d594370 100644
--- a/word.plp
+++ b/word.plp
@@ -28,6 +28,9 @@ figure {
 	overflow: hidden;
 	padding: 1px;
 }
+figcaption > small {
+	display: inline-block;
+}
 
 figure:hover ~ ul figure,
 figure:hover ~ ul figcaption {
@@ -66,9 +69,9 @@ my %table = do 'wordlist.inc.pl' or die $@ // $!;
 
 sub showimg {
 	my ($name) = @_;
-	my ($img) = $name =~ /^([\w-]+)/;
+	my ($img) = $name =~ /^([\w -]+)/;
 	$name =~ s/\w{4} [^aoeuiyc\W] [rl]?+ \K (?= [^aoeuiy\W] [rl]? [aoeuiy] \w)/&shy;/gx;
-	$name =~ y/_/ /;
+	$name =~ s{/(.*)}{ <small>($1)</small>}g;
 	my $hidden = $name =~ s/\?$//;
 	my $alt = $name;
 	$name = "<q>$name</q>" if $name =~ s/\?$//;
diff --git a/writer.plp b/writer.plp
index 275909b..e9f0f8d 100644
--- a/writer.plp
+++ b/writer.plp
@@ -111,6 +111,7 @@ my @wordcols = (
 	lang    => 'Language',
 	cat     => 'Category',
 	form    => 'Translation',
+	alt     => 'Synonyms',
 	wptitle => 'Wikipedia',
 	source  => 'Image URL',
 	thumb   => 'Convert options',
-- 
2.30.0