Module Name: src
Committed By: mrg
Date: Wed Mar 6 11:05:18 UTC 2019
Modified Files:
src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man
src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst
evdev.lst
Log Message:
regen for xkeyboard-config 2.26.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man
cvs rdiff -u -r1.12 -r1.13 \
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
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.5 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.6
--- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.5 Sun Jan 13 19:21:27 2019
+++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man Wed Mar 6 11:05:18 2019
@@ -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.25" "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;
@@ -201,6 +201,9 @@ htcdream Htc Dream phone
teck227 Truly Ergonomic 227
teck229 Truly Ergonomic 229
apex300 SteelSeries Apex 300 (Apex RAW)
+chromebook Chromebook
+teck227 Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)
+teck229 Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)
.TE
.SH LAYOUTS
@@ -308,6 +311,7 @@ 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)
@@ -321,6 +325,7 @@ in(tam) Tamil (Inscript)
in(tel) Telugu
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)
@@ -484,7 +489,7 @@ fr(azerty) French (AZERTY)
fr(bre) French (Breton)
fr(oci) Occitan
fr(geo) Georgian (France, AZERTY Tskapo)
-fr(us) French (US keyboard with French letters)
+fr(us) French (US, with French letters)
_
gh English (Ghana)
@@ -613,6 +618,8 @@ latam(nodeadkeys) Spanish (Latin America
latam(deadtilde) Spanish (Latin American, dead tilde)
latam(sundeadkeys) Spanish (Latin American, with Sun dead keys)
latam(dvorak) Spanish (Latin American, Dvorak)
+latam(colemak) Spanish (Latin American, Colemak)
+latam(colemak-gaming) Spanish (Latin American, Colemak for gaming)
_
lt Lithuanian
@@ -700,6 +707,7 @@ _
ru Russian
ru(phonetic) Russian (phonetic)
ru(phonetic_winkeys) Russian (phonetic, with Win keys)
+ru(phonetic_yazherty) Russian (phonetic yazherty)
ru(typewriter) Russian (typewriter)
ru(legacy) Russian (legacy)
ru(typewriter-legacy) Russian (typewriter, legacy)
@@ -838,6 +846,7 @@ gb(dvorakukp) English (UK, Dvorak, with
gb(mac) English (UK, Macintosh)
gb(mac_intl) English (UK, intl., Macintosh)
gb(colemak) English (UK, Colemak)
+gb(pl) Polish (British keyboard)
_
uz Uzbek
@@ -897,7 +906,9 @@ sn Wolof
_
brai Braille
brai(left_hand) Braille (left-handed)
+brai(left_hand_invert) Braille (left-handed inverted thumb)
brai(right_hand) Braille (right-handed)
+brai(right_hand_invert) Braille (right-handed inverted thumb)
_
tm Turkmen
@@ -1363,23 +1374,23 @@ terminate:ctrl_alt_bksp Ctrl+Alt+Backspa
.SH FILES
-/usr/local/share/X11/xkb/compat
+__xkb_base__/compat
-/usr/local/share/X11/xkb/compiled
+__xkb_base__/compiled
-/usr/local/share/X11/xkb/geometry
+__xkb_base__/geometry
-/usr/local/share/X11/xkb/keycodes
+__xkb_base__/keycodes
-/usr/local/share/X11/xkb/keymap
+__xkb_base__/keymap
-/usr/local/share/X11/xkb/rules
+__xkb_base__/rules
-/usr/local/share/X11/xkb/semantics
+__xkb_base__/semantics
-/usr/local/share/X11/xkb/symbols
+__xkb_base__/symbols
-/usr/local/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.12 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.13
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.12 Sun Mar 11 20:17:19 2018
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base Wed Mar 6 11:05:18 2019
@@ -124,9 +124,9 @@
silvercrest \
sk1300 sk2500 sk6200 sk7100 \
sven sven303 symplon \
+ teck227 teck229 \
toshiba_s3000 trust trustda \
unitekkb1925 yahoo \
- teck227 teck229 \
apex300
! $inetmediakbds = acer_ferrari4k acer_laptop btc5090 btc9019u cherryblueb \
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.12 src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.13
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.12 Sun Mar 11 20:17:19 2018
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst Wed Mar 6 11:05:18 2019
@@ -1,6 +1,6 @@
! model
pc101 Generic 101-key PC
- pc102 Generic 101-key PC (intl.)
+ pc102 Generic 102-key PC (intl.)
pc104 Generic 104-key PC
pc105 Generic 105-key PC (intl.)
dell101 Dell 101-key PC
@@ -187,6 +187,9 @@
teck227 Truly Ergonomic 227
teck229 Truly Ergonomic 229
apex300 SteelSeries Apex 300 (Apex RAW)
+ chromebook Chromebook
+ teck227 Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)
+ teck229 Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)
! layout
us English (US)
@@ -353,19 +356,21 @@
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)
ori in: Oriya
olck in: Ol Chiki
- tam_unicode in: Tamil (Unicode)
- tam_keyboard_with_numerals in: Tamil (keyboard with numerals)
- tam_TAB in: Tamil (TAB typewriter)
- tam_TSCII in: Tamil (TSCII typewriter)
- tam in: Tamil
+ 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)
tel in: Telugu
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)
@@ -401,6 +406,7 @@
azerty cm: Cameroon Multilingual (AZERTY)
dvorak cm: Cameroon Multilingual (Dvorak)
mmuock cm: Mmuock
+ zawgyi mm: Burmese Zawgyi
fr-dvorak ca: French (Canada, Dvorak)
fr-legacy ca: French (Canada, legacy)
multix ca: Canadian Multilingual
@@ -411,6 +417,7 @@
tib cn: Tibetan
tib_asciinum cn: Tibetan (with ASCII numerals)
ug cn: Uyghur
+ altgr-pinyin cn: Hanyu Pinyin (altgr)
alternatequotes hr: Croatian (with guillemets)
unicode hr: Croatian (with Croatian digraphs)
unicodeus hr: Croatian (US, with Croatian digraphs)
@@ -464,6 +471,7 @@
bre fr: French (Breton)
oci fr: Occitan
geo fr: Georgian (France, AZERTY Tskapo)
+ us fr: French (US, with French letters)
generic gh: English (Ghana, multilingual)
akan gh: Akan
ewe gh: Ewe
@@ -541,11 +549,14 @@
ruskaz kz: Russian (Kazakhstan, with Kazakh)
kazrus kz: Kazakh (with Russian)
ext kz: Kazakh (extended)
+ latin kz: Kazakh (Latin)
stea la: Lao (STEA proposed standard layout)
nodeadkeys latam: Spanish (Latin American, no dead keys)
deadtilde latam: Spanish (Latin American, dead tilde)
sundeadkeys latam: Spanish (Latin American, with 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)
ibm lt: Lithuanian (IBM LST 1205-92)
@@ -597,6 +608,7 @@
winkeys ro: Romanian (Win keys)
phonetic ru: Russian (phonetic)
phonetic_winkeys ru: Russian (phonetic, with Win keys)
+ phonetic_yazherty ru: Russian (phonetic yazherty)
typewriter ru: Russian (typewriter)
legacy ru: Russian (legacy)
typewriter-legacy ru: Russian (typewriter, legacy)
@@ -646,6 +658,7 @@
mac se: Swedish (Macintosh)
svdvorak se: Swedish (Svdvorak)
us_dvorak se: Swedish (based on US Intl. Dvorak)
+ us se: Swedish (US, with Swedish letters)
swl se: Swedish Sign Language
legacy ch: German (Switzerland, legacy)
de_nodeadkeys ch: German (Switzerland, no dead keys)
@@ -661,8 +674,8 @@
ku_f sy: Kurdish (Syria, F)
ku_alt sy: Kurdish (Syria, Latin Alt-Q)
legacy tj: Tajik (legacy)
- tam_unicode lk: Tamil (Sri Lanka, Unicode)
- tam_TAB lk: Tamil (Sri Lanka, TAB Typewriter)
+ 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)
tis th: Thai (TIS-820.2538)
pat th: Thai (Pattachote)
@@ -692,7 +705,10 @@
mac gb: English (UK, Macintosh)
mac_intl gb: English (UK, intl., Macintosh)
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)
CloGaelach ie: CloGaelach
UnicodeExpert ie: Irish (UnicodeExpert)
@@ -707,7 +723,9 @@
yoruba ng: Yoruba
hausa ng: Hausa (Nigeria)
left_hand brai: Braille (left-handed)
+ left_hand_invert brai: Braille (left-handed inverted thumb)
right_hand brai: Braille (right-handed)
+ right_hand_invert brai: Braille (right-handed inverted thumb)
alt tm: Turkmen (Alt-Q)
fr-oss ml: French (Mali, alt.)
us-mac ml: English (Mali, US, Macintosh)
@@ -912,7 +930,6 @@
japan:nicola_f_bs NICOLA-F style Backspace
japan:hztg_escape Make Zenkaku Hankaku an additional Esc
korean Korean Hangul/Hanja keys
- korean:hw_keys Hardware Hangul/Hanja keys
korean:ralt_rctrl Right Alt as Hangul, right Ctrl as Hanja
korean:rctrl_ralt Right Ctrl as Hangul, right Alt as Hanja
esperanto Adding Esperanto supersigned letters
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.12 src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.13
--- src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.12 Sun Mar 11 20:17:19 2018
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst Wed Mar 6 11:05:18 2019
@@ -1,6 +1,6 @@
! model
pc101 Generic 101-key PC
- pc102 Generic 101-key PC (intl.)
+ pc102 Generic 102-key PC (intl.)
pc104 Generic 104-key PC
pc105 Generic 105-key PC (intl.)
dell101 Dell 101-key PC
@@ -187,6 +187,9 @@
teck227 Truly Ergonomic 227
teck229 Truly Ergonomic 229
apex300 SteelSeries Apex 300 (Apex RAW)
+ chromebook Chromebook
+ teck227 Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)
+ teck229 Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)
! layout
us English (US)
@@ -353,19 +356,21 @@
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)
ori in: Oriya
olck in: Ol Chiki
- tam_unicode in: Tamil (Unicode)
- tam_keyboard_with_numerals in: Tamil (keyboard with numerals)
- tam_TAB in: Tamil (TAB typewriter)
- tam_TSCII in: Tamil (TSCII typewriter)
- tam in: Tamil
+ 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)
tel in: Telugu
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)
@@ -401,6 +406,7 @@
azerty cm: Cameroon Multilingual (AZERTY)
dvorak cm: Cameroon Multilingual (Dvorak)
mmuock cm: Mmuock
+ zawgyi mm: Burmese Zawgyi
fr-dvorak ca: French (Canada, Dvorak)
fr-legacy ca: French (Canada, legacy)
multix ca: Canadian Multilingual
@@ -411,6 +417,7 @@
tib cn: Tibetan
tib_asciinum cn: Tibetan (with ASCII numerals)
ug cn: Uyghur
+ altgr-pinyin cn: Hanyu Pinyin (altgr)
alternatequotes hr: Croatian (with guillemets)
unicode hr: Croatian (with Croatian digraphs)
unicodeus hr: Croatian (US, with Croatian digraphs)
@@ -464,6 +471,7 @@
bre fr: French (Breton)
oci fr: Occitan
geo fr: Georgian (France, AZERTY Tskapo)
+ us fr: French (US, with French letters)
generic gh: English (Ghana, multilingual)
akan gh: Akan
ewe gh: Ewe
@@ -541,11 +549,14 @@
ruskaz kz: Russian (Kazakhstan, with Kazakh)
kazrus kz: Kazakh (with Russian)
ext kz: Kazakh (extended)
+ latin kz: Kazakh (Latin)
stea la: Lao (STEA proposed standard layout)
nodeadkeys latam: Spanish (Latin American, no dead keys)
deadtilde latam: Spanish (Latin American, dead tilde)
sundeadkeys latam: Spanish (Latin American, with 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)
ibm lt: Lithuanian (IBM LST 1205-92)
@@ -597,6 +608,7 @@
winkeys ro: Romanian (Win keys)
phonetic ru: Russian (phonetic)
phonetic_winkeys ru: Russian (phonetic, with Win keys)
+ phonetic_yazherty ru: Russian (phonetic yazherty)
typewriter ru: Russian (typewriter)
legacy ru: Russian (legacy)
typewriter-legacy ru: Russian (typewriter, legacy)
@@ -646,6 +658,7 @@
mac se: Swedish (Macintosh)
svdvorak se: Swedish (Svdvorak)
us_dvorak se: Swedish (based on US Intl. Dvorak)
+ us se: Swedish (US, with Swedish letters)
swl se: Swedish Sign Language
legacy ch: German (Switzerland, legacy)
de_nodeadkeys ch: German (Switzerland, no dead keys)
@@ -661,8 +674,8 @@
ku_f sy: Kurdish (Syria, F)
ku_alt sy: Kurdish (Syria, Latin Alt-Q)
legacy tj: Tajik (legacy)
- tam_unicode lk: Tamil (Sri Lanka, Unicode)
- tam_TAB lk: Tamil (Sri Lanka, TAB Typewriter)
+ 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)
tis th: Thai (TIS-820.2538)
pat th: Thai (Pattachote)
@@ -692,7 +705,10 @@
mac gb: English (UK, Macintosh)
mac_intl gb: English (UK, intl., Macintosh)
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)
CloGaelach ie: CloGaelach
UnicodeExpert ie: Irish (UnicodeExpert)
@@ -707,7 +723,9 @@
yoruba ng: Yoruba
hausa ng: Hausa (Nigeria)
left_hand brai: Braille (left-handed)
+ left_hand_invert brai: Braille (left-handed inverted thumb)
right_hand brai: Braille (right-handed)
+ right_hand_invert brai: Braille (right-handed inverted thumb)
alt tm: Turkmen (Alt-Q)
fr-oss ml: French (Mali, alt.)
us-mac ml: English (Mali, US, Macintosh)
@@ -912,7 +930,6 @@
japan:nicola_f_bs NICOLA-F style Backspace
japan:hztg_escape Make Zenkaku Hankaku an additional Esc
korean Korean Hangul/Hanja keys
- korean:hw_keys Hardware Hangul/Hanja keys
korean:ralt_rctrl Right Alt as Hangul, right Ctrl as Hanja
korean:rctrl_ralt Right Ctrl as Hangul, right Alt as Hanja
esperanto Adding Esperanto supersigned letters
