Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mit/xorg/lib/xkeyboard-config merge new xkeyboard-c...



details:   https://anonhg.NetBSD.org/src/rev/271e8b93d6e1
branches:  trunk
changeset: 977765:271e8b93d6e1
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Nov 01 12:07:09 2020 +0000

description:
merge new xkeyboard-config 2.31 parts.

diffstat:

 external/mit/xorg/lib/xkeyboard-config/rules/base           |   61 ++-
 external/mit/xorg/lib/xkeyboard-config/rules/base.lst       |  303 +++++-----
 external/mit/xorg/lib/xkeyboard-config/rules/evdev          |   61 ++-
 external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst      |  303 +++++-----
 external/mit/xorg/lib/xkeyboard-config/symbols/Makefile     |    4 +-
 external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man |  327 ++++++-----
 6 files changed, 612 insertions(+), 447 deletions(-)

diffs (truncated from 2530 to 300 lines):

diff -r 48debf7ba024 -r 271e8b93d6e1 external/mit/xorg/lib/xkeyboard-config/rules/base
--- a/external/mit/xorg/lib/xkeyboard-config/rules/base Sun Nov 01 11:50:11 2020 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/rules/base Sun Nov 01 12:07:09 2020 +0000
@@ -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)
diff -r 48debf7ba024 -r 271e8b93d6e1 external/mit/xorg/lib/xkeyboard-config/rules/base.lst
--- a/external/mit/xorg/lib/xkeyboard-config/rules/base.lst     Sun Nov 01 11:50:11 2020 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/rules/base.lst     Sun Nov 01 12:07:09 2020 +0000
@@ -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)



Home | Main Index | Thread Index | Old Index