From b1a099f695f80243c53d97c448c98053dcc6effb Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sun, 24 Mar 2024 00:20:27 +0100
Subject: [PATCH] keyboard/altgr/zoo: missing entries, some shuffling around

---
 keyboard/altgr/zoo.eng.inc.pl | 77 +++++++++++++++++++----------------
 1 file changed, 43 insertions(+), 34 deletions(-)

diff --git a/keyboard/altgr/zoo.eng.inc.pl b/keyboard/altgr/zoo.eng.inc.pl
index e54380e..a3ff9c1 100644
--- a/keyboard/altgr/zoo.eng.inc.pl
+++ b/keyboard/altgr/zoo.eng.inc.pl
@@ -5,11 +5,6 @@ no  warnings 'qw';
 use Shiar_Sheet::KeyboardChars 'kbchars';
 
 my %rows = qw(
-	;  🐔
-	:  🐓
-	+; 🦢swan??
-	+; 🐤
-	+: 🐥
 	a  🐒Apey_monkey
 	A  🐜Ant
 	+a 🕷Arachnid
@@ -24,13 +19,11 @@ my %rows = qw(
 	+C 🐱Cat_face
 	d  🐕Dog
 	D  🦆Duck
-	+d 🦌Deer_cerVid_Ungulate??
 	+d 🐩pooDle_Dog
 	+D 🐶Dog_face
 	e  🐘Elephant
 	E  🦅Eagle
 	+e 🦣Elder_Elephant_or_mammoth
-	+E 🐹Eee!_hamstEr_face
 	f  🐟Fish
 	F  🪰Fly
 	+f 🦩Flamingo
@@ -44,23 +37,24 @@ my %rows = qw(
 	+h 🦔HedgeHog
 	+H 🐴Horse_face
 	i  🐛Insect
-	I  🐞ladIbug_Insect
-	+i 🐿chIpmunk
+	I  🐿chIpmunk_or_squIrrel
+	+i 🪲beetle_Insect
 	+I 🦄unIcorn_face
 	j  🪼Jelly
-	J  🐬Jumping_dolphin
+	J  🐬dolphin_Jumping
 	+j 🦐Jrimp
 	k  🐨Koala
 	K  🦨sKunK
 	+k 🦘Kangaroo
+	+K 🐼fake_Koala_face_(panda)
 	l  🦎Lizard
 	L  🦙LLama
 	+l 🐆Leopard
 	+L 🦁Lion_face
-	m  🐄Moo
-	M  🐁Mouse
-	+m 🦠Microbe
-	+M 🐮Moo_face
+	m  🐁Mouse
+	M  🦠Microbe
+	+m 🫏Mule_or_donkey
+	+M 🐭Mouse_face
 	n  🐌sNail
 	N  🦛Nile_hippo
 	+n 🦞Nephropid_lobster
@@ -72,20 +66,16 @@ my %rows = qw(
 	P  🐧Penguin
 	+p 🦜Parrot
 	+P 🐷Pig_face
-	[  🦝raccoon_trash_Panda
-	{  🐗wild_Pig
-	+{ 🐼Panda_face
-	+[ 🐡blowfish??
 	q  🦑sQuid
 	Q  🦟Mosquito
 	+q 🦚peaQoQ
 	r  🐀Rat
 	R  🦏Rhino
 	+r 🪳Roach
-	+R 🐭Rodent_face
+	+R 🐹Rodent_hamster_face
 	s  🐍SSSnail
-	S  🦈Shark
-	+s 🦂Scorpion
+	S  🦂Scorpion
+	+s 🦈Shark
 	+S 🦭Seal_face
 	t  🐢TurTle
 	T  🐅Tiger
@@ -95,9 +85,9 @@ my %rows = qw(
 	U  🐫hUmped_camel
 	+u 🐪hUmped_dromedary
 	+U 🐻Ursus_face
-	v  🦇Vampiric_bat
+	v  🦇Vampire_in_bat_form
 	V  🕊doVe
-	+v 🦫beaVer
+	+v 🦫beaVer,_kurVa!
 	w  🐋Whale
 	W  🪱Worm
 	+w 🐃Water_buffalo
@@ -106,21 +96,35 @@ my %rows = qw(
 	X  🐂oX
 	+x 🦤eXtinct_dodo
 	+X 🦊foX_face
-	y  🦋butterflY
-	Y  🦪oYster
-	+y 🦬bYson
+	y  🐞ladYbug
+	Y  🦋butterflY
+	+y 🦪oYster
 	z  🐑zzz_sheep
 	Z  🐏zzz_ram
 	+z 🦥Zzzloth
 	+Z 🦓Zebra_face
-	]  🐉dragon
-	}  🦕sauropod
-	+] 🪸coral??
-	+} 🐲dragon_face
+	,  🐔<:_chicken
+	<  🐓<:_rooster
+	+, 🐤<:_chicklet
+	+< 🐥<:_chicklet_face
+
+	>  🦢swan??
+	;  🐉dragon
+	:  🦕sauropod
+	+; 🪸coral??
+	+: 🐲dragon_face
+	+> 🦝raccoon_trash_Panda
+	.  🐗wild_Pig
+
+	[  🐄horned_cow
+	{  🦌horned_deer
+	+[ 🦬horned_bison
+	+{ 🐮cow_face
 );
 s/.\K/\n/, y/_/ / for values %rows;
 
 #	🐠tropical_fish
+#	🐡blowfish??
 
 my $groups = kbchars(\%rows);
 
@@ -138,16 +142,21 @@ while (my ($k, $c) = each %rows) {
 
 +{
 	%{ $groups },
-	version => '1.0',
+	version => '1.1',
 	title => 'Unicode animals',
 	category => 'specialized',
 	intro => join("\n",
+		"Collecting all emoji animals as of Unicode 11.0",
+		"with English mnemonics as AltGr mode.",
+		'Because who needs <a href="/keyboard/altgr">letters</a>',
+		'or <a href="/keyboard/altgr/emojiworks">other emoji</a>',
+		'when you have direct access to all these critters and creatures.',
 	),
-	moderows => '5421-1',
+	moderows => '5421-',
 	flag => {
 		g3 => ['initial'  => 'initial emoji in Unicode 6.0'],
-		g4 => ['8.0'      => ''],
-		g5 => ['10.0'     => ''],
+		g4 => ['8.0'      => 'added in Unicode 7 or 8 (2015)'],
+		g5 => ['10.0'     => 'added in Unicode 9 or 10 (2017)'],
 		g7 => ['later'    => 'Unicode 11.0 or above'],
 	},
 }
-- 
2.30.0