[crux-commits] ports/xorg (3.5): xkeyboard-config: update to 2.30

crux at crux.nu crux at crux.nu
Wed Jul 1 15:24:55 UTC 2020


commit d7d4e2b465274015e774c23596f24ae06e30d5e5
Author: Juergen Daubert <jue at jue.li>
Date:   Wed Jul 1 17:24:40 2020 +0200

    xkeyboard-config: update to 2.30

diff --git a/xkeyboard-config/.footprint b/xkeyboard-config/.footprint
index 1b9c03b4..e98cdc27 100644
--- a/xkeyboard-config/.footprint
+++ b/xkeyboard-config/.footprint
@@ -129,6 +129,7 @@ drwxr-xr-x	root/root	usr/share/X11/xkb/symbols/digital_vndr/
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/dk
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/dz
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/ee
+-rw-r--r--	root/root	usr/share/X11/xkb/symbols/eg
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/empty
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/epo
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/es
diff --git a/xkeyboard-config/.signature b/xkeyboard-config/.signature
index 91d3e548..25e31aca 100644
--- a/xkeyboard-config/.signature
+++ b/xkeyboard-config/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndKgCVRnDOXEvqxAotLyfMfo4C4uOiO1+0Z9AbsJ1VQdWs2KiWKZYE9Fq1GgaVId6miGyRVUOnyMh0ajcKBXdPQc=
-SHA256 (Pkgfile) = 0e5ab79470b596b547b19afc023fb43743f4d237301c0be69214fd860e4b68b6
-SHA256 (.footprint) = b2abe1e8f77f50bfb4f4956c4d65d127b755fe89437f4eca501efa9923dfd865
-SHA256 (xkeyboard-config-2.29.tar.bz2) = 1d4175278bf06000683656763a8b1d3282c61a314b6db41260c8efe92d621802
-SHA256 (xkeyboard-config.7) = 25077aff7b9fe7db12c7e3600801aaa3fd0dda245fddb03accb0e11c2bb6efa6
+RWTSGWF5Q7TndMyOtm2RH95B/3B32U71+bJlFGoH1SapUK+mGwO4SMyDOnIjDQgEAwGpGJhUIt8591IXU1cWkay0bErJyiXDZws=
+SHA256 (Pkgfile) = cadf01a29cd44ae82e367bb4e79b25059d9e0c00f1bad57dfcc2d383383ed887
+SHA256 (.footprint) = 7c29911ac852b964c59075ec699341ffeb662a97bf000c35c30640cd0d980e7a
+SHA256 (xkeyboard-config-2.30.tar.bz2) = 095a524f7b633ed257617202d06c9c71fe020c8897b106cf0dcdd0c6e8b797d4
+SHA256 (xkeyboard-config.7) = 740505b03fac8e14ca5f2d5ac8543d43b2e104fcf19633d43dcd6f35c83092b7
diff --git a/xkeyboard-config/Pkgfile b/xkeyboard-config/Pkgfile
index 3ef09dfb..88f61938 100644
--- a/xkeyboard-config/Pkgfile
+++ b/xkeyboard-config/Pkgfile
@@ -2,13 +2,12 @@
 # URL: https://cgit.freedesktop.org/xkeyboard-config/
 # Maintainer: CRUX Xorg Team, xorg-ports at crux dot nu
 # Depends on: intltool xorg-xkbcomp
-# Optional: libxslt
 
 name=xkeyboard-config
-version=2.29
+version=2.30
 release=1
 source=(https://www.x.org/releases/individual/data/$name/$name-$version.tar.bz2
-	xkeyboard-config.7)
+        xkeyboard-config.7)
 
 build() {
 	cd $name-$version
@@ -24,6 +23,5 @@ build() {
 	ln -s /var/lib/xkb $PKG/usr/share/X11/xkb/compiled
 	find $PKG -name README -delete
 
-	[ -e '/usr/bin/xsltproc' ] || install -Dm 644 $SRC/xkeyboard-config.7 \
-		$PKG/usr/share/man/man7/xkeyboard-config.7
+	install -Dm 644 $SRC/xkeyboard-config.7 $PKG/usr/share/man/man7/xkeyboard-config.7
 }
diff --git a/xkeyboard-config/xkeyboard-config.7 b/xkeyboard-config/xkeyboard-config.7
index 0a6a297c..bc289fd9 100644
--- a/xkeyboard-config/xkeyboard-config.7
+++ b/xkeyboard-config/xkeyboard-config.7
@@ -1,5 +1,5 @@
 .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes.
-.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.28" "X Version 11"
+.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.30" "X Version 11"
 .SH NAME
 xkeyboard-config \- XKB data description files
 .SH DESCRIPTION
@@ -13,10 +13,12 @@ lB lB
 ___
 lB l.
 Model	Description
+pc86	Generic 86-key PC
 pc101	Generic 101-key PC
-pc102	Generic 102-key PC (intl.)
+pc102	Generic 102-key PC
 pc104	Generic 104-key PC
-pc105	Generic 105-key PC (intl.)
+pc104alt	Generic 104-key PC with L-shaped Enter key
+pc105	Generic 105-key PC
 dell101	Dell 101-key PC
 latitude	Dell Latitude laptop
 dellm65	Dell Precision M65 laptop
@@ -77,7 +79,6 @@ geniuscomfy2	Genius Comfy KB-21e-Scroll
 geniuskb19e	Genius KB-19e NB
 geniuskkb2050hs	Genius KKB-2050HS
 gyration	Gyration
-htcdream	HTC Dream
 kinesis	Kinesis
 logitech_base	Logitech
 logitech_g15	Logitech G15 extra keys via G15daemon
@@ -136,6 +137,7 @@ vsonku306	ViewSonic KU-306 Internet
 microsoftprose	Microsoft Internet Pro (Swedish)
 microsoftoffice	Microsoft Office Keyboard
 microsoftmult	Microsoft Wireless Multimedia 1.0A
+microsoftsurface	Microsoft Surface
 microsoftelite	Microsoft Natural Elite
 microsoftccurve2k	Microsoft Comfort Curve 2000
 oretec	Ortek Multimedia/Internet MCK-800
@@ -197,7 +199,6 @@ targa_v811	Targa Visionary 811
 unitekkb1925	Unitek KB-1925
 compalfl90	FL90
 creativedw7000	Creative Desktop Wireless 7000
-htcdream	Htc Dream phone
 teck227	Truly Ergonomic 227
 teck229	Truly Ergonomic 229
 apex300	SteelSeries Apex 300 (Apex RAW)
@@ -215,6 +216,7 @@ lB l.
 Layout(Variant)	Description
 us	English (US)
 us(chr)	Cherokee
+us(haw)	Hawaiian
 us(euro)	English (US, euro on 5)
 us(intl)	English (US, intl., with dead keys)
 us(alt-intl)	English (US, alt. intl.)
@@ -229,7 +231,7 @@ us(dvp)	English (programmer Dvorak)
 us(rus)	Russian (US, phonetic)
 us(mac)	English (Macintosh)
 us(altgr-intl)	English (intl., with AltGr dead keys)
-us(olpc2)	English (the divide/multiply keys toggle the layout)
+us(olpc2)	English (the divide/multiply toggle the layout)
 us(hbs)	Serbo-Croatian (US)
 us(norman)	English (Norman)
 us(workman)	English (Workman)
@@ -246,10 +248,10 @@ af(uz-olpc)	Uzbek (Afghanistan, OLPC)
 _
 ara	Arabic
 ara(azerty)	Arabic (AZERTY)
-ara(azerty_digits)	Arabic (AZERTY/digits)
-ara(digits)	Arabic (digits)
+ara(azerty_digits)	Arabic (AZERTY, Eastern Arabic numerals)
+ara(digits)	Arabic (Eastern Arabic numerals)
 ara(qwerty)	Arabic (QWERTY)
-ara(qwerty_digits)	Arabic (qwerty/digits)
+ara(qwerty_digits)	Arabic (QWERTY, Eastern Arabic numerals)
 ara(buckwalter)	Arabic (Buckwalter)
 ara(olpc)	Arabic (OLPC)
 ara(mac)	Arabic (Macintosh)
@@ -257,6 +259,7 @@ ara(mac)	Arabic (Macintosh)
 _
 al	Albanian
 al(plisi)	Albanian (Plisi)
+al(veqilharxhi)	Albanian (Veqilharxhi)
 
 _
 am	Armenian
@@ -269,7 +272,7 @@ am(eastern-alt)	Armenian (alt. eastern)
 _
 at	German (Austria)
 at(nodeadkeys)	German (Austria, no dead keys)
-at(sundeadkeys)	German (Austria, with Sun dead keys)
+at(sundeadkeys)	German (Austria, Sun dead keys)
 at(mac)	German (Austria, Macintosh)
 
 _
@@ -283,15 +286,17 @@ _
 by	Belarusian
 by(legacy)	Belarusian (legacy)
 by(latin)	Belarusian (Latin)
+by(ru)	Russian (Belarus)
+by(intl)	Belarusian (intl.)
 
 _
 be	Belgian
 be(oss)	Belgian (alt.)
-be(oss_latin9)	Belgian (alt., Latin-9 only)
-be(oss_sundeadkeys)	Belgian (alt., with Sun dead keys)
-be(iso-alternate)	Belgian (alt. ISO)
+be(oss_latin9)	Belgian (Latin-9 only, alt.)
+be(oss_sundeadkeys)	Belgian (Sun dead keys, alt.)
+be(iso-alternate)	Belgian (ISO, alt.)
 be(nodeadkeys)	Belgian (no dead keys)
-be(sundeadkeys)	Belgian (with Sun dead keys)
+be(sundeadkeys)	Belgian (Sun dead keys)
 be(wang)	Belgian (Wang 724 AZERTY)
 
 _
@@ -304,14 +309,14 @@ in(ben)	Bangla (India)
 in(ben_probhat)	Bangla (India, Probhat)
 in(ben_baishakhi)	Bangla (India, Baishakhi)
 in(ben_bornona)	Bangla (India, Bornona)
-in(ben_gitanjali)	Bangla (India, Uni Gitanjali)
+in(ben_gitanjali)	Bangla (India, Gitanjali)
 in(ben_inscript)	Bangla (India, Baishakhi Inscript)
 in(eeyek)	Manipuri (Eeyek)
 in(guj)	Gujarati
 in(guru)	Punjabi (Gurmukhi)
 in(jhelum)	Punjabi (Gurmukhi Jhelum)
 in(kan)	Kannada
-in(kan-kagapa)	Kannada (KaGaPa phonetic)
+in(kan-kagapa)	Kannada (KaGaPa, phonetic)
 in(mal)	Malayalam
 in(mal_lalitha)	Malayalam (Lalitha)
 in(mal_enhanced)	Malayalam (enhanced Inscript, with rupee)
@@ -323,25 +328,27 @@ in(tam_tamilnet_TAB)	Tamil (TamilNet '99, TAB encoding)
 in(tam_tamilnet_TSCII)	Tamil (TamilNet '99, TSCII encoding)
 in(tam)	Tamil (Inscript)
 in(tel)	Telugu
-in(tel-kagapa)	Telugu (KaGaPa phonetic)
+in(tel-kagapa)	Telugu (KaGaPa, phonetic)
 in(tel-sarala)	Telugu (Sarala)
-in(tel-kagapa)	Telugu (KaGaPa phonetic)
+in(tel-kagapa)	Telugu (KaGaPa, phonetic)
 in(urd-phonetic)	Urdu (phonetic)
 in(urd-phonetic3)	Urdu (alt. phonetic)
-in(urd-winkeys)	Urdu (Win keys)
+in(urd-winkeys)	Urdu (Windows)
 in(bolnagri)	Hindi (Bolnagri)
 in(hin-wx)	Hindi (Wx)
-in(hin-kagapa)	Hindi (KaGaPa phonetic)
-in(san-kagapa)	Sanskrit (KaGaPa phonetic)
-in(mar-kagapa)	Marathi (KaGaPa phonetic)
+in(hin-kagapa)	Hindi (KaGaPa, phonetic)
+in(san-kagapa)	Sanskrit (KaGaPa, phonetic)
+in(mar-kagapa)	Marathi (KaGaPa, phonetic)
 in(eng)	English (India, with rupee)
+in(iipa)	Indic IPA (IIPA)
+in(marathi)	मराठी इन्स्क्रिप्ट
 
 _
 ba	Bosnian
 ba(alternatequotes)	Bosnian (with guillemets)
 ba(unicode)	Bosnian (with Bosnian digraphs)
 ba(unicodeus)	Bosnian (US, with Bosnian digraphs)
-ba(us)	Bosnian (US, with Bosnian letters)
+ba(us)	Bosnian (US)
 
 _
 br	Portuguese (Brazil)
@@ -358,8 +365,11 @@ bg(phonetic)	Bulgarian (traditional phonetic)
 bg(bas_phonetic)	Bulgarian (new phonetic)
 
 _
-dz	Berber (Algeria, Latin)
-dz(ber)	Berber (Algeria, Tifinagh)
+dz	Kabylian (azerty layout, no dead keys)
+dz(azerty-deadkeys)	Kabylian (azerty layout, with dead keys)
+dz(qwerty-gb-deadkeys)	Kabylian (qwerty-gb layout, with dead keys)
+dz(qwerty-us-deadkeys)	Kabylian (qwerty-us layout, with dead keys)
+dz(ber)	Kabylian (Algeria, Tifinagh)
 dz(ar)	Arabic (Algeria)
 
 _
@@ -367,7 +377,7 @@ ma	Arabic (Morocco)
 ma(french)	French (Morocco)
 ma(tifinagh)	Berber (Morocco, Tifinagh)
 ma(tifinagh-alt)	Berber (Morocco, Tifinagh alt.)
-ma(tifinagh-alt-phonetic)	Berber (Morocco, Tifinagh alt. phonetic)
+ma(tifinagh-alt-phonetic)	Berber (Morocco, Tifinagh phonetic, alt.)
 ma(tifinagh-extended)	Berber (Morocco, Tifinagh extended)
 ma(tifinagh-phonetic)	Berber (Morocco, Tifinagh phonetic)
 ma(tifinagh-extended-phonetic)	Berber (Morocco, Tifinagh extended phonetic)
@@ -375,9 +385,9 @@ ma(tifinagh-extended-phonetic)	Berber (Morocco, Tifinagh extended phonetic)
 _
 cm	English (Cameroon)
 cm(french)	French (Cameroon)
-cm(qwerty)	Cameroon Multilingual (QWERTY)
-cm(azerty)	Cameroon Multilingual (AZERTY)
-cm(dvorak)	Cameroon Multilingual (Dvorak)
+cm(qwerty)	Cameroon Multilingual (QWERTY, intl.)
+cm(azerty)	Cameroon (AZERTY, intl.)
+cm(dvorak)	Cameroon (Dvorak, intl.)
 cm(mmuock)	Mmuock
 
 _
@@ -388,9 +398,9 @@ _
 ca	French (Canada)
 ca(fr-dvorak)	French (Canada, Dvorak)
 ca(fr-legacy)	French (Canada, legacy)
-ca(multix)	Canadian Multilingual
-ca(multi)	Canadian Multilingual (1st part)
-ca(multi-2gr)	Canadian Multilingual (2nd part)
+ca(multix)	Canadian (intl.)
+ca(multi)	Canadian (intl., 1st part)
+ca(multi-2gr)	Canadian (intl., 2nd part)
 ca(ike)	Inuktitut
 ca(eng)	English (Canada)
 
@@ -400,23 +410,23 @@ cd	French (Democratic Republic of the Congo)
 _
 cn	Chinese
 cn(mon_trad)	Mongolian (Bichig)
-cn(mon_trad_todo)	Mongolian Todo
-cn(mon_trad_xibe)	Mongolian Xibe
-cn(mon_trad_manchu)	Mongolian Manchu
-cn(mon_trad_galik)	Mongolian Galik
-cn(mon_todo_galik)	Mongolian Todo Galik
-cn(mon_manchu_galik)	Mongolian Manchu Galik
+cn(mon_trad_todo)	Mongolian (Todo)
+cn(mon_trad_xibe)	Mongolian (Xibe)
+cn(mon_trad_manchu)	Mongolian (Manchu)
+cn(mon_trad_galik)	Mongolian (Galik)
+cn(mon_todo_galik)	Mongolian (Todo Galik)
+cn(mon_manchu_galik)	Mongolian (Manchu Galik)
 cn(tib)	Tibetan
 cn(tib_asciinum)	Tibetan (with ASCII numerals)
 cn(ug)	Uyghur
-cn(altgr-pinyin)	Hanyu Pinyin (altgr)
+cn(altgr-pinyin)	Hanyu Pinyin (with AltGr dead keys)
 
 _
 hr	Croatian
 hr(alternatequotes)	Croatian (with guillemets)
 hr(unicode)	Croatian (with Croatian digraphs)
 hr(unicodeus)	Croatian (US, with Croatian digraphs)
-hr(us)	Croatian (US, with Croatian letters)
+hr(us)	Croatian (US)
 
 _
 cz	Czech
@@ -431,14 +441,14 @@ cz(rus)	Russian (Czech, phonetic)
 _
 dk	Danish
 dk(nodeadkeys)	Danish (no dead keys)
-dk(winkeys)	Danish (Win keys)
+dk(winkeys)	Danish (Windows)
 dk(mac)	Danish (Macintosh)
 dk(mac_nodeadkeys)	Danish (Macintosh, no dead keys)
 dk(dvorak)	Danish (Dvorak)
 
 _
 nl	Dutch
-nl(sundeadkeys)	Dutch (with Sun dead keys)
+nl(sundeadkeys)	Dutch (Sun dead keys)
 nl(mac)	Dutch (Macintosh)
 nl(std)	Dutch (standard)
 
@@ -449,7 +459,7 @@ _
 ee	Estonian
 ee(nodeadkeys)	Estonian (no dead keys)
 ee(dvorak)	Estonian (Dvorak)
-ee(us)	Estonian (US, with Estonian letters)
+ee(us)	Estonian (US)
 
 _
 ir	Persian
@@ -472,34 +482,34 @@ fo(nodeadkeys)	Faroese (no dead keys)
 
 _
 fi	Finnish
+fi(winkeys)	Finnish (Windows)
 fi(classic)	Finnish (classic)
 fi(nodeadkeys)	Finnish (classic, no dead keys)
-fi(winkeys)	Finnish (Winkeys)
 fi(smi)	Northern Saami (Finland)
 fi(mac)	Finnish (Macintosh)
 
 _
 fr	French
 fr(nodeadkeys)	French (no dead keys)
-fr(sundeadkeys)	French (with Sun dead keys)
+fr(sundeadkeys)	French (Sun dead keys)
 fr(oss)	French (alt.)
 fr(oss_latin9)	French (alt., Latin-9 only)
 fr(oss_nodeadkeys)	French (alt., no dead keys)
-fr(oss_sundeadkeys)	French (alt., with Sun dead keys)
+fr(oss_sundeadkeys)	French (alt., Sun dead keys)
 fr(latin9)	French (legacy, alt.)
 fr(latin9_nodeadkeys)	French (legacy, alt., no dead keys)
-fr(latin9_sundeadkeys)	French (legacy, alt., with Sun dead keys)
-fr(bepo)	French (Bepo, ergonomic, Dvorak way)
-fr(bepo_latin9)	French (Bepo, ergonomic, Dvorak way, Latin-9 only)
-fr(bepo_afnor)	French (Bepo, ergonomic, Dvorak way, AFNOR)
+fr(latin9_sundeadkeys)	French (legacy, alt., Sun dead keys)
+fr(bepo)	French (BEPO)
+fr(bepo_latin9)	French (BEPO, Latin-9 only)
+fr(bepo_afnor)	French (BEPO, AFNOR)
 fr(dvorak)	French (Dvorak)
 fr(mac)	French (Macintosh)
 fr(azerty)	French (AZERTY)
-fr(afnor)	French (AFNOR standardized AZERTY)
+fr(afnor)	French (AZERTY, AFNOR)
 fr(bre)	French (Breton)
 fr(oci)	Occitan
 fr(geo)	Georgian (France, AZERTY Tskapo)
-fr(us)	French (US, with French letters)
+fr(us)	French (US)
 
 _
 gh	English (Ghana)
@@ -531,7 +541,7 @@ de(T3)	German (T3)
 de(ro)	Romanian (Germany)
 de(ro_nodeadkeys)	Romanian (Germany, no dead keys)
 de(dvorak)	German (Dvorak)
-de(sundeadkeys)	German (with Sun dead keys)
+de(sundeadkeys)	German (Sun dead keys)
 de(neo)	German (Neo 2)
 de(mac)	German (Macintosh)
 de(mac_nodeadkeys)	German (Macintosh, no dead keys)
@@ -554,26 +564,26 @@ hu	Hungarian
 hu(standard)	Hungarian (standard)
 hu(nodeadkeys)	Hungarian (no dead keys)
 hu(qwerty)	Hungarian (QWERTY)
-hu(101_qwertz_comma_dead)	Hungarian (101/QWERTZ/comma/dead keys)
-hu(101_qwertz_comma_nodead)	Hungarian (101/QWERTZ/comma/no dead keys)
-hu(101_qwertz_dot_dead)	Hungarian (101/QWERTZ/dot/dead keys)
-hu(101_qwertz_dot_nodead)	Hungarian (101/QWERTZ/dot/no dead keys)
-hu(101_qwerty_comma_dead)	Hungarian (101/QWERTY/comma/dead keys)
-hu(101_qwerty_comma_nodead)	Hungarian (101/QWERTY/comma/no dead keys)
-hu(101_qwerty_dot_dead)	Hungarian (101/QWERTY/dot/dead keys)
-hu(101_qwerty_dot_nodead)	Hungarian (101/QWERTY/dot/no dead keys)
-hu(102_qwertz_comma_dead)	Hungarian (102/QWERTZ/comma/dead keys)
-hu(102_qwertz_comma_nodead)	Hungarian (102/QWERTZ/comma/no dead keys)
-hu(102_qwertz_dot_dead)	Hungarian (102/QWERTZ/dot/dead keys)
-hu(102_qwertz_dot_nodead)	Hungarian (102/QWERTZ/dot/no dead keys)
-hu(102_qwerty_comma_dead)	Hungarian (102/QWERTY/comma/dead keys)
-hu(102_qwerty_comma_nodead)	Hungarian (102/QWERTY/comma/no dead keys)
-hu(102_qwerty_dot_dead)	Hungarian (102/QWERTY/dot/dead keys)
-hu(102_qwerty_dot_nodead)	Hungarian (102/QWERTY/dot/no dead keys)
+hu(101_qwertz_comma_dead)	Hungarian (QWERTZ, 101-key, comma, dead keys)
+hu(101_qwertz_comma_nodead)	Hungarian (QWERTZ, 101-key, comma, no dead keys)
+hu(101_qwertz_dot_dead)	Hungarian (QWERTZ, 101-key, dot, dead keys)
+hu(101_qwertz_dot_nodead)	Hungarian (QWERTZ, 101-key, dot, no dead keys)
+hu(101_qwerty_comma_dead)	Hungarian (QWERTY, 101-key, comma, dead keys)
+hu(101_qwerty_comma_nodead)	Hungarian (QWERTY, 101-key, comma, no dead keys)
+hu(101_qwerty_dot_dead)	Hungarian (QWERTY, 101-key, dot, dead keys)
+hu(101_qwerty_dot_nodead)	Hungarian (QWERTY, 101-key, dot, no dead keys)
+hu(102_qwertz_comma_dead)	Hungarian (QWERTZ, 102-key, comma, dead keys)
+hu(102_qwertz_comma_nodead)	Hungarian (QWERTZ, 102-key, comma, no dead keys)
+hu(102_qwertz_dot_dead)	Hungarian (QWERTZ, 102-key, dot, dead keys)
+hu(102_qwertz_dot_nodead)	Hungarian (QWERTZ, 102-key, dot, no dead keys)
+hu(102_qwerty_comma_dead)	Hungarian (QWERTY, 102-key, comma, dead keys)
+hu(102_qwerty_comma_nodead)	Hungarian (QWERTY, 102-key, comma, no dead keys)
+hu(102_qwerty_dot_dead)	Hungarian (QWERTY, 102-key, dot, dead keys)
+hu(102_qwerty_dot_nodead)	Hungarian (QWERTY, 102-key, dot, no dead keys)
 
 _
 is	Icelandic
-is(Sundeadkeys)	Icelandic (with Sun dead keys)
+is(Sundeadkeys)	Icelandic (Sun dead keys)
 is(nodeadkeys)	Icelandic (no dead keys)
 is(mac_legacy)	Icelandic (Macintosh, legacy)
 is(mac)	Icelandic (Macintosh)
@@ -588,9 +598,9 @@ il(biblical)	Hebrew (Biblical, Tiro)
 _
 it	Italian
 it(nodeadkeys)	Italian (no dead keys)
-it(winkeys)	Italian (Winkeys)
+it(winkeys)	Italian (Windows)
 it(mac)	Italian (Macintosh)
-it(us)	Italian (US, with Italian letters)
+it(us)	Italian (US)
 it(geo)	Georgian (Italy)
 it(ibm)	Italian (IBM 142)
 it(intl)	Italian (intl., with dead keys)
@@ -621,13 +631,13 @@ kz(latin)	Kazakh (Latin)
 
 _
 la	Lao
-la(stea)	Lao (STEA proposed standard layout)
+la(stea)	Lao (STEA)
 
 _
 latam	Spanish (Latin American)
 latam(nodeadkeys)	Spanish (Latin American, no dead keys)
 latam(deadtilde)	Spanish (Latin American, dead tilde)
-latam(sundeadkeys)	Spanish (Latin American, with Sun dead keys)
+latam(sundeadkeys)	Spanish (Latin American, Sun dead keys)
 latam(dvorak)	Spanish (Latin American, Dvorak)
 latam(colemak)	Spanish (Latin American, Colemak)
 latam(colemak-gaming)	Spanish (Latin American, Colemak for gaming)
@@ -635,10 +645,11 @@ latam(colemak-gaming)	Spanish (Latin American, Colemak for gaming)
 _
 lt	Lithuanian
 lt(std)	Lithuanian (standard)
-lt(us)	Lithuanian (US, with Lithuanian letters)
+lt(us)	Lithuanian (US)
 lt(ibm)	Lithuanian (IBM LST 1205-92)
 lt(lekp)	Lithuanian (LEKP)
 lt(lekpa)	Lithuanian (LEKPa)
+lt(sgs)	Samogitian
 
 _
 lv	Latvian
@@ -659,8 +670,8 @@ me(cyrillicyz)	Montenegrin (Cyrillic, ZE and ZHE swapped)
 me(latinunicode)	Montenegrin (Latin, Unicode)
 me(latinyz)	Montenegrin (Latin, QWERTY)
 me(latinunicodeyz)	Montenegrin (Latin, Unicode, QWERTY)
-me(cyrillicalternatequotes)	Montenegrin (Cyrillic with guillemets)
-me(latinalternatequotes)	Montenegrin (Latin with guillemets)
+me(cyrillicalternatequotes)	Montenegrin (Cyrillic, with guillemets)
+me(latinalternatequotes)	Montenegrin (Latin, with guillemets)
 
 _
 mk	Macedonian
@@ -668,9 +679,9 @@ mk(nodeadkeys)	Macedonian (no dead keys)
 
 _
 mt	Maltese
-mt(us)	Maltese (with US layout)
+mt(us)	Maltese (US)
 mt(alt-us)	Maltese (US layout with AltGr overrides)
-mt(alt-gb)	Maltese (UK layout with AltGr overrides)
+mt(alt-gb)	Maltese (UK, with AltGr overrides)
 
 _
 mn	Mongolian
@@ -678,7 +689,7 @@ mn	Mongolian
 _
 no	Norwegian
 no(nodeadkeys)	Norwegian (no dead keys)
-no(winkeys)	Norwegian (Win keys)
+no(winkeys)	Norwegian (Windows)
 no(dvorak)	Norwegian (Dvorak)
 no(smi)	Northern Saami (Norway)
 no(smi_nodeadkeys)	Northern Saami (Norway, no dead keys)
@@ -701,10 +712,10 @@ pl(dvp)	Polish (programmer Dvorak)
 _
 pt	Portuguese
 pt(nodeadkeys)	Portuguese (no dead keys)
-pt(sundeadkeys)	Portuguese (with Sun dead keys)
+pt(sundeadkeys)	Portuguese (Sun dead keys)
 pt(mac)	Portuguese (Macintosh)
 pt(mac_nodeadkeys)	Portuguese (Macintosh, no dead keys)
-pt(mac_sundeadkeys)	Portuguese (Macintosh, with Sun dead keys)
+pt(mac_sundeadkeys)	Portuguese (Macintosh, Sun dead keys)
 pt(nativo)	Portuguese (Nativo)
 pt(nativo-us)	Portuguese (Nativo for US keyboards)
 pt(nativo-epo)	Esperanto (Portugal, Nativo)
@@ -714,19 +725,19 @@ ro	Romanian
 ro(cedilla)	Romanian (cedilla)
 ro(std)	Romanian (standard)
 ro(std_cedilla)	Romanian (standard cedilla)
-ro(winkeys)	Romanian (Win keys)
+ro(winkeys)	Romanian (Windows)
 
 _
 ru	Russian
 ru(phonetic)	Russian (phonetic)
-ru(phonetic_winkeys)	Russian (phonetic, with Win keys)
-ru(phonetic_yazherty)	Russian (phonetic yazherty)
+ru(phonetic_winkeys)	Russian (phonetic, Windows)
+ru(phonetic_YAZHERTY)	Russian (phonetic, YAZHERTY)
 ru(typewriter)	Russian (typewriter)
 ru(legacy)	Russian (legacy)
 ru(typewriter-legacy)	Russian (typewriter, legacy)
 ru(tt)	Tatar
 ru(os_legacy)	Ossetian (legacy)
-ru(os_winkeys)	Ossetian (Win keys)
+ru(os_winkeys)	Ossetian (Windows)
 ru(cv)	Chuvash
 ru(cv_latin)	Chuvash (Latin)
 ru(udm)	Udmurt
@@ -749,14 +760,14 @@ rs(latin)	Serbian (Latin)
 rs(latinunicode)	Serbian (Latin, Unicode)
 rs(latinyz)	Serbian (Latin, QWERTY)
 rs(latinunicodeyz)	Serbian (Latin, Unicode, QWERTY)
-rs(alternatequotes)	Serbian (Cyrillic with guillemets)
-rs(latinalternatequotes)	Serbian (Latin with guillemets)
+rs(alternatequotes)	Serbian (Cyrillic, with guillemets)
+rs(latinalternatequotes)	Serbian (Latin, with guillemets)
 rs(rue)	Pannonian Rusyn
 
 _
 si	Slovenian
 si(alternatequotes)	Slovenian (with guillemets)
-si(us)	Slovenian (US, with Slovenian letters)
+si(us)	Slovenian (US)
 
 _
 sk	Slovak
@@ -767,11 +778,11 @@ sk(qwerty_bksl)	Slovak (QWERTY, extended backslash)
 _
 es	Spanish
 es(nodeadkeys)	Spanish (no dead keys)
-es(winkeys)	Spanish (Win keys)
+es(winkeys)	Spanish (Windows)
 es(deadtilde)	Spanish (dead tilde)
-es(sundeadkeys)	Spanish (with Sun dead keys)
+es(sundeadkeys)	Spanish (Sun dead keys)
 es(dvorak)	Spanish (Dvorak)
-es(ast)	Asturian (Spain, with bottom-dot H and bottom-dot L)
+es(ast)	Asturian (Spain, with bottom-dot H and L)
 es(cat)	Catalan (Spain, with middle-dot L)
 es(mac)	Spanish (Macintosh)
 
@@ -784,18 +795,18 @@ se(rus_nodeadkeys)	Russian (Sweden, phonetic, no dead keys)
 se(smi)	Northern Saami (Sweden)
 se(mac)	Swedish (Macintosh)
 se(svdvorak)	Swedish (Svdvorak)
-se(us_dvorak)	Swedish (based on US Intl. Dvorak)
-se(us)	Swedish (US, with Swedish letters)
+se(us_dvorak)	Swedish (Dvorak, intl.)
+se(us)	Swedish (US)
 se(swl)	Swedish Sign Language
 
 _
 ch	German (Switzerland)
 ch(legacy)	German (Switzerland, legacy)
 ch(de_nodeadkeys)	German (Switzerland, no dead keys)
-ch(de_sundeadkeys)	German (Switzerland, with Sun dead keys)
+ch(de_sundeadkeys)	German (Switzerland, Sun dead keys)
 ch(fr)	French (Switzerland)
 ch(fr_nodeadkeys)	French (Switzerland, no dead keys)
-ch(fr_sundeadkeys)	French (Switzerland, with Sun dead keys)
+ch(fr_sundeadkeys)	French (Switzerland, Sun dead keys)
 ch(fr_mac)	French (Switzerland, Macintosh)
 ch(de_mac)	German (Switzerland, Macintosh)
 
@@ -815,7 +826,7 @@ _
 lk	Sinhala (phonetic)
 lk(tam_unicode)	Tamil (Sri Lanka, TamilNet '99)
 lk(tam_TAB)	Tamil (Sri Lanka, TamilNet '99, TAB encoding)
-lk(us)	Sinhala (US, with Sinhala letters)
+lk(us)	Sinhala (US)
 
 _
 th	Thai
@@ -826,7 +837,7 @@ _
 tr	Turkish
 tr(f)	Turkish (F)
 tr(alt)	Turkish (Alt-Q)
-tr(sundeadkeys)	Turkish (with Sun dead keys)
+tr(sundeadkeys)	Turkish (Sun dead keys)
 tr(ku)	Kurdish (Turkey, Latin Q)
 tr(ku_f)	Kurdish (Turkey, F)
 tr(ku_alt)	Kurdish (Turkey, Latin Alt-Q)
@@ -844,7 +855,7 @@ _
 ua	Ukrainian
 ua(phonetic)	Ukrainian (phonetic)
 ua(typewriter)	Ukrainian (typewriter)
-ua(winkeys)	Ukrainian (Win keys)
+ua(winkeys)	Ukrainian (Windows)
 ua(legacy)	Ukrainian (legacy)
 ua(rstu)	Ukrainian (standard RSTU)
 ua(rstu_ru)	Russian (Ukraine, standard RSTU)
@@ -852,12 +863,12 @@ ua(homophonic)	Ukrainian (homophonic)
 
 _
 gb	English (UK)
-gb(extd)	English (UK, extended, with Win keys)
+gb(extd)	English (UK, extended, Windows)
 gb(intl)	English (UK, intl., with dead keys)
 gb(dvorak)	English (UK, Dvorak)
 gb(dvorakukp)	English (UK, Dvorak, with UK punctuation)
 gb(mac)	English (UK, Macintosh)
-gb(mac_intl)	English (UK, intl., Macintosh)
+gb(mac_intl)	English (UK, Macintosh, intl.)
 gb(colemak)	English (UK, Colemak)
 gb(pl)	Polish (British keyboard)
 
@@ -867,12 +878,12 @@ uz(latin)	Uzbek (Latin)
 
 _
 vn	Vietnamese
-vn(us)	Vietnamese (US, with Vietnamese letters)
-vn(fr)	Vietnamese (French, with Vietnamese letters)
+vn(us)	Vietnamese (US)
+vn(fr)	Vietnamese (French)
 
 _
 kr	Korean
-kr(kr104)	Korean (101/104 key compatible)
+kr(kr104)	Korean (101/104-key compatible)
 
 _
 nec_vndr/jp	Japanese (PC-98)
@@ -899,7 +910,7 @@ za	English (South Africa)
 
 _
 epo	Esperanto
-epo(legacy)	Esperanto (displaced semicolon and quote, obsolete)
+epo(legacy)	Esperanto (legacy)
 
 _
 np	Nepali
@@ -964,7 +975,10 @@ md(gag)	Moldavian (Gagauz)
 
 _
 id	Indonesian (Arab Melayu, phonetic)
-id(phoneticx)	Indonesian (Arab Melayu, ext. phonetic)
+id(phoneticx)	Indonesian (Arab Melayu, extended phonetic)
+
+_
+jv	Indonesian (Javanese)
 
 _
 my	Malay (Jawi, Arabic Keyboard)
@@ -1047,10 +1061,10 @@ lv3:ralt_alt	Right Alt never chooses 3rd level
 lv3:enter_switch	Enter on keypad
 lv3:caps_switch	Caps Lock
 lv3:bksl_switch	Backslash
-lv3:lsgt_switch	<Less/Greater>
+lv3:lsgt_switch	The "< >" key
 lv3:caps_switch_latch	Caps Lock; acts as onetime lock when pressed together with another 3rd-level chooser
 lv3:bksl_switch_latch	Backslash; acts as onetime lock when pressed together with another 3rd level chooser
-lv3:lsgt_switch_latch	<Less/Greater>; acts as onetime lock when pressed together with another 3rd level chooser
+lv3:lsgt_switch_latch	The "< >" key; acts as onetime lock when pressed together with another 3rd level chooser
 
 .TE
 
@@ -1067,9 +1081,9 @@ Option	Description
 ctrl:nocaps	Caps Lock as Ctrl
 ctrl:lctrl_meta	Left Ctrl as Meta
 ctrl:swapcaps	Swap Ctrl and Caps Lock
-ctrl:swapcaps_hyper	Caps Lock as Control, Control as Hyper
-ctrl:ac_ctrl	At left of 'A'
-ctrl:aa_ctrl	At bottom left
+ctrl:swapcaps_hyper	Caps Lock as Ctrl, Ctrl as Hyper
+ctrl:ac_ctrl	To the left of "A"
+ctrl:aa_ctrl	At the bottom left
 ctrl:rctrl_ralt	Right Ctrl as Right Alt
 ctrl:menu_rctrl	Menu as Right Ctrl
 ctrl:swap_lalt_lctl	Swap Left Alt with Left Ctrl
@@ -1096,6 +1110,20 @@ grp_led:scroll	Scroll Lock
 .TE
 
 
+.SS
+Use keyboard LED to indicate modifiers
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option	Description
+mod_led:compose	Compose
+
+.TE
+
+
 .SS
 Layout of numeric keypad
 .BR
@@ -1106,13 +1134,13 @@ ___
 lB l.
 Option	Description
 keypad:legacy	Legacy
-keypad:oss	Unicode additions (arrows and math operators)
-keypad:future	Unicode additions (arrows and math operators; math operators on default level)
+keypad:oss	Unicode arrows and math operators
+keypad:future	Unicode arrows and math operators on default level
 keypad:legacy_wang	Legacy Wang 724
-keypad:oss_wang	Wang 724 keypad with Unicode additions (arrows and math operators)
-keypad:future_wang	Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)
+keypad:oss_wang	Wang 724 keypad with Unicode arrows and math operators
+keypad:future_wang	Wang 724 keypad with Unicode arrows and math operators on default level
 keypad:hex	Hexadecimal
-keypad:atm	ATM/phone-style
+keypad:atm	Phone and ATM style
 
 .TE
 
@@ -1152,10 +1180,10 @@ caps:internal_nocancel	Caps Lock uses internal capitalization; Shift does not af
 caps:shift	Caps Lock acts as Shift with locking; Shift "pauses" Caps Lock
 caps:shift_nocancel	Caps Lock acts as Shift with locking; Shift does not affect Caps Lock
 caps:capslock	Caps Lock toggles normal capitalization of alphabetic characters
-caps:shiftlock	Caps Lock toggles ShiftLock (affects all keys)
-caps:swapescape	Swap ESC and Caps Lock
+caps:shiftlock	Caps Lock toggles Shift Lock (affects all keys)
+caps:swapescape	Swap Esc and Caps Lock
 caps:escape	Make Caps Lock an additional Esc
-caps:escape_shifted_capslock	Make unmodified Caps Lock an additional Esc, but Shift + Caps Lock behaves like regular Caps Lock
+caps:escape_shifted_capslock	Make Caps Lock an additional Esc, but Shift + Caps Lock is the regular Caps Lock
 caps:backspace	Make Caps Lock an additional Backspace
 caps:super	Make Caps Lock an additional Super
 caps:hyper	Make Caps Lock an additional Hyper
@@ -1168,7 +1196,7 @@ caps:none	Caps Lock is disabled
 
 
 .SS
-Alt/Win key behavior
+Alt and Win behavior
 .BR
 .TS
 left,box;
@@ -1180,8 +1208,8 @@ altwin:menu	Add the standard behavior to Menu key
 altwin:menu_win	Menu is mapped to Win
 altwin:meta_alt	Alt and Meta are on Alt
 altwin:alt_win	Alt is mapped to Win and the usual Alt
-altwin:ctrl_win	Ctrl is mapped to Win and the usual Ctrl keys
-altwin:ctrl_alt_win	Ctrl is mapped to Alt; Alt is mapped to Win
+altwin:ctrl_win	Ctrl is mapped to Win and the usual Ctrl
+altwin:ctrl_alt_win	Ctrl is mapped to Alt, Alt to Win
 altwin:meta_win	Meta is mapped to Win
 altwin:left_meta_win	Meta is mapped to Left Win
 altwin:hyper_win	Hyper is mapped to Win
@@ -1215,8 +1243,8 @@ compose:rctrl	Right Ctrl
 compose:rctrl-altgr	3rd level of Right Ctrl
 compose:caps	Caps Lock
 compose:caps-altgr	3rd level of Caps Lock
-compose:102	<Less/Greater>
-compose:102-altgr	3rd level of <Less/Greater>
+compose:102	The "< >" key
+compose:102-altgr	3rd level of the "< >" key
 compose:paus	Pause
 compose:prsc	PrtSc
 compose:sclk	Scroll Lock
@@ -1225,7 +1253,7 @@ compose:sclk	Scroll Lock
 
 
 .SS
-Miscellaneous compatibility options
+Compatibility options
 .BR
 .TS
 left,box;
@@ -1235,12 +1263,13 @@ lB l.
 Option	Description
 numpad:pc	Default numeric keypad keys
 numpad:mac	Numeric keypad always enters digits (as in macOS)
-numpad:microsoft	Num Lock on: digits; Shift for arrow keys. Num Lock off: arrow keys (as in Windows)
+numpad:microsoft	Num Lock on: digits; Shift for arrows. Num Lock off: arrows (as in Windows)
 numpad:shift3	Shift does not cancel Num Lock, chooses 3rd level instead
 srvrkeys:none	Special keys (Ctrl+Alt+<key>) handled in a server
-apple:alupckeys	Apple Aluminium: emulate PC keys (PrtSc, Scroll Lock, Pause, Num Lock)
+apple:alupckeys	Apple Aluminium emulates Pause, PrtSc, Scroll Lock
 shift:breaks_caps	Shift cancels Caps Lock
 misc:typo	Enable extra typographic characters
+misc:apl	Enable APL overlay characters
 shift:both_capslock	Both Shift together enable Caps Lock
 shift:both_capslock_cancel	Both Shift together enable Caps Lock; one Shift key disables it
 shift:both_shiftlock	Both Shift together enable Shift Lock
@@ -1252,7 +1281,7 @@ grab:debug	Allow grab and window tree logging
 
 
 .SS
-Adding currency signs to certain keys
+Currency signs
 .BR
 .TS
 left,box;
@@ -1278,18 +1307,18 @@ lB lB
 ___
 lB l.
 Option	Description
-lv5:lsgt_switch	<Less/Greater> chooses 5th level
+lv5:lsgt_switch	The "< >" key chooses 5th level
 lv5:ralt_switch	Right Alt chooses 5th level
-lv5:lsgt_switch_lock	<Less/Greater> chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
-lv5:ralt_switch_lock	Right Alt chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
-lv5:lwin_switch_lock	Left Win chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
-lv5:rwin_switch_lock	Right Win chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
+lv5:lsgt_switch_lock	The "< >" key chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
+lv5:ralt_switch_lock	Right Alt chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
+lv5:lwin_switch_lock	Left Win chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
+lv5:rwin_switch_lock	Right Win chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
 
 .TE
 
 
 .SS
-Using space key to input non-breaking space
+Non-breaking space input
 .BR
 .TS
 left,box;
@@ -1351,7 +1380,7 @@ korean:rctrl_hanja	Make right Ctrl a Hanja key
 
 
 .SS
-Adding Esperanto supersigned letters
+Esperanto letters with superscripts
 .BR
 .TS
 left,box;
@@ -1359,15 +1388,15 @@ lB lB
 ___
 lB l.
 Option	Description
-esperanto:qwerty	To the corresponding key in a QWERTY layout
-esperanto:dvorak	To the corresponding key in a Dvorak layout
-esperanto:colemak	To the corresponding key in a Colemak layout
+esperanto:qwerty	At the corresponding key in a QWERTY layout
+esperanto:dvorak	At the corresponding key in a Dvorak layout
+esperanto:colemak	At the corresponding key in a Colemak layout
 
 .TE
 
 
 .SS
-Maintain key compatibility with old Solaris keycodes
+Old Solaris keycodes compatibility
 .BR
 .TS
 left,box;
@@ -1375,7 +1404,7 @@ lB lB
 ___
 lB l.
 Option	Description
-solaris:sun_compat	Sun Key compatibility
+solaris:sun_compat	Sun key compatibility
 
 .TE
 


More information about the crux-commits mailing list