From: Mischa POSLAWSKY <perl@shiar.org>
Date: Tue, 2 Jan 2024 18:03:39 +0000 (+0100)
Subject: keyboard/altgr: automatically generate thumbnails from source images
X-Git-Url: http://git.shiar.net/sheet.git/commitdiff_plain/a6462b5d3af5799f73f6475cbe551b35b84c44b2

keyboard/altgr: automatically generate thumbnails from source images

Treat original images as untracked data, named with proper conversion
parameters for results similar to earlier gimp manipulation and exports.
Reuse the mkimgthumb script to crop and resize as appropriate:

	tools/mkimgthumb --jpg '400x300>^ x200<' *

This will result in similar visual quality (at much smaller file sizes)
as gallery cells do not exceed 400px wide.  Enlarge to at least 200px high
to elicit preview images on social media.
---

diff --git a/keyboard/altgr/apl.eng.inc.pl b/keyboard/altgr/apl.eng.inc.pl
index b8636b7..efae0ba 100644
--- a/keyboard/altgr/apl.eng.inc.pl
+++ b/keyboard/altgr/apl.eng.inc.pl
@@ -112,5 +112,5 @@ $groups->{flag}{ext} = ['extended', 'optional operators not available in all var
 		'Typical IBM-derived APL keyboard layout,',
 		'as found in APLX and Dyalog implementations.',
 	],
-	image => 'keyboard/altgr/unicomp-apl.jpg',
+	image => 'data/keyboard/thumb/unicomp-apl.jpg',
 }
diff --git a/keyboard/altgr/chromebook-hp11.jpg b/keyboard/altgr/chromebook-hp11.jpg
deleted file mode 100644
index 7bfa00f..0000000
Binary files a/keyboard/altgr/chromebook-hp11.jpg and /dev/null differ
diff --git a/keyboard/altgr/eurkey.eng.inc.pl b/keyboard/altgr/eurkey.eng.inc.pl
index 4fd357d..1da4a38 100644
--- a/keyboard/altgr/eurkey.eng.inc.pl
+++ b/keyboard/altgr/eurkey.eng.inc.pl
@@ -290,5 +290,5 @@ my %rows = (
 	description => [
 		"An interactive map of EurKEY, the European Keyboard Layout.",
 	],
-	image => 'keyboard/altgr/eurkeyboard.jpg',
+	image => 'data/keyboard/thumb/eurkeyboard.jpg',
 }
diff --git a/keyboard/altgr/eurkeyboard.jpg b/keyboard/altgr/eurkeyboard.jpg
deleted file mode 100644
index f90e2ff..0000000
Binary files a/keyboard/altgr/eurkeyboard.jpg and /dev/null differ
diff --git a/keyboard/altgr/ibm-m.jpg b/keyboard/altgr/ibm-m.jpg
deleted file mode 100644
index 35448d7..0000000
Binary files a/keyboard/altgr/ibm-m.jpg and /dev/null differ
diff --git a/keyboard/altgr/ku2971b-usint.jpg b/keyboard/altgr/ku2971b-usint.jpg
deleted file mode 100644
index 3f1f55f..0000000
Binary files a/keyboard/altgr/ku2971b-usint.jpg and /dev/null differ
diff --git a/keyboard/altgr/macbook-gray.jpg b/keyboard/altgr/macbook-gray.jpg
deleted file mode 100644
index d4e3dbc..0000000
Binary files a/keyboard/altgr/macbook-gray.jpg and /dev/null differ
diff --git a/keyboard/altgr/macos-abc.eng.inc.pl b/keyboard/altgr/macos-abc.eng.inc.pl
index a5d63b4..b643303 100644
--- a/keyboard/altgr/macos-abc.eng.inc.pl
+++ b/keyboard/altgr/macos-abc.eng.inc.pl
@@ -208,5 +208,5 @@ my %rows = (
 		"Apple ABC Extended keyboard layout table",
 		"with the Option modifier key.",
 	],
-	image => 'keyboard/altgr/macbook-gray.jpg',
+	image => 'data/keyboard/thumb/macbook-gray.jpg',
 }
diff --git a/keyboard/altgr/macos.eng.inc.pl b/keyboard/altgr/macos.eng.inc.pl
index 884eeb9..5b211f0 100644
--- a/keyboard/altgr/macos.eng.inc.pl
+++ b/keyboard/altgr/macos.eng.inc.pl
@@ -115,5 +115,5 @@ my %rows = (
 		"Apple US International keyboard layout table",
 		"with the Option modifier key.",
 	],
-	image => 'keyboard/altgr/matias-fk302.jpg',
+	image => 'data/keyboard/thumb/matias-fk302.jpg',
 }
diff --git a/keyboard/altgr/matias-fk302.jpg b/keyboard/altgr/matias-fk302.jpg
deleted file mode 100644
index 3e8aca3..0000000
Binary files a/keyboard/altgr/matias-fk302.jpg and /dev/null differ
diff --git a/keyboard/altgr/msx.eng.inc.pl b/keyboard/altgr/msx.eng.inc.pl
index eeb71c4..6ed49a6 100644
--- a/keyboard/altgr/msx.eng.inc.pl
+++ b/keyboard/altgr/msx.eng.inc.pl
@@ -107,5 +107,5 @@ $groups->{flag}{ext} = ['anachrone', 'expected uppercase variants if allowed by
 		"MSX keyboard layout table",
 		"with the code modifier key.",
 	],
-	image => 'keyboard/altgr/msxcode.jpg',
+	image => 'data/keyboard/thumb/msxcode.jpg',
 }
diff --git a/keyboard/altgr/msxcode.jpg b/keyboard/altgr/msxcode.jpg
deleted file mode 100644
index 8553564..0000000
Binary files a/keyboard/altgr/msxcode.jpg and /dev/null differ
diff --git a/keyboard/altgr/spacecadet.eng.inc.pl b/keyboard/altgr/spacecadet.eng.inc.pl
index 0fd8952..614ae4c 100644
--- a/keyboard/altgr/spacecadet.eng.inc.pl
+++ b/keyboard/altgr/spacecadet.eng.inc.pl
@@ -106,5 +106,5 @@ my %rows = (
 	],
 	rows => [3, 0], # greek/front and top
 	moderows => '41-4',
-	image => 'keyboard/altgr/spacecadet.jpg',
+	image => 'data/keyboard/thumb/spacecadet.jpg',
 }
diff --git a/keyboard/altgr/spacecadet.jpg b/keyboard/altgr/spacecadet.jpg
deleted file mode 100644
index a5a1ff7..0000000
Binary files a/keyboard/altgr/spacecadet.jpg and /dev/null differ
diff --git a/keyboard/altgr/ukext.eng.inc.pl b/keyboard/altgr/ukext.eng.inc.pl
index 9fa019f..3e3a8ce 100644
--- a/keyboard/altgr/ukext.eng.inc.pl
+++ b/keyboard/altgr/ukext.eng.inc.pl
@@ -114,5 +114,5 @@ $rows{']'} = $rows{'#'};
 		"Google UK-Extended keyboard layout table for Chrome OS",
 		"with the AltGr modifier key.",
 	],
-	image => 'keyboard/altgr/chromebook-hp11.jpg',
+	image => 'data/keyboard/thumb/chromebook-hp11.jpg',
 }
diff --git a/keyboard/altgr/unicomp-apl.jpg b/keyboard/altgr/unicomp-apl.jpg
deleted file mode 100644
index 9cc674e..0000000
Binary files a/keyboard/altgr/unicomp-apl.jpg and /dev/null differ
diff --git a/keyboard/altgr/windows.eng.inc.pl b/keyboard/altgr/windows.eng.inc.pl
index 06c2993..810b692 100644
--- a/keyboard/altgr/windows.eng.inc.pl
+++ b/keyboard/altgr/windows.eng.inc.pl
@@ -79,5 +79,5 @@ $groups->{flag}{ext} = ['xkb', 'unofficial extensions added in Linux (Gnome, KDE
 		"Windows US international keyboard layout table",
 		"with the AltGr modifier key.",
 	],
-	image => 'keyboard/altgr/ku2971b-usint.jpg',
+	image => 'data/keyboard/thumb/ku2971b-usint.jpg',
 }
diff --git a/tools/mkimgthumb b/tools/mkimgthumb
index c672d3f..e9d6eb2 100755
--- a/tools/mkimgthumb
+++ b/tools/mkimgthumb
@@ -27,9 +27,13 @@ for (keys %opt) {
 	push @ffs, my $ff = [$_];
 	my $r = $opt{$_};
 	push @{$ff}, -quality => $1 if $r =~ s/@(\d+)//;
-	push @{$ff}, -resize => "$r^", -extent => $r;
+	push @{$ff}, -resize => !/\dx\d+$/ ? $_ : ("$_^", -extent => $_)
+		for split / /, $r;
 }
 
+my $target = '..';
+$target = pop @ARGV if @ARGV >= 2 and -d $ARGV[-1];
+
 my $failcount = 0;
 
 for my $src (@ARGV) {
@@ -56,7 +60,7 @@ for my $src (@ARGV) {
 		for (@ffs) {
 			my ($ff, @ffcmds) = @{$_};
 			print " $ff";
-			$image->convert("../$name.$ff", [@cmds, @ffcmds]);
+			$image->convert("$target/$name.$ff", [@cmds, @ffcmds]);
 		}
 		1;
 	} or do {