diff options
author | stephan <stephan@b9310e46-f624-0410-8ea1-cfbb3a30dc96> | 2010-03-27 14:11:43 +0000 |
---|---|---|
committer | stephan <stephan@b9310e46-f624-0410-8ea1-cfbb3a30dc96> | 2010-03-27 14:11:43 +0000 |
commit | 710bee77b157a0b09b6d8c613babe2d0c854c1ba (patch) | |
tree | d8b89b396abeae740907994f96a77ab8001ad304 /linux/X | |
parent | 434c2374f1c9e6722070cf76c212a569610031ec (diff) |
Rebase auf xkeyboard-config git („-lang“-varianten noch nicht aktualisiert).
Korrekturen/Aufräumarbeiten
git-svn-id: https://svn.neo-layout.org@2228 b9310e46-f624-0410-8ea1-cfbb3a30dc96
Diffstat (limited to 'linux/X')
-rw-r--r-- | linux/X/rules/base | 910 | ||||
-rw-r--r-- | linux/X/rules/base.xml | 366 | ||||
-rw-r--r-- | linux/X/rules/evdev | 912 | ||||
-rw-r--r-- | linux/X/rules/evdev.xml | 366 | ||||
-rw-r--r-- | linux/X/symbols/level5 | 11 | ||||
-rw-r--r-- | linux/X/symbols/shift | 4 |
6 files changed, 1597 insertions, 972 deletions
diff --git a/linux/X/rules/base b/linux/X/rules/base index 7441403..2f0c8f4 100644 --- a/linux/X/rules/base +++ b/linux/X/rules/base @@ -21,6 +21,9 @@ // Microsoft models (using MS geometry) ! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose +// Nokia devices and keyboards +! $nokiamodels = nokiasu8w nokiarx44 nokiarx51 + // PC geometries - they have special geometry but symbols are mostly pc105 ! $pcgeometries = latitude @@ -28,13 +31,14 @@ ! $tmgeometries = tm2020 tm2030PS2 tm2030USB tm2030USB-102 tm2030USB-106 // Layouts that provide further specializations for the OLPC -! $olpclayouts = af am ara br ca es et it kh kz in mn np ru th tr us +! $olpclayouts = af am ara br ca es et fr it kh kz in mn np ru th tr us ! $macbooks = macbook78 macbook79 ! $maclaptop = ibook powerbook macbook78 macbook79 +! $applealu = applealu_ansi applealu_iso applealu_jis ! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79 -! $macvendorlayouts = ch de dk es fi fr gb is it latam nl no pt se us +! $macvendorlayouts = ch de dk fi fr gb is it latam nl no pt se us ! $azerty = be fr ! $qwertz = al cz de hr hu ro si sk @@ -76,7 +80,7 @@ silvercrest \ sk1300 sk2500 sk6200 sk7100 \ sven sven303 symplon \ - toshiba_s3000 trust trustda \ + tm2030USB toshiba_s3000 trust trustda \ unitekkb1925 yahoo // all layouts with 3rd and 4th groups @@ -105,18 +109,27 @@ ! $thinkpads = thinkpad thinkpad60 thinkpadz60 +! $sun_t6_custom = ara be br ca ch cz de dk \ + ee es fi fr gb gr it kr \ + lt lv nl no pl pt ro ru \ + se sk tr tw ua + + ! $dvoraklayouts = br ca de ee es fr gb no pl se us ! model = keycodes amiga = amiga(de) ataritt = ataritt(de) + empty = empty sun4 = sun(type4_euro) sun5 = sun(type5_euro) sun6 = sun(type6_usb) sun6euro = sun(type6tuv_usb) pc98 = xfree98(pc98) evdev = evdev + $nokiamodels = evdev olpc = evdev + $applealu = macintosh(alukbd) macintosh_hhk = macintosh(hhk) macintosh_old = macintosh(old) $macs = macintosh @@ -146,6 +159,8 @@ latitude = dell(latitude) flexpro = keytronic(FlexPro) hp6000 = hp(omnibook) + hpmini110 = hp(mini110) + hpdv5 = hp(dv5) omnikey101 = northgate(omnikey101) $pcmodels = pc(%m) $pcgeometries = pc(%m) @@ -156,10 +171,12 @@ $tmgeometries = typematrix(%m) winbook = winbook(XP5) pc98 = nec(pc98) + $applealu = macintosh(%m) $macbooks = macintosh(%m) $macs = macintosh(macintosh) hhk = hhk(basic) kinesis = kinesis(model100) + $nokiamodels = nokia(%m) * = pc(pc104) ! model layout variant = symbols @@ -220,6 +237,7 @@ classmate us intl = pc+us(classmate-intl) classmate us alt-intl = pc+us(classmate-alt-intl) classmate us altgr-intl = pc+us(classmate-altgr-intl) + nokiarx51 cz qwerty = nokia_vndr/rx-51(cz_qwerty) ! model layout = symbols * ar = pc+ara @@ -309,24 +327,36 @@ amiga $nonlatin = xfree68_vndr/amiga(usa1)+%l%(v):2 amiga * = xfree68_vndr/amiga(usa1)+%l%(v) classmate us = pc+%l(classmate) + empty * = empty(basic) + * empty = empty(basic) sun4 $nonlatin = latin+sun_vndr/us(type4)+%l%(v):2 sun4 * = latin+sun_vndr/us(type4)+%l%(v) sun5 $nonlatin = latin+sun_vndr/us(type5)+%l%(v):2 sun5 * = latin+sun_vndr/us(type5)+%l%(v) - sun6 us = sun_vndr/us(type6) - sun6 en_US = sun_vndr/us(type6)+iso9995-3(basic) - sun6 * = sun_vndr/us(type6)+%l%(v) - sun6euro us = sun_vndr/us(type6) - sun6euro en_US = sun_vndr/us(type6)+iso9995-3(basic) - sun6euro * = sun_vndr/us(type6)+%l%(v) + sun6 us = pc+sun_vndr/us(type6) + sun6 en_US = pc+sun_vndr/us(type6)+iso9995-3(basic) + sun6 $sun_t6_custom = pc+sun_vndr/us(type6)+sun_vndr/%l%(v) + sun6 * = pc+sun_vndr/us(type6)+%l%(v) + sun6euro us = pc+sun_vndr/us(type6) + sun6euro en_US = pc+sun_vndr/us(type6)+iso9995-3(basic) + sun6euro $sun_t6_custom = pc+sun_vndr/us(type6)+sun_vndr/%l%(v) + sun6euro * = pc+sun_vndr/us(type6)+%l%(v) pc98 nec_vndr/jp = nec_vndr/jp(pc98) macintosh_old us = macintosh_vndr/us(oldmac) macintosh_old en_US = macintosh_vndr/us(oldmac) macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l%(v) macintosh_old $nonlatin = macintosh_vndr/us(oldmac)+%l%(v):2 macintosh_old * = macintosh_vndr/us(oldmac)+%l%(v) + applealu_jis jp = macintosh_vndr/apple(alukbd)+macintosh_vndr/jp(usmac)+macintosh_vndr/jp(mac):2 + applealu_jis * = macintosh_vndr/apple(alukbd)+%l%(v)+macintosh_vndr/jp(mac):2 + $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l%(v) + $applealu * = macintosh_vndr/apple(alukbd)+%l%(v) $macs en_US = pc+macintosh_vndr/us(extended) $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v) + nokiarx44 * = nokia_vndr/rx-44(%l) + nokiarx51 cz(qwerty) = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty) + nokiarx51 * = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l%_v) + nokiasu8w * = nokia_vndr/su-8w(%l) olpc $olpclayouts = olpc+%l%(m) olpc * = olpc+%l%(v) $thinkpads br = pc+br(thinkpad) @@ -423,7 +453,12 @@ macintosh_old us = macintosh_vndr/us(oldmac) macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1]) + applealu_jis us = macintosh_vndr/apple(alukbd)+macintosh_vndr/jp(usmac) + $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l[1]%(v[1]) + $applealu * = macintosh_vndr/apple(alukbd)+%l[1]%(v[1]) $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1]) + nokiarx51 cz(qwerty) = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty) + nokiarx51 * = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l[1]%_v[1]) $thinkpads br = pc+%l[1](thinkpad) * * = pc+%l[1]%(v[1]) @@ -483,428 +518,434 @@ * us crd = pc+extras/us(crd) * us intl-unicode = pc+extras/us(intl-unicode) -! layout[2] = symbols - ar = +ara%(v[2]):2 - ben = +in(ben):2 - bs = +ba%(v[2]):2 - cs = +rs%(v[2]):2 - cz_qwerty = +cz(qwerty):2 - dev = +in(deva):2 - dvorak = +us(dvorak):2 - dzdwi = +bt%(v[2]):2 - el = +gr%(v[2]):2 - en_US = +latin%(v[2]):2 - guj = +in(guj):2 - gur = +in(guru):2 - iu = +ca(ike):2 - lo = +la%(v[2]):2 - kan = +in(kan):2 - mi = +mao%(v[2]):2 - ml = +in(mal):2 - ogham = +ie(ogam):2 - ori = +ie(ori):2 - sapmi = +no(smi):2 - sr = +srp%(v[2]):2 - syr = +sy(syc):2 - tel = +in(tel):2 - tml = +in(tam):2 - yu = +srp%(v[2]):2 - fr-latin9 = +fr(latin9):2 - us_intl = +us(alt-intl):2 - ben(basic) = +in(ben):2 - ben(probhat) = +in(ben_probhat):2 - dev(basic) = +in(deva):2 - dvorak($dvoraklayouts) = +%v(dvorak):2 - dvorak(basic) = +us(dvorak):2 - dvorak(pl_basic) = +pl(dvorak):2 - dvorak(pl) = +pl(dvorak_quotes):2 - dvorak(pl_altquotes) = +pl(dvorak_altquotes):2 - dzdwi(basic) = +bt(basic):2 - fi(basic) = +fi(classic):2 - ge(azerty_tskapo) = +fr(geo):2 - guj(basic) = +in(guj):2 - gur(basic) = +in(guru):2 - ie(laptop) = +ie(basic):2 - ie(CloGaelachLaptop) = +ie(CloGaelach):2 - il(si1452) = +ie(basic):2 - in(urd) = +in(urd-phonetic):2 - iu(basic) = +ca(ike):2 - lo(basic) = +la(basic):2 - kan(basic) = +in(kan):2 - mal(basic) = +in(mal):2 - mal(mlplusnum) = +in(mal):2 - ogham(basic) = +ie(ogam):2 - ogham(laptop) = +ie(ogam):2 - ogham(is434) = +ie(ogam_is434):2 - ogham(is434laptop) = +ie(ogam_is434):2 - ori(basic) = +in(ori):2 - ro(de) = +ro(winkeys):2 - ro(us) = +ro(std):2 - ro(academic) = +ro(std):2 - ro(std_comma) = +ro(std):2 - ro(comma) = +ro(basic):2 - ru(os) = +ru(os_legacy):2 - pk(urd) = +pk(urd-phonetic):2 - sapmi(basic) = +no(smi):2 - sapmi(nodeadkeys) = +no(smi_nodeadkeys):2 - sapmi(sefi) = +fi(smi):2 - sin(phonetic-static) = +in(sin_phonetic):2 - syr(basic) = +sy(syc):2 - syr(phonetic) = +sy(syc_phonetic):2 - tam(INSCRIPT) = +in(tam):2 - tam(UNI) = +in(tam_unicode):2 - tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):2 - tam(TAB) = +in(tam_TAB):2 - tam(TSCII) = +in(tam_TSCII):2 - tel(basic) = +in(tel):2 - yu(basic) = +srp(latin):2 - yu(unicode) = +srp(latinunicode):2 - yu(yz) = +srp(latinyz):2 - yu(unicodeyz) = +srp(latinunicodeyz):2 - apl = +extras/apl%(v[2]):2 - rs(combiningkeys) = +extras/rs(combiningkeys):2 - us(alt-intl-unicode) = +extras/us(alt-intl-unicode):2 - us(crd) = +extras/us(crd):2 - us(intl-unicode) = +extras/us(intl-unicode):2 - * = +%l[2]%(v[2]):2 +! model layout[2] = symbols + * ar = +ara%(v[2]):2 + * ben = +in(ben):2 + * bs = +ba%(v[2]):2 + * cs = +rs%(v[2]):2 + * cz_qwerty = +cz(qwerty):2 + * dev = +in(deva):2 + * dvorak = +us(dvorak):2 + * dzdwi = +bt%(v[2]):2 + * el = +gr%(v[2]):2 + * en_US = +latin%(v[2]):2 + * guj = +in(guj):2 + * gur = +in(guru):2 + * iu = +ca(ike):2 + * lo = +la%(v[2]):2 + * kan = +in(kan):2 + * mi = +mao%(v[2]):2 + * ml = +in(mal):2 + * ogham = +ie(ogam):2 + * ori = +ie(ori):2 + * sapmi = +no(smi):2 + * sr = +srp%(v[2]):2 + * syr = +sy(syc):2 + * tel = +in(tel):2 + * tml = +in(tam):2 + * yu = +srp%(v[2]):2 + * fr-latin9 = +fr(latin9):2 + * us_intl = +us(alt-intl):2 + * ben(basic) = +in(ben):2 + * ben(probhat) = +in(ben_probhat):2 + * dev(basic) = +in(deva):2 + * dvorak($dvoraklayouts) = +%v(dvorak):2 + * dvorak(basic) = +us(dvorak):2 + * dvorak(pl_basic) = +pl(dvorak):2 + * dvorak(pl) = +pl(dvorak_quotes):2 + * dvorak(pl_altquotes) = +pl(dvorak_altquotes):2 + * dzdwi(basic) = +bt(basic):2 + * fi(basic) = +fi(classic):2 + * ge(azerty_tskapo) = +fr(geo):2 + * guj(basic) = +in(guj):2 + * gur(basic) = +in(guru):2 + * ie(laptop) = +ie(basic):2 + * ie(CloGaelachLaptop) = +ie(CloGaelach):2 + * il(si1452) = +ie(basic):2 + * in(urd) = +in(urd-phonetic):2 + * iu(basic) = +ca(ike):2 + * lo(basic) = +la(basic):2 + * kan(basic) = +in(kan):2 + * mal(basic) = +in(mal):2 + * mal(mlplusnum) = +in(mal):2 + * ogham(basic) = +ie(ogam):2 + * ogham(laptop) = +ie(ogam):2 + * ogham(is434) = +ie(ogam_is434):2 + * ogham(is434laptop) = +ie(ogam_is434):2 + * ori(basic) = +in(ori):2 + * ro(de) = +ro(winkeys):2 + * ro(us) = +ro(std):2 + * ro(academic) = +ro(std):2 + * ro(std_comma) = +ro(std):2 + * ro(comma) = +ro(basic):2 + * ru(os) = +ru(os_legacy):2 + * pk(urd) = +pk(urd-phonetic):2 + * sapmi(basic) = +no(smi):2 + * sapmi(nodeadkeys) = +no(smi_nodeadkeys):2 + * sapmi(sefi) = +fi(smi):2 + * sin(phonetic-static) = +in(sin_phonetic):2 + * syr(basic) = +sy(syc):2 + * syr(phonetic) = +sy(syc_phonetic):2 + * tam(INSCRIPT) = +in(tam):2 + * tam(UNI) = +in(tam_unicode):2 + * tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):2 + * tam(TAB) = +in(tam_TAB):2 + * tam(TSCII) = +in(tam_TSCII):2 + * tel(basic) = +in(tel):2 + * yu(basic) = +srp(latin):2 + * yu(unicode) = +srp(latinunicode):2 + * yu(yz) = +srp(latinyz):2 + * yu(unicodeyz) = +srp(latinunicodeyz):2 + * apl = +extras/apl%(v[2]):2 + * rs(combiningkeys) = +extras/rs(combiningkeys):2 + * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):2 + * us(crd) = +extras/us(crd):2 + * us(intl-unicode) = +extras/us(intl-unicode):2 + nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):2 + nokiarx51 * = +nokia_vndr/rx-51(%l[2]%_v[2]):2 + * * = +%l[2]%(v[2]):2 -! layout[3] = symbols - ar = +ara%(v[3]):3 - ben = +in(ben):3 - bs = +ba%(v[3]):3 - cs = +rs%(v[3]):3 - cz_qwerty = +cz(qwerty):3 - dev = +in(deva):3 - dvorak = +us(dvorak):3 - dzdwi = +bt%(v[3]):3 - el = +gr%(v[3]):3 - en_US = +latin%(v[3]):3 - guj = +in(guj):3 - gur = +in(guru):3 - iu = +ca(ike):3 - lo = +la%(v[3]):3 - kan = +in(kan):3 - mi = +mao%(v[3]):3 - ml = +in(mal):3 - ogham = +ie(ogam):3 - ori = +ie(ori):3 - sapmi = +no(smi):3 - sr = +srp%(v[3]):3 - syr = +sy(syc):3 - tel = +in(tel):3 - tml = +in(tam):3 - yu = +srp%(v[3]):3 - fr-latin9 = +fr(latin9):3 - us_intl = +us(alt-intl):3 - ben(basic) = +in(ben):3 - ben(probhat) = +in(ben_probhat):3 - dev(basic) = +in(deva):3 - dvorak($dvoraklayouts) = +%v(dvorak):3 - dvorak(basic) = +us(dvorak):3 - dvorak(pl_basic) = +pl(dvorak):3 - dvorak(pl) = +pl(dvorak_quotes):3 - dvorak(pl_altquotes) = +pl(dvorak_altquotes):3 - dzdwi(basic) = +bt(basic):3 - fi(basic) = +fi(classic):3 - ge(azerty_tskapo) = +fr(geo):3 - guj(basic) = +in(guj):3 - gur(basic) = +in(guru):3 - ie(laptop) = +ie(basic):3 - ie(CloGaelachLaptop) = +ie(CloGaelach):3 - il(si1452) = +ie(basic):3 - in(urd) = +in(urd-phonetic):3 - iu(basic) = +ca(ike):3 - lo(basic) = +la(basic):3 - kan(basic) = +in(kan):3 - mal(basic) = +in(mal):3 - mal(mlplusnum) = +in(mal):3 - ogham(basic) = +ie(ogam):3 - ogham(laptop) = +ie(ogam):3 - ogham(is434) = +ie(ogam_is434):3 - ogham(is434laptop) = +ie(ogam_is434):3 - ori(basic) = +in(ori):3 - ro(de) = +ro(winkeys):3 - ro(us) = +ro(std):3 - ro(academic) = +ro(std):3 - ro(std_comma) = +ro(std):3 - ro(comma) = +ro(basic):3 - ru(os) = +ru(os_legacy):3 - pk(urd) = +pk(urd-phonetic):3 - sapmi(basic) = +no(smi):3 - sapmi(nodeadkeys) = +no(smi_nodeadkeys):3 - sapmi(sefi) = +fi(smi):3 - sin(phonetic-static) = +in(sin_phonetic):3 - syr(basic) = +sy(syc):3 - syr(phonetic) = +sy(syc_phonetic):3 - tam(INSCRIPT) = +in(tam):3 - tam(UNI) = +in(tam_unicode):3 - tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):3 - tam(TAB) = +in(tam_TAB):3 - tam(TSCII) = +in(tam_TSCII):3 - tel(basic) = +in(tel):3 - yu(basic) = +srp(latin):3 - yu(unicode) = +srp(latinunicode):3 - yu(yz) = +srp(latinyz):3 - yu(unicodeyz) = +srp(latinunicodeyz):3 - apl = +extras/apl%(v[3]):3 - rs(combiningkeys) = +extras/rs(combiningkeys):3 - us(alt-intl-unicode) = +extras/us(alt-intl-unicode):3 - us(crd) = +extras/us(crd):3 - us(intl-unicode) = +extras/us(intl-unicode):3 - * = +%l[3]%(v[3]):3 +! model layout[3] = symbols + * ar = +ara%(v[3]):3 + * ben = +in(ben):3 + * bs = +ba%(v[3]):3 + * cs = +rs%(v[3]):3 + * cz_qwerty = +cz(qwerty):3 + * dev = +in(deva):3 + * dvorak = +us(dvorak):3 + * dzdwi = +bt%(v[3]):3 + * el = +gr%(v[3]):3 + * en_US = +latin%(v[3]):3 + * guj = +in(guj):3 + * gur = +in(guru):3 + * iu = +ca(ike):3 + * lo = +la%(v[3]):3 + * kan = +in(kan):3 + * mi = +mao%(v[3]):3 + * ml = +in(mal):3 + * ogham = +ie(ogam):3 + * ori = +ie(ori):3 + * sapmi = +no(smi):3 + * sr = +srp%(v[3]):3 + * syr = +sy(syc):3 + * tel = +in(tel):3 + * tml = +in(tam):3 + * yu = +srp%(v[3]):3 + * fr-latin9 = +fr(latin9):3 + * us_intl = +us(alt-intl):3 + * ben(basic) = +in(ben):3 + * ben(probhat) = +in(ben_probhat):3 + * dev(basic) = +in(deva):3 + * dvorak($dvoraklayouts) = +%v(dvorak):3 + * dvorak(basic) = +us(dvorak):3 + * dvorak(pl_basic) = +pl(dvorak):3 + * dvorak(pl) = +pl(dvorak_quotes):3 + * dvorak(pl_altquotes) = +pl(dvorak_altquotes):3 + * dzdwi(basic) = +bt(basic):3 + * fi(basic) = +fi(classic):3 + * ge(azerty_tskapo) = +fr(geo):3 + * guj(basic) = +in(guj):3 + * gur(basic) = +in(guru):3 + * ie(laptop) = +ie(basic):3 + * ie(CloGaelachLaptop) = +ie(CloGaelach):3 + * il(si1452) = +ie(basic):3 + * in(urd) = +in(urd-phonetic):3 + * iu(basic) = +ca(ike):3 + * lo(basic) = +la(basic):3 + * kan(basic) = +in(kan):3 + * mal(basic) = +in(mal):3 + * mal(mlplusnum) = +in(mal):3 + * ogham(basic) = +ie(ogam):3 + * ogham(laptop) = +ie(ogam):3 + * ogham(is434) = +ie(ogam_is434):3 + * ogham(is434laptop) = +ie(ogam_is434):3 + * ori(basic) = +in(ori):3 + * ro(de) = +ro(winkeys):3 + * ro(us) = +ro(std):3 + * ro(academic) = +ro(std):3 + * ro(std_comma) = +ro(std):3 + * ro(comma) = +ro(basic):3 + * ru(os) = +ru(os_legacy):3 + * pk(urd) = +pk(urd-phonetic):3 + * sapmi(basic) = +no(smi):3 + * sapmi(nodeadkeys) = +no(smi_nodeadkeys):3 + * sapmi(sefi) = +fi(smi):3 + * sin(phonetic-static) = +in(sin_phonetic):3 + * syr(basic) = +sy(syc):3 + * syr(phonetic) = +sy(syc_phonetic):3 + * tam(INSCRIPT) = +in(tam):3 + * tam(UNI) = +in(tam_unicode):3 + * tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):3 + * tam(TAB) = +in(tam_TAB):3 + * tam(TSCII) = +in(tam_TSCII):3 + * tel(basic) = +in(tel):3 + * yu(basic) = +srp(latin):3 + * yu(unicode) = +srp(latinunicode):3 + * yu(yz) = +srp(latinyz):3 + * yu(unicodeyz) = +srp(latinunicodeyz):3 + * apl = +extras/apl%(v[3]):3 + * rs(combiningkeys) = +extras/rs(combiningkeys):3 + * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):3 + * us(crd) = +extras/us(crd):3 + * us(intl-unicode) = +extras/us(intl-unicode):3 + nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):3 + nokiarx51 * = +nokia_vndr/rx-51(%l[3]%_v[3]):3 + * * = +%l[3]%(v[3]):3 -! layout[4] = symbols - ar = +ara%(v[4]):4 - ben = +in(ben):4 - bs = +ba%(v[4]):4 - cs = +rs%(v[4]):4 - cz_qwerty = +cz(qwerty):4 - dev = +in(deva):4 - dvorak = +us(dvorak):4 - dzdwi = +bt%(v[4]):4 - el = +gr%(v[4]):4 - en_US = +latin%(v[4]):4 - guj = +in(guj):4 - gur = +in(guru):4 - iu = +ca(ike):4 - lo = +la%(v[4]):4 - kan = +in(kan):4 - mi = +mao%(v[4]):4 - ml = +in(mal):4 - ogham = +ie(ogam):4 - ori = +ie(ori):4 - sapmi = +no(smi):4 - sr = +srp%(v[4]):4 - syr = +sy(syc):4 - tel = +in(tel):4 - tml = +in(tam):4 - yu = +srp%(v[4]):4 - fr-latin9 = +fr(latin9):4 - us_intl = +us(alt-intl):4 - ben(basic) = +in(ben):4 - ben(probhat) = +in(ben_probhat):4 - dev(basic) = +in(deva):4 - dvorak($dvoraklayouts) = +%v(dvorak):4 - dvorak(basic) = +us(dvorak):4 - dvorak(pl_basic) = +pl(dvorak):4 - dvorak(pl) = +pl(dvorak_quotes):4 - dvorak(pl_altquotes) = +pl(dvorak_altquotes):4 - dzdwi(basic) = +bt(basic):4 - fi(basic) = +fi(classic):4 - ge(azerty_tskapo) = +fr(geo):4 - guj(basic) = +in(guj):4 - gur(basic) = +in(guru):4 - ie(laptop) = +ie(basic):4 - ie(CloGaelachLaptop) = +ie(CloGaelach):4 - il(si1452) = +ie(basic):4 - in(urd) = +in(urd-phonetic):4 - iu(basic) = +ca(ike):4 - lo(basic) = +la(basic):4 - kan(basic) = +in(kan):4 - mal(basic) = +in(mal):4 - mal(mlplusnum) = +in(mal):4 - ogham(basic) = +ie(ogam):4 - ogham(laptop) = +ie(ogam):4 - ogham(is434) = +ie(ogam_is434):4 - ogham(is434laptop) = +ie(ogam_is434):4 - ori(basic) = +in(ori):4 - ro(de) = +ro(winkeys):4 - ro(us) = +ro(std):4 - ro(academic) = +ro(std):4 - ro(std_comma) = +ro(std):4 - ro(comma) = +ro(basic):4 - ru(os) = +ru(os_legacy):4 - pk(urd) = +pk(urd-phonetic):4 - sapmi(basic) = +no(smi):4 - sapmi(nodeadkeys) = +no(smi_nodeadkeys):4 - sapmi(sefi) = +fi(smi):4 - sin(phonetic-static) = +in(sin_phonetic):4 - syr(basic) = +sy(syc):4 - syr(phonetic) = +sy(syc_phonetic):4 - tam(INSCRIPT) = +in(tam):4 - tam(UNI) = +in(tam_unicode):4 - tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):4 - tam(TAB) = +in(tam_TAB):4 - tam(TSCII) = +in(tam_TSCII):4 - tel(basic) = +in(tel):4 - yu(basic) = +srp(latin):4 - yu(unicode) = +srp(latinunicode):4 - yu(yz) = +srp(latinyz):4 - yu(unicodeyz) = +srp(latinunicodeyz):4 - apl = +extras/apl%(v[4]):4 - rs(combiningkeys) = +extras/rs(combiningkeys):4 - us(alt-intl-unicode) = +extras/us(alt-intl-unicode):4 - us(crd) = +extras/us(crd):4 - us(intl-unicode) = +extras/us(intl-unicode):4 - * = +%l[4]%(v[4]):4 +! model layout[4] = symbols + * ar = +ara%(v[4]):4 + * ben = +in(ben):4 + * bs = +ba%(v[4]):4 + * cs = +rs%(v[4]):4 + * cz_qwerty = +cz(qwerty):4 + * dev = +in(deva):4 + * dvorak = +us(dvorak):4 + * dzdwi = +bt%(v[4]):4 + * el = +gr%(v[4]):4 + * en_US = +latin%(v[4]):4 + * guj = +in(guj):4 + * gur = +in(guru):4 + * iu = +ca(ike):4 + * lo = +la%(v[4]):4 + * kan = +in(kan):4 + * mi = +mao%(v[4]):4 + * ml = +in(mal):4 + * ogham = +ie(ogam):4 + * ori = +ie(ori):4 + * sapmi = +no(smi):4 + * sr = +srp%(v[4]):4 + * syr = +sy(syc):4 + * tel = +in(tel):4 + * tml = +in(tam):4 + * yu = +srp%(v[4]):4 + * fr-latin9 = +fr(latin9):4 + * us_intl = +us(alt-intl):4 + * ben(basic) = +in(ben):4 + * ben(probhat) = +in(ben_probhat):4 + * dev(basic) = +in(deva):4 + * dvorak($dvoraklayouts) = +%v(dvorak):4 + * dvorak(basic) = +us(dvorak):4 + * dvorak(pl_basic) = +pl(dvorak):4 + * dvorak(pl) = +pl(dvorak_quotes):4 + * dvorak(pl_altquotes) = +pl(dvorak_altquotes):4 + * dzdwi(basic) = +bt(basic):4 + * fi(basic) = +fi(classic):4 + * ge(azerty_tskapo) = +fr(geo):4 + * guj(basic) = +in(guj):4 + * gur(basic) = +in(guru):4 + * ie(laptop) = +ie(basic):4 + * ie(CloGaelachLaptop) = +ie(CloGaelach):4 + * il(si1452) = +ie(basic):4 + * in(urd) = +in(urd-phonetic):4 + * iu(basic) = +ca(ike):4 + * lo(basic) = +la(basic):4 + * kan(basic) = +in(kan):4 + * mal(basic) = +in(mal):4 + * mal(mlplusnum) = +in(mal):4 + * ogham(basic) = +ie(ogam):4 + * ogham(laptop) = +ie(ogam):4 + * ogham(is434) = +ie(ogam_is434):4 + * ogham(is434laptop) = +ie(ogam_is434):4 + * ori(basic) = +in(ori):4 + * ro(de) = +ro(winkeys):4 + * ro(us) = +ro(std):4 + * ro(academic) = +ro(std):4 + * ro(std_comma) = +ro(std):4 + * ro(comma) = +ro(basic):4 + * ru(os) = +ru(os_legacy):4 + * pk(urd) = +pk(urd-phonetic):4 + * sapmi(basic) = +no(smi):4 + * sapmi(nodeadkeys) = +no(smi_nodeadkeys):4 + * sapmi(sefi) = +fi(smi):4 + * sin(phonetic-static) = +in(sin_phonetic):4 + * syr(basic) = +sy(syc):4 + * syr(phonetic) = +sy(syc_phonetic):4 + * tam(INSCRIPT) = +in(tam):4 + * tam(UNI) = +in(tam_unicode):4 + * tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):4 + * tam(TAB) = +in(tam_TAB):4 + * tam(TSCII) = +in(tam_TSCII):4 + * tel(basic) = +in(tel):4 + * yu(basic) = +srp(latin):4 + * yu(unicode) = +srp(latinunicode):4 + * yu(yz) = +srp(latinyz):4 + * yu(unicodeyz) = +srp(latinunicodeyz):4 + * apl = +extras/apl%(v[4]):4 + * rs(combiningkeys) = +extras/rs(combiningkeys):4 + * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):4 + * us(crd) = +extras/us(crd):4 + * us(intl-unicode) = +extras/us(intl-unicode):4 + nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):4 + nokiarx51 * = +nokia_vndr/rx-51(%l[4]%_v[4]):4 + * * = +%l[4]%(v[4]):4 -! layout[2] variant[2] = symbols - ben basic = +in(ben):2 - ben probhat = +in(ben_probhat):2 - dev basic = +in(deva):2 - dvorak $dvoraklayouts = +%v(dvorak):2 - dvorak basic = +us(dvorak):2 - dvorak pl_basic = +pl(dvorak):2 - dvorak pl = +pl(dvorak_quotes):2 - dvorak pl_altquotes = +pl(dvorak_altquotes):2 - dzdwi basic = +bt(basic):2 - fi basic = +fi(classic):2 - ge azerty_tskapo = +fr(geo):2 - guj basic = +in(guj):2 - gur basic = +in(guru):2 - ie laptop = +ie(basic):2 - ie CloGaelachLaptop = +ie(CloGaelach):2 - il si1452 = +ie(basic):2 - in urd = +in(urd-phonetic):2 - iu basic = +ca(ike):2 - lo basic = +la(basic):2 - kan basic = +in(kan):2 - mal basic = +in(mal):2 - mal mlplusnum = +in(mal):2 - ogham basic = +ie(ogam):2 - ogham laptop = +ie(ogam):2 - ogham is434 = +ie(ogam_is434):2 - ogham is434laptop = +ie(ogam_is434):2 - ori basic = +in(ori):2 - ro de = +ro(winkeys):2 - ro us = +ro(std):2 - ro academic = +ro(std):2 - ro std_comma = +ro(std):2 - ro comma = +ro(basic):2 - ru os = +ru(os_legacy):2 - pk urd = +pk(urd-phonetic):2 - sapmi basic = +no(smi):2 - sapmi nodeadkeys = +no(smi_nodeadkeys):2 - sapmi sefi = +fi(smi):2 - sin phonetic-static = +in(sin_phonetic):2 - syr basic = +sy(syc):2 - syr phonetic = +sy(syc_phonetic):2 - tam INSCRIPT = +in(tam):2 - tam UNI = +in(tam_unicode):2 - tam NUMERAL-KEYBOARD = +in(tam_keyboard_with_numerals):2 - tam TAB = +in(tam_TAB):2 - tam TSCII = +in(tam_TSCII):2 - tel basic = +in(tel):2 - yu basic = +srp(latin):2 - yu unicode = +srp(latinunicode):2 - yu yz = +srp(latinyz):2 - yu unicodeyz = +srp(latinunicodeyz):2 - rs combiningkeys = +extras/rs(combiningkeys):2 - us alt-intl-unicode = +extras/us(alt-intl-unicode):2 - us crd = +extras/us(crd):2 - us intl-unicode = +extras/us(intl-unicode):2 +! model layout[2] variant[2] = symbols + * ben basic = +in(ben):2 + * ben probhat = +in(ben_probhat):2 + * dev basic = +in(deva):2 + * dvorak $dvoraklayouts = +%v(dvorak):2 + * dvorak basic = +us(dvorak):2 + * dvorak pl_basic = +pl(dvorak):2 + * dvorak pl = +pl(dvorak_quotes):2 + * dvorak pl_altquotes = +pl(dvorak_altquotes):2 + * dzdwi basic = +bt(basic):2 + * fi basic = +fi(classic):2 + * ge azerty_tskapo = +fr(geo):2 + * guj basic = +in(guj):2 + * gur basic = +in(guru):2 + * ie laptop = +ie(basic):2 + * ie CloGaelachLaptop = +ie(CloGaelach):2 + * il si1452 = +ie(basic):2 + * in urd = +in(urd-phonetic):2 + * iu basic = +ca(ike):2 + * lo basic = +la(basic):2 + * kan basic = +in(kan):2 + * mal basic = +in(mal):2 + * mal mlplusnum = +in(mal):2 + * ogham basic = +ie(ogam):2 + * ogham laptop = +ie(ogam):2 + * ogham is434 = +ie(ogam_is434):2 + * ogham is434laptop = +ie(ogam_is434):2 + * ori basic = +in(ori):2 + * ro de = +ro(winkeys):2 + * ro us = +ro(std):2 + * ro academic = +ro(std):2 + * ro std_comma = +ro(std):2 + * ro comma = +ro(basic):2 + * ru os = +ru(os_legacy):2 + * pk urd = +pk(urd-phonetic):2 + * sapmi basic = +no(smi):2 + * sapmi nodeadkeys = +no(smi_nodeadkeys):2 + * sapmi sefi = +fi(smi):2 + * sin phonetic-static = +in(sin_phonetic):2 + * syr basic = +sy(syc):2 + * syr phonetic = +sy(syc_phonetic):2 + * tam INSCRIPT = +in(tam):2 + * tam UNI = +in(tam_unicode):2 + * tam NUMERAL-KEYBOARD = +in(tam_keyboard_with_numerals):2 + * tam TAB = +in(tam_TAB):2 + * tam TSCII = +in(tam_TSCII):2 + * tel basic = +in(tel):2 + * yu basic = +srp(latin):2 + * yu unicode = +srp(latinunicode):2 + * yu yz = +srp(latinyz):2 + * yu unicodeyz = +srp(latinunicodeyz):2 + * rs combiningkeys = +extras/rs(combiningkeys):2 + * us alt-intl-unicode = +extras/us(alt-intl-unicode):2 + * us crd = +extras/us(crd):2 + * us intl-unicode = +extras/us(intl-unicode):2 -! layout[3] variant[3] = symbols - ben basic = +in(ben):3 - ben probhat = +in(ben_probhat):3 - dev basic = +in(deva):3 - dvorak $dvoraklayouts = +%v(dvorak):3 - dvorak basic = +us(dvorak):3 - dvorak pl_basic = +pl(dvorak):3 - dvorak pl = +pl(dvorak_quotes):3 - dvorak pl_altquotes = +pl(dvorak_altquotes):3 - dzdwi basic = +bt(basic):3 - fi basic = +fi(classic):3 - ge azerty_tskapo = +fr(geo):3 - guj basic = +in(guj):3 - gur basic = +in(guru):3 - ie laptop = +ie(basic):3 - ie CloGaelachLaptop = +ie(CloGaelach):3 - il si1452 = +ie(basic):3 - in urd = +in(urd-phonetic):3 - iu basic = +ca(ike):3 - lo basic = +la(basic):3 - kan basic = +in(kan):3 - mal basic = +in(mal):3 - mal mlplusnum = +in(mal):3 - ogham basic = +ie(ogam):3 - ogham laptop = +ie(ogam):3 - ogham is434 = +ie(ogam_is434):3 - ogham is434laptop = +ie(ogam_is434):3 - ori basic = +in(ori):3 - ro de = +ro(winkeys):3 - ro us = +ro(std):3 - ro academic = +ro(std):3 - ro std_comma = +ro(std):3 - ro comma = +ro(basic):3 - ru os = +ru(os_legacy):3 - pk urd = +pk(urd-phonetic):3 - sapmi basic = +no(smi):3 - sapmi nodeadkeys = +no(smi_nodeadkeys):3 - sapmi sefi = +fi(smi):3 - sin phonetic-static = +in(sin_phonetic):3 - syr basic = +sy(syc):3 - syr phonetic = +sy(syc_phonetic):3 - tam INSCRIPT = +in(tam):3 - tam UNI = +in(tam_unicode):3 - tam NUMERAL-KEYBOARD = +in(tam_keyboard_with_numerals):3 - tam TAB = +in(tam_TAB):3 - tam TSCII = +in(tam_TSCII):3 - tel basic = +in(tel):3 - yu basic = +srp(latin):3 - yu unicode = +srp(latinunicode):3 - yu yz = +srp(latinyz):3 - yu unicodeyz = +srp(latinunicodeyz):3 - rs combiningkeys = +extras/rs(combiningkeys):3 - us alt-intl-unicode = +extras/us(alt-intl-unicode):3 - us crd = +extras/us(crd):3 - us intl-unicode = +extras/us(intl-unicode):3 +! model layout[3] variant[3] = symbols + * ben basic = +in(ben):3 + * ben probhat = +in(ben_probhat):3 + * dev basic = +in(deva):3 + * dvorak $dvoraklayouts = +%v(dvorak):3 + * dvorak basic = +us(dvorak):3 + * dvorak pl_basic = +pl(dvorak):3 + * dvorak pl = +pl(dvorak_quotes):3 + * dvorak pl_altquotes = +pl(dvorak_altquotes):3 + * dzdwi basic = +bt(basic):3 + * fi basic = +fi(classic):3 + * ge azerty_tskapo = +fr(geo):3 + * guj basic = +in(guj):3 + * gur basic = +in(guru):3 + * ie laptop = +ie(basic):3 + * ie CloGaelachLaptop = +ie(CloGaelach):3 + * il si1452 = +ie(basic):3 + * in urd = +in(urd-phonetic):3 + * iu basic = +ca(ike):3 + * lo basic = +la(basic):3 + * kan basic = +in(kan):3 + * mal basic = +in(mal):3 + * mal mlplusnum = +in(mal):3 + * ogham basic = +ie(ogam):3 + * ogham laptop = +ie(ogam):3 + * ogham is434 = +ie(ogam_is434):3 + * ogham is434laptop = +ie(ogam_is434):3 + * ori basic = +in(ori):3 + * ro de = +ro(winkeys):3 + * ro us = +ro(std):3 + * ro academic = +ro(std):3 + * ro std_comma = +ro(std):3 + * ro comma = +ro(basic):3 + * ru os = +ru(os_legacy):3 + * pk urd = +pk(urd-phonetic):3 + * sapmi basic = +no(smi):3 + * sapmi nodeadkeys = +no(smi_nodeadkeys):3 + * sapmi sefi = +fi(smi):3 + * sin phonetic-static = +in(sin_phonetic):3 + * syr basic = +sy(syc):3 + * syr phonetic = +sy(syc_phonetic):3 + * tam INSCRIPT = +in(tam):3 + * tam UNI = +in(tam_unicode):3 + * tam NUMERAL-KEYBOARD = +in(tam_keyboard_with_numerals):3 + * tam TAB = +in(tam_TAB):3 + * tam TSCII = +in(tam_TSCII):3 + * tel basic = +in(tel):3 + * yu basic = +srp(latin):3 + * yu unicode = +srp(latinunicode):3 + * yu yz = +srp(latinyz):3 + * yu unicodeyz = +srp(latinunicodeyz):3 + * rs combiningkeys = +extras/rs(combiningkeys):3 + * us alt-intl-unicode = +extras/us(alt-intl-unicode):3 + * us crd = +extras/us(crd):3 + * us intl-unicode = +extras/us(intl-unicode):3 -! layout[4] variant[4] = symbols - ben basic = +in(ben):4 - ben probhat = +in(ben_probhat):4 - dev basic = +in(deva):4 - dvorak $dvoraklayouts = +%v(dvorak):4 - dvorak basic = +us(dvorak):4 - dvorak pl_basic = +pl(dvorak):4 - dvorak pl = +pl(dvorak_quotes):4 - dvorak pl_altquotes = +pl(dvorak_altquotes):4 - dzdwi basic = +bt(basic):4 - fi basic = +fi(classic):4 - ge azerty_tskapo = +fr(geo):4 - guj basic = +in(guj):4 - gur basic = +in(guru):4 - ie laptop = +ie(basic):4 - ie CloGaelachLaptop = +ie(CloGaelach):4 - il si1452 = +ie(basic):4 - in urd = +in(urd-phonetic):4 - iu basic = +ca(ike):4 - lo basic = +la(basic):4 - kan basic = +in(kan):4 - mal basic = +in(mal):4 - mal mlplusnum = +in(mal):4 - ogham basic = +ie(ogam):4 - ogham laptop = +ie(ogam):4 - ogham is434 = +ie(ogam_is434):4 - ogham is434laptop = +ie(ogam_is434):4 - ori basic = +in(ori):4 - ro de = +ro(winkeys):4 - ro us = +ro(std):4 - ro academic = +ro(std):4 - ro std_comma = +ro(std):4 - ro comma = +ro(basic):4 - ru os = +ru(os_legacy):4 - pk urd = +pk(urd-phonetic):4 - sapmi basic = +no(smi):4 - sapmi nodeadkeys = +no(smi_nodeadkeys):4 - sapmi sefi = +fi(smi):4 - sin phonetic-static = +in(sin_phonetic):4 - syr basic = +sy(syc):4 - syr phonetic = +sy(syc_phonetic):4 - tam INSCRIPT = +in(tam):4 - tam UNI = +in(tam_unicode):4 - tam NUMERAL-KEYBOARD = +in(tam_keyboard_with_numerals):4 - tam TAB = +in(tam_TAB):4 - tam TSCII = +in(tam_TSCII):4 - tel basic = +in(tel):4 - yu basic = +srp(latin):4 - yu unicode = +srp(latinunicode):4 - yu yz = +srp(latinyz):4 - yu unicodeyz = +srp(latinunicodeyz):4 - rs combiningkeys = +extras/rs(combiningkeys):4 - us alt-intl-unicode = +extras/us(alt-intl-unicode):4 - us crd = +extras/us(crd):4 - us intl-unicode = +extras/us(intl-unicode):4 +! model layout[4] variant[4] = symbols + * ben basic = +in(ben):4 + * ben probhat = +in(ben_probhat):4 + * dev basic = +in(deva):4 + * dvorak $dvoraklayouts = +%v(dvorak):4 + * dvorak basic = +us(dvorak):4 + * dvorak pl_basic = +pl(dvorak):4 + * dvorak pl = +pl(dvorak_quotes):4 + * dvorak pl_altquotes = +pl(dvorak_altquotes):4 + * dzdwi basic = +bt(basic):4 + * fi basic = +fi(classic):4 + * ge azerty_tskapo = +fr(geo):4 + * guj basic = +in(guj):4 + * gur basic = +in(guru):4 + * ie laptop = +ie(basic):4 + * ie CloGaelachLaptop = +ie(CloGaelach):4 + * il si1452 = +ie(basic):4 + * in urd = +in(urd-phonetic):4 + * iu basic = +ca(ike):4 + * lo basic = +la(basic):4 + * kan basic = +in(kan):4 + * mal basic = +in(mal):4 + * mal mlplusnum = +in(mal):4 + * ogham basic = +ie(ogam):4 + * ogham laptop = +ie(ogam):4 + * ogham is434 = +ie(ogam_is434):4 + * ogham is434laptop = +ie(ogam_is434):4 + * ori basic = +in(ori):4 + * ro de = +ro(winkeys):4 + * ro us = +ro(std):4 + * ro academic = +ro(std):4 + * ro std_comma = +ro(std):4 + * ro comma = +ro(basic):4 + * ru os = +ru(os_legacy):4 + * pk urd = +pk(urd-phonetic):4 + * sapmi basic = +no(smi):4 + * sapmi nodeadkeys = +no(smi_nodeadkeys):4 + * sapmi sefi = +fi(smi):4 + * sin phonetic-static = +in(sin_phonetic):4 + * syr basic = +sy(syc):4 + * syr phonetic = +sy(syc_phonetic):4 + * tam INSCRIPT = +in(tam):4 + * tam UNI = +in(tam_unicode):4 + * tam NUMERAL-KEYBOARD = +in(tam_keyboard_with_numerals):4 + * tam TAB = +in(tam_TAB):4 + * tam TSCII = +in(tam_TSCII):4 + * tel basic = +in(tel):4 + * yu basic = +srp(latin):4 + * yu unicode = +srp(latinunicode):4 + * yu yz = +srp(latinyz):4 + * yu unicodeyz = +srp(latinunicodeyz):4 + * rs combiningkeys = +extras/rs(combiningkeys):4 + * us alt-intl-unicode = +extras/us(alt-intl-unicode):4 + * us crd = +extras/us(crd):4 + * us intl-unicode = +extras/us(intl-unicode):4 ! model = symbols a4techKB21 = +inet(media_nav_common) @@ -951,12 +992,16 @@ targa_v811 = +inet(media_nav_acpi_common) thinkpad = +inet(media_nav_common) thinkpadz60 = +inet(thinkpad60) + tm2030USB-102 = +inet(media_nav_acpi_common) + tm2030USB-106 = +inet(media_nav_acpi_common) trust_slimline = +inet(media_nav_acpi_common) vsonku306 = +inet(microsoftprooem) $inetkbds = +inet(%m) $maclaptop = +inet(apple)+level3(enter_switch) + $applealu = +inet(apple) $macs = +inet(apple) - + + // Neo special modifier-keys ! layout variant = compat de neo = +neo_mods @@ -979,6 +1024,8 @@ de neo = pc(pc105) ! layout[4] variant[4] = geometry de neo = pc(pc105) + + ! model layout = compat pc98 nec_vndr/jp = pc98(basic) @@ -991,6 +1038,8 @@ ! model = types $macs = complete+numpad(mac) + $applealu = complete+numpad(mac) + $nokiamodels = complete+nokia * = complete ! layout option = symbols @@ -1035,6 +1084,7 @@ grp:alts_toggle = +group(alts_toggle) grp:ctrl_shift_toggle = +group(ctrl_shift_toggle) grp:lctrl_lshift_toggle = +group(lctrl_lshift_toggle) + grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle) grp:caps_toggle = +capslock(grouplock) grp:caps_switch = +capslock(groupshift) grp:shift_caps_toggle = +group(shift_caps_toggle) @@ -1054,6 +1104,7 @@ grp:rctrl_toggle = +group(rctrl_toggle) grp:lalt_toggle = +group(lalt_toggle) grp:sclk_toggle = +group(sclk_toggle) + grp:lctrl_rctrl_switch = +group(lctrl_rctrl_switch) lv3:switch = +level3(switch) lv3:ralt_switch = +level3(ralt_switch) lv3:ralt_switch_multikey = +level3(ralt_switch_multikey) @@ -1083,9 +1134,13 @@ compose:lwin = +compose(lwin) compose:rwin = +compose(rwin) compose:menu = +compose(menu) + compose:lctrl = +compose(lctrl) compose:rctrl = +compose(rctrl) compose:caps = +compose(caps) compose:102 = +compose(102) + compose:paus = +compose(paus) + compose:prsc = +compose(prsc) + compose:sclk = +compose(sclk) srvrkeys:none = +srvr_ctrl(no_srvr_keys) eurosign:e = +eurosign(e) eurosign:2 = +eurosign(2) @@ -1120,6 +1175,7 @@ esperanto:qwerty = +epo(qwerty) esperanto:dvorak = +epo(dvorak) terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp) + apple:alupckeys = +macintosh_vndr/apple(alupckeys) shift:both_capslock = +shift(both_capslock) shift:lshift_both_capslock = +shift(lshift_both_capslock) shift:rshift_both_capslock = +shift(rshift_both_capslock) diff --git a/linux/X/rules/base.xml b/linux/X/rules/base.xml index f6fc72d..e48c705 100644 --- a/linux/X/rules/base.xml +++ b/linux/X/rules/base.xml @@ -554,6 +554,13 @@ </model> <model> <configItem> + <name>hpmini110</name> + <description>Hewlett-Packard Mini 110 Notebook</description> + <vendor>Hewlett-Packard</vendor> + </configItem> + </model> + <model> + <configItem> <name>rapidaccess</name> <description>IBM Rapid Access</description> <vendor>IBM</vendor> @@ -575,13 +582,6 @@ </model> <model> <configItem> - <name>thinkpadintl</name> - <description>IBM ThinkPad 560Z/600/600E/A22E, Intl</description> - <vendor>IBM</vendor> - </configItem> - </model> - <model> - <configItem> <name>thinkpad60</name> <description>IBM ThinkPad R60/T60/R61/T61</description> <vendor>IBM</vendor> @@ -981,6 +981,41 @@ </model> <model> <configItem> + <name>tm2020</name> + <description>TypeMatrix EZ-Reach 2020</description> + <vendor>TypeMatrix</vendor> + </configItem> + </model> + <model> + <configItem> + <name>tm2030PS2</name> + <description>TypeMatrix EZ-Reach 2030 PS2</description> + <vendor>TypeMatrix</vendor> + </configItem> + </model> + <model> + <configItem> + <name>tm2030USB</name> + <description>TypeMatrix EZ-Reach 2030 USB</description> + <vendor>TypeMatrix</vendor> + </configItem> + </model> + <model> + <configItem> + <name>tm2030USB-102</name> + <description>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)</description> + <vendor>TypeMatrix</vendor> + </configItem> + </model> + <model> + <configItem> + <name>tm2030USB-106</name> + <description>TypeMatrix EZ-Reach 2030 USB (106:JP mode)</description> + <vendor>TypeMatrix</vendor> + </configItem> + </model> + <model> + <configItem> <name>yahoo</name> <description>Yahoo! Internet Keyboard</description> <vendor>Yahoo!</vendor> @@ -1065,6 +1100,27 @@ </model> <model> <configItem> + <name>applealu_ansi</name> + <description>Apple Aluminium Keyboard (ANSI)</description> + <vendor>Apple</vendor> + </configItem> + </model> + <model> + <configItem> + <name>applealu_iso</name> + <description>Apple Aluminium Keyboard (ISO)</description> + <vendor>Apple</vendor> + </configItem> + </model> + <model> + <configItem> + <name>applealu_jis</name> + <description>Apple Aluminium Keyboard (JIS)</description> + <vendor>Apple</vendor> + </configItem> + </model> + <model> + <configItem> <name>silvercrest</name> <description>SILVERCREST Multimedia Wireless Keyboard</description> <vendor>Silvercrest</vendor> @@ -1154,6 +1210,13 @@ <vendor>Compal Electronics Inc.</vendor> </configItem> </model> + <model> + <configItem> + <name>creativedw7000</name> + <description>Creative Desktop Wireless 7000</description> + <vendor>Creative</vendor> + </configItem> + </model> </modelList> <layoutList> <layout> @@ -1186,7 +1249,7 @@ <variant> <configItem> <name>alt-intl</name> - <description>Alternative international (former us_intl)</description> + <description>Alternative international</description> </configItem> </variant> <variant> @@ -1204,7 +1267,13 @@ <variant> <configItem> <name>dvorak-intl</name> - <description>Dvorak international</description> + <description>Dvorak international (with dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>dvorak-alt-intl</name> + <description>Dvorak alternative international (no dead keys)</description> </configItem> </variant> <variant> @@ -1235,6 +1304,7 @@ <configItem> <name>rus</name> <description>Russian phonetic</description> + <languageList><iso639Id>rus</iso639Id></languageList> </configItem> </variant> <variant> @@ -1258,6 +1328,14 @@ <description>Group toggle on multiply/divide key</description> </configItem> </variant> + <variant> + <configItem> + <name>srp</name> + <description>Serbian</description> + <languageList><iso639Id>eng</iso639Id> + <iso639Id>srp</iso639Id> </languageList> + </configItem> + </variant> </variantList> </layout> <layout> @@ -1455,8 +1533,8 @@ <variantList> <variant> <configItem> - <name>winkeys</name> - <description>Winkeys</description> + <name>legacy</name> + <description>Legacy</description> </configItem> </variant> <variant> @@ -1523,7 +1601,7 @@ <layout> <configItem> <name>bd</name> - <shortDescription>Ban</shortDescription> + <shortDescription>Bgd</shortDescription> <description>Bangladesh</description> <languageList><iso639Id>ben</iso639Id></languageList> </configItem> @@ -1615,6 +1693,13 @@ </variant> <variant> <configItem> + <name>tam_keyboard_with_numerals</name> + <description>Tamil Keyboard with Numerals</description> + <languageList><iso639Id>tam</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> <name>tam_TAB</name> <description>Tamil TAB Typewriter</description> <languageList><iso639Id>tam</iso639Id></languageList> @@ -1764,7 +1849,7 @@ <variant> <configItem> <name>phonetic</name> - <description>Traditional Phonetic</description> + <description>Traditional phonetic</description> </configItem> </variant> </variantList> @@ -1772,7 +1857,7 @@ <variant> <configItem> <name>bas_phonetic</name> - <description>Standard Phonetic</description> + <description>New phonetic</description> </configItem> </variant> </variantList> @@ -1913,7 +1998,7 @@ <layout> <configItem> <name>cd</name> - <shortDescription>DRC</shortDescription> + <shortDescription>COD</shortDescription> <description>Congo, Democratic Republic of the</description> <languageList><iso639Id>fra</iso639Id></languageList> </configItem> @@ -1922,7 +2007,7 @@ <layout> <configItem> <name>cn</name> - <shortDescription>China</shortDescription> + <shortDescription>Chn</shortDescription> <description>China</description> <languageList><iso639Id>chi</iso639Id></languageList> </configItem> @@ -2009,12 +2094,18 @@ <description>UCW layout (accented letters only)</description> </configItem> </variant> + <variant> + <configItem> + <name>dvorak-ucw</name> + <description>US Dvorak with CZ UCW support</description> + </configItem> + </variant> </variantList> </layout> <layout> <configItem> <name>dk</name> - <shortDescription>Dan</shortDescription> + <shortDescription>Dnk</shortDescription> <description>Denmark</description> <languageList><iso639Id>dan</iso639Id></languageList> </configItem> @@ -2076,7 +2167,7 @@ <layout> <configItem> <name>bt</name> - <shortDescription>Bhu</shortDescription> + <shortDescription>Btn</shortDescription> <description>Bhutan</description> <languageList><iso639Id>dzo</iso639Id></languageList> </configItem> @@ -2119,20 +2210,8 @@ <variantList> <variant> <configItem> - <name>pro</name> - <description>Pro</description> - </configItem> - </variant> - <variant> - <configItem> - <name>keypad</name> - <description>Keypad</description> - </configItem> - </variant> - <variant> - <configItem> - <name>pro_keypad</name> - <description>Pro Keypad</description> + <name>pes_keypad</name> + <description>Persian, with Persian Keypad</description> </configItem> </variant> <variant> @@ -2207,7 +2286,7 @@ <layout> <configItem> <name>fo</name> - <shortDescription>Fao</shortDescription> + <shortDescription>Fro</shortDescription> <description>Faroe Islands</description> <languageList><iso639Id>fao</iso639Id></languageList> </configItem> @@ -2418,7 +2497,7 @@ <layout> <configItem> <name>gn</name> - <shortDescription>Gui</shortDescription> + <shortDescription>Gin</shortDescription> <description>Guinea</description> <languageList><iso639Id>fra</iso639Id></languageList> </configItem> @@ -2553,7 +2632,7 @@ <layout> <configItem> <name>gr</name> - <shortDescription>Gre</shortDescription> + <shortDescription>Grc</shortDescription> <description>Greece</description> <languageList><iso639Id>gre</iso639Id></languageList> </configItem> @@ -2797,6 +2876,12 @@ </variant> <variant> <configItem> + <name>us</name> + <description>US keyboard with Italian letters</description> + </configItem> + </variant> + <variant> + <configItem> <name>geo</name> <description>Georgian</description> <languageList><iso639Id>geo</iso639Id></languageList> @@ -2824,6 +2909,12 @@ <description>OADG 109A</description> </configItem> </variant> + <variant> + <configItem> + <name>mac</name> + <description>Macintosh</description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -2853,9 +2944,9 @@ </layout> <layout> <configItem> - <name>kz</name> - <shortDescription>Kaz</shortDescription> - <description>Kazakhstan</description> + <name>kz</name> + <shortDescription>Kaz</shortDescription> + <description>Kazakhstan</description> <languageList><iso639Id>kaz</iso639Id></languageList> </configItem> <variantList> @@ -2975,18 +3066,12 @@ <description>LEKPa</description> </configItem> </variant> - <variant> - <configItem> - <name>balticplus</name> - <description>Baltic+</description> - </configItem> - </variant> </variantList> </layout> <layout> <configItem> <name>lv</name> - <shortDescription>Lav</shortDescription> + <shortDescription>Lva</shortDescription> <description>Latvia</description> <languageList><iso639Id>lav</iso639Id></languageList> </configItem> @@ -3207,6 +3292,12 @@ <languageList><iso639Id>rus</iso639Id></languageList> </configItem> </variant> + <variant> + <configItem> + <name>dvp</name> + <description>Programmer Dvorak</description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -3364,6 +3455,12 @@ </variant> <variant> <configItem> + <name>typewriter-legacy</name> + <description>Typewriter, legacy</description> + </configItem> + </variant> + <variant> + <configItem> <name>tt</name> <description>Tatar</description> <languageList><iso639Id>tat</iso639Id></languageList> @@ -3431,6 +3528,21 @@ <description>DOS</description> </configItem> </variant> + <variant> + <configItem> + <name>srp</name> + <description>Serbian</description> + <languageList><iso639Id>rus</iso639Id> + <iso639Id>srp</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>bak</name> + <description>Bashkirian</description> + <languageList><iso639Id>bak</iso639Id></languageList> + </configItem> + </variant> </variantList> </layout> <layout> @@ -3655,6 +3767,12 @@ <variantList> <variant> <configItem> + <name>legacy</name> + <description>Legacy</description> + </configItem> + </variant> + <variant> + <configItem> <name>de_nodeadkeys</name> <description>German, eliminate dead keys</description> </configItem> @@ -3763,7 +3881,7 @@ <layout> <configItem> <name>lk</name> - <shortDescription>SrL</shortDescription> + <shortDescription>Lka</shortDescription> <description>Sri Lanka</description> <languageList><iso639Id>sin</iso639Id></languageList> </configItem> @@ -4146,7 +4264,7 @@ <layout> <configItem> <name>mv</name> - <shortDescription>Mal</shortDescription> + <shortDescription>Mdv</shortDescription> <description>Maldives</description> <languageList><iso639Id>div</iso639Id></languageList> </configItem> @@ -4155,7 +4273,7 @@ <layout> <configItem> <name>za</name> - <shortDescription>Zar</shortDescription> + <shortDescription>Zaf</shortDescription> <description>South Africa</description> <languageList><iso639Id>eng</iso639Id></languageList> </configItem> @@ -4179,7 +4297,7 @@ <layout> <configItem> <name>np</name> - <shortDescription>Nep</shortDescription> + <shortDescription>Npl</shortDescription> <description>Nepal</description> <languageList><iso639Id>nep</iso639Id></languageList> </configItem> @@ -4187,7 +4305,7 @@ <layout> <configItem> <name>ng</name> - <shortDescription>Nig</shortDescription> + <shortDescription>Nga</shortDescription> <description>Nigeria</description> <languageList><iso639Id>eng</iso639Id></languageList> </configItem> @@ -4270,6 +4388,34 @@ </variant> </variantList> </layout> + <layout> + <configItem> + <name>ml</name> + <shortDescription>Mli</shortDescription> + <description>Mali</description> + <languageList><iso639Id>bam</iso639Id></languageList> + </configItem> + <variantList> + <variant> + <configItem> + <name>fr-oss</name> + <description>Français (France Alternative)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>us-mac</name> + <description>English (USA Macintosh)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>us-intl</name> + <description>English (USA International)</description> + </configItem> + </variant> + </variantList> + </layout> </layoutList> <optionList> <group allowMultipleSelection="true"> @@ -4358,6 +4504,12 @@ </option> <option> <configItem> + <name>grp:lctrl_rctrl_switch</name> + <description>Left Ctrl (to first layout), Right Ctrl (to last layout)</description> + </configItem> + </option> + <option> + <configItem> <name>grp:alt_caps_toggle</name> <description>Alt+CapsLock</description> </configItem> @@ -4394,6 +4546,12 @@ </option> <option> <configItem> + <name>grp:rctrl_rshift_toggle</name> + <description>Right Ctrl+Right Shift</description> + </configItem> + </option> + <option> + <configItem> <name>grp:ctrl_alt_toggle</name> <description>Alt+Ctrl</description> </configItem> @@ -4455,7 +4613,7 @@ <option> <configItem> <name>grp:sclk_toggle</name> - <description>Scroll Lock</description> + <description>ScrollLock</description> </configItem> </option> </group> @@ -4764,6 +4922,12 @@ </option> <option> <configItem> + <name>caps:numlock</name> + <description>Make CapsLock an additional NumLock</description> + </configItem> + </option> + <option> + <configItem> <name>caps:swapescape</name> <description>Swap ESC and CapsLock</description> </configItem> @@ -4782,10 +4946,28 @@ </option> <option> <configItem> + <name>caps:super</name> + <description>Make CapsLock an additional Super</description> + </configItem> + </option> + <option> + <configItem> + <name>caps:hyper</name> + <description>Make CapsLock an additional Hyper</description> + </configItem> + </option> + <option> + <configItem> <name>caps:shiftlock</name> <description>CapsLock toggles Shift so all keys are affected</description> </configItem> </option> + <option> + <configItem> + <name>caps:none</name> + <description>CapsLock is disabled</description> + </configItem> + </option> </group> <group allowMultipleSelection="false"> @@ -4880,6 +5062,12 @@ </option> <option> <configItem> + <name>compose:lctrl</name> + <description>Left Ctrl</description> + </configItem> + </option> + <option> + <configItem> <name>compose:rctrl</name> <description>Right Ctrl</description> </configItem> @@ -4887,7 +5075,7 @@ <option> <configItem> <name>compose:caps</name> - <description>Caps Lock</description> + <description>CapsLock</description> </configItem> </option> <option> @@ -4896,6 +5084,24 @@ <description>Less-than/Greater-than</description> </configItem> </option> + <option> + <configItem> + <name>compose:paus</name> + <description>Pause</description> + </configItem> + </option> + <option> + <configItem> + <name>compose:prsc</name> + <description>PrtSc</description> + </configItem> + </option> + <option> + <configItem> + <name>compose:sclk</name> + <description>ScrollLock</description> + </configItem> + </option> </group> <group allowMultipleSelection="true"> <configItem> @@ -4923,7 +5129,7 @@ <option> <configItem> <name>numpad:shift3</name> - <description>Shift does not cancel NumLock, chooses 3d level instead</description> + <description>Shift does not cancel NumLock, chooses 3rd level instead</description> </configItem> </option> <option> @@ -4934,6 +5140,12 @@ </option> <option> <configItem> + <name>apple:alupckeys</name> + <description>Apple Aluminium Keyboard: emulate PC keys (Print, Scroll_Lock, Pause, NumLock)</description> + </configItem> + </option> + <option> + <configItem> <name>shift:breaks_caps</name> <description>Shift cancels CapsLock</description> </configItem> @@ -5121,6 +5333,54 @@ <description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)</description> </configItem> </option> + <option> + <configItem> + <name>nbsp:zwnj2</name> + <description>Zero-width non-joiner character at second level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj2zwj3</name> + <description>Zero-width non-joiner character at second level, zero-width joiner character at third level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj2zwj3nb4</name> + <description>Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj2nb3</name> + <description>Zero-width non-joiner character at second level, non-breakable space character at third level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj2nb3s</name> + <description>Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj2nb3zwj4</name> + <description>Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj2nb3nnb4</name> + <description>Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj3zwj4</name> + <description>Zero-width non-joiner character at third level, zero-width joiner at fourth level</description> + </configItem> + </option> </group> <group allowMultipleSelection="true"> <configItem> diff --git a/linux/X/rules/evdev b/linux/X/rules/evdev index a5f0a88..9fa1577 100644 --- a/linux/X/rules/evdev +++ b/linux/X/rules/evdev @@ -21,6 +21,9 @@ // Microsoft models (using MS geometry) ! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose +// Nokia devices and keyboards +! $nokiamodels = nokiasu8w nokiarx44 nokiarx51 + // PC geometries - they have special geometry but symbols are mostly pc105 ! $pcgeometries = latitude @@ -28,13 +31,14 @@ ! $tmgeometries = tm2020 tm2030PS2 tm2030USB tm2030USB-102 tm2030USB-106 // Layouts that provide further specializations for the OLPC -! $olpclayouts = af am ara br ca es et it kh kz in mn np ru th tr us +! $olpclayouts = af am ara br ca es et fr it kh kz in mn np ru th tr us ! $macbooks = macbook78 macbook79 ! $maclaptop = ibook powerbook macbook78 macbook79 +! $applealu = applealu_ansi applealu_iso applealu_jis ! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79 -! $macvendorlayouts = ch de dk es fi fr gb is it latam nl no pt se us +! $macvendorlayouts = ch de dk fi fr gb is it latam nl no pt se us ! $azerty = be fr ! $qwertz = al cz de hr hu ro si sk @@ -76,7 +80,7 @@ silvercrest \ sk1300 sk2500 sk6200 sk7100 \ sven sven303 symplon \ - toshiba_s3000 trust trustda \ + tm2030USB toshiba_s3000 trust trustda \ unitekkb1925 yahoo // all layouts with 3rd and 4th groups @@ -105,10 +109,17 @@ ! $thinkpads = thinkpad thinkpad60 thinkpadz60 +! $sun_t6_custom = ara be br ca ch cz de dk \ + ee es fi fr gb gr it kr \ + lt lv nl no pl pt ro ru \ + se sk tr tw ua + + ! $dvoraklayouts = br ca de ee es fr gb no pl se us ! model = keycodes pc98 = evdev(pc98) + applealu_jis = evdev+macintosh(jisevdev) * = evdev ! layout[1] = keycodes @@ -134,6 +145,8 @@ latitude = dell(latitude) flexpro = keytronic(FlexPro) hp6000 = hp(omnibook) + hpmini110 = hp(mini110) + hpdv5 = hp(dv5) omnikey101 = northgate(omnikey101) $pcmodels = pc(%m) $pcgeometries = pc(%m) @@ -144,10 +157,12 @@ $tmgeometries = typematrix(%m) winbook = winbook(XP5) pc98 = nec(pc98) + $applealu = macintosh(%m) $macbooks = macintosh(%m) $macs = macintosh(macintosh) hhk = hhk(basic) kinesis = kinesis(model100) + $nokiamodels = nokia(%m) * = pc(pc104) ! model layout variant = symbols @@ -208,6 +223,7 @@ classmate us intl = pc+us(classmate-intl) classmate us alt-intl = pc+us(classmate-alt-intl) classmate us altgr-intl = pc+us(classmate-altgr-intl) + nokiarx51 cz qwerty = nokia_vndr/rx-51(cz_qwerty) ! model layout = symbols * ar = pc+ara @@ -297,24 +313,36 @@ amiga $nonlatin = xfree68_vndr/amiga(usa1)+%l%(v):2 amiga * = xfree68_vndr/amiga(usa1)+%l%(v) classmate us = pc+%l(classmate) + empty * = empty(basic) + * empty = empty(basic) sun4 $nonlatin = latin+sun_vndr/us(type4)+%l%(v):2 sun4 * = latin+sun_vndr/us(type4)+%l%(v) sun5 $nonlatin = latin+sun_vndr/us(type5)+%l%(v):2 sun5 * = latin+sun_vndr/us(type5)+%l%(v) - sun6 us = sun_vndr/us(type6) - sun6 en_US = sun_vndr/us(type6)+iso9995-3(basic) - sun6 * = sun_vndr/us(type6)+%l%(v) - sun6euro us = sun_vndr/us(type6) - sun6euro en_US = sun_vndr/us(type6)+iso9995-3(basic) - sun6euro * = sun_vndr/us(type6)+%l%(v) + sun6 us = pc+sun_vndr/us(type6) + sun6 en_US = pc+sun_vndr/us(type6)+iso9995-3(basic) + sun6 $sun_t6_custom = pc+sun_vndr/us(type6)+sun_vndr/%l%(v) + sun6 * = pc+sun_vndr/us(type6)+%l%(v) + sun6euro us = pc+sun_vndr/us(type6) + sun6euro en_US = pc+sun_vndr/us(type6)+iso9995-3(basic) + sun6euro $sun_t6_custom = pc+sun_vndr/us(type6)+sun_vndr/%l%(v) + sun6euro * = pc+sun_vndr/us(type6)+%l%(v) pc98 nec_vndr/jp = nec_vndr/jp(pc98) macintosh_old us = macintosh_vndr/us(oldmac) macintosh_old en_US = macintosh_vndr/us(oldmac) macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l%(v) macintosh_old $nonlatin = macintosh_vndr/us(oldmac)+%l%(v):2 macintosh_old * = macintosh_vndr/us(oldmac)+%l%(v) + applealu_jis jp = macintosh_vndr/apple(alukbd)+macintosh_vndr/jp(usmac)+macintosh_vndr/jp(mac):2 + applealu_jis * = macintosh_vndr/apple(alukbd)+%l%(v)+macintosh_vndr/jp(mac):2 + $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l%(v) + $applealu * = macintosh_vndr/apple(alukbd)+%l%(v) $macs en_US = pc+macintosh_vndr/us(extended) $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v) + nokiarx44 * = nokia_vndr/rx-44(%l) + nokiarx51 cz(qwerty) = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty) + nokiarx51 * = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l%_v) + nokiasu8w * = nokia_vndr/su-8w(%l) olpc $olpclayouts = olpc+%l%(m) olpc * = olpc+%l%(v) $thinkpads br = pc+br(thinkpad) @@ -411,7 +439,12 @@ macintosh_old us = macintosh_vndr/us(oldmac) macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1]) + applealu_jis us = macintosh_vndr/apple(alukbd)+macintosh_vndr/jp(usmac) + $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l[1]%(v[1]) + $applealu * = macintosh_vndr/apple(alukbd)+%l[1]%(v[1]) $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1]) + nokiarx51 cz(qwerty) = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty) + nokiarx51 * = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l[1]%_v[1]) $thinkpads br = pc+%l[1](thinkpad) * * = pc+%l[1]%(v[1]) @@ -471,433 +504,436 @@ * us crd = pc+extras/us(crd) * us intl-unicode = pc+extras/us(intl-unicode) -! layout[2] = symbols - ar = +ara%(v[2]):2 - ben = +in(ben):2 - bs = +ba%(v[2]):2 - cs = +rs%(v[2]):2 - cz_qwerty = +cz(qwerty):2 - dev = +in(deva):2 - dvorak = +us(dvorak):2 - dzdwi = +bt%(v[2]):2 - el = +gr%(v[2]):2 - en_US = +latin%(v[2]):2 - guj = +in(guj):2 - gur = +in(guru):2 - iu = +ca(ike):2 - lo = +la%(v[2]):2 - kan = +in(kan):2 - mi = +mao%(v[2]):2 - ml = +in(mal):2 - ogham = +ie(ogam):2 - ori = +ie(ori):2 - sapmi = +no(smi):2 - sr = +srp%(v[2]):2 - syr = +sy(syc):2 - tel = +in(tel):2 - tml = +in(tam):2 - yu = +srp%(v[2]):2 - fr-latin9 = +fr(latin9):2 - us_intl = +us(alt-intl):2 - ben(basic) = +in(ben):2 - ben(probhat) = +in(ben_probhat):2 - dev(basic) = +in(deva):2 - dvorak($dvoraklayouts) = +%v(dvorak):2 - dvorak(basic) = +us(dvorak):2 - dvorak(pl_basic) = +pl(dvorak):2 - dvorak(pl) = +pl(dvorak_quotes):2 - dvorak(pl_altquotes) = +pl(dvorak_altquotes):2 - dzdwi(basic) = +bt(basic):2 - fi(basic) = +fi(classic):2 - ge(azerty_tskapo) = +fr(geo):2 - guj(basic) = +in(guj):2 - gur(basic) = +in(guru):2 - ie(laptop) = +ie(basic):2 - ie(CloGaelachLaptop) = +ie(CloGaelach):2 - il(si1452) = +ie(basic):2 - in(urd) = +in(urd-phonetic):2 - iu(basic) = +ca(ike):2 - lo(basic) = +la(basic):2 - kan(basic) = +in(kan):2 - mal(basic) = +in(mal):2 - mal(mlplusnum) = +in(mal):2 - ogham(basic) = +ie(ogam):2 - ogham(laptop) = +ie(ogam):2 - ogham(is434) = +ie(ogam_is434):2 - ogham(is434laptop) = +ie(ogam_is434):2 - ori(basic) = +in(ori):2 - ro(de) = +ro(winkeys):2 - ro(us) = +ro(std):2 - ro(academic) = +ro(std):2 - ro(std_comma) = +ro(std):2 - ro(comma) = +ro(basic):2 - ru(os) = +ru(os_legacy):2 - pk(urd) = +pk(urd-phonetic):2 - sapmi(basic) = +no(smi):2 - sapmi(nodeadkeys) = +no(smi_nodeadkeys):2 - sapmi(sefi) = +fi(smi):2 - sin(phonetic-static) = +in(sin_phonetic):2 - syr(basic) = +sy(syc):2 - syr(phonetic) = +sy(syc_phonetic):2 - tam(INSCRIPT) = +in(tam):2 - tam(UNI) = +in(tam_unicode):2 - tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):2 - tam(TAB) = +in(tam_TAB):2 - tam(TSCII) = +in(tam_TSCII):2 - tel(basic) = +in(tel):2 - yu(basic) = +srp(latin):2 - yu(unicode) = +srp(latinunicode):2 - yu(yz) = +srp(latinyz):2 - yu(unicodeyz) = +srp(latinunicodeyz):2 - apl = +extras/apl%(v[2]):2 - rs(combiningkeys) = +extras/rs(combiningkeys):2 - us(alt-intl-unicode) = +extras/us(alt-intl-unicode):2 - us(crd) = +extras/us(crd):2 - us(intl-unicode) = +extras/us(intl-unicode):2 - * = +%l[2]%(v[2]):2 +! model layout[2] = symbols + * ar = +ara%(v[2]):2 + * ben = +in(ben):2 + * bs = +ba%(v[2]):2 + * cs = +rs%(v[2]):2 + * cz_qwerty = +cz(qwerty):2 + * dev = +in(deva):2 + * dvorak = +us(dvorak):2 + * dzdwi = +bt%(v[2]):2 + * el = +gr%(v[2]):2 + * en_US = +latin%(v[2]):2 + * guj = +in(guj):2 + * gur = +in(guru):2 + * iu = +ca(ike):2 + * lo = +la%(v[2]):2 + * kan = +in(kan):2 + * mi = +mao%(v[2]):2 + * ml = +in(mal):2 + * ogham = +ie(ogam):2 + * ori = +ie(ori):2 + * sapmi = +no(smi):2 + * sr = +srp%(v[2]):2 + * syr = +sy(syc):2 + * tel = +in(tel):2 + * tml = +in(tam):2 + * yu = +srp%(v[2]):2 + * fr-latin9 = +fr(latin9):2 + * us_intl = +us(alt-intl):2 + * ben(basic) = +in(ben):2 + * ben(probhat) = +in(ben_probhat):2 + * dev(basic) = +in(deva):2 + * dvorak($dvoraklayouts) = +%v(dvorak):2 + * dvorak(basic) = +us(dvorak):2 + * dvorak(pl_basic) = +pl(dvorak):2 + * dvorak(pl) = +pl(dvorak_quotes):2 + * dvorak(pl_altquotes) = +pl(dvorak_altquotes):2 + * dzdwi(basic) = +bt(basic):2 + * fi(basic) = +fi(classic):2 + * ge(azerty_tskapo) = +fr(geo):2 + * guj(basic) = +in(guj):2 + * gur(basic) = +in(guru):2 + * ie(laptop) = +ie(basic):2 + * ie(CloGaelachLaptop) = +ie(CloGaelach):2 + * il(si1452) = +ie(basic):2 + * in(urd) = +in(urd-phonetic):2 + * iu(basic) = +ca(ike):2 + * lo(basic) = +la(basic):2 + * kan(basic) = +in(kan):2 + * mal(basic) = +in(mal):2 + * mal(mlplusnum) = +in(mal):2 + * ogham(basic) = +ie(ogam):2 + * ogham(laptop) = +ie(ogam):2 + * ogham(is434) = +ie(ogam_is434):2 + * ogham(is434laptop) = +ie(ogam_is434):2 + * ori(basic) = +in(ori):2 + * ro(de) = +ro(winkeys):2 + * ro(us) = +ro(std):2 + * ro(academic) = +ro(std):2 + * ro(std_comma) = +ro(std):2 + * ro(comma) = +ro(basic):2 + * ru(os) = +ru(os_legacy):2 + * pk(urd) = +pk(urd-phonetic):2 + * sapmi(basic) = +no(smi):2 + * sapmi(nodeadkeys) = +no(smi_nodeadkeys):2 + * sapmi(sefi) = +fi(smi):2 + * sin(phonetic-static) = +in(sin_phonetic):2 + * syr(basic) = +sy(syc):2 + * syr(phonetic) = +sy(syc_phonetic):2 + * tam(INSCRIPT) = +in(tam):2 + * tam(UNI) = +in(tam_unicode):2 + * tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):2 + * tam(TAB) = +in(tam_TAB):2 + * tam(TSCII) = +in(tam_TSCII):2 + * tel(basic) = +in(tel):2 + * yu(basic) = +srp(latin):2 + * yu(unicode) = +srp(latinunicode):2 + * yu(yz) = +srp(latinyz):2 + * yu(unicodeyz) = +srp(latinunicodeyz):2 + * apl = +extras/apl%(v[2]):2 + * rs(combiningkeys) = +extras/rs(combiningkeys):2 + * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):2 + * us(crd) = +extras/us(crd):2 + * us(intl-unicode) = +extras/us(intl-unicode):2 + nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):2 + nokiarx51 * = +nokia_vndr/rx-51(%l[2]%_v[2]):2 + * * = +%l[2]%(v[2]):2 -! layout[3] = symbols - ar = +ara%(v[3]):3 - ben = +in(ben):3 - bs = +ba%(v[3]):3 - cs = +rs%(v[3]):3 - cz_qwerty = +cz(qwerty):3 - dev = +in(deva):3 - dvorak = +us(dvorak):3 - dzdwi = +bt%(v[3]):3 - el = +gr%(v[3]):3 - en_US = +latin%(v[3]):3 - guj = +in(guj):3 - gur = +in(guru):3 - iu = +ca(ike):3 - lo = +la%(v[3]):3 - kan = +in(kan):3 - mi = +mao%(v[3]):3 - ml = +in(mal):3 - ogham = +ie(ogam):3 - ori = +ie(ori):3 - sapmi = +no(smi):3 - sr = +srp%(v[3]):3 - syr = +sy(syc):3 - tel = +in(tel):3 - tml = +in(tam):3 - yu = +srp%(v[3]):3 - fr-latin9 = +fr(latin9):3 - us_intl = +us(alt-intl):3 - ben(basic) = +in(ben):3 - ben(probhat) = +in(ben_probhat):3 - dev(basic) = +in(deva):3 - dvorak($dvoraklayouts) = +%v(dvorak):3 - dvorak(basic) = +us(dvorak):3 - dvorak(pl_basic) = +pl(dvorak):3 - dvorak(pl) = +pl(dvorak_quotes):3 - dvorak(pl_altquotes) = +pl(dvorak_altquotes):3 - dzdwi(basic) = +bt(basic):3 - fi(basic) = +fi(classic):3 - ge(azerty_tskapo) = +fr(geo):3 - guj(basic) = +in(guj):3 - gur(basic) = +in(guru):3 - ie(laptop) = +ie(basic):3 - ie(CloGaelachLaptop) = +ie(CloGaelach):3 - il(si1452) = +ie(basic):3 - in(urd) = +in(urd-phonetic):3 - iu(basic) = +ca(ike):3 - lo(basic) = +la(basic):3 - kan(basic) = +in(kan):3 - mal(basic) = +in(mal):3 - mal(mlplusnum) = +in(mal):3 - ogham(basic) = +ie(ogam):3 - ogham(laptop) = +ie(ogam):3 - ogham(is434) = +ie(ogam_is434):3 - ogham(is434laptop) = +ie(ogam_is434):3 - ori(basic) = +in(ori):3 - ro(de) = +ro(winkeys):3 - ro(us) = +ro(std):3 - ro(academic) = +ro(std):3 - ro(std_comma) = +ro(std):3 - ro(comma) = +ro(basic):3 - ru(os) = +ru(os_legacy):3 - pk(urd) = +pk(urd-phonetic):3 - sapmi(basic) = +no(smi):3 - sapmi(nodeadkeys) = +no(smi_nodeadkeys):3 - sapmi(sefi) = +fi(smi):3 - sin(phonetic-static) = +in(sin_phonetic):3 - syr(basic) = +sy(syc):3 - syr(phonetic) = +sy(syc_phonetic):3 - tam(INSCRIPT) = +in(tam):3 - tam(UNI) = +in(tam_unicode):3 - tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):3 - tam(TAB) = +in(tam_TAB):3 - tam(TSCII) = +in(tam_TSCII):3 - tel(basic) = +in(tel):3 - yu(basic) = +srp(latin):3 - yu(unicode) = +srp(latinunicode):3 - yu(yz) = +srp(latinyz):3 - yu(unicodeyz) = +srp(latinunicodeyz):3 - apl = +extras/apl%(v[3]):3 - rs(combiningkeys) = +extras/rs(combiningkeys):3 - us(alt-intl-unicode) = +extras/us(alt-intl-unicode):3 - us(crd) = +extras/us(crd):3 - us(intl-unicode) = +extras/us(intl-unicode):3 - * = +%l[3]%(v[3]):3 +! model layout[3] = symbols + * ar = +ara%(v[3]):3 + * ben = +in(ben):3 + * bs = +ba%(v[3]):3 + * cs = +rs%(v[3]):3 + * cz_qwerty = +cz(qwerty):3 + * dev = +in(deva):3 + * dvorak = +us(dvorak):3 + * dzdwi = +bt%(v[3]):3 + * el = +gr%(v[3]):3 + * en_US = +latin%(v[3]):3 + * guj = +in(guj):3 + * gur = +in(guru):3 + * iu = +ca(ike):3 + * lo = +la%(v[3]):3 + * kan = +in(kan):3 + * mi = +mao%(v[3]):3 + * ml = +in(mal):3 + * ogham = +ie(ogam):3 + * ori = +ie(ori):3 + * sapmi = +no(smi):3 + * sr = +srp%(v[3]):3 + * syr = +sy(syc):3 + * tel = +in(tel):3 + * tml = +in(tam):3 + * yu = +srp%(v[3]):3 + * fr-latin9 = +fr(latin9):3 + * us_intl = +us(alt-intl):3 + * ben(basic) = +in(ben):3 + * ben(probhat) = +in(ben_probhat):3 + * dev(basic) = +in(deva):3 + * dvorak($dvoraklayouts) = +%v(dvorak):3 + * dvorak(basic) = +us(dvorak):3 + * dvorak(pl_basic) = +pl(dvorak):3 + * dvorak(pl) = +pl(dvorak_quotes):3 + * dvorak(pl_altquotes) = +pl(dvorak_altquotes):3 + * dzdwi(basic) = +bt(basic):3 + * fi(basic) = +fi(classic):3 + * ge(azerty_tskapo) = +fr(geo):3 + * guj(basic) = +in(guj):3 + * gur(basic) = +in(guru):3 + * ie(laptop) = +ie(basic):3 + * ie(CloGaelachLaptop) = +ie(CloGaelach):3 + * il(si1452) = +ie(basic):3 + * in(urd) = +in(urd-phonetic):3 + * iu(basic) = +ca(ike):3 + * lo(basic) = +la(basic):3 + * kan(basic) = +in(kan):3 + * mal(basic) = +in(mal):3 + * mal(mlplusnum) = +in(mal):3 + * ogham(basic) = +ie(ogam):3 + * ogham(laptop) = +ie(ogam):3 + * ogham(is434) = +ie(ogam_is434):3 + * ogham(is434laptop) = +ie(ogam_is434):3 + * ori(basic) = +in(ori):3 + * ro(de) = +ro(winkeys):3 + * ro(us) = +ro(std):3 + * ro(academic) = +ro(std):3 + * ro(std_comma) = +ro(std):3 + * ro(comma) = +ro(basic):3 + * ru(os) = +ru(os_legacy):3 + * pk(urd) = +pk(urd-phonetic):3 + * sapmi(basic) = +no(smi):3 + * sapmi(nodeadkeys) = +no(smi_nodeadkeys):3 + * sapmi(sefi) = +fi(smi):3 + * sin(phonetic-static) = +in(sin_phonetic):3 + * syr(basic) = +sy(syc):3 + * syr(phonetic) = +sy(syc_phonetic):3 + * tam(INSCRIPT) = +in(tam):3 + * tam(UNI) = +in(tam_unicode):3 + * tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):3 + * tam(TAB) = +in(tam_TAB):3 + * tam(TSCII) = +in(tam_TSCII):3 + * tel(basic) = +in(tel):3 + * yu(basic) = +srp(latin):3 + * yu(unicode) = +srp(latinunicode):3 + * yu(yz) = +srp(latinyz):3 + * yu(unicodeyz) = +srp(latinunicodeyz):3 + * apl = +extras/apl%(v[3]):3 + * rs(combiningkeys) = +extras/rs(combiningkeys):3 + * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):3 + * us(crd) = +extras/us(crd):3 + * us(intl-unicode) = +extras/us(intl-unicode):3 + nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):3 + nokiarx51 * = +nokia_vndr/rx-51(%l[3]%_v[3]):3 + * * = +%l[3]%(v[3]):3 -! layout[4] = symbols - ar = +ara%(v[4]):4 - ben = +in(ben):4 - bs = +ba%(v[4]):4 - cs = +rs%(v[4]):4 - cz_qwerty = +cz(qwerty):4 - dev = +in(deva):4 - dvorak = +us(dvorak):4 - dzdwi = +bt%(v[4]):4 - el = +gr%(v[4]):4 - en_US = +latin%(v[4]):4 - guj = +in(guj):4 - gur = +in(guru):4 - iu = +ca(ike):4 - lo = +la%(v[4]):4 - kan = +in(kan):4 - mi = +mao%(v[4]):4 - ml = +in(mal):4 - ogham = +ie(ogam):4 - ori = +ie(ori):4 - sapmi = +no(smi):4 - sr = +srp%(v[4]):4 - syr = +sy(syc):4 - tel = +in(tel):4 - tml = +in(tam):4 - yu = +srp%(v[4]):4 - fr-latin9 = +fr(latin9):4 - us_intl = +us(alt-intl):4 - ben(basic) = +in(ben):4 - ben(probhat) = +in(ben_probhat):4 - dev(basic) = +in(deva):4 - dvorak($dvoraklayouts) = +%v(dvorak):4 - dvorak(basic) = +us(dvorak):4 - dvorak(pl_basic) = +pl(dvorak):4 - dvorak(pl) = +pl(dvorak_quotes):4 - dvorak(pl_altquotes) = +pl(dvorak_altquotes):4 - dzdwi(basic) = +bt(basic):4 - fi(basic) = +fi(classic):4 - ge(azerty_tskapo) = +fr(geo):4 - guj(basic) = +in(guj):4 - gur(basic) = +in(guru):4 - ie(laptop) = +ie(basic):4 - ie(CloGaelachLaptop) = +ie(CloGaelach):4 - il(si1452) = +ie(basic):4 - in(urd) = +in(urd-phonetic):4 - iu(basic) = +ca(ike):4 - lo(basic) = +la(basic):4 - kan(basic) = +in(kan):4 - mal(basic) = +in(mal):4 - mal(mlplusnum) = +in(mal):4 - ogham(basic) = +ie(ogam):4 - ogham(laptop) = +ie(ogam):4 - ogham(is434) = +ie(ogam_is434):4 - ogham(is434laptop) = +ie(ogam_is434):4 - ori(basic) = +in(ori):4 - ro(de) = +ro(winkeys):4 - ro(us) = +ro(std):4 - ro(academic) = +ro(std):4 - ro(std_comma) = +ro(std):4 - ro(comma) = +ro(basic):4 - ru(os) = +ru(os_legacy):4 - pk(urd) = +pk(urd-phonetic):4 - sapmi(basic) = +no(smi):4 - sapmi(nodeadkeys) = +no(smi_nodeadkeys):4 - sapmi(sefi) = +fi(smi):4 - sin(phonetic-static) = +in(sin_phonetic):4 - syr(basic) = +sy(syc):4 - syr(phonetic) = +sy(syc_phonetic):4 - tam(INSCRIPT) = +in(tam):4 - tam(UNI) = +in(tam_unicode):4 - tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):4 - tam(TAB) = +in(tam_TAB):4 - tam(TSCII) = +in(tam_TSCII):4 - tel(basic) = +in(tel):4 - yu(basic) = +srp(latin):4 - yu(unicode) = +srp(latinunicode):4 - yu(yz) = +srp(latinyz):4 - yu(unicodeyz) = +srp(latinunicodeyz):4 - apl = +extras/apl%(v[4]):4 - rs(combiningkeys) = +extras/rs(combiningkeys):4 - us(alt-intl-unicode) = +extras/us(alt-intl-unicode):4 - us(crd) = +extras/us(crd):4 - us(intl-unicode) = +extras/us(intl-unicode):4 - * = +%l[4]%(v[4]):4 +! model layout[4] = symbols + * ar = +ara%(v[4]):4 + * ben = +in(ben):4 + * bs = +ba%(v[4]):4 + * cs = +rs%(v[4]):4 + * cz_qwerty = +cz(qwerty):4 + * dev = +in(deva):4 + * dvorak = +us(dvorak):4 + * dzdwi = +bt%(v[4]):4 + * el = +gr%(v[4]):4 + * en_US = +latin%(v[4]):4 + * guj = +in(guj):4 + * gur = +in(guru):4 + * iu = +ca(ike):4 + * lo = +la%(v[4]):4 + * kan = +in(kan):4 + * mi = +mao%(v[4]):4 + * ml = +in(mal):4 + * ogham = +ie(ogam):4 + * ori = +ie(ori):4 + * sapmi = +no(smi):4 + * sr = +srp%(v[4]):4 + * syr = +sy(syc):4 + * tel = +in(tel):4 + * tml = +in(tam):4 + * yu = +srp%(v[4]):4 + * fr-latin9 = +fr(latin9):4 + * us_intl = +us(alt-intl):4 + * ben(basic) = +in(ben):4 + * ben(probhat) = +in(ben_probhat):4 + * dev(basic) = +in(deva):4 + * dvorak($dvoraklayouts) = +%v(dvorak):4 + * dvorak(basic) = +us(dvorak):4 + * dvorak(pl_basic) = +pl(dvorak):4 + * dvorak(pl) = +pl(dvorak_quotes):4 + * dvorak(pl_altquotes) = +pl(dvorak_altquotes):4 + * dzdwi(basic) = +bt(basic):4 + * fi(basic) = +fi(classic):4 + * ge(azerty_tskapo) = +fr(geo):4 + * guj(basic) = +in(guj):4 + * gur(basic) = +in(guru):4 + * ie(laptop) = +ie(basic):4 + * ie(CloGaelachLaptop) = +ie(CloGaelach):4 + * il(si1452) = +ie(basic):4 + * in(urd) = +in(urd-phonetic):4 + * iu(basic) = +ca(ike):4 + * lo(basic) = +la(basic):4 + * kan(basic) = +in(kan):4 + * mal(basic) = +in(mal):4 + * mal(mlplusnum) = +in(mal):4 + * ogham(basic) = +ie(ogam):4 + * ogham(laptop) = +ie(ogam):4 + * ogham(is434) = +ie(ogam_is434):4 + * ogham(is434laptop) = +ie(ogam_is434):4 + * ori(basic) = +in(ori):4 + * ro(de) = +ro(winkeys):4 + * ro(us) = +ro(std):4 + * ro(academic) = +ro(std):4 + * ro(std_comma) = +ro(std):4 + * ro(comma) = +ro(basic):4 + * ru(os) = +ru(os_legacy):4 + * pk(urd) = +pk(urd-phonetic):4 + * sapmi(basic) = +no(smi):4 + * sapmi(nodeadkeys) = +no(smi_nodeadkeys):4 + * sapmi(sefi) = +fi(smi):4 + * sin(phonetic-static) = +in(sin_phonetic):4 + * syr(basic) = +sy(syc):4 + * syr(phonetic) = +sy(syc_phonetic):4 + * tam(INSCRIPT) = +in(tam):4 + * tam(UNI) = +in(tam_unicode):4 + * tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):4 + * tam(TAB) = +in(tam_TAB):4 + * tam(TSCII) = +in(tam_TSCII):4 + * tel(basic) = +in(tel):4 + * yu(basic) = +srp(latin):4 + * yu(unicode) = +srp(latinunicode):4 + * yu(yz) = +srp(latinyz):4 + * yu(unicodeyz) = +srp(latinunicodeyz):4 + * apl = +extras/apl%(v[4]):4 + * rs(combiningkeys) = +extras/rs(combiningkeys):4 + * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):4 + * us(crd) = +extras/us(crd):4 + * us(intl-unicode) = +extras/us(intl-unicode):4 + nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):4 + nokiarx51 * = +nokia_vndr/rx-51(%l[4]%_v[4]):4 + * * = +%l[4]%(v[4]):4 -! layout[2] variant[2] = symbols - ben basic = +in(ben):2 - ben probhat = +in(ben_probhat):2 - dev basic = +in(deva):2 - dvorak $dvoraklayouts = +%v(dvorak):2 - dvorak basic = +us(dvorak):2 - dvorak pl_basic = +pl(dvorak):2 - dvorak pl = +pl(dvorak_quotes):2 - dvorak pl_altquotes = +pl(dvorak_altquotes):2 - dzdwi basic = +bt(basic):2 - fi basic = +fi(classic):2 - ge azerty_tskapo = +fr(geo):2 - guj basic = +in(guj):2 - gur basic = +in(guru):2 - ie laptop = +ie(basic):2 - ie CloGaelachLaptop = +ie(CloGaelach):2 - il si1452 = +ie(basic):2 - in urd = +in(urd-phonetic):2 - iu basic = +ca(ike):2 - lo basic = +la(basic):2 - kan basic = +in(kan):2 - mal basic = +in(mal):2 - mal mlplusnum = +in(mal):2 - ogham basic = +ie(ogam):2 - ogham laptop = +ie(ogam):2 - ogham is434 = +ie(ogam_is434):2 - ogham is434laptop = +ie(ogam_is434):2 - ori basic = +in(ori):2 - ro de = +ro(winkeys):2 - ro us = +ro(std):2 - ro academic = +ro(std):2 - ro std_comma = +ro(std):2 - ro comma = +ro(basic):2 - ru os = +ru(os_legacy):2 - pk urd = +pk(urd-phonetic):2 - sapmi basic = +no(smi):2 - sapmi nodeadkeys = +no(smi_nodeadkeys):2 - sapmi sefi = +fi(smi):2 - sin phonetic-static = +in(sin_phonetic):2 - syr basic = +sy(syc):2 - syr phonetic = +sy(syc_phonetic):2 - tam INSCRIPT = +in(tam):2 - tam UNI = +in(tam_unicode):2 - tam NUMERAL-KEYBOARD = +in(tam_keyboard_with_numerals):2 - tam TAB = +in(tam_TAB):2 - tam TSCII = +in(tam_TSCII):2 - tel basic = +in(tel):2 - yu basic = +srp(latin):2 - yu unicode = +srp(latinunicode):2 - yu yz = +srp(latinyz):2 - yu unicodeyz = +srp(latinunicodeyz):2 - rs combiningkeys = +extras/rs(combiningkeys):2 - us alt-intl-unicode = +extras/us(alt-intl-unicode):2 - us crd = +extras/us(crd):2 - us intl-unicode = +extras/us(intl-unicode):2 +! model layout[2] variant[2] = symbols + * ben basic = +in(ben):2 + * ben probhat = +in(ben_probhat):2 + * dev basic = +in(deva):2 + * dvorak $dvoraklayouts = +%v(dvorak):2 + * dvorak basic = +us(dvorak):2 + * dvorak pl_basic = +pl(dvorak):2 + * dvorak pl = +pl(dvorak_quotes):2 + * dvorak pl_altquotes = +pl(dvorak_altquotes):2 + * dzdwi basic = +bt(basic):2 + * fi basic = +fi(classic):2 + * ge azerty_tskapo = +fr(geo):2 + * guj basic = +in(guj):2 + * gur basic = +in(guru):2 + * ie laptop = +ie(basic):2 + * ie CloGaelachLaptop = +ie(CloGaelach):2 + * il si1452 = +ie(basic):2 + * in urd = +in(urd-phonetic):2 + * iu basic = +ca(ike):2 + * lo basic = +la(basic):2 + * kan basic = +in(kan):2 + * mal basic = +in(mal):2 + * mal mlplusnum = +in(mal):2 + * ogham basic = +ie(ogam):2 + * ogham laptop = +ie(ogam):2 + * ogham is434 = +ie(ogam_is434):2 + * ogham is434laptop = +ie(ogam_is434):2 + * ori basic = +in(ori):2 + * ro de = +ro(winkeys):2 + * ro us = +ro(std):2 + * ro academic = +ro(std):2 + * ro std_comma = +ro(std):2 + * ro comma = +ro(basic):2 + * ru os = +ru(os_legacy):2 + * pk urd = +pk(urd-phonetic):2 + * sapmi basic = +no(smi):2 + * sapmi nodeadkeys = +no(smi_nodeadkeys):2 + * sapmi sefi = +fi(smi):2 + * sin phonetic-static = +in(sin_phonetic):2 + * syr basic = +sy(syc):2 + * syr phonetic = +sy(syc_phonetic):2 + * tam INSCRIPT = +in(tam):2 + * tam UNI = +in(tam_unicode):2 + * tam NUMERAL-KEYBOARD = +in(tam_keyboard_with_numerals):2 + * tam TAB = +in(tam_TAB):2 + * tam TSCII = +in(tam_TSCII):2 + * tel basic = +in(tel):2 + * yu basic = +srp(latin):2 + * yu unicode = +srp(latinunicode):2 + * yu yz = +srp(latinyz):2 + * yu unicodeyz = +srp(latinunicodeyz):2 + * rs combiningkeys = +extras/rs(combiningkeys):2 + * us alt-intl-unicode = +extras/us(alt-intl-unicode):2 + * us crd = +extras/us(crd):2 + * us intl-unicode = +extras/us(intl-unicode):2 -! layout[3] variant[3] = symbols - ben basic = +in(ben):3 - ben probhat = +in(ben_probhat):3 - dev basic = +in(deva):3 - dvorak $dvoraklayouts = +%v(dvorak):3 - dvorak basic = +us(dvorak):3 - dvorak pl_basic = +pl(dvorak):3 - dvorak pl = +pl(dvorak_quotes):3 - dvorak pl_altquotes = +pl(dvorak_altquotes):3 - dzdwi basic = +bt(basic):3 - fi basic = +fi(classic):3 - ge azerty_tskapo = +fr(geo):3 - guj basic = +in(guj):3 - gur basic = +in(guru):3 - ie laptop = +ie(basic):3 - ie CloGaelachLaptop = +ie(CloGaelach):3 - il si1452 = +ie(basic):3 - in urd = +in(urd-phonetic):3 - iu basic = +ca(ike):3 - lo basic = +la(basic):3 - kan basic = +in(kan):3 - mal basic = +in(mal):3 - mal mlplusnum = +in(mal):3 - ogham basic = +ie(ogam):3 - ogham laptop = +ie(ogam):3 - ogham is434 = +ie(ogam_is434):3 - ogham is434laptop = +ie(ogam_is434):3 - ori basic = +in(ori):3 - ro de = +ro(winkeys):3 - ro us = +ro(std):3 - ro academic = +ro(std):3 - ro std_comma = +ro(std):3 - ro comma = +ro(basic):3 - ru os = +ru(os_legacy):3 - pk urd = +pk(urd-phonetic):3 - sapmi basic = +no(smi):3 - sapmi nodeadkeys = +no(smi_nodeadkeys):3 - sapmi sefi = +fi(smi):3 - sin phonetic-static = +in(sin_phonetic):3 - syr basic = +sy(syc):3 - syr phonetic = +sy(syc_phonetic):3 - tam INSCRIPT = +in(tam):3 - tam UNI = +in(tam_unicode):3 - tam NUMERAL-KEYBOARD = +in(tam_keyboard_with_numerals):3 - tam TAB = +in(tam_TAB):3 - tam TSCII = +in(tam_TSCII):3 - tel basic = +in(tel):3 - yu basic = +srp(latin):3 - yu unicode = +srp(latinunicode):3 - yu yz = +srp(latinyz):3 - yu unicodeyz = +srp(latinunicodeyz):3 - rs combiningkeys = +extras/rs(combiningkeys):3 - us alt-intl-unicode = +extras/us(alt-intl-unicode):3 - us crd = +extras/us(crd):3 - us intl-unicode = +extras/us(intl-unicode):3 - -! layout[4] variant[4] = symbols - ben basic = +in(ben):4 - ben probhat = +in(ben_probhat):4 - dev basic = +in(deva):4 - dvorak $dvoraklayouts = +%v(dvorak):4 - dvorak basic = +us(dvorak):4 - dvorak pl_basic = +pl(dvorak):4 - dvorak pl = +pl(dvorak_quotes):4 - dvorak pl_altquotes = +pl(dvorak_altquotes):4 - dzdwi basic = +bt(basic):4 - fi basic = +fi(classic):4 - ge azerty_tskapo = +fr(geo):4 - guj basic = +in(guj):4 - gur basic = +in(guru):4 - ie laptop = +ie(basic):4 - ie CloGaelachLaptop = +ie(CloGaelach):4 - il si1452 = +ie(basic):4 - in urd = +in(urd-phonetic):4 - iu basic = +ca(ike):4 - lo basic = +la(basic):4 - kan basic = +in(kan):4 - mal basic = +in(mal):4 - mal mlplusnum = +in(mal):4 - ogham basic = +ie(ogam):4 - ogham laptop = +ie(ogam):4 - ogham is434 = +ie(ogam_is434):4 - ogham is434laptop = +ie(ogam_is434):4 - ori basic = +in(ori):4 - ro de = +ro(winkeys):4 - ro us = +ro(std):4 - ro academic = +ro(std):4 - ro std_comma = +ro(std):4 - ro comma = +ro(basic):4 - ru os = +ru(os_legacy):4 - pk urd = +pk(urd-phonetic):4 - sapmi basic = +no(smi):4 - sapmi nodeadkeys = +no(smi_nodeadkeys):4 - sapmi sefi = +fi(smi):4 - sin phonetic-static = +in(sin_phonetic):4 - syr basic = +sy(syc):4 - syr phonetic = +sy(syc_phonetic):4 - tam INSCRIPT = +in(tam):4 - tam UNI = +in(tam_unicode):4 - tam NUMERAL-KEYBOARD = +in(tam_keyboard_with_numerals):4 - tam TAB = +in(tam_TAB):4 - tam TSCII = +in(tam_TSCII):4 - tel basic = +in(tel):4 - yu basic = +srp(latin):4 - yu unicode = +srp(latinunicode):4 - yu yz = +srp(latinyz):4 - yu unicodeyz = +srp(latinunicodeyz):4 - rs combiningkeys = +extras/rs(combiningkeys):4 - us alt-intl-unicode = +extras/us(alt-intl-unicode):4 - us crd = +extras/us(crd):4 - us intl-unicode = +extras/us(intl-unicode):4 - -! model = symbols - $evdevkbds = +inet(evdev)+inet(%m) - * = +inet(evdev) +! model layout[3] variant[3] = symbols + * ben basic = +in(ben):3 + * ben probhat = +in(ben_probhat):3 + * dev basic = +in(deva):3 + * dvorak $dvoraklayouts = +%v(dvorak):3 + * dvorak basic = +us(dvorak):3 + * dvorak pl_basic = +pl(dvorak):3 + * dvorak pl = +pl(dvorak_quotes):3 + * dvorak pl_altquotes = +pl(dvorak_altquotes):3 + * dzdwi basic = +bt(basic):3 + * fi basic = +fi(classic):3 + * ge azerty_tskapo = +fr(geo):3 + * guj basic = +in(guj):3 + * gur basic = +in(guru):3 + * ie laptop = +ie(basic):3 + * ie CloGaelachLaptop = +ie(CloGaelach):3 + * il si1452 = +ie(basic):3 + * in urd = +in(urd-phonetic):3 + * iu basic = +ca(ike):3 + * lo basic = +la(basic):3 + * kan basic = +in(kan):3 + * mal basic = +in(mal):3 + * mal mlplusnum = +in(mal):3 + * ogham basic = +ie(ogam):3 + * ogham laptop = +ie(ogam):3 + * ogham is434 = +ie(ogam_is434):3 + * ogham is434laptop = +ie(ogam_is434):3 + * ori basic = +in(ori):3 + * ro de = +ro(winkeys):3 + * ro us = +ro(std):3 + * ro academic = +ro(std):3 + * ro std_comma = +ro(std):3 + * ro comma = +ro(basic):3 + * ru os = +ru(os_legacy):3 + * pk urd = +pk(urd-phonetic):3 + * sapmi basic = +no(smi):3 + * sapmi nodeadkeys = +no(smi_nodeadkeys):3 + * sapmi sefi = +fi(smi):3 + * sin phonetic-static = +in(sin_phonetic):3 + * syr basic = +sy(syc):3 + * syr phonetic = +sy(syc_phonetic):3 + * tam INSCRIPT = +in(tam):3 + * tam UNI = +in(tam_unicode):3 + * tam NUMERAL-KEYBOARD = +in(tam_keyboard_with_numerals):3 + * tam TAB = +in(tam_TAB):3 + * tam TSCII = +in(tam_TSCII):3 + * tel basic = +in(tel):3 + * yu basic = +srp(latin):3 + * yu unicode = +srp(latinunicode):3 + * yu yz = +srp(latinyz):3 + * yu unicodeyz = +srp(latinunicodeyz):3 + * rs combiningkeys = +extras/rs(combiningkeys):3 + * us alt-intl-unicode = +extras/us(alt-intl-unicode):3 + * us crd = +extras/us(crd):3 + * us intl-unicode = +extras/us(intl-unicode):3 +! model layout[4] variant[4] = symbols + * ben basic = +in(ben):4 + * ben probhat = +in(ben_probhat):4 + * dev basic = +in(deva):4 + * dvorak $dvoraklayouts = +%v(dvorak):4 + * dvorak basic = +us(dvorak):4 + * dvorak pl_basic = +pl(dvorak):4 + * dvorak pl = +pl(dvorak_quotes):4 + * dvorak pl_altquotes = +pl(dvorak_altquotes):4 + * dzdwi basic = +bt(basic):4 + * fi basic = +fi(classic):4 + * ge azerty_tskapo = +fr(geo):4 + * guj basic = +in(guj):4 + * gur basic = +in(guru):4 + * ie laptop = +ie(basic):4 + * ie CloGaelachLaptop = +ie(CloGaelach):4 + * il si1452 = +ie(basic):4 + * in urd = +in(urd-phonetic):4 + * iu basic = +ca(ike):4 + * lo basic = +la(basic):4 + * kan basic = +in(kan):4 + * mal basic = +in(mal):4 + * mal mlplusnum = +in(mal):4 + * ogham basic = +ie(ogam):4 + * ogham laptop = +ie(ogam):4 + * ogham is434 = +ie(ogam_is434):4 + * ogham is434laptop = +ie(ogam_is434):4 + * ori basic = +in(ori):4 + * ro de = +ro(winkeys):4 + * ro us = +ro(std):4 + * ro academic = +ro(std):4 + * ro std_comma = +ro(std):4 + * ro comma = +ro(basic):4 + * ru os = +ru(os_legacy):4 + * pk urd = +pk(urd-phonetic):4 + * sapmi basic = +no(smi):4 + * sapmi nodeadkeys = +no(smi_nodeadkeys):4 + * sapmi sefi = +fi(smi):4 + * sin phonetic-static = +in(sin_phonetic):4 + * syr basic = +sy(syc):4 + * syr phonetic = +sy(syc_phonetic):4 + * tam INSCRIPT = +in(tam):4 + * tam UNI = +in(tam_unicode):4 + * tam NUMERAL-KEYBOARD = +in(tam_keyboard_with_numerals):4 + * tam TAB = +in(tam_TAB):4 + * tam TSCII = +in(tam_TSCII):4 + * tel basic = +in(tel):4 + * yu basic = +srp(latin):4 + * yu unicode = +srp(latinunicode):4 + * yu yz = +srp(latinyz):4 + * yu unicodeyz = +srp(latinunicodeyz):4 + * rs combiningkeys = +extras/rs(combiningkeys):4 + * us alt-intl-unicode = +extras/us(alt-intl-unicode):4 + * us crd = +extras/us(crd):4 + * us intl-unicode = +extras/us(intl-unicode):4 + + // Neo special modifier-keys ! layout variant = compat de neo = +neo_mods @@ -921,6 +957,11 @@ ! layout[4] variant[4] = geometry de neo = pc(pc105) +! model = symbols + $evdevkbds = +inet(evdev)+inet(%m) + applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys) + * = +inet(evdev) + ! model layout = compat pc98 nec_vndr/jp = pc98(basic) * jp = complete+japan @@ -932,6 +973,8 @@ ! model = types $macs = complete+numpad(mac) + $applealu = complete+numpad(mac) + $nokiamodels = complete+nokia * = complete ! layout option = symbols @@ -976,6 +1019,7 @@ grp:alts_toggle = +group(alts_toggle) grp:ctrl_shift_toggle = +group(ctrl_shift_toggle) grp:lctrl_lshift_toggle = +group(lctrl_lshift_toggle) + grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle) grp:caps_toggle = +capslock(grouplock) grp:caps_switch = +capslock(groupshift) grp:shift_caps_toggle = +group(shift_caps_toggle) @@ -995,6 +1039,7 @@ grp:rctrl_toggle = +group(rctrl_toggle) grp:lalt_toggle = +group(lalt_toggle) grp:sclk_toggle = +group(sclk_toggle) + grp:lctrl_rctrl_switch = +group(lctrl_rctrl_switch) lv3:switch = +level3(switch) lv3:ralt_switch = +level3(ralt_switch) lv3:ralt_switch_multikey = +level3(ralt_switch_multikey) @@ -1024,9 +1069,13 @@ compose:lwin = +compose(lwin) compose:rwin = +compose(rwin) compose:menu = +compose(menu) + compose:lctrl = +compose(lctrl) compose:rctrl = +compose(rctrl) compose:caps = +compose(caps) compose:102 = +compose(102) + compose:paus = +compose(paus) + compose:prsc = +compose(prsc) + compose:sclk = +compose(sclk) srvrkeys:none = +srvr_ctrl(no_srvr_keys) eurosign:e = +eurosign(e) eurosign:2 = +eurosign(2) @@ -1061,6 +1110,7 @@ esperanto:qwerty = +epo(qwerty) esperanto:dvorak = +epo(dvorak) terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp) + apple:alupckeys = +macintosh_vndr/apple(alupckeys) shift:both_capslock = +shift(both_capslock) shift:lshift_both_capslock = +shift(lshift_both_capslock) shift:rshift_both_capslock = +shift(rshift_both_capslock) diff --git a/linux/X/rules/evdev.xml b/linux/X/rules/evdev.xml index f6fc72d..e48c705 100644 --- a/linux/X/rules/evdev.xml +++ b/linux/X/rules/evdev.xml @@ -554,6 +554,13 @@ </model> <model> <configItem> + <name>hpmini110</name> + <description>Hewlett-Packard Mini 110 Notebook</description> + <vendor>Hewlett-Packard</vendor> + </configItem> + </model> + <model> + <configItem> <name>rapidaccess</name> <description>IBM Rapid Access</description> <vendor>IBM</vendor> @@ -575,13 +582,6 @@ </model> <model> <configItem> - <name>thinkpadintl</name> - <description>IBM ThinkPad 560Z/600/600E/A22E, Intl</description> - <vendor>IBM</vendor> - </configItem> - </model> - <model> - <configItem> <name>thinkpad60</name> <description>IBM ThinkPad R60/T60/R61/T61</description> <vendor>IBM</vendor> @@ -981,6 +981,41 @@ </model> <model> <configItem> + <name>tm2020</name> + <description>TypeMatrix EZ-Reach 2020</description> + <vendor>TypeMatrix</vendor> + </configItem> + </model> + <model> + <configItem> + <name>tm2030PS2</name> + <description>TypeMatrix EZ-Reach 2030 PS2</description> + <vendor>TypeMatrix</vendor> + </configItem> + </model> + <model> + <configItem> + <name>tm2030USB</name> + <description>TypeMatrix EZ-Reach 2030 USB</description> + <vendor>TypeMatrix</vendor> + </configItem> + </model> + <model> + <configItem> + <name>tm2030USB-102</name> + <description>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)</description> + <vendor>TypeMatrix</vendor> + </configItem> + </model> + <model> + <configItem> + <name>tm2030USB-106</name> + <description>TypeMatrix EZ-Reach 2030 USB (106:JP mode)</description> + <vendor>TypeMatrix</vendor> + </configItem> + </model> + <model> + <configItem> <name>yahoo</name> <description>Yahoo! Internet Keyboard</description> <vendor>Yahoo!</vendor> @@ -1065,6 +1100,27 @@ </model> <model> <configItem> + <name>applealu_ansi</name> + <description>Apple Aluminium Keyboard (ANSI)</description> + <vendor>Apple</vendor> + </configItem> + </model> + <model> + <configItem> + <name>applealu_iso</name> + <description>Apple Aluminium Keyboard (ISO)</description> + <vendor>Apple</vendor> + </configItem> + </model> + <model> + <configItem> + <name>applealu_jis</name> + <description>Apple Aluminium Keyboard (JIS)</description> + <vendor>Apple</vendor> + </configItem> + </model> + <model> + <configItem> <name>silvercrest</name> <description>SILVERCREST Multimedia Wireless Keyboard</description> <vendor>Silvercrest</vendor> @@ -1154,6 +1210,13 @@ <vendor>Compal Electronics Inc.</vendor> </configItem> </model> + <model> + <configItem> + <name>creativedw7000</name> + <description>Creative Desktop Wireless 7000</description> + <vendor>Creative</vendor> + </configItem> + </model> </modelList> <layoutList> <layout> @@ -1186,7 +1249,7 @@ <variant> <configItem> <name>alt-intl</name> - <description>Alternative international (former us_intl)</description> + <description>Alternative international</description> </configItem> </variant> <variant> @@ -1204,7 +1267,13 @@ <variant> <configItem> <name>dvorak-intl</name> - <description>Dvorak international</description> + <description>Dvorak international (with dead keys)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>dvorak-alt-intl</name> + <description>Dvorak alternative international (no dead keys)</description> </configItem> </variant> <variant> @@ -1235,6 +1304,7 @@ <configItem> <name>rus</name> <description>Russian phonetic</description> + <languageList><iso639Id>rus</iso639Id></languageList> </configItem> </variant> <variant> @@ -1258,6 +1328,14 @@ <description>Group toggle on multiply/divide key</description> </configItem> </variant> + <variant> + <configItem> + <name>srp</name> + <description>Serbian</description> + <languageList><iso639Id>eng</iso639Id> + <iso639Id>srp</iso639Id> </languageList> + </configItem> + </variant> </variantList> </layout> <layout> @@ -1455,8 +1533,8 @@ <variantList> <variant> <configItem> - <name>winkeys</name> - <description>Winkeys</description> + <name>legacy</name> + <description>Legacy</description> </configItem> </variant> <variant> @@ -1523,7 +1601,7 @@ <layout> <configItem> <name>bd</name> - <shortDescription>Ban</shortDescription> + <shortDescription>Bgd</shortDescription> <description>Bangladesh</description> <languageList><iso639Id>ben</iso639Id></languageList> </configItem> @@ -1615,6 +1693,13 @@ </variant> <variant> <configItem> + <name>tam_keyboard_with_numerals</name> + <description>Tamil Keyboard with Numerals</description> + <languageList><iso639Id>tam</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> <name>tam_TAB</name> <description>Tamil TAB Typewriter</description> <languageList><iso639Id>tam</iso639Id></languageList> @@ -1764,7 +1849,7 @@ <variant> <configItem> <name>phonetic</name> - <description>Traditional Phonetic</description> + <description>Traditional phonetic</description> </configItem> </variant> </variantList> @@ -1772,7 +1857,7 @@ <variant> <configItem> <name>bas_phonetic</name> - <description>Standard Phonetic</description> + <description>New phonetic</description> </configItem> </variant> </variantList> @@ -1913,7 +1998,7 @@ <layout> <configItem> <name>cd</name> - <shortDescription>DRC</shortDescription> + <shortDescription>COD</shortDescription> <description>Congo, Democratic Republic of the</description> <languageList><iso639Id>fra</iso639Id></languageList> </configItem> @@ -1922,7 +2007,7 @@ <layout> <configItem> <name>cn</name> - <shortDescription>China</shortDescription> + <shortDescription>Chn</shortDescription> <description>China</description> <languageList><iso639Id>chi</iso639Id></languageList> </configItem> @@ -2009,12 +2094,18 @@ <description>UCW layout (accented letters only)</description> </configItem> </variant> + <variant> + <configItem> + <name>dvorak-ucw</name> + <description>US Dvorak with CZ UCW support</description> + </configItem> + </variant> </variantList> </layout> <layout> <configItem> <name>dk</name> - <shortDescription>Dan</shortDescription> + <shortDescription>Dnk</shortDescription> <description>Denmark</description> <languageList><iso639Id>dan</iso639Id></languageList> </configItem> @@ -2076,7 +2167,7 @@ <layout> <configItem> <name>bt</name> - <shortDescription>Bhu</shortDescription> + <shortDescription>Btn</shortDescription> <description>Bhutan</description> <languageList><iso639Id>dzo</iso639Id></languageList> </configItem> @@ -2119,20 +2210,8 @@ <variantList> <variant> <configItem> - <name>pro</name> - <description>Pro</description> - </configItem> - </variant> - <variant> - <configItem> - <name>keypad</name> - <description>Keypad</description> - </configItem> - </variant> - <variant> - <configItem> - <name>pro_keypad</name> - <description>Pro Keypad</description> + <name>pes_keypad</name> + <description>Persian, with Persian Keypad</description> </configItem> </variant> <variant> @@ -2207,7 +2286,7 @@ <layout> <configItem> <name>fo</name> - <shortDescription>Fao</shortDescription> + <shortDescription>Fro</shortDescription> <description>Faroe Islands</description> <languageList><iso639Id>fao</iso639Id></languageList> </configItem> @@ -2418,7 +2497,7 @@ <layout> <configItem> <name>gn</name> - <shortDescription>Gui</shortDescription> + <shortDescription>Gin</shortDescription> <description>Guinea</description> <languageList><iso639Id>fra</iso639Id></languageList> </configItem> @@ -2553,7 +2632,7 @@ <layout> <configItem> <name>gr</name> - <shortDescription>Gre</shortDescription> + <shortDescription>Grc</shortDescription> <description>Greece</description> <languageList><iso639Id>gre</iso639Id></languageList> </configItem> @@ -2797,6 +2876,12 @@ </variant> <variant> <configItem> + <name>us</name> + <description>US keyboard with Italian letters</description> + </configItem> + </variant> + <variant> + <configItem> <name>geo</name> <description>Georgian</description> <languageList><iso639Id>geo</iso639Id></languageList> @@ -2824,6 +2909,12 @@ <description>OADG 109A</description> </configItem> </variant> + <variant> + <configItem> + <name>mac</name> + <description>Macintosh</description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -2853,9 +2944,9 @@ </layout> <layout> <configItem> - <name>kz</name> - <shortDescription>Kaz</shortDescription> - <description>Kazakhstan</description> + <name>kz</name> + <shortDescription>Kaz</shortDescription> + <description>Kazakhstan</description> <languageList><iso639Id>kaz</iso639Id></languageList> </configItem> <variantList> @@ -2975,18 +3066,12 @@ <description>LEKPa</description> </configItem> </variant> - <variant> - <configItem> - <name>balticplus</name> - <description>Baltic+</description> - </configItem> - </variant> </variantList> </layout> <layout> <configItem> <name>lv</name> - <shortDescription>Lav</shortDescription> + <shortDescription>Lva</shortDescription> <description>Latvia</description> <languageList><iso639Id>lav</iso639Id></languageList> </configItem> @@ -3207,6 +3292,12 @@ <languageList><iso639Id>rus</iso639Id></languageList> </configItem> </variant> + <variant> + <configItem> + <name>dvp</name> + <description>Programmer Dvorak</description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -3364,6 +3455,12 @@ </variant> <variant> <configItem> + <name>typewriter-legacy</name> + <description>Typewriter, legacy</description> + </configItem> + </variant> + <variant> + <configItem> <name>tt</name> <description>Tatar</description> <languageList><iso639Id>tat</iso639Id></languageList> @@ -3431,6 +3528,21 @@ <description>DOS</description> </configItem> </variant> + <variant> + <configItem> + <name>srp</name> + <description>Serbian</description> + <languageList><iso639Id>rus</iso639Id> + <iso639Id>srp</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>bak</name> + <description>Bashkirian</description> + <languageList><iso639Id>bak</iso639Id></languageList> + </configItem> + </variant> </variantList> </layout> <layout> @@ -3655,6 +3767,12 @@ <variantList> <variant> <configItem> + <name>legacy</name> + <description>Legacy</description> + </configItem> + </variant> + <variant> + <configItem> <name>de_nodeadkeys</name> <description>German, eliminate dead keys</description> </configItem> @@ -3763,7 +3881,7 @@ <layout> <configItem> <name>lk</name> - <shortDescription>SrL</shortDescription> + <shortDescription>Lka</shortDescription> <description>Sri Lanka</description> <languageList><iso639Id>sin</iso639Id></languageList> </configItem> @@ -4146,7 +4264,7 @@ <layout> <configItem> <name>mv</name> - <shortDescription>Mal</shortDescription> + <shortDescription>Mdv</shortDescription> <description>Maldives</description> <languageList><iso639Id>div</iso639Id></languageList> </configItem> @@ -4155,7 +4273,7 @@ <layout> <configItem> <name>za</name> - <shortDescription>Zar</shortDescription> + <shortDescription>Zaf</shortDescription> <description>South Africa</description> <languageList><iso639Id>eng</iso639Id></languageList> </configItem> @@ -4179,7 +4297,7 @@ <layout> <configItem> <name>np</name> - <shortDescription>Nep</shortDescription> + <shortDescription>Npl</shortDescription> <description>Nepal</description> <languageList><iso639Id>nep</iso639Id></languageList> </configItem> @@ -4187,7 +4305,7 @@ <layout> <configItem> <name>ng</name> - <shortDescription>Nig</shortDescription> + <shortDescription>Nga</shortDescription> <description>Nigeria</description> <languageList><iso639Id>eng</iso639Id></languageList> </configItem> @@ -4270,6 +4388,34 @@ </variant> </variantList> </layout> + <layout> + <configItem> + <name>ml</name> + <shortDescription>Mli</shortDescription> + <description>Mali</description> + <languageList><iso639Id>bam</iso639Id></languageList> + </configItem> + <variantList> + <variant> + <configItem> + <name>fr-oss</name> + <description>Français (France Alternative)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>us-mac</name> + <description>English (USA Macintosh)</description> + </configItem> + </variant> + <variant> + <configItem> + <name>us-intl</name> + <description>English (USA International)</description> + </configItem> + </variant> + </variantList> + </layout> </layoutList> <optionList> <group allowMultipleSelection="true"> @@ -4358,6 +4504,12 @@ </option> <option> <configItem> + <name>grp:lctrl_rctrl_switch</name> + <description>Left Ctrl (to first layout), Right Ctrl (to last layout)</description> + </configItem> + </option> + <option> + <configItem> <name>grp:alt_caps_toggle</name> <description>Alt+CapsLock</description> </configItem> @@ -4394,6 +4546,12 @@ </option> <option> <configItem> + <name>grp:rctrl_rshift_toggle</name> + <description>Right Ctrl+Right Shift</description> + </configItem> + </option> + <option> + <configItem> <name>grp:ctrl_alt_toggle</name> <description>Alt+Ctrl</description> </configItem> @@ -4455,7 +4613,7 @@ <option> <configItem> <name>grp:sclk_toggle</name> - <description>Scroll Lock</description> + <description>ScrollLock</description> </configItem> </option> </group> @@ -4764,6 +4922,12 @@ </option> <option> <configItem> + <name>caps:numlock</name> + <description>Make CapsLock an additional NumLock</description> + </configItem> + </option> + <option> + <configItem> <name>caps:swapescape</name> <description>Swap ESC and CapsLock</description> </configItem> @@ -4782,10 +4946,28 @@ </option> <option> <configItem> + <name>caps:super</name> + <description>Make CapsLock an additional Super</description> + </configItem> + </option> + <option> + <configItem> + <name>caps:hyper</name> + <description>Make CapsLock an additional Hyper</description> + </configItem> + </option> + <option> + <configItem> <name>caps:shiftlock</name> <description>CapsLock toggles Shift so all keys are affected</description> </configItem> </option> + <option> + <configItem> + <name>caps:none</name> + <description>CapsLock is disabled</description> + </configItem> + </option> </group> <group allowMultipleSelection="false"> @@ -4880,6 +5062,12 @@ </option> <option> <configItem> + <name>compose:lctrl</name> + <description>Left Ctrl</description> + </configItem> + </option> + <option> + <configItem> <name>compose:rctrl</name> <description>Right Ctrl</description> </configItem> @@ -4887,7 +5075,7 @@ <option> <configItem> <name>compose:caps</name> - <description>Caps Lock</description> + <description>CapsLock</description> </configItem> </option> <option> @@ -4896,6 +5084,24 @@ <description>Less-than/Greater-than</description> </configItem> </option> + <option> + <configItem> + <name>compose:paus</name> + <description>Pause</description> + </configItem> + </option> + <option> + <configItem> + <name>compose:prsc</name> + <description>PrtSc</description> + </configItem> + </option> + <option> + <configItem> + <name>compose:sclk</name> + <description>ScrollLock</description> + </configItem> + </option> </group> <group allowMultipleSelection="true"> <configItem> @@ -4923,7 +5129,7 @@ <option> <configItem> <name>numpad:shift3</name> - <description>Shift does not cancel NumLock, chooses 3d level instead</description> + <description>Shift does not cancel NumLock, chooses 3rd level instead</description> </configItem> </option> <option> @@ -4934,6 +5140,12 @@ </option> <option> <configItem> + <name>apple:alupckeys</name> + <description>Apple Aluminium Keyboard: emulate PC keys (Print, Scroll_Lock, Pause, NumLock)</description> + </configItem> + </option> + <option> + <configItem> <name>shift:breaks_caps</name> <description>Shift cancels CapsLock</description> </configItem> @@ -5121,6 +5333,54 @@ <description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)</description> </configItem> </option> + <option> + <configItem> + <name>nbsp:zwnj2</name> + <description>Zero-width non-joiner character at second level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj2zwj3</name> + <description>Zero-width non-joiner character at second level, zero-width joiner character at third level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj2zwj3nb4</name> + <description>Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj2nb3</name> + <description>Zero-width non-joiner character at second level, non-breakable space character at third level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj2nb3s</name> + <description>Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj2nb3zwj4</name> + <description>Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj2nb3nnb4</name> + <description>Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level</description> + </configItem> + </option> + <option> + <configItem> + <name>nbsp:zwnj3zwj4</name> + <description>Zero-width non-joiner character at third level, zero-width joiner at fourth level</description> + </configItem> + </option> </group> <group allowMultipleSelection="true"> <configItem> diff --git a/linux/X/symbols/level5 b/linux/X/symbols/level5 index e829e90..ff7041c 100644 --- a/linux/X/symbols/level5 +++ b/linux/X/symbols/level5 @@ -18,22 +18,21 @@ xkb_symbols "rctrl_switch" { }; // The following modifier keys are used to switch to the third shift and to set a -// corresponding lock, implemented as NumLock. They do not use *Level5* keysyms, -// as some applications get confused by it. +// corresponding lock, implemented as NumLock. partial modifier_keys xkb_symbols "neomod_map" { + key.type[Group1] = "ONE_LEVEL"; + replace key <MDSW> { - type[Group1] = "ONE_LEVEL", - vmods[Group1] = LevelFive, + vmods = LevelFive, symbols[Group1] = [ ISO_Level5_Shift ], actions[Group1] = [ SetMods(modifiers=LevelFive) ] }; modifier_map Mod3 { <MDSW> }; replace key <HYPR> { - type[Group1] = "ONE_LEVEL", - vmods[Group1] = NumLock, + vmods = NumLock, symbols[Group1] = [ NoSymbol ], actions[Group1] = [ SetMods(modifiers=NumLock) ] }; diff --git a/linux/X/symbols/shift b/linux/X/symbols/shift index ccb4ae1..78951c1 100644 --- a/linux/X/symbols/shift +++ b/linux/X/symbols/shift @@ -40,7 +40,7 @@ xkb_symbols "both_capslock" { include "shift(rshift_both_capslock)" }; -// When pressed alone, release Lock, whan pressed with another Shift key, set Lock. +// Release Lock when pressed alone and set Lock when pressed with another Shift key. partial modifier_keys xkb_symbols "lshift_both_capslock_cancel" { key <LFSH> { @@ -48,7 +48,7 @@ xkb_symbols "lshift_both_capslock_cancel" { symbols[Group1] = [ Shift_L, Caps_Lock ] }; }; -// When pressed alone, release Lock, whan pressed with another Shift key, set Lock. +// Release Lock when pressed alone and set Lock when pressed with another Shift key. partial modifier_keys xkb_symbols "rshift_both_capslock_cancel" { key <RTSH> { |