Module Name:    src
Committed By:   mrg
Date:           Sun Jan  9 13:54:16 UTC 2022

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

Log Message:
updates for xkeyboard-config 2.34.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
    src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man
cvs rdiff -u -r1.16 -r1.17 \
    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.15 -r1.16 \
    src/external/mit/xorg/lib/xkeyboard-config/rules/evdev

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.9 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.10
--- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.9	Tue Apr 27 03:58:55 2021
+++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man	Sun Jan  9 13:54:16 2022
@@ -1,11 +1,11 @@
 .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes.
-.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.32" "X Version 11"
+.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(1).
+setxkbmap(@appmansuffix@).
 .SH MODELS
 .TS
 left,box;
@@ -32,7 +32,7 @@ a4techKB21	A4Tech KB-21
 a4techKBS8	A4Tech KBS-8
 a4_rfkb23	A4Tech Wireless Desktop RFKB-23
 airkey	Acer AirKey V
-azonaRF2300	Azona RF2300 wireless Internet
+azonaRF2300	Azona RF2300 Wireless Internet
 scorpius	Advance Scorpius KI
 brother	Brother Internet
 btc5113rf	BTC 5113RF Multimedia
@@ -220,6 +220,7 @@ us(intl)	English (US, intl., with dead k
 us(alt-intl)	English (US, alt. intl.)
 us(colemak)	English (Colemak)
 us(colemak_dh)	English (Colemak-DH)
+us(colemak_dh_iso)	English (Colemak-DH ISO)
 us(dvorak)	English (Dvorak)
 us(dvorak-intl)	English (Dvorak, intl., with dead keys)
 us(dvorak-alt-intl)	English (Dvorak, alt. intl.)
@@ -227,6 +228,7 @@ 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(dvorak-mac)	English (Dvorak, Macintosh)
 us(symbolic)	English (US, Symbolic)
 us(rus)	Russian (US, phonetic)
 us(mac)	English (Macintosh)
@@ -307,7 +309,7 @@ in(ben_probhat)	Bangla (India, Probhat)
 in(ben_baishakhi)	Bangla (India, Baishakhi)
 in(ben_bornona)	Bangla (India, Bornona)
 in(ben_gitanjali)	Bangla (India, Gitanjali)
-in(ben_inscript)	Bangla (India, Baishakhi Inscript)
+in(ben_inscript)	Bangla (India, Baishakhi InScript)
 in(eeyek)	Manipuri (Eeyek)
 in(guj)	Gujarati
 in(guru)	Punjabi (Gurmukhi)
@@ -316,14 +318,16 @@ in(kan)	Kannada
 in(kan-kagapa)	Kannada (KaGaPa, phonetic)
 in(mal)	Malayalam
 in(mal_lalitha)	Malayalam (Lalitha)
-in(mal_enhanced)	Malayalam (enhanced Inscript, with rupee)
+in(mal_enhanced)	Malayalam (enhanced InScript, with rupee)
 in(ori)	Oriya
+in(ori-bolnagri)	Oriya (Bolnagri)
+in(ori-wx)	Oriya (Wx)
 in(olck)	Ol Chiki
 in(tam_tamilnet)	Tamil (TamilNet '99)
 in(tam_tamilnet_with_tam_nums)	Tamil (TamilNet '99 with Tamil numerals)
 in(tam_tamilnet_TAB)	Tamil (TamilNet '99, TAB encoding)
 in(tam_tamilnet_TSCII)	Tamil (TamilNet '99, TSCII encoding)
-in(tam)	Tamil (Inscript)
+in(tam)	Tamil (InScript)
 in(tel)	Telugu
 in(tel-kagapa)	Telugu (KaGaPa, phonetic)
 in(tel-sarala)	Telugu (Sarala)
@@ -337,7 +341,7 @@ in(san-kagapa)	Sanskrit (KaGaPa, phoneti
 in(mar-kagapa)	Marathi (KaGaPa, phonetic)
 in(eng)	English (India, with rupee)
 in(iipa)	Indic IPA
-in(marathi)	Marathi (enhanced Inscript)
+in(marathi)	Marathi (enhanced InScript)
 
 _
 ba	Bosnian
@@ -363,9 +367,9 @@ bg(bekl)	Bulgarian (enhanced)
 
 _
 dz	Berber (Algeria, Latin)
-dz(azerty-deadkeys)	Kabyle (azerty layout, dead keys)
-dz(qwerty-gb-deadkeys)	Kabyle (qwerty-gb layout, dead keys)
-dz(qwerty-us-deadkeys)	Kabyle (qwerty-us layout, dead keys)
+dz(azerty-deadkeys)	Kabyle (AZERTY, with dead keys)
+dz(qwerty-gb-deadkeys)	Kabyle (QWERTY, UK, with dead keys)
+dz(qwerty-us-deadkeys)	Kabyle (QWERTY, US, with dead keys)
 dz(ber)	Berber (Algeria, Tifinagh)
 dz(ar)	Arabic (Algeria)
 
@@ -445,6 +449,7 @@ dk(dvorak)	Danish (Dvorak)
 
 _
 nl	Dutch
+nl(us)	Dutch (US)
 nl(mac)	Dutch (Macintosh)
 nl(std)	Dutch (standard)
 
@@ -516,7 +521,7 @@ gh(avn)	Avatime
 gh(gillbt)	English (Ghana, GILLBT)
 
 _
-gn	N'Ko (azerty)
+gn	N'Ko (AZERTY)
 
 _
 ge	Georgian
@@ -673,7 +678,7 @@ mk(nodeadkeys)	Macedonian (no dead keys)
 _
 mt	Maltese
 mt(us)	Maltese (US)
-mt(alt-us)	Maltese (US layout with AltGr overrides)
+mt(alt-us)	Maltese (US, with AltGr overrides)
 mt(alt-gb)	Maltese (UK, with AltGr overrides)
 
 _
@@ -830,6 +835,10 @@ tr(intl)	Turkish (intl., with dead keys)
 tr(crh)	Crimean Tatar (Turkish Q)
 tr(crh_f)	Crimean Tatar (Turkish F)
 tr(crh_alt)	Crimean Tatar (Turkish Alt-Q)
+tr(ot)	Ottoman
+tr(otf)	Ottoman (F)
+tr(otk)	Old Turkic
+tr(otkf)	Old Turkic (F)
 
 _
 tw	Taiwanese
@@ -960,8 +969,8 @@ md	Moldavian
 md(gag)	Moldavian (Gagauz)
 
 _
-id	Indonesian (Arab Melayu, phonetic)
-id(phoneticx)	Indonesian (Arab Melayu, extended phonetic)
+id	Indonesian (Latin)
+id(phoneticx)	Indonesian (Arab Pegon, extended phonetic)
 
 _
 jv	Indonesian (Javanese)
@@ -971,6 +980,9 @@ my	Malay (Jawi, Arabic Keyboard)
 my(phonetic)	Malay (Jawi, phonetic)
 
 _
+custom	A user-defined custom Layout
+
+_
 
 .TE
 .SH OPTIONS
@@ -1209,6 +1221,7 @@ 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
+altwin:ctrl_rwin	Ctrl is mapped to Right 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
@@ -1425,23 +1438,23 @@ terminate:ctrl_alt_bksp	Ctrl+Alt+Backspa
 
 
 .SH FILES
-/usr/X11R7/share/X11/xkb/compat
+@xkb_base@/compat
 
-/usr/X11R7/share/X11/xkb/compiled
+@xkb_base@/compiled
 
-/usr/X11R7/share/X11/xkb/geometry
+@xkb_base@/geometry
 
-/usr/X11R7/share/X11/xkb/keycodes
+@xkb_base@/keycodes
 
-/usr/X11R7/share/X11/xkb/keymap
+@xkb_base@/keymap
 
-/usr/X11R7/share/X11/xkb/rules
+@xkb_base@/rules
 
-/usr/X11R7/share/X11/xkb/semantics
+@xkb_base@/semantics
 
-/usr/X11R7/share/X11/xkb/symbols
+@xkb_base@/symbols
 
-/usr/X11R7/share/X11/xkb/types
+@xkb_base@/types
 
 .SH SEE ALSO
-setxkbmap(1)
+setxkbmap(@appmansuffix@)

Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.16 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.17
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.16	Tue Apr 27 03:58:55 2021
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base	Sun Jan  9 13:54:16 2022
@@ -1120,6 +1120,7 @@
   altwin:meta_alt	=	+altwin(meta_alt)
   altwin:alt_win	=	+altwin(alt_win)
   altwin:ctrl_win	=	+altwin(ctrl_win)
+  altwin:ctrl_rwin	=	+altwin(ctrl_rwin)
   altwin:ctrl_alt_win	=	+altwin(ctrl_alt_win)
   altwin:meta_win	=	+altwin(meta_win)
   altwin:left_meta_win	=	+altwin(left_meta_win)
@@ -1299,7 +1300,6 @@
   lv3:lsgt_switch_latch              =       +level3(lsgt_switch_latch)
   lv5:lsgt_switch                 =       +level5(lsgt_switch)
   lv5:ralt_switch                 =       +level5(ralt_switch)
-  lv5:menu_switch                 =       +level5(menu_switch)
   lv5:lsgt_switch_lock            =       +level5(lsgt_switch_lock)
   lv5:ralt_switch_lock            =       +level5(ralt_switch_lock)
   lv5:lwin_switch_lock            =       +level5(lwin_switch_lock)
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.16 src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.17
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.16	Tue Apr 27 03:58:55 2021
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst	Sun Jan  9 13:54:16 2022
@@ -18,7 +18,7 @@
   a4techKBS8      A4Tech KBS-8
   a4_rfkb23       A4Tech Wireless Desktop RFKB-23
   airkey          Acer AirKey V
-  azonaRF2300     Azona RF2300 wireless Internet
+  azonaRF2300     Azona RF2300 Wireless Internet
   scorpius        Advance Scorpius KI
   brother         Brother Internet
   btc5113rf       BTC 5113RF Multimedia
@@ -225,7 +225,7 @@
   fi              Finnish
   fr              French
   gh              English (Ghana)
-  gn              N'Ko (azerty)
+  gn              N'Ko (AZERTY)
   ge              Georgian
   de              German
   gr              Greek
@@ -287,9 +287,10 @@
   bw              Tswana
   ph              Filipino
   md              Moldavian
-  id              Indonesian (Arab Melayu, phonetic)
+  id              Indonesian (Latin)
   jv              Indonesian (Javanese)
   my              Malay (Jawi, Arabic Keyboard)
+  custom          A user-defined custom Layout
 
 ! variant
   chr             us: Cherokee
@@ -299,6 +300,7 @@
   alt-intl        us: English (US, alt. intl.)
   colemak         us: English (Colemak)
   colemak_dh      us: English (Colemak-DH)
+  colemak_dh_iso  us: English (Colemak-DH ISO)
   dvorak          us: English (Dvorak)
   dvorak-intl     us: English (Dvorak, intl., with dead keys)
   dvorak-alt-intl us: English (Dvorak, alt. intl.)
@@ -306,6 +308,7 @@
   dvorak-r        us: English (Dvorak, right-handed)
   dvorak-classic  us: English (classic Dvorak)
   dvp             us: English (programmer Dvorak)
+  dvorak-mac      us: English (Dvorak, Macintosh)
   symbolic        us: English (US, Symbolic)
   rus             us: Russian (US, phonetic)
   mac             us: English (Macintosh)
@@ -353,7 +356,7 @@
   ben_baishakhi   in: Bangla (India, Baishakhi)
   ben_bornona     in: Bangla (India, Bornona)
   ben_gitanjali   in: Bangla (India, Gitanjali)
-  ben_inscript    in: Bangla (India, Baishakhi Inscript)
+  ben_inscript    in: Bangla (India, Baishakhi InScript)
   eeyek           in: Manipuri (Eeyek)
   guj             in: Gujarati
   guru            in: Punjabi (Gurmukhi)
@@ -362,14 +365,16 @@
   kan-kagapa      in: Kannada (KaGaPa, phonetic)
   mal             in: Malayalam
   mal_lalitha     in: Malayalam (Lalitha)
-  mal_enhanced    in: Malayalam (enhanced Inscript, with rupee)
+  mal_enhanced    in: Malayalam (enhanced InScript, with rupee)
   ori             in: Oriya
+  ori-bolnagri    in: Oriya (Bolnagri)
+  ori-wx          in: Oriya (Wx)
   olck            in: Ol Chiki
   tam_tamilnet    in: Tamil (TamilNet '99)
   tam_tamilnet_with_tam_nums in: Tamil (TamilNet '99 with Tamil numerals)
   tam_tamilnet_TAB in: Tamil (TamilNet '99, TAB encoding)
   tam_tamilnet_TSCII in: Tamil (TamilNet '99, TSCII encoding)
-  tam             in: Tamil (Inscript)
+  tam             in: Tamil (InScript)
   tel             in: Telugu
   tel-kagapa      in: Telugu (KaGaPa, phonetic)
   tel-sarala      in: Telugu (Sarala)
@@ -383,7 +388,7 @@
   mar-kagapa      in: Marathi (KaGaPa, phonetic)
   eng             in: English (India, with rupee)
   iipa            in: Indic IPA
-  marathi         in: Marathi (enhanced Inscript)
+  marathi         in: Marathi (enhanced InScript)
   alternatequotes ba: Bosnian (with guillemets)
   unicode         ba: Bosnian (with Bosnian digraphs)
   unicodeus       ba: Bosnian (US, with Bosnian digraphs)
@@ -397,9 +402,9 @@
   phonetic        bg: Bulgarian (traditional phonetic)
   bas_phonetic    bg: Bulgarian (new phonetic)
   bekl            bg: Bulgarian (enhanced)
-  azerty-deadkeys dz: Kabyle (azerty layout, dead keys)
-  qwerty-gb-deadkeys dz: Kabyle (qwerty-gb layout, dead keys)
-  qwerty-us-deadkeys dz: Kabyle (qwerty-us layout, dead keys)
+  azerty-deadkeys dz: Kabyle (AZERTY, with dead keys)
+  qwerty-gb-deadkeys dz: Kabyle (QWERTY, UK, with dead keys)
+  qwerty-us-deadkeys dz: Kabyle (QWERTY, US, with dead keys)
   ber             dz: Berber (Algeria, Tifinagh)
   ar              dz: Arabic (Algeria)
   french          ma: French (Morocco)
@@ -449,6 +454,7 @@
   mac             dk: Danish (Macintosh)
   mac_nodeadkeys  dk: Danish (Macintosh, no dead keys)
   dvorak          dk: Danish (Dvorak)
+  us              nl: Dutch (US)
   mac             nl: Dutch (Macintosh)
   std             nl: Dutch (standard)
   nodeadkeys      ee: Estonian (no dead keys)
@@ -593,7 +599,7 @@
   latinalternatequotes me: Montenegrin (Latin, with guillemets)
   nodeadkeys      mk: Macedonian (no dead keys)
   us              mt: Maltese (US)
-  alt-us          mt: Maltese (US layout with AltGr overrides)
+  alt-us          mt: Maltese (US, with AltGr overrides)
   alt-gb          mt: Maltese (UK, with AltGr overrides)
   nodeadkeys      no: Norwegian (no dead keys)
   winkeys         no: Norwegian (Windows)
@@ -699,6 +705,10 @@
   crh             tr: Crimean Tatar (Turkish Q)
   crh_f           tr: Crimean Tatar (Turkish F)
   crh_alt         tr: Crimean Tatar (Turkish Alt-Q)
+  ot              tr: Ottoman
+  otf             tr: Ottoman (F)
+  otk             tr: Old Turkic
+  otkf            tr: Old Turkic (F)
   indigenous      tw: Taiwanese (indigenous)
   saisiyat        tw: Saisiyat (Taiwan)
   phonetic        ua: Ukrainian (phonetic)
@@ -752,7 +762,7 @@
   dvorak          ph: Filipino (Dvorak, Latin)
   dvorak-bay      ph: Filipino (Dvorak, Baybayin)
   gag             md: Moldavian (Gagauz)
-  phoneticx       id: Indonesian (Arab Melayu, extended phonetic)
+  phoneticx       id: Indonesian (Arab Pegon, extended phonetic)
   phonetic        my: Malay (Jawi, phonetic)
 
 ! option
@@ -874,6 +884,7 @@
   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
+  altwin:ctrl_rwin     Ctrl is mapped to Right 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
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.16 src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.17
--- src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.16	Tue Apr 27 03:58:55 2021
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst	Sun Jan  9 13:54:16 2022
@@ -18,7 +18,7 @@
   a4techKBS8      A4Tech KBS-8
   a4_rfkb23       A4Tech Wireless Desktop RFKB-23
   airkey          Acer AirKey V
-  azonaRF2300     Azona RF2300 wireless Internet
+  azonaRF2300     Azona RF2300 Wireless Internet
   scorpius        Advance Scorpius KI
   brother         Brother Internet
   btc5113rf       BTC 5113RF Multimedia
@@ -225,7 +225,7 @@
   fi              Finnish
   fr              French
   gh              English (Ghana)
-  gn              N'Ko (azerty)
+  gn              N'Ko (AZERTY)
   ge              Georgian
   de              German
   gr              Greek
@@ -287,9 +287,10 @@
   bw              Tswana
   ph              Filipino
   md              Moldavian
-  id              Indonesian (Arab Melayu, phonetic)
+  id              Indonesian (Latin)
   jv              Indonesian (Javanese)
   my              Malay (Jawi, Arabic Keyboard)
+  custom          A user-defined custom Layout
 
 ! variant
   chr             us: Cherokee
@@ -299,6 +300,7 @@
   alt-intl        us: English (US, alt. intl.)
   colemak         us: English (Colemak)
   colemak_dh      us: English (Colemak-DH)
+  colemak_dh_iso  us: English (Colemak-DH ISO)
   dvorak          us: English (Dvorak)
   dvorak-intl     us: English (Dvorak, intl., with dead keys)
   dvorak-alt-intl us: English (Dvorak, alt. intl.)
@@ -306,6 +308,7 @@
   dvorak-r        us: English (Dvorak, right-handed)
   dvorak-classic  us: English (classic Dvorak)
   dvp             us: English (programmer Dvorak)
+  dvorak-mac      us: English (Dvorak, Macintosh)
   symbolic        us: English (US, Symbolic)
   rus             us: Russian (US, phonetic)
   mac             us: English (Macintosh)
@@ -353,7 +356,7 @@
   ben_baishakhi   in: Bangla (India, Baishakhi)
   ben_bornona     in: Bangla (India, Bornona)
   ben_gitanjali   in: Bangla (India, Gitanjali)
-  ben_inscript    in: Bangla (India, Baishakhi Inscript)
+  ben_inscript    in: Bangla (India, Baishakhi InScript)
   eeyek           in: Manipuri (Eeyek)
   guj             in: Gujarati
   guru            in: Punjabi (Gurmukhi)
@@ -362,14 +365,16 @@
   kan-kagapa      in: Kannada (KaGaPa, phonetic)
   mal             in: Malayalam
   mal_lalitha     in: Malayalam (Lalitha)
-  mal_enhanced    in: Malayalam (enhanced Inscript, with rupee)
+  mal_enhanced    in: Malayalam (enhanced InScript, with rupee)
   ori             in: Oriya
+  ori-bolnagri    in: Oriya (Bolnagri)
+  ori-wx          in: Oriya (Wx)
   olck            in: Ol Chiki
   tam_tamilnet    in: Tamil (TamilNet '99)
   tam_tamilnet_with_tam_nums in: Tamil (TamilNet '99 with Tamil numerals)
   tam_tamilnet_TAB in: Tamil (TamilNet '99, TAB encoding)
   tam_tamilnet_TSCII in: Tamil (TamilNet '99, TSCII encoding)
-  tam             in: Tamil (Inscript)
+  tam             in: Tamil (InScript)
   tel             in: Telugu
   tel-kagapa      in: Telugu (KaGaPa, phonetic)
   tel-sarala      in: Telugu (Sarala)
@@ -383,7 +388,7 @@
   mar-kagapa      in: Marathi (KaGaPa, phonetic)
   eng             in: English (India, with rupee)
   iipa            in: Indic IPA
-  marathi         in: Marathi (enhanced Inscript)
+  marathi         in: Marathi (enhanced InScript)
   alternatequotes ba: Bosnian (with guillemets)
   unicode         ba: Bosnian (with Bosnian digraphs)
   unicodeus       ba: Bosnian (US, with Bosnian digraphs)
@@ -397,9 +402,9 @@
   phonetic        bg: Bulgarian (traditional phonetic)
   bas_phonetic    bg: Bulgarian (new phonetic)
   bekl            bg: Bulgarian (enhanced)
-  azerty-deadkeys dz: Kabyle (azerty layout, dead keys)
-  qwerty-gb-deadkeys dz: Kabyle (qwerty-gb layout, dead keys)
-  qwerty-us-deadkeys dz: Kabyle (qwerty-us layout, dead keys)
+  azerty-deadkeys dz: Kabyle (AZERTY, with dead keys)
+  qwerty-gb-deadkeys dz: Kabyle (QWERTY, UK, with dead keys)
+  qwerty-us-deadkeys dz: Kabyle (QWERTY, US, with dead keys)
   ber             dz: Berber (Algeria, Tifinagh)
   ar              dz: Arabic (Algeria)
   french          ma: French (Morocco)
@@ -449,6 +454,7 @@
   mac             dk: Danish (Macintosh)
   mac_nodeadkeys  dk: Danish (Macintosh, no dead keys)
   dvorak          dk: Danish (Dvorak)
+  us              nl: Dutch (US)
   mac             nl: Dutch (Macintosh)
   std             nl: Dutch (standard)
   nodeadkeys      ee: Estonian (no dead keys)
@@ -593,7 +599,7 @@
   latinalternatequotes me: Montenegrin (Latin, with guillemets)
   nodeadkeys      mk: Macedonian (no dead keys)
   us              mt: Maltese (US)
-  alt-us          mt: Maltese (US layout with AltGr overrides)
+  alt-us          mt: Maltese (US, with AltGr overrides)
   alt-gb          mt: Maltese (UK, with AltGr overrides)
   nodeadkeys      no: Norwegian (no dead keys)
   winkeys         no: Norwegian (Windows)
@@ -699,6 +705,10 @@
   crh             tr: Crimean Tatar (Turkish Q)
   crh_f           tr: Crimean Tatar (Turkish F)
   crh_alt         tr: Crimean Tatar (Turkish Alt-Q)
+  ot              tr: Ottoman
+  otf             tr: Ottoman (F)
+  otk             tr: Old Turkic
+  otkf            tr: Old Turkic (F)
   indigenous      tw: Taiwanese (indigenous)
   saisiyat        tw: Saisiyat (Taiwan)
   phonetic        ua: Ukrainian (phonetic)
@@ -752,7 +762,7 @@
   dvorak          ph: Filipino (Dvorak, Latin)
   dvorak-bay      ph: Filipino (Dvorak, Baybayin)
   gag             md: Moldavian (Gagauz)
-  phoneticx       id: Indonesian (Arab Melayu, extended phonetic)
+  phoneticx       id: Indonesian (Arab Pegon, extended phonetic)
   phonetic        my: Malay (Jawi, phonetic)
 
 ! option
@@ -874,6 +884,7 @@
   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
+  altwin:ctrl_rwin     Ctrl is mapped to Right 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

Index: src/external/mit/xorg/lib/xkeyboard-config/rules/evdev
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.15 src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.16
--- src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.15	Tue Apr 27 03:58:55 2021
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev	Sun Jan  9 13:54:16 2022
@@ -1007,6 +1007,7 @@
   altwin:meta_alt	=	+altwin(meta_alt)
   altwin:alt_win	=	+altwin(alt_win)
   altwin:ctrl_win	=	+altwin(ctrl_win)
+  altwin:ctrl_rwin	=	+altwin(ctrl_rwin)
   altwin:ctrl_alt_win	=	+altwin(ctrl_alt_win)
   altwin:meta_win	=	+altwin(meta_win)
   altwin:left_meta_win	=	+altwin(left_meta_win)
@@ -1186,7 +1187,6 @@
   lv3:lsgt_switch_latch              =       +level3(lsgt_switch_latch)
   lv5:lsgt_switch                 =       +level5(lsgt_switch)
   lv5:ralt_switch                 =       +level5(ralt_switch)
-  lv5:menu_switch                 =       +level5(menu_switch)
   lv5:lsgt_switch_lock            =       +level5(lsgt_switch_lock)
   lv5:ralt_switch_lock            =       +level5(ralt_switch_lock)
   lv5:lwin_switch_lock            =       +level5(lwin_switch_lock)

Reply via email to