Module Name: src
Committed By: mrg
Date: Sun Nov 1 12:07:09 UTC 2020
Modified Files:
src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man
src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev
evdev.lst
src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile
Log Message:
merge new xkeyboard-config 2.31 parts.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/lib/xkeyboard-config/rules/base \
src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \
src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/lib/xkeyboard-config/rules/evdev
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man
diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.7 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.8
--- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.7 Thu Mar 12 21:55:31 2020
+++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man Sun Nov 1 12:07:09 2020
@@ -1,11 +1,11 @@
.\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes.
-.TH XKEYBOARD-CONFIG __miscmansuffix__ __vendorversion__
+.TH XKEYBOARD-CONFIG @miscmansuffix@ @vendorversion@
.SH NAME
xkeyboard-config \- XKB data description files
.SH DESCRIPTION
xkeyboard-config provides the description files for the X Keyboard
Extension (XKB). The configuration options below are usually applied with
-setxkbmap(__appmansuffix__).
+setxkbmap(@appmansuffix@).
.SH MODELS
.TS
left,box;
@@ -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
@@ -214,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.)
@@ -225,10 +228,11 @@ us(dvorak-l) English (Dvorak, left-hande
us(dvorak-r) English (Dvorak, right-handed)
us(dvorak-classic) English (classic Dvorak)
us(dvp) English (programmer Dvorak)
+us(symbolic) English (US, Symbolic)
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)
@@ -245,10 +249,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)
@@ -269,7 +273,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 +287,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 +310,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 +329,26 @@ in(tam_tamilnet_TAB) Tamil (TamilNet '99
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(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 (phonetic, IPA)
+in(marathi) Marathi (enhanced Inscript)
_
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)
@@ -356,10 +363,14 @@ _
bg Bulgarian
bg(phonetic) Bulgarian (traditional phonetic)
bg(bas_phonetic) Bulgarian (new phonetic)
+bg(bekl) Bulgarian (enhanced)
_
-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 +378,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 +386,9 @@ ma(tifinagh-extended-phonetic) Berber (M
_
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 +399,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 +411,23 @@ cd French (Democratic Republic of the Co
_
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 +442,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 +460,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,7 +483,7 @@ fo(nodeadkeys) Faroese (no dead keys)
_
fi Finnish
-fi(winkeys) Finnish (Winkeys)
+fi(winkeys) Finnish (Windows)
fi(classic) Finnish (classic)
fi(nodeadkeys) Finnish (classic, no dead keys)
fi(smi) Northern Saami (Finland)
@@ -481,25 +492,25 @@ 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)
@@ -527,11 +538,14 @@ de German
de(deadacute) German (dead acute)
de(deadgraveacute) German (dead grave acute)
de(nodeadkeys) German (no dead keys)
+de(e1) German (E1)
+de(e2) German (E2)
de(T3) German (T3)
+de(us) German (US)
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 +568,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 +602,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 +635,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,7 +649,7 @@ latam(colemak-gaming) Spanish (Latin Ame
_
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)
@@ -660,8 +674,8 @@ me(cyrillicyz) Montenegrin (Cyrillic, ZE
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
@@ -669,9 +683,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
@@ -679,7 +693,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)
@@ -702,10 +716,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)
@@ -715,19 +729,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
@@ -750,14 +764,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
@@ -768,11 +782,11 @@ sk(qwerty_bksl) Slovak (QWERTY, extended
_
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)
@@ -785,18 +799,18 @@ se(rus_nodeadkeys) Russian (Sweden, phon
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)
@@ -816,7 +830,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
@@ -827,7 +841,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)
@@ -845,7 +859,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)
@@ -853,12 +867,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)
@@ -868,12 +882,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)
@@ -900,7 +914,7 @@ za English (South Africa)
_
epo Esperanto
-epo(legacy) Esperanto (displaced semicolon and quote, obsolete)
+epo(legacy) Esperanto (legacy)
_
np Nepali
@@ -965,7 +979,7 @@ 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)
@@ -1030,6 +1044,20 @@ grp:lctrl_lwin_toggle Left Ctrl+Left Win
.SS
+Key to choose the 2nd level
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option Description
+lv2:lsgt_switch The "< >" key
+
+.TE
+
+
+.SS
Key to choose the 3rd level
.BR
.TS
@@ -1051,10 +1079,10 @@ lv3:ralt_alt Right Alt never chooses 3rd
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
@@ -1071,9 +1099,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
@@ -1124,13 +1152,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
@@ -1170,10 +1198,10 @@ caps:internal_nocancel Caps Lock uses in
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
@@ -1186,7 +1214,7 @@ caps:none Caps Lock is disabled
.SS
-Alt/Win key behavior
+Alt and Win behavior
.BR
.TS
left,box;
@@ -1198,8 +1226,8 @@ altwin:menu Add the standard behavior to
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
@@ -1233,8 +1261,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
@@ -1243,7 +1271,7 @@ compose:sclk Scroll Lock
.SS
-Miscellaneous compatibility options
+Compatibility options
.BR
.TS
left,box;
@@ -1253,12 +1281,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
@@ -1270,7 +1299,7 @@ grab:debug Allow grab and window tree lo
.SS
-Adding currency signs to certain keys
+Currency signs
.BR
.TS
left,box;
@@ -1296,18 +1325,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;
@@ -1369,7 +1398,7 @@ korean:rctrl_hanja Make right Ctrl a Han
.SS
-Adding Esperanto supersigned letters
+Esperanto letters with superscripts
.BR
.TS
left,box;
@@ -1377,15 +1406,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;
@@ -1393,7 +1422,7 @@ lB lB
___
lB l.
Option Description
-solaris:sun_compat Sun Key compatibility
+solaris:sun_compat Sun key compatibility
.TE
@@ -1413,23 +1442,23 @@ terminate:ctrl_alt_bksp Ctrl+Alt+Backspa
.SH FILES
-__xkb_base__/compat
+@xkb_base@/compat
-__xkb_base__/compiled
+@xkb_base@/compiled
-__xkb_base__/geometry
+@xkb_base@/geometry
-__xkb_base__/keycodes
+@xkb_base@/keycodes
-__xkb_base__/keymap
+@xkb_base@/keymap
-__xkb_base__/rules
+@xkb_base@/rules
-__xkb_base__/semantics
+@xkb_base@/semantics
-__xkb_base__/symbols
+@xkb_base@/symbols
-__xkb_base__/types
+@xkb_base@/types
.SH SEE ALSO
-setxkbmap(__appmansuffix__)
+setxkbmap(@appmansuffix@)
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.14 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.15
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.14 Sun Feb 23 11:17:03 2020
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base Sun Nov 1 12:07:09 2020
@@ -14,7 +14,7 @@
// ori pk ru scc sy syr tel th tj tam ua uz
// PC models
-! $pcmodels = pc101 pc102 pc104 pc105
+! $pcmodels = pc86 pc101 pc102 pc104 pc104alt pc105
// Jolla devices and keyboards
! $jollamodels = jollasbj
@@ -25,9 +25,6 @@
// Nokia devices and keyboards
! $nokiamodels = nokiasu8w nokiarx44 nokiarx51
-// PC geometries - they have special geometry but symbols are mostly pc105
-! $pcgeometries = latitude
-
// TypeMatrix geometries
! $tmgeometries = tm2020 tm2030PS2 tm2030USB tm2030USB-102 tm2030USB-106
@@ -188,7 +185,6 @@
omnikey101 = northgate(omnikey101)
sanwaskbkg3 = sanwa(sanwaskbkg3)
$pcmodels = pc(%m)
- $pcgeometries = pc(%m)
everex = everex(STEPnote)
thinkpad = thinkpad(intl)
thinkpad60 = thinkpad(60)
@@ -992,6 +988,14 @@
de neo_qwertz = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
de neo_qwerty = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
jp $sun_compat = complete+japan(kana_lock)
+ de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de koy = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de bone = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de bone_eszett_home = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo_qwertz = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo_qwerty = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ jp $sun_compat = complete+japan(kana_lock)
! layout[1] variant[1] = compat
de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
@@ -1002,6 +1006,14 @@
de neo_qwertz = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
de neo_qwerty = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
jp $sun_compat = complete+japan(kana_lock)
+ de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de koy = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de bone = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de bone_eszett_home = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo_qwertz = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo_qwerty = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ jp $sun_compat = complete+japan(kana_lock)
! layout[2] variant[2] = compat
de neo = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
@@ -1012,6 +1024,14 @@
de neo_qwertz = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
de neo_qwerty = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
jp $sun_compat = +complete+japan(kana_lock):2
+ de neo = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de adnw = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de koy = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de bone = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de bone_eszett_home = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de neo_qwertz = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de neo_qwerty = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ jp $sun_compat = +complete+japan(kana_lock):2
! layout[3] variant[3] = compat
de neo = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
@@ -1022,6 +1042,14 @@
de neo_qwertz = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
de neo_qwerty = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
jp $sun_compat = +complete+japan(kana_lock):3
+ de neo = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de adnw = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de koy = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de bone = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de bone_eszett_home = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de neo_qwertz = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de neo_qwerty = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ jp $sun_compat = +complete+japan(kana_lock):3
! layout[4] variant[4] = compat
de neo = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
@@ -1032,6 +1060,14 @@
de neo_qwertz = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
de neo_qwerty = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
jp $sun_compat = +complete+japan(kana_lock):4
+ de neo = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de adnw = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de koy = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de bone = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de bone_eszett_home = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de neo_qwertz = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de neo_qwerty = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ jp $sun_compat = +complete+japan(kana_lock):4
! model layout = compat
pc98 nec_vndr/jp = pc98(basic)
@@ -1052,25 +1088,31 @@
! layout option = symbols
$threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle)
* misc:typo = +typo(base)
+ * misc:apl = +apl(level3)
! layout[1] option = symbols
$threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1
* misc:typo = +typo(base):1
+ * misc:apl = +apl(level3):1
! layout[2] option = symbols
$threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2
* misc:typo = +typo(base):2
+ * misc:apl = +apl(level3):2
! layout[3] option = symbols
$threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3
* misc:typo = +typo(base):3
+ * misc:apl = +apl(level3):3
! layout[4] option = symbols
$threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4
* misc:typo = +typo(base):4
+ * misc:apl = +apl(level3):4
! option = symbols
grp:shift_toggle = +group(shifts_toggle)
+ grp:shift_toggle = +group(shifts_toggle)
altwin:menu = +altwin(menu)
altwin:menu_win = +altwin(menu_win)
altwin:meta_alt = +altwin(meta_alt)
@@ -1207,6 +1249,14 @@
nbsp:level4 = +nbsp(level4)
nbsp:level4n = +nbsp(level4n)
nbsp:level4nl = +nbsp(level4nl)
+ nbsp:zwnj2 = +nbsp(zwnj2)
+ nbsp:zwnj2zwj3 = +nbsp(zwnj2zwj3)
+ nbsp:zwnj2zwj3nb4 = +nbsp(zwnj2zwj3nb4)
+ nbsp:zwnj2nb3 = +nbsp(zwnj2nb3)
+ nbsp:zwnj2nb3s = +nbsp(zwnj2nb3s)
+ nbsp:zwnj2nb3zwj4 = +nbsp(zwnj2nb3zwj4)
+ nbsp:zwnj2nb3nnb4 = +nbsp(zwnj2nb3nnb4)
+ nbsp:zwnj3zwj4 = +nbsp(zwnj3zwj4)
japan:nicola_f_bs = +jp(nicola_f_bs)
japan:hztg_escape = +jp(hztg_escape)
korean:ralt_hangul = +kr(ralt_hangul)
@@ -1238,6 +1288,7 @@
shift:lshift_both_shiftlock = +shift(lshift_both_shiftlock)
shift:rshift_both_shiftlock = +shift(rshift_both_shiftlock)
solaris:sun_compat = +sun_vndr/solaris(sun_compat)
+ lv2:lsgt_switch = +level2(lsgt_switch)
lv3:caps_switch = +level3(caps_switch)
lv3:bksl_switch = +level3(bksl_switch)
lv3:lsgt_switch = +level3(lsgt_switch)
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.14 src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.15
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.14 Sun Feb 23 11:17:03 2020
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst Sun Nov 1 12:07:09 2020
@@ -1,8 +1,10 @@
! model
+ 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
@@ -206,7 +208,7 @@
ba Bosnian
br Portuguese (Brazil)
bg Bulgarian
- dz Berber (Algeria, Latin)
+ dz Kabylian (azerty layout, no dead keys)
ma Arabic (Morocco)
cm English (Cameroon)
mm Burmese
@@ -293,6 +295,7 @@
! variant
chr us: Cherokee
+ haw us: Hawaiian
euro us: English (US, euro on 5)
intl us: English (US, intl., with dead keys)
alt-intl us: English (US, alt. intl.)
@@ -304,10 +307,11 @@
dvorak-r us: English (Dvorak, right-handed)
dvorak-classic us: English (classic Dvorak)
dvp us: English (programmer Dvorak)
+ symbolic us: English (US, Symbolic)
rus us: Russian (US, phonetic)
mac us: English (Macintosh)
altgr-intl us: English (intl., with AltGr dead keys)
- olpc2 us: English (the divide/multiply keys toggle the layout)
+ olpc2 us: English (the divide/multiply toggle the layout)
hbs us: Serbo-Croatian (US)
norman us: English (Norman)
workman us: English (Workman)
@@ -318,10 +322,10 @@
fa-olpc af: Persian (Afghanistan, Dari OLPC)
uz-olpc af: Uzbek (Afghanistan, OLPC)
azerty ara: Arabic (AZERTY)
- azerty_digits ara: Arabic (AZERTY/digits)
- digits ara: Arabic (digits)
+ azerty_digits ara: Arabic (AZERTY, Eastern Arabic numerals)
+ digits ara: Arabic (Eastern Arabic numerals)
qwerty ara: Arabic (QWERTY)
- qwerty_digits ara: Arabic (qwerty/digits)
+ qwerty_digits ara: Arabic (QWERTY, Eastern Arabic numerals)
buckwalter ara: Arabic (Buckwalter)
olpc ara: Arabic (OLPC)
mac ara: Arabic (Macintosh)
@@ -333,31 +337,33 @@
western am: Armenian (western)
eastern-alt am: Armenian (alt. eastern)
nodeadkeys at: German (Austria, no dead keys)
- sundeadkeys at: German (Austria, with Sun dead keys)
+ sundeadkeys at: German (Austria, Sun dead keys)
mac at: German (Austria, Macintosh)
cyrillic az: Azerbaijani (Cyrillic)
legacy by: Belarusian (legacy)
latin by: Belarusian (Latin)
+ ru by: Russian (Belarus)
+ intl by: Belarusian (intl.)
oss be: Belgian (alt.)
- oss_latin9 be: Belgian (alt., Latin-9 only)
- oss_sundeadkeys be: Belgian (alt., with Sun dead keys)
- iso-alternate be: Belgian (alt. ISO)
+ oss_latin9 be: Belgian (Latin-9 only, alt.)
+ oss_sundeadkeys be: Belgian (Sun dead keys, alt.)
+ iso-alternate be: Belgian (ISO, alt.)
nodeadkeys be: Belgian (no dead keys)
- sundeadkeys be: Belgian (with Sun dead keys)
+ sundeadkeys be: Belgian (Sun dead keys)
wang be: Belgian (Wang 724 AZERTY)
probhat bd: Bangla (Probhat)
ben in: Bangla (India)
ben_probhat in: Bangla (India, Probhat)
ben_baishakhi in: Bangla (India, Baishakhi)
ben_bornona in: Bangla (India, Bornona)
- ben_gitanjali in: Bangla (India, Uni Gitanjali)
+ ben_gitanjali in: Bangla (India, Gitanjali)
ben_inscript in: Bangla (India, Baishakhi Inscript)
eeyek in: Manipuri (Eeyek)
guj in: Gujarati
guru in: Punjabi (Gurmukhi)
jhelum in: Punjabi (Gurmukhi Jhelum)
kan in: Kannada
- kan-kagapa in: Kannada (KaGaPa phonetic)
+ kan-kagapa in: Kannada (KaGaPa, phonetic)
mal in: Malayalam
mal_lalitha in: Malayalam (Lalitha)
mal_enhanced in: Malayalam (enhanced Inscript, with rupee)
@@ -369,22 +375,23 @@
tam_tamilnet_TSCII in: Tamil (TamilNet '99, TSCII encoding)
tam in: Tamil (Inscript)
tel in: Telugu
- tel-kagapa in: Telugu (KaGaPa phonetic)
+ tel-kagapa in: Telugu (KaGaPa, phonetic)
tel-sarala in: Telugu (Sarala)
- tel-kagapa in: Telugu (KaGaPa phonetic)
urd-phonetic in: Urdu (phonetic)
urd-phonetic3 in: Urdu (alt. phonetic)
- urd-winkeys in: Urdu (Win keys)
+ urd-winkeys in: Urdu (Windows)
bolnagri in: Hindi (Bolnagri)
hin-wx in: Hindi (Wx)
- hin-kagapa in: Hindi (KaGaPa phonetic)
- san-kagapa in: Sanskrit (KaGaPa phonetic)
- mar-kagapa in: Marathi (KaGaPa phonetic)
+ hin-kagapa in: Hindi (KaGaPa, phonetic)
+ san-kagapa in: Sanskrit (KaGaPa, phonetic)
+ mar-kagapa in: Marathi (KaGaPa, phonetic)
eng in: English (India, with rupee)
+ iipa in: Indic (phonetic, IPA)
+ marathi in: Marathi (enhanced Inscript)
alternatequotes ba: Bosnian (with guillemets)
unicode ba: Bosnian (with Bosnian digraphs)
unicodeus ba: Bosnian (US, with Bosnian digraphs)
- us ba: Bosnian (US, with Bosnian letters)
+ us ba: Bosnian (US)
nodeadkeys br: Portuguese (Brazil, no dead keys)
dvorak br: Portuguese (Brazil, Dvorak)
nativo br: Portuguese (Brazil, Nativo)
@@ -393,43 +400,47 @@
thinkpad br: Portuguese (Brazil, IBM/Lenovo ThinkPad)
phonetic bg: Bulgarian (traditional phonetic)
bas_phonetic bg: Bulgarian (new phonetic)
- ber dz: Berber (Algeria, Tifinagh)
+ bekl bg: Bulgarian (enhanced)
+ azerty-deadkeys dz: Kabylian (azerty layout, with dead keys)
+ qwerty-gb-deadkeys dz: Kabylian (qwerty-gb layout, with dead keys)
+ qwerty-us-deadkeys dz: Kabylian (qwerty-us layout, with dead keys)
+ ber dz: Kabylian (Algeria, Tifinagh)
ar dz: Arabic (Algeria)
french ma: French (Morocco)
tifinagh ma: Berber (Morocco, Tifinagh)
tifinagh-alt ma: Berber (Morocco, Tifinagh alt.)
- tifinagh-alt-phonetic ma: Berber (Morocco, Tifinagh alt. phonetic)
+ tifinagh-alt-phonetic ma: Berber (Morocco, Tifinagh phonetic, alt.)
tifinagh-extended ma: Berber (Morocco, Tifinagh extended)
tifinagh-phonetic ma: Berber (Morocco, Tifinagh phonetic)
tifinagh-extended-phonetic ma: Berber (Morocco, Tifinagh extended phonetic)
french cm: French (Cameroon)
- qwerty cm: Cameroon Multilingual (QWERTY)
- azerty cm: Cameroon Multilingual (AZERTY)
- dvorak cm: Cameroon Multilingual (Dvorak)
+ qwerty cm: Cameroon Multilingual (QWERTY, intl.)
+ azerty cm: Cameroon (AZERTY, intl.)
+ dvorak cm: Cameroon (Dvorak, intl.)
mmuock cm: Mmuock
zawgyi mm: Burmese Zawgyi
fr-dvorak ca: French (Canada, Dvorak)
fr-legacy ca: French (Canada, legacy)
- multix ca: Canadian Multilingual
- multi ca: Canadian Multilingual (1st part)
- multi-2gr ca: Canadian Multilingual (2nd part)
+ multix ca: Canadian (intl.)
+ multi ca: Canadian (intl., 1st part)
+ multi-2gr ca: Canadian (intl., 2nd part)
ike ca: Inuktitut
eng ca: English (Canada)
mon_trad cn: Mongolian (Bichig)
- mon_trad_todo cn: Mongolian Todo
- mon_trad_xibe cn: Mongolian Xibe
- mon_trad_manchu cn: Mongolian Manchu
- mon_trad_galik cn: Mongolian Galik
- mon_todo_galik cn: Mongolian Todo Galik
- mon_manchu_galik cn: Mongolian Manchu Galik
+ mon_trad_todo cn: Mongolian (Todo)
+ mon_trad_xibe cn: Mongolian (Xibe)
+ mon_trad_manchu cn: Mongolian (Manchu)
+ mon_trad_galik cn: Mongolian (Galik)
+ mon_todo_galik cn: Mongolian (Todo Galik)
+ mon_manchu_galik cn: Mongolian (Manchu Galik)
tib cn: Tibetan
tib_asciinum cn: Tibetan (with ASCII numerals)
ug cn: Uyghur
- altgr-pinyin cn: Hanyu Pinyin (altgr)
+ altgr-pinyin cn: Hanyu Pinyin (with AltGr dead keys)
alternatequotes hr: Croatian (with guillemets)
unicode hr: Croatian (with Croatian digraphs)
unicodeus hr: Croatian (US, with Croatian digraphs)
- us hr: Croatian (US, with Croatian letters)
+ us hr: Croatian (US)
bksl cz: Czech (with <\|> key)
qwerty cz: Czech (QWERTY)
qwerty_bksl cz: Czech (QWERTY, extended backslash)
@@ -438,16 +449,16 @@
dvorak-ucw cz: Czech (US, Dvorak, UCW support)
rus cz: Russian (Czech, phonetic)
nodeadkeys dk: Danish (no dead keys)
- winkeys dk: Danish (Win keys)
+ winkeys dk: Danish (Windows)
mac dk: Danish (Macintosh)
mac_nodeadkeys dk: Danish (Macintosh, no dead keys)
dvorak dk: Danish (Dvorak)
- sundeadkeys nl: Dutch (with Sun dead keys)
+ sundeadkeys nl: Dutch (Sun dead keys)
mac nl: Dutch (Macintosh)
std nl: Dutch (standard)
nodeadkeys ee: Estonian (no dead keys)
dvorak ee: Estonian (Dvorak)
- us ee: Estonian (US, with Estonian letters)
+ us ee: Estonian (US)
pes_keypad ir: Persian (with Persian keypad)
ku ir: Kurdish (Iran, Latin Q)
ku_f ir: Kurdish (Iran, F)
@@ -458,31 +469,31 @@
ku_alt iq: Kurdish (Iraq, Latin Alt-Q)
ku_ara iq: Kurdish (Iraq, Arabic-Latin)
nodeadkeys fo: Faroese (no dead keys)
- winkeys fi: Finnish (Winkeys)
+ winkeys fi: Finnish (Windows)
classic fi: Finnish (classic)
nodeadkeys fi: Finnish (classic, no dead keys)
smi fi: Northern Saami (Finland)
mac fi: Finnish (Macintosh)
nodeadkeys fr: French (no dead keys)
- sundeadkeys fr: French (with Sun dead keys)
+ sundeadkeys fr: French (Sun dead keys)
oss fr: French (alt.)
oss_latin9 fr: French (alt., Latin-9 only)
oss_nodeadkeys fr: French (alt., no dead keys)
- oss_sundeadkeys fr: French (alt., with Sun dead keys)
+ oss_sundeadkeys fr: French (alt., Sun dead keys)
latin9 fr: French (legacy, alt.)
latin9_nodeadkeys fr: French (legacy, alt., no dead keys)
- latin9_sundeadkeys fr: French (legacy, alt., with Sun dead keys)
- bepo fr: French (Bepo, ergonomic, Dvorak way)
- bepo_latin9 fr: French (Bepo, ergonomic, Dvorak way, Latin-9 only)
- bepo_afnor fr: French (Bepo, ergonomic, Dvorak way, AFNOR)
+ latin9_sundeadkeys fr: French (legacy, alt., Sun dead keys)
+ bepo fr: French (BEPO)
+ bepo_latin9 fr: French (BEPO, Latin-9 only)
+ bepo_afnor fr: French (BEPO, AFNOR)
dvorak fr: French (Dvorak)
mac fr: French (Macintosh)
azerty fr: French (AZERTY)
- afnor fr: French (AFNOR standardized AZERTY)
+ afnor fr: French (AZERTY, AFNOR)
bre fr: French (Breton)
oci fr: Occitan
geo fr: Georgian (France, AZERTY Tskapo)
- us fr: French (US, with French letters)
+ us fr: French (US)
generic gh: English (Ghana, multilingual)
akan gh: Akan
ewe gh: Ewe
@@ -498,11 +509,14 @@
deadacute de: German (dead acute)
deadgraveacute de: German (dead grave acute)
nodeadkeys de: German (no dead keys)
+ e1 de: German (E1)
+ e2 de: German (E2)
T3 de: German (T3)
+ us de: German (US)
ro de: Romanian (Germany)
ro_nodeadkeys de: Romanian (Germany, no dead keys)
dvorak de: German (Dvorak)
- sundeadkeys de: German (with Sun dead keys)
+ sundeadkeys de: German (Sun dead keys)
neo de: German (Neo 2)
mac de: German (Macintosh)
mac_nodeadkeys de: German (Macintosh, no dead keys)
@@ -519,23 +533,23 @@
standard hu: Hungarian (standard)
nodeadkeys hu: Hungarian (no dead keys)
qwerty hu: Hungarian (QWERTY)
- 101_qwertz_comma_dead hu: Hungarian (101/QWERTZ/comma/dead keys)
- 101_qwertz_comma_nodead hu: Hungarian (101/QWERTZ/comma/no dead keys)
- 101_qwertz_dot_dead hu: Hungarian (101/QWERTZ/dot/dead keys)
- 101_qwertz_dot_nodead hu: Hungarian (101/QWERTZ/dot/no dead keys)
- 101_qwerty_comma_dead hu: Hungarian (101/QWERTY/comma/dead keys)
- 101_qwerty_comma_nodead hu: Hungarian (101/QWERTY/comma/no dead keys)
- 101_qwerty_dot_dead hu: Hungarian (101/QWERTY/dot/dead keys)
- 101_qwerty_dot_nodead hu: Hungarian (101/QWERTY/dot/no dead keys)
- 102_qwertz_comma_dead hu: Hungarian (102/QWERTZ/comma/dead keys)
- 102_qwertz_comma_nodead hu: Hungarian (102/QWERTZ/comma/no dead keys)
- 102_qwertz_dot_dead hu: Hungarian (102/QWERTZ/dot/dead keys)
- 102_qwertz_dot_nodead hu: Hungarian (102/QWERTZ/dot/no dead keys)
- 102_qwerty_comma_dead hu: Hungarian (102/QWERTY/comma/dead keys)
- 102_qwerty_comma_nodead hu: Hungarian (102/QWERTY/comma/no dead keys)
- 102_qwerty_dot_dead hu: Hungarian (102/QWERTY/dot/dead keys)
- 102_qwerty_dot_nodead hu: Hungarian (102/QWERTY/dot/no dead keys)
- Sundeadkeys is: Icelandic (with Sun dead keys)
+ 101_qwertz_comma_dead hu: Hungarian (QWERTZ, 101-key, comma, dead keys)
+ 101_qwertz_comma_nodead hu: Hungarian (QWERTZ, 101-key, comma, no dead keys)
+ 101_qwertz_dot_dead hu: Hungarian (QWERTZ, 101-key, dot, dead keys)
+ 101_qwertz_dot_nodead hu: Hungarian (QWERTZ, 101-key, dot, no dead keys)
+ 101_qwerty_comma_dead hu: Hungarian (QWERTY, 101-key, comma, dead keys)
+ 101_qwerty_comma_nodead hu: Hungarian (QWERTY, 101-key, comma, no dead keys)
+ 101_qwerty_dot_dead hu: Hungarian (QWERTY, 101-key, dot, dead keys)
+ 101_qwerty_dot_nodead hu: Hungarian (QWERTY, 101-key, dot, no dead keys)
+ 102_qwertz_comma_dead hu: Hungarian (QWERTZ, 102-key, comma, dead keys)
+ 102_qwertz_comma_nodead hu: Hungarian (QWERTZ, 102-key, comma, no dead keys)
+ 102_qwertz_dot_dead hu: Hungarian (QWERTZ, 102-key, dot, dead keys)
+ 102_qwertz_dot_nodead hu: Hungarian (QWERTZ, 102-key, dot, no dead keys)
+ 102_qwerty_comma_dead hu: Hungarian (QWERTY, 102-key, comma, dead keys)
+ 102_qwerty_comma_nodead hu: Hungarian (QWERTY, 102-key, comma, no dead keys)
+ 102_qwerty_dot_dead hu: Hungarian (QWERTY, 102-key, dot, dead keys)
+ 102_qwerty_dot_nodead hu: Hungarian (QWERTY, 102-key, dot, no dead keys)
+ Sundeadkeys is: Icelandic (Sun dead keys)
nodeadkeys is: Icelandic (no dead keys)
mac_legacy is: Icelandic (Macintosh, legacy)
mac is: Icelandic (Macintosh)
@@ -544,9 +558,9 @@
phonetic il: Hebrew (phonetic)
biblical il: Hebrew (Biblical, Tiro)
nodeadkeys it: Italian (no dead keys)
- winkeys it: Italian (Winkeys)
+ winkeys it: Italian (Windows)
mac it: Italian (Macintosh)
- us it: Italian (US, with Italian letters)
+ us it: Italian (US)
geo it: Georgian (Italy)
ibm it: Italian (IBM 142)
intl it: Italian (intl., with dead keys)
@@ -562,15 +576,15 @@
kazrus kz: Kazakh (with Russian)
ext kz: Kazakh (extended)
latin kz: Kazakh (Latin)
- stea la: Lao (STEA proposed standard layout)
+ stea la: Lao (STEA)
nodeadkeys latam: Spanish (Latin American, no dead keys)
deadtilde latam: Spanish (Latin American, dead tilde)
- sundeadkeys latam: Spanish (Latin American, with Sun dead keys)
+ sundeadkeys latam: Spanish (Latin American, Sun dead keys)
dvorak latam: Spanish (Latin American, Dvorak)
colemak latam: Spanish (Latin American, Colemak)
colemak-gaming latam: Spanish (Latin American, Colemak for gaming)
std lt: Lithuanian (standard)
- us lt: Lithuanian (US, with Lithuanian letters)
+ us lt: Lithuanian (US)
ibm lt: Lithuanian (IBM LST 1205-92)
lekp lt: Lithuanian (LEKP)
lekpa lt: Lithuanian (LEKPa)
@@ -586,14 +600,14 @@
latinunicode me: Montenegrin (Latin, Unicode)
latinyz me: Montenegrin (Latin, QWERTY)
latinunicodeyz me: Montenegrin (Latin, Unicode, QWERTY)
- cyrillicalternatequotes me: Montenegrin (Cyrillic with guillemets)
- latinalternatequotes me: Montenegrin (Latin with guillemets)
+ cyrillicalternatequotes me: Montenegrin (Cyrillic, with guillemets)
+ latinalternatequotes me: Montenegrin (Latin, with guillemets)
nodeadkeys mk: Macedonian (no dead keys)
- us mt: Maltese (with US layout)
+ us mt: Maltese (US)
alt-us mt: Maltese (US layout with AltGr overrides)
- alt-gb mt: Maltese (UK layout with AltGr overrides)
+ alt-gb mt: Maltese (UK, with AltGr overrides)
nodeadkeys no: Norwegian (no dead keys)
- winkeys no: Norwegian (Win keys)
+ winkeys no: Norwegian (Windows)
dvorak no: Norwegian (Dvorak)
smi no: Northern Saami (Norway)
smi_nodeadkeys no: Northern Saami (Norway, no dead keys)
@@ -610,26 +624,26 @@
ru_phonetic_dvorak pl: Russian (Poland, phonetic Dvorak)
dvp pl: Polish (programmer Dvorak)
nodeadkeys pt: Portuguese (no dead keys)
- sundeadkeys pt: Portuguese (with Sun dead keys)
+ sundeadkeys pt: Portuguese (Sun dead keys)
mac pt: Portuguese (Macintosh)
mac_nodeadkeys pt: Portuguese (Macintosh, no dead keys)
- mac_sundeadkeys pt: Portuguese (Macintosh, with Sun dead keys)
+ mac_sundeadkeys pt: Portuguese (Macintosh, Sun dead keys)
nativo pt: Portuguese (Nativo)
nativo-us pt: Portuguese (Nativo for US keyboards)
nativo-epo pt: Esperanto (Portugal, Nativo)
cedilla ro: Romanian (cedilla)
std ro: Romanian (standard)
std_cedilla ro: Romanian (standard cedilla)
- winkeys ro: Romanian (Win keys)
+ winkeys ro: Romanian (Windows)
phonetic ru: Russian (phonetic)
- phonetic_winkeys ru: Russian (phonetic, with Win keys)
- phonetic_yazherty ru: Russian (phonetic yazherty)
+ phonetic_winkeys ru: Russian (phonetic, Windows)
+ phonetic_YAZHERTY ru: Russian (phonetic, YAZHERTY)
typewriter ru: Russian (typewriter)
legacy ru: Russian (legacy)
typewriter-legacy ru: Russian (typewriter, legacy)
tt ru: Tatar
os_legacy ru: Ossetian (legacy)
- os_winkeys ru: Ossetian (Win keys)
+ os_winkeys ru: Ossetian (Windows)
cv ru: Chuvash
cv_latin ru: Chuvash (Latin)
udm ru: Udmurt
@@ -649,20 +663,20 @@
latinunicode rs: Serbian (Latin, Unicode)
latinyz rs: Serbian (Latin, QWERTY)
latinunicodeyz rs: Serbian (Latin, Unicode, QWERTY)
- alternatequotes rs: Serbian (Cyrillic with guillemets)
- latinalternatequotes rs: Serbian (Latin with guillemets)
+ alternatequotes rs: Serbian (Cyrillic, with guillemets)
+ latinalternatequotes rs: Serbian (Latin, with guillemets)
rue rs: Pannonian Rusyn
alternatequotes si: Slovenian (with guillemets)
- us si: Slovenian (US, with Slovenian letters)
+ us si: Slovenian (US)
bksl sk: Slovak (extended backslash)
qwerty sk: Slovak (QWERTY)
qwerty_bksl sk: Slovak (QWERTY, extended backslash)
nodeadkeys es: Spanish (no dead keys)
- winkeys es: Spanish (Win keys)
+ winkeys es: Spanish (Windows)
deadtilde es: Spanish (dead tilde)
- sundeadkeys es: Spanish (with Sun dead keys)
+ sundeadkeys es: Spanish (Sun dead keys)
dvorak es: Spanish (Dvorak)
- ast es: Asturian (Spain, with bottom-dot H and bottom-dot L)
+ ast es: Asturian (Spain, with bottom-dot H and L)
cat es: Catalan (Spain, with middle-dot L)
mac es: Spanish (Macintosh)
nodeadkeys se: Swedish (no dead keys)
@@ -672,15 +686,15 @@
smi se: Northern Saami (Sweden)
mac se: Swedish (Macintosh)
svdvorak se: Swedish (Svdvorak)
- us_dvorak se: Swedish (based on US Intl. Dvorak)
- us se: Swedish (US, with Swedish letters)
+ us_dvorak se: Swedish (Dvorak, intl.)
+ us se: Swedish (US)
swl se: Swedish Sign Language
legacy ch: German (Switzerland, legacy)
de_nodeadkeys ch: German (Switzerland, no dead keys)
- de_sundeadkeys ch: German (Switzerland, with Sun dead keys)
+ de_sundeadkeys ch: German (Switzerland, Sun dead keys)
fr ch: French (Switzerland)
fr_nodeadkeys ch: French (Switzerland, no dead keys)
- fr_sundeadkeys ch: French (Switzerland, with Sun dead keys)
+ fr_sundeadkeys ch: French (Switzerland, Sun dead keys)
fr_mac ch: French (Switzerland, Macintosh)
de_mac ch: German (Switzerland, Macintosh)
syc sy: Syriac
@@ -691,12 +705,12 @@
legacy tj: Tajik (legacy)
tam_unicode lk: Tamil (Sri Lanka, TamilNet '99)
tam_TAB lk: Tamil (Sri Lanka, TamilNet '99, TAB encoding)
- us lk: Sinhala (US, with Sinhala letters)
+ us lk: Sinhala (US)
tis th: Thai (TIS-820.2538)
pat th: Thai (Pattachote)
f tr: Turkish (F)
alt tr: Turkish (Alt-Q)
- sundeadkeys tr: Turkish (with Sun dead keys)
+ sundeadkeys tr: Turkish (Sun dead keys)
ku tr: Kurdish (Turkey, Latin Q)
ku_f tr: Kurdish (Turkey, F)
ku_alt tr: Kurdish (Turkey, Latin Alt-Q)
@@ -708,23 +722,23 @@
saisiyat tw: Saisiyat (Taiwan)
phonetic ua: Ukrainian (phonetic)
typewriter ua: Ukrainian (typewriter)
- winkeys ua: Ukrainian (Win keys)
+ winkeys ua: Ukrainian (Windows)
legacy ua: Ukrainian (legacy)
rstu ua: Ukrainian (standard RSTU)
rstu_ru ua: Russian (Ukraine, standard RSTU)
homophonic ua: Ukrainian (homophonic)
- extd gb: English (UK, extended, with Win keys)
+ extd gb: English (UK, extended, Windows)
intl gb: English (UK, intl., with dead keys)
dvorak gb: English (UK, Dvorak)
dvorakukp gb: English (UK, Dvorak, with UK punctuation)
mac gb: English (UK, Macintosh)
- mac_intl gb: English (UK, intl., Macintosh)
+ mac_intl gb: English (UK, Macintosh, intl.)
colemak gb: English (UK, Colemak)
pl gb: Polish (British keyboard)
latin uz: Uzbek (Latin)
- us vn: Vietnamese (US, with Vietnamese letters)
- fr vn: Vietnamese (French, with Vietnamese letters)
- kr104 kr: Korean (101/104 key compatible)
+ us vn: Vietnamese (US)
+ fr vn: Vietnamese (French)
+ kr104 kr: Korean (101/104-key compatible)
CloGaelach ie: CloGaelach
UnicodeExpert ie: Irish (UnicodeExpert)
ogam ie: Ogham
@@ -733,7 +747,7 @@
urd-nla pk: Urdu (Pakistan, NLA)
ara pk: Arabic (Pakistan)
snd pk: Sindhi
- legacy epo: Esperanto (displaced semicolon and quote, obsolete)
+ legacy epo: Esperanto (legacy)
igbo ng: Igbo
yoruba ng: Yoruba
hausa ng: Hausa (Nigeria)
@@ -756,7 +770,7 @@
dvorak ph: Filipino (Dvorak, Latin)
dvorak-bay ph: Filipino (Dvorak, Baybayin)
gag md: Moldavian (Gagauz)
- phoneticx id: Indonesian (Arab Melayu, ext. phonetic)
+ phoneticx id: Indonesian (Arab Melayu, extended phonetic)
phonetic my: Malay (Jawi, phonetic)
! option
@@ -798,6 +812,8 @@
grp:sclk_toggle Scroll Lock
grp:lctrl_lwin_rctrl_menu Left Ctrl+Left Win to first layout; Right Ctrl+Menu to second layout
grp:lctrl_lwin_toggle Left Ctrl+Left Win
+ lv2 Key to choose the 2nd level
+ lv2:lsgt_switch The "< >" key
lv3 Key to choose the 3rd level
lv3:switch Right Ctrl
lv3:menu_switch Menu
@@ -812,17 +828,17 @@
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
ctrl Ctrl position
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
@@ -837,13 +853,13 @@
mod_led:compose Compose
keypad Layout of numeric keypad
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
kpdl Numeric keypad Delete behavior
kpdl:dot Legacy key with dot
kpdl:comma Legacy key with comma
@@ -859,10 +875,10 @@
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
@@ -870,13 +886,13 @@
caps:numlock Make Caps Lock an additional Num Lock
caps:ctrl_modifier Caps Lock is also a Ctrl
caps:none Caps Lock is disabled
- altwin Alt/Win key behavior
+ altwin Alt and Win behavior
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
@@ -898,47 +914,48 @@
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
- compat Miscellaneous compatibility options
+ compat Compatibility options
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
keypad:pointerkeys Shift + Num Lock enables PointerKeys
grab:break_actions Allow breaking grabs with keyboard actions (warning: security risk)
grab:debug Allow grab and window tree logging
- currencysign Adding currency signs to certain keys
+ currencysign Currency signs
eurosign:e Euro on E
eurosign:2 Euro on 2
eurosign:4 Euro on 4
eurosign:5 Euro on 5
rupeesign:4 Rupee on 4
lv5 Key to choose 5th level
- 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_cancel <Less/Greater> chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
- lv5:lsgt_switch <Less/Greater> chooses 5th level
+ 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
+ lv5:lsgt_switch_lock_cancel The "< >" key chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
+ 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
- nbsp Using space key to input non-breaking space
+ 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
+ nbsp Non-breaking space input
nbsp:none Usual space at any level
nbsp:level2 Non-breaking space at the 2nd level
nbsp:level3 Non-breaking space at the 3rd level
@@ -964,11 +981,11 @@
korean:rctrl_hangul Make right Ctrl a Hangul key
korean:ralt_hanja Make right Alt a Hanja key
korean:rctrl_hanja Make right Ctrl a Hanja key
- esperanto Adding Esperanto supersigned letters
- 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
- solaris Maintain key compatibility with old Solaris keycodes
- solaris:sun_compat Sun Key compatibility
+ esperanto Esperanto letters with superscripts
+ 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
+ solaris Old Solaris keycodes compatibility
+ solaris:sun_compat Sun key compatibility
terminate Key sequence to kill the X server
terminate:ctrl_alt_bksp Ctrl+Alt+Backspace
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.14 src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.15
--- src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.14 Sun Feb 23 11:17:03 2020
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst Sun Nov 1 12:07:09 2020
@@ -1,8 +1,10 @@
! model
+ 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
@@ -206,7 +208,7 @@
ba Bosnian
br Portuguese (Brazil)
bg Bulgarian
- dz Berber (Algeria, Latin)
+ dz Kabylian (azerty layout, no dead keys)
ma Arabic (Morocco)
cm English (Cameroon)
mm Burmese
@@ -293,6 +295,7 @@
! variant
chr us: Cherokee
+ haw us: Hawaiian
euro us: English (US, euro on 5)
intl us: English (US, intl., with dead keys)
alt-intl us: English (US, alt. intl.)
@@ -304,10 +307,11 @@
dvorak-r us: English (Dvorak, right-handed)
dvorak-classic us: English (classic Dvorak)
dvp us: English (programmer Dvorak)
+ symbolic us: English (US, Symbolic)
rus us: Russian (US, phonetic)
mac us: English (Macintosh)
altgr-intl us: English (intl., with AltGr dead keys)
- olpc2 us: English (the divide/multiply keys toggle the layout)
+ olpc2 us: English (the divide/multiply toggle the layout)
hbs us: Serbo-Croatian (US)
norman us: English (Norman)
workman us: English (Workman)
@@ -318,10 +322,10 @@
fa-olpc af: Persian (Afghanistan, Dari OLPC)
uz-olpc af: Uzbek (Afghanistan, OLPC)
azerty ara: Arabic (AZERTY)
- azerty_digits ara: Arabic (AZERTY/digits)
- digits ara: Arabic (digits)
+ azerty_digits ara: Arabic (AZERTY, Eastern Arabic numerals)
+ digits ara: Arabic (Eastern Arabic numerals)
qwerty ara: Arabic (QWERTY)
- qwerty_digits ara: Arabic (qwerty/digits)
+ qwerty_digits ara: Arabic (QWERTY, Eastern Arabic numerals)
buckwalter ara: Arabic (Buckwalter)
olpc ara: Arabic (OLPC)
mac ara: Arabic (Macintosh)
@@ -333,31 +337,33 @@
western am: Armenian (western)
eastern-alt am: Armenian (alt. eastern)
nodeadkeys at: German (Austria, no dead keys)
- sundeadkeys at: German (Austria, with Sun dead keys)
+ sundeadkeys at: German (Austria, Sun dead keys)
mac at: German (Austria, Macintosh)
cyrillic az: Azerbaijani (Cyrillic)
legacy by: Belarusian (legacy)
latin by: Belarusian (Latin)
+ ru by: Russian (Belarus)
+ intl by: Belarusian (intl.)
oss be: Belgian (alt.)
- oss_latin9 be: Belgian (alt., Latin-9 only)
- oss_sundeadkeys be: Belgian (alt., with Sun dead keys)
- iso-alternate be: Belgian (alt. ISO)
+ oss_latin9 be: Belgian (Latin-9 only, alt.)
+ oss_sundeadkeys be: Belgian (Sun dead keys, alt.)
+ iso-alternate be: Belgian (ISO, alt.)
nodeadkeys be: Belgian (no dead keys)
- sundeadkeys be: Belgian (with Sun dead keys)
+ sundeadkeys be: Belgian (Sun dead keys)
wang be: Belgian (Wang 724 AZERTY)
probhat bd: Bangla (Probhat)
ben in: Bangla (India)
ben_probhat in: Bangla (India, Probhat)
ben_baishakhi in: Bangla (India, Baishakhi)
ben_bornona in: Bangla (India, Bornona)
- ben_gitanjali in: Bangla (India, Uni Gitanjali)
+ ben_gitanjali in: Bangla (India, Gitanjali)
ben_inscript in: Bangla (India, Baishakhi Inscript)
eeyek in: Manipuri (Eeyek)
guj in: Gujarati
guru in: Punjabi (Gurmukhi)
jhelum in: Punjabi (Gurmukhi Jhelum)
kan in: Kannada
- kan-kagapa in: Kannada (KaGaPa phonetic)
+ kan-kagapa in: Kannada (KaGaPa, phonetic)
mal in: Malayalam
mal_lalitha in: Malayalam (Lalitha)
mal_enhanced in: Malayalam (enhanced Inscript, with rupee)
@@ -369,22 +375,23 @@
tam_tamilnet_TSCII in: Tamil (TamilNet '99, TSCII encoding)
tam in: Tamil (Inscript)
tel in: Telugu
- tel-kagapa in: Telugu (KaGaPa phonetic)
+ tel-kagapa in: Telugu (KaGaPa, phonetic)
tel-sarala in: Telugu (Sarala)
- tel-kagapa in: Telugu (KaGaPa phonetic)
urd-phonetic in: Urdu (phonetic)
urd-phonetic3 in: Urdu (alt. phonetic)
- urd-winkeys in: Urdu (Win keys)
+ urd-winkeys in: Urdu (Windows)
bolnagri in: Hindi (Bolnagri)
hin-wx in: Hindi (Wx)
- hin-kagapa in: Hindi (KaGaPa phonetic)
- san-kagapa in: Sanskrit (KaGaPa phonetic)
- mar-kagapa in: Marathi (KaGaPa phonetic)
+ hin-kagapa in: Hindi (KaGaPa, phonetic)
+ san-kagapa in: Sanskrit (KaGaPa, phonetic)
+ mar-kagapa in: Marathi (KaGaPa, phonetic)
eng in: English (India, with rupee)
+ iipa in: Indic (phonetic, IPA)
+ marathi in: Marathi (enhanced Inscript)
alternatequotes ba: Bosnian (with guillemets)
unicode ba: Bosnian (with Bosnian digraphs)
unicodeus ba: Bosnian (US, with Bosnian digraphs)
- us ba: Bosnian (US, with Bosnian letters)
+ us ba: Bosnian (US)
nodeadkeys br: Portuguese (Brazil, no dead keys)
dvorak br: Portuguese (Brazil, Dvorak)
nativo br: Portuguese (Brazil, Nativo)
@@ -393,43 +400,47 @@
thinkpad br: Portuguese (Brazil, IBM/Lenovo ThinkPad)
phonetic bg: Bulgarian (traditional phonetic)
bas_phonetic bg: Bulgarian (new phonetic)
- ber dz: Berber (Algeria, Tifinagh)
+ bekl bg: Bulgarian (enhanced)
+ azerty-deadkeys dz: Kabylian (azerty layout, with dead keys)
+ qwerty-gb-deadkeys dz: Kabylian (qwerty-gb layout, with dead keys)
+ qwerty-us-deadkeys dz: Kabylian (qwerty-us layout, with dead keys)
+ ber dz: Kabylian (Algeria, Tifinagh)
ar dz: Arabic (Algeria)
french ma: French (Morocco)
tifinagh ma: Berber (Morocco, Tifinagh)
tifinagh-alt ma: Berber (Morocco, Tifinagh alt.)
- tifinagh-alt-phonetic ma: Berber (Morocco, Tifinagh alt. phonetic)
+ tifinagh-alt-phonetic ma: Berber (Morocco, Tifinagh phonetic, alt.)
tifinagh-extended ma: Berber (Morocco, Tifinagh extended)
tifinagh-phonetic ma: Berber (Morocco, Tifinagh phonetic)
tifinagh-extended-phonetic ma: Berber (Morocco, Tifinagh extended phonetic)
french cm: French (Cameroon)
- qwerty cm: Cameroon Multilingual (QWERTY)
- azerty cm: Cameroon Multilingual (AZERTY)
- dvorak cm: Cameroon Multilingual (Dvorak)
+ qwerty cm: Cameroon Multilingual (QWERTY, intl.)
+ azerty cm: Cameroon (AZERTY, intl.)
+ dvorak cm: Cameroon (Dvorak, intl.)
mmuock cm: Mmuock
zawgyi mm: Burmese Zawgyi
fr-dvorak ca: French (Canada, Dvorak)
fr-legacy ca: French (Canada, legacy)
- multix ca: Canadian Multilingual
- multi ca: Canadian Multilingual (1st part)
- multi-2gr ca: Canadian Multilingual (2nd part)
+ multix ca: Canadian (intl.)
+ multi ca: Canadian (intl., 1st part)
+ multi-2gr ca: Canadian (intl., 2nd part)
ike ca: Inuktitut
eng ca: English (Canada)
mon_trad cn: Mongolian (Bichig)
- mon_trad_todo cn: Mongolian Todo
- mon_trad_xibe cn: Mongolian Xibe
- mon_trad_manchu cn: Mongolian Manchu
- mon_trad_galik cn: Mongolian Galik
- mon_todo_galik cn: Mongolian Todo Galik
- mon_manchu_galik cn: Mongolian Manchu Galik
+ mon_trad_todo cn: Mongolian (Todo)
+ mon_trad_xibe cn: Mongolian (Xibe)
+ mon_trad_manchu cn: Mongolian (Manchu)
+ mon_trad_galik cn: Mongolian (Galik)
+ mon_todo_galik cn: Mongolian (Todo Galik)
+ mon_manchu_galik cn: Mongolian (Manchu Galik)
tib cn: Tibetan
tib_asciinum cn: Tibetan (with ASCII numerals)
ug cn: Uyghur
- altgr-pinyin cn: Hanyu Pinyin (altgr)
+ altgr-pinyin cn: Hanyu Pinyin (with AltGr dead keys)
alternatequotes hr: Croatian (with guillemets)
unicode hr: Croatian (with Croatian digraphs)
unicodeus hr: Croatian (US, with Croatian digraphs)
- us hr: Croatian (US, with Croatian letters)
+ us hr: Croatian (US)
bksl cz: Czech (with <\|> key)
qwerty cz: Czech (QWERTY)
qwerty_bksl cz: Czech (QWERTY, extended backslash)
@@ -438,16 +449,16 @@
dvorak-ucw cz: Czech (US, Dvorak, UCW support)
rus cz: Russian (Czech, phonetic)
nodeadkeys dk: Danish (no dead keys)
- winkeys dk: Danish (Win keys)
+ winkeys dk: Danish (Windows)
mac dk: Danish (Macintosh)
mac_nodeadkeys dk: Danish (Macintosh, no dead keys)
dvorak dk: Danish (Dvorak)
- sundeadkeys nl: Dutch (with Sun dead keys)
+ sundeadkeys nl: Dutch (Sun dead keys)
mac nl: Dutch (Macintosh)
std nl: Dutch (standard)
nodeadkeys ee: Estonian (no dead keys)
dvorak ee: Estonian (Dvorak)
- us ee: Estonian (US, with Estonian letters)
+ us ee: Estonian (US)
pes_keypad ir: Persian (with Persian keypad)
ku ir: Kurdish (Iran, Latin Q)
ku_f ir: Kurdish (Iran, F)
@@ -458,31 +469,31 @@
ku_alt iq: Kurdish (Iraq, Latin Alt-Q)
ku_ara iq: Kurdish (Iraq, Arabic-Latin)
nodeadkeys fo: Faroese (no dead keys)
- winkeys fi: Finnish (Winkeys)
+ winkeys fi: Finnish (Windows)
classic fi: Finnish (classic)
nodeadkeys fi: Finnish (classic, no dead keys)
smi fi: Northern Saami (Finland)
mac fi: Finnish (Macintosh)
nodeadkeys fr: French (no dead keys)
- sundeadkeys fr: French (with Sun dead keys)
+ sundeadkeys fr: French (Sun dead keys)
oss fr: French (alt.)
oss_latin9 fr: French (alt., Latin-9 only)
oss_nodeadkeys fr: French (alt., no dead keys)
- oss_sundeadkeys fr: French (alt., with Sun dead keys)
+ oss_sundeadkeys fr: French (alt., Sun dead keys)
latin9 fr: French (legacy, alt.)
latin9_nodeadkeys fr: French (legacy, alt., no dead keys)
- latin9_sundeadkeys fr: French (legacy, alt., with Sun dead keys)
- bepo fr: French (Bepo, ergonomic, Dvorak way)
- bepo_latin9 fr: French (Bepo, ergonomic, Dvorak way, Latin-9 only)
- bepo_afnor fr: French (Bepo, ergonomic, Dvorak way, AFNOR)
+ latin9_sundeadkeys fr: French (legacy, alt., Sun dead keys)
+ bepo fr: French (BEPO)
+ bepo_latin9 fr: French (BEPO, Latin-9 only)
+ bepo_afnor fr: French (BEPO, AFNOR)
dvorak fr: French (Dvorak)
mac fr: French (Macintosh)
azerty fr: French (AZERTY)
- afnor fr: French (AFNOR standardized AZERTY)
+ afnor fr: French (AZERTY, AFNOR)
bre fr: French (Breton)
oci fr: Occitan
geo fr: Georgian (France, AZERTY Tskapo)
- us fr: French (US, with French letters)
+ us fr: French (US)
generic gh: English (Ghana, multilingual)
akan gh: Akan
ewe gh: Ewe
@@ -498,11 +509,14 @@
deadacute de: German (dead acute)
deadgraveacute de: German (dead grave acute)
nodeadkeys de: German (no dead keys)
+ e1 de: German (E1)
+ e2 de: German (E2)
T3 de: German (T3)
+ us de: German (US)
ro de: Romanian (Germany)
ro_nodeadkeys de: Romanian (Germany, no dead keys)
dvorak de: German (Dvorak)
- sundeadkeys de: German (with Sun dead keys)
+ sundeadkeys de: German (Sun dead keys)
neo de: German (Neo 2)
mac de: German (Macintosh)
mac_nodeadkeys de: German (Macintosh, no dead keys)
@@ -519,23 +533,23 @@
standard hu: Hungarian (standard)
nodeadkeys hu: Hungarian (no dead keys)
qwerty hu: Hungarian (QWERTY)
- 101_qwertz_comma_dead hu: Hungarian (101/QWERTZ/comma/dead keys)
- 101_qwertz_comma_nodead hu: Hungarian (101/QWERTZ/comma/no dead keys)
- 101_qwertz_dot_dead hu: Hungarian (101/QWERTZ/dot/dead keys)
- 101_qwertz_dot_nodead hu: Hungarian (101/QWERTZ/dot/no dead keys)
- 101_qwerty_comma_dead hu: Hungarian (101/QWERTY/comma/dead keys)
- 101_qwerty_comma_nodead hu: Hungarian (101/QWERTY/comma/no dead keys)
- 101_qwerty_dot_dead hu: Hungarian (101/QWERTY/dot/dead keys)
- 101_qwerty_dot_nodead hu: Hungarian (101/QWERTY/dot/no dead keys)
- 102_qwertz_comma_dead hu: Hungarian (102/QWERTZ/comma/dead keys)
- 102_qwertz_comma_nodead hu: Hungarian (102/QWERTZ/comma/no dead keys)
- 102_qwertz_dot_dead hu: Hungarian (102/QWERTZ/dot/dead keys)
- 102_qwertz_dot_nodead hu: Hungarian (102/QWERTZ/dot/no dead keys)
- 102_qwerty_comma_dead hu: Hungarian (102/QWERTY/comma/dead keys)
- 102_qwerty_comma_nodead hu: Hungarian (102/QWERTY/comma/no dead keys)
- 102_qwerty_dot_dead hu: Hungarian (102/QWERTY/dot/dead keys)
- 102_qwerty_dot_nodead hu: Hungarian (102/QWERTY/dot/no dead keys)
- Sundeadkeys is: Icelandic (with Sun dead keys)
+ 101_qwertz_comma_dead hu: Hungarian (QWERTZ, 101-key, comma, dead keys)
+ 101_qwertz_comma_nodead hu: Hungarian (QWERTZ, 101-key, comma, no dead keys)
+ 101_qwertz_dot_dead hu: Hungarian (QWERTZ, 101-key, dot, dead keys)
+ 101_qwertz_dot_nodead hu: Hungarian (QWERTZ, 101-key, dot, no dead keys)
+ 101_qwerty_comma_dead hu: Hungarian (QWERTY, 101-key, comma, dead keys)
+ 101_qwerty_comma_nodead hu: Hungarian (QWERTY, 101-key, comma, no dead keys)
+ 101_qwerty_dot_dead hu: Hungarian (QWERTY, 101-key, dot, dead keys)
+ 101_qwerty_dot_nodead hu: Hungarian (QWERTY, 101-key, dot, no dead keys)
+ 102_qwertz_comma_dead hu: Hungarian (QWERTZ, 102-key, comma, dead keys)
+ 102_qwertz_comma_nodead hu: Hungarian (QWERTZ, 102-key, comma, no dead keys)
+ 102_qwertz_dot_dead hu: Hungarian (QWERTZ, 102-key, dot, dead keys)
+ 102_qwertz_dot_nodead hu: Hungarian (QWERTZ, 102-key, dot, no dead keys)
+ 102_qwerty_comma_dead hu: Hungarian (QWERTY, 102-key, comma, dead keys)
+ 102_qwerty_comma_nodead hu: Hungarian (QWERTY, 102-key, comma, no dead keys)
+ 102_qwerty_dot_dead hu: Hungarian (QWERTY, 102-key, dot, dead keys)
+ 102_qwerty_dot_nodead hu: Hungarian (QWERTY, 102-key, dot, no dead keys)
+ Sundeadkeys is: Icelandic (Sun dead keys)
nodeadkeys is: Icelandic (no dead keys)
mac_legacy is: Icelandic (Macintosh, legacy)
mac is: Icelandic (Macintosh)
@@ -544,9 +558,9 @@
phonetic il: Hebrew (phonetic)
biblical il: Hebrew (Biblical, Tiro)
nodeadkeys it: Italian (no dead keys)
- winkeys it: Italian (Winkeys)
+ winkeys it: Italian (Windows)
mac it: Italian (Macintosh)
- us it: Italian (US, with Italian letters)
+ us it: Italian (US)
geo it: Georgian (Italy)
ibm it: Italian (IBM 142)
intl it: Italian (intl., with dead keys)
@@ -562,15 +576,15 @@
kazrus kz: Kazakh (with Russian)
ext kz: Kazakh (extended)
latin kz: Kazakh (Latin)
- stea la: Lao (STEA proposed standard layout)
+ stea la: Lao (STEA)
nodeadkeys latam: Spanish (Latin American, no dead keys)
deadtilde latam: Spanish (Latin American, dead tilde)
- sundeadkeys latam: Spanish (Latin American, with Sun dead keys)
+ sundeadkeys latam: Spanish (Latin American, Sun dead keys)
dvorak latam: Spanish (Latin American, Dvorak)
colemak latam: Spanish (Latin American, Colemak)
colemak-gaming latam: Spanish (Latin American, Colemak for gaming)
std lt: Lithuanian (standard)
- us lt: Lithuanian (US, with Lithuanian letters)
+ us lt: Lithuanian (US)
ibm lt: Lithuanian (IBM LST 1205-92)
lekp lt: Lithuanian (LEKP)
lekpa lt: Lithuanian (LEKPa)
@@ -586,14 +600,14 @@
latinunicode me: Montenegrin (Latin, Unicode)
latinyz me: Montenegrin (Latin, QWERTY)
latinunicodeyz me: Montenegrin (Latin, Unicode, QWERTY)
- cyrillicalternatequotes me: Montenegrin (Cyrillic with guillemets)
- latinalternatequotes me: Montenegrin (Latin with guillemets)
+ cyrillicalternatequotes me: Montenegrin (Cyrillic, with guillemets)
+ latinalternatequotes me: Montenegrin (Latin, with guillemets)
nodeadkeys mk: Macedonian (no dead keys)
- us mt: Maltese (with US layout)
+ us mt: Maltese (US)
alt-us mt: Maltese (US layout with AltGr overrides)
- alt-gb mt: Maltese (UK layout with AltGr overrides)
+ alt-gb mt: Maltese (UK, with AltGr overrides)
nodeadkeys no: Norwegian (no dead keys)
- winkeys no: Norwegian (Win keys)
+ winkeys no: Norwegian (Windows)
dvorak no: Norwegian (Dvorak)
smi no: Northern Saami (Norway)
smi_nodeadkeys no: Northern Saami (Norway, no dead keys)
@@ -610,26 +624,26 @@
ru_phonetic_dvorak pl: Russian (Poland, phonetic Dvorak)
dvp pl: Polish (programmer Dvorak)
nodeadkeys pt: Portuguese (no dead keys)
- sundeadkeys pt: Portuguese (with Sun dead keys)
+ sundeadkeys pt: Portuguese (Sun dead keys)
mac pt: Portuguese (Macintosh)
mac_nodeadkeys pt: Portuguese (Macintosh, no dead keys)
- mac_sundeadkeys pt: Portuguese (Macintosh, with Sun dead keys)
+ mac_sundeadkeys pt: Portuguese (Macintosh, Sun dead keys)
nativo pt: Portuguese (Nativo)
nativo-us pt: Portuguese (Nativo for US keyboards)
nativo-epo pt: Esperanto (Portugal, Nativo)
cedilla ro: Romanian (cedilla)
std ro: Romanian (standard)
std_cedilla ro: Romanian (standard cedilla)
- winkeys ro: Romanian (Win keys)
+ winkeys ro: Romanian (Windows)
phonetic ru: Russian (phonetic)
- phonetic_winkeys ru: Russian (phonetic, with Win keys)
- phonetic_yazherty ru: Russian (phonetic yazherty)
+ phonetic_winkeys ru: Russian (phonetic, Windows)
+ phonetic_YAZHERTY ru: Russian (phonetic, YAZHERTY)
typewriter ru: Russian (typewriter)
legacy ru: Russian (legacy)
typewriter-legacy ru: Russian (typewriter, legacy)
tt ru: Tatar
os_legacy ru: Ossetian (legacy)
- os_winkeys ru: Ossetian (Win keys)
+ os_winkeys ru: Ossetian (Windows)
cv ru: Chuvash
cv_latin ru: Chuvash (Latin)
udm ru: Udmurt
@@ -649,20 +663,20 @@
latinunicode rs: Serbian (Latin, Unicode)
latinyz rs: Serbian (Latin, QWERTY)
latinunicodeyz rs: Serbian (Latin, Unicode, QWERTY)
- alternatequotes rs: Serbian (Cyrillic with guillemets)
- latinalternatequotes rs: Serbian (Latin with guillemets)
+ alternatequotes rs: Serbian (Cyrillic, with guillemets)
+ latinalternatequotes rs: Serbian (Latin, with guillemets)
rue rs: Pannonian Rusyn
alternatequotes si: Slovenian (with guillemets)
- us si: Slovenian (US, with Slovenian letters)
+ us si: Slovenian (US)
bksl sk: Slovak (extended backslash)
qwerty sk: Slovak (QWERTY)
qwerty_bksl sk: Slovak (QWERTY, extended backslash)
nodeadkeys es: Spanish (no dead keys)
- winkeys es: Spanish (Win keys)
+ winkeys es: Spanish (Windows)
deadtilde es: Spanish (dead tilde)
- sundeadkeys es: Spanish (with Sun dead keys)
+ sundeadkeys es: Spanish (Sun dead keys)
dvorak es: Spanish (Dvorak)
- ast es: Asturian (Spain, with bottom-dot H and bottom-dot L)
+ ast es: Asturian (Spain, with bottom-dot H and L)
cat es: Catalan (Spain, with middle-dot L)
mac es: Spanish (Macintosh)
nodeadkeys se: Swedish (no dead keys)
@@ -672,15 +686,15 @@
smi se: Northern Saami (Sweden)
mac se: Swedish (Macintosh)
svdvorak se: Swedish (Svdvorak)
- us_dvorak se: Swedish (based on US Intl. Dvorak)
- us se: Swedish (US, with Swedish letters)
+ us_dvorak se: Swedish (Dvorak, intl.)
+ us se: Swedish (US)
swl se: Swedish Sign Language
legacy ch: German (Switzerland, legacy)
de_nodeadkeys ch: German (Switzerland, no dead keys)
- de_sundeadkeys ch: German (Switzerland, with Sun dead keys)
+ de_sundeadkeys ch: German (Switzerland, Sun dead keys)
fr ch: French (Switzerland)
fr_nodeadkeys ch: French (Switzerland, no dead keys)
- fr_sundeadkeys ch: French (Switzerland, with Sun dead keys)
+ fr_sundeadkeys ch: French (Switzerland, Sun dead keys)
fr_mac ch: French (Switzerland, Macintosh)
de_mac ch: German (Switzerland, Macintosh)
syc sy: Syriac
@@ -691,12 +705,12 @@
legacy tj: Tajik (legacy)
tam_unicode lk: Tamil (Sri Lanka, TamilNet '99)
tam_TAB lk: Tamil (Sri Lanka, TamilNet '99, TAB encoding)
- us lk: Sinhala (US, with Sinhala letters)
+ us lk: Sinhala (US)
tis th: Thai (TIS-820.2538)
pat th: Thai (Pattachote)
f tr: Turkish (F)
alt tr: Turkish (Alt-Q)
- sundeadkeys tr: Turkish (with Sun dead keys)
+ sundeadkeys tr: Turkish (Sun dead keys)
ku tr: Kurdish (Turkey, Latin Q)
ku_f tr: Kurdish (Turkey, F)
ku_alt tr: Kurdish (Turkey, Latin Alt-Q)
@@ -708,23 +722,23 @@
saisiyat tw: Saisiyat (Taiwan)
phonetic ua: Ukrainian (phonetic)
typewriter ua: Ukrainian (typewriter)
- winkeys ua: Ukrainian (Win keys)
+ winkeys ua: Ukrainian (Windows)
legacy ua: Ukrainian (legacy)
rstu ua: Ukrainian (standard RSTU)
rstu_ru ua: Russian (Ukraine, standard RSTU)
homophonic ua: Ukrainian (homophonic)
- extd gb: English (UK, extended, with Win keys)
+ extd gb: English (UK, extended, Windows)
intl gb: English (UK, intl., with dead keys)
dvorak gb: English (UK, Dvorak)
dvorakukp gb: English (UK, Dvorak, with UK punctuation)
mac gb: English (UK, Macintosh)
- mac_intl gb: English (UK, intl., Macintosh)
+ mac_intl gb: English (UK, Macintosh, intl.)
colemak gb: English (UK, Colemak)
pl gb: Polish (British keyboard)
latin uz: Uzbek (Latin)
- us vn: Vietnamese (US, with Vietnamese letters)
- fr vn: Vietnamese (French, with Vietnamese letters)
- kr104 kr: Korean (101/104 key compatible)
+ us vn: Vietnamese (US)
+ fr vn: Vietnamese (French)
+ kr104 kr: Korean (101/104-key compatible)
CloGaelach ie: CloGaelach
UnicodeExpert ie: Irish (UnicodeExpert)
ogam ie: Ogham
@@ -733,7 +747,7 @@
urd-nla pk: Urdu (Pakistan, NLA)
ara pk: Arabic (Pakistan)
snd pk: Sindhi
- legacy epo: Esperanto (displaced semicolon and quote, obsolete)
+ legacy epo: Esperanto (legacy)
igbo ng: Igbo
yoruba ng: Yoruba
hausa ng: Hausa (Nigeria)
@@ -756,7 +770,7 @@
dvorak ph: Filipino (Dvorak, Latin)
dvorak-bay ph: Filipino (Dvorak, Baybayin)
gag md: Moldavian (Gagauz)
- phoneticx id: Indonesian (Arab Melayu, ext. phonetic)
+ phoneticx id: Indonesian (Arab Melayu, extended phonetic)
phonetic my: Malay (Jawi, phonetic)
! option
@@ -798,6 +812,8 @@
grp:sclk_toggle Scroll Lock
grp:lctrl_lwin_rctrl_menu Left Ctrl+Left Win to first layout; Right Ctrl+Menu to second layout
grp:lctrl_lwin_toggle Left Ctrl+Left Win
+ lv2 Key to choose the 2nd level
+ lv2:lsgt_switch The "< >" key
lv3 Key to choose the 3rd level
lv3:switch Right Ctrl
lv3:menu_switch Menu
@@ -812,17 +828,17 @@
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
ctrl Ctrl position
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
@@ -837,13 +853,13 @@
mod_led:compose Compose
keypad Layout of numeric keypad
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
kpdl Numeric keypad Delete behavior
kpdl:dot Legacy key with dot
kpdl:comma Legacy key with comma
@@ -859,10 +875,10 @@
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
@@ -870,13 +886,13 @@
caps:numlock Make Caps Lock an additional Num Lock
caps:ctrl_modifier Caps Lock is also a Ctrl
caps:none Caps Lock is disabled
- altwin Alt/Win key behavior
+ altwin Alt and Win behavior
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
@@ -898,47 +914,48 @@
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
- compat Miscellaneous compatibility options
+ compat Compatibility options
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
keypad:pointerkeys Shift + Num Lock enables PointerKeys
grab:break_actions Allow breaking grabs with keyboard actions (warning: security risk)
grab:debug Allow grab and window tree logging
- currencysign Adding currency signs to certain keys
+ currencysign Currency signs
eurosign:e Euro on E
eurosign:2 Euro on 2
eurosign:4 Euro on 4
eurosign:5 Euro on 5
rupeesign:4 Rupee on 4
lv5 Key to choose 5th level
- 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_cancel <Less/Greater> chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
- lv5:lsgt_switch <Less/Greater> chooses 5th level
+ 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
+ lv5:lsgt_switch_lock_cancel The "< >" key chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
+ 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
- nbsp Using space key to input non-breaking space
+ 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
+ nbsp Non-breaking space input
nbsp:none Usual space at any level
nbsp:level2 Non-breaking space at the 2nd level
nbsp:level3 Non-breaking space at the 3rd level
@@ -964,11 +981,11 @@
korean:rctrl_hangul Make right Ctrl a Hangul key
korean:ralt_hanja Make right Alt a Hanja key
korean:rctrl_hanja Make right Ctrl a Hanja key
- esperanto Adding Esperanto supersigned letters
- 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
- solaris Maintain key compatibility with old Solaris keycodes
- solaris:sun_compat Sun Key compatibility
+ esperanto Esperanto letters with superscripts
+ 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
+ solaris Old Solaris keycodes compatibility
+ solaris:sun_compat Sun key compatibility
terminate Key sequence to kill the X server
terminate:ctrl_alt_bksp Ctrl+Alt+Backspace
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/evdev
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.13 src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.14
--- src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.13 Sun Feb 23 11:17:03 2020
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev Sun Nov 1 12:07:09 2020
@@ -14,7 +14,7 @@
// ori pk ru scc sy syr tel th tj tam ua uz
// PC models
-! $pcmodels = pc101 pc102 pc104 pc105
+! $pcmodels = pc86 pc101 pc102 pc104 pc104alt pc105
// Jolla devices and keyboards
! $jollamodels = jollasbj
@@ -25,9 +25,6 @@
// Nokia devices and keyboards
! $nokiamodels = nokiasu8w nokiarx44 nokiarx51
-// PC geometries - they have special geometry but symbols are mostly pc105
-! $pcgeometries = latitude
-
// TypeMatrix geometries
! $tmgeometries = tm2020 tm2030PS2 tm2030USB tm2030USB-102 tm2030USB-106
@@ -126,7 +123,6 @@
omnikey101 = northgate(omnikey101)
sanwaskbkg3 = sanwa(sanwaskbkg3)
$pcmodels = pc(%m)
- $pcgeometries = pc(%m)
everex = everex(STEPnote)
thinkpad = thinkpad(intl)
thinkpad60 = thinkpad(60)
@@ -879,6 +875,14 @@
de neo_qwertz = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
de neo_qwerty = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
jp $sun_compat = complete+japan(kana_lock)
+ de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de koy = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de bone = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de bone_eszett_home = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo_qwertz = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo_qwerty = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ jp $sun_compat = complete+japan(kana_lock)
! layout[1] variant[1] = compat
de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
@@ -889,6 +893,14 @@
de neo_qwertz = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
de neo_qwerty = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
jp $sun_compat = complete+japan(kana_lock)
+ de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de koy = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de bone = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de bone_eszett_home = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo_qwertz = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo_qwerty = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ jp $sun_compat = complete+japan(kana_lock)
! layout[2] variant[2] = compat
de neo = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
@@ -899,6 +911,14 @@
de neo_qwertz = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
de neo_qwerty = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
jp $sun_compat = +complete+japan(kana_lock):2
+ de neo = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de adnw = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de koy = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de bone = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de bone_eszett_home = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de neo_qwertz = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de neo_qwerty = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ jp $sun_compat = +complete+japan(kana_lock):2
! layout[3] variant[3] = compat
de neo = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
@@ -909,6 +929,14 @@
de neo_qwertz = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
de neo_qwerty = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
jp $sun_compat = +complete+japan(kana_lock):3
+ de neo = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de adnw = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de koy = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de bone = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de bone_eszett_home = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de neo_qwertz = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de neo_qwerty = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ jp $sun_compat = +complete+japan(kana_lock):3
! layout[4] variant[4] = compat
de neo = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
@@ -919,6 +947,14 @@
de neo_qwertz = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
de neo_qwerty = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
jp $sun_compat = +complete+japan(kana_lock):4
+ de neo = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de adnw = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de koy = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de bone = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de bone_eszett_home = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de neo_qwertz = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de neo_qwerty = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ jp $sun_compat = +complete+japan(kana_lock):4
! model layout = compat
pc98 nec_vndr/jp = pc98(basic)
@@ -939,25 +975,31 @@
! layout option = symbols
$threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle)
* misc:typo = +typo(base)
+ * misc:apl = +apl(level3)
! layout[1] option = symbols
$threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1
* misc:typo = +typo(base):1
+ * misc:apl = +apl(level3):1
! layout[2] option = symbols
$threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2
* misc:typo = +typo(base):2
+ * misc:apl = +apl(level3):2
! layout[3] option = symbols
$threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3
* misc:typo = +typo(base):3
+ * misc:apl = +apl(level3):3
! layout[4] option = symbols
$threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4
* misc:typo = +typo(base):4
+ * misc:apl = +apl(level3):4
! option = symbols
grp:shift_toggle = +group(shifts_toggle)
+ grp:shift_toggle = +group(shifts_toggle)
altwin:menu = +altwin(menu)
altwin:menu_win = +altwin(menu_win)
altwin:meta_alt = +altwin(meta_alt)
@@ -1094,6 +1136,14 @@
nbsp:level4 = +nbsp(level4)
nbsp:level4n = +nbsp(level4n)
nbsp:level4nl = +nbsp(level4nl)
+ nbsp:zwnj2 = +nbsp(zwnj2)
+ nbsp:zwnj2zwj3 = +nbsp(zwnj2zwj3)
+ nbsp:zwnj2zwj3nb4 = +nbsp(zwnj2zwj3nb4)
+ nbsp:zwnj2nb3 = +nbsp(zwnj2nb3)
+ nbsp:zwnj2nb3s = +nbsp(zwnj2nb3s)
+ nbsp:zwnj2nb3zwj4 = +nbsp(zwnj2nb3zwj4)
+ nbsp:zwnj2nb3nnb4 = +nbsp(zwnj2nb3nnb4)
+ nbsp:zwnj3zwj4 = +nbsp(zwnj3zwj4)
japan:nicola_f_bs = +jp(nicola_f_bs)
japan:hztg_escape = +jp(hztg_escape)
korean:ralt_hangul = +kr(ralt_hangul)
@@ -1125,6 +1175,7 @@
shift:lshift_both_shiftlock = +shift(lshift_both_shiftlock)
shift:rshift_both_shiftlock = +shift(rshift_both_shiftlock)
solaris:sun_compat = +sun_vndr/solaris(sun_compat)
+ lv2:lsgt_switch = +level2(lsgt_switch)
lv3:caps_switch = +level3(caps_switch)
lv3:bksl_switch = +level3(bksl_switch)
lv3:lsgt_switch = +level3(lsgt_switch)
Index: src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.15 src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.16
--- src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.15 Sun Feb 23 11:17:03 2020
+++ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile Sun Nov 1 12:07:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2020/02/23 11:17:03 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2020/11/01 12:07:09 mrg Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@ FILES= af al altwin am apl ara at au az
ba bd be bg br brai bt bw by \
ca capslock cd ch cm cn compose ctrl cz \
de dk dz \
- ee empty epo es et eu eurosign \
+ ee eg empty epo es et eu eurosign \
fi fo fr \
gb ge gh gn gr group \
hr hu \
