diff --git a/README.md b/README.md index 3119ed7..2c06b8e 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,26 @@ DreymaR's Big Bag of Keyboard Tricks ==================================== -For Linux (updated to XKB-data v2.12.1) +For Linux (updated to XKB-data v2.17.1ub1, 2016-06) + +* New "Colemak[eD]" AltGr mappings (lv3-4) putting dead keys on AltGr+symbol keys and reworking most other mappings +* An "Extend" layer using Caps Lock as a modifier (lv5-8) for navigation/editing from the home position and more +* Angle/Wide ergo modifications to improve wrist angles, hand spacing and right pinky stretch/load effort +* Curl-DH ergo modifications to encourage natural finger curvature +* For several locales, a 'Unified Symbols' layout with only a few necessary changes from the standard Colemak[eD]; + Also, a layout to 'Keep Local Symbols' like their default (QWERTY-type) counterparts for that locale +* Intuitive phonetic layouts for Cyrillic, Greek and Hebrew scripts +* Mirrored Colemak that allows one-handed typing (if I ever break an arm...) +* The 4 Tarmak transitional Colemak layouts for learning Colemak (or Colemak-Curl) in smaller steps if desired + +More info +--------- + +Run the install and setxkb scripts with -h (or look inside them) for more help and info about their workings! -* New "Colemak[eD]" AltGr mappings (lv 3-4) putting dead keys on AltGr+symbol keys and reworking most other mappings -* An Extend layer using Caps Lock for its modifier (lv 5-8; "Extend") for navigation from the home position and more -* Angle/Wide modifications to improve wrist angles, hand spacing and right pinky stretch/load effort -* Curl modifications to improve hand curvature -* For several locales, a 'Unified Symbols' layout with only a few necessary locale changes from the standard Colemak[eD]; -* Also, a layout to 'Keep Local Symbols' like their default (QWERTY-type) counterparts and key cap markings for that locale -* Access to Cyrillic, Greek and Hebrew letters using layout toggling to intuitive phonetic Colemak layouts -* Access to a mirrored Colemak that allows one-handed typing (I haven't used it much - but if I ever break an arm...!) -* The 4 Tarmak transitional Colemak layouts for learning Colemak in smaller steps if so desired Links ----- -See the [DREYMAR'S (XKB) topic on the Colemak Forums](http://forum.colemak.com/viewtopic.php?id=1438) (http://forum.colemak.com) -There are plenty of explanations and further links in there, as well as links to files +See the [DREYMAR'S (XKB) topic on the Colemak Forums](http://forum.colemak.com/viewtopic.php?id=1438) (http://forum.colemak.com). +There are plenty of explanations and further links in there, as well as links to files. \ No newline at end of file diff --git a/README_dreymar-xmod.txt b/README_dreymar-xmod.txt deleted file mode 100644 index c6ffb41..0000000 --- a/README_dreymar-xmod.txt +++ /dev/null @@ -1,24 +0,0 @@ -# ================================================================= -# === INSTALL-DREYMAR-XMOD.sh for DreymaR's XKB modifications === -# === by ﾘystein Bech "DreymaR" Gadmar, 2015 === -# ================================================================= -# -# DreymaR's Big Bag Of Tricks install script (by GadOE, 2015-01) -# -# Shell script to apply DreymaR's changes to the X keyboard files: -# - AngleWide Ergonomic keyboard models for pc104/pc105 keyboards, -# - Extend mappings as a Misc option and CapsLock as a chooser (using lv5-8), -# - the Colemak [edition DreymaR] layout, using my own lv3-4 mappings, -# - locale variants of Colemak[eD] with 'local' or 'unified' symbol keys, -# - mirrored Colemak[eD] for one-handed typing, -# - and the Tarmak(1-4) transitional (step-by-step) Colemak learning layouts. -# -# - By default, this script creates a backup of the X11 files if none exist. -# - With '-o', overwrite the system X11 files (makes the mod GUI accessible). -# - With '-s ', specify a model/layout to activate immediately. -# (Shortstring format: -s '[4|5][n|a|w] loc [ks|us]'; 'loc'(ale) is 2-letter. -# Some model shortstr examples: '4n' is pc104, '5w' is pc105AngleWide etc. -# E.g.: -s '5n fr us' is normal pc105 model, French Colemak[eD]'USym'.) -# - With '-?', list further instructions and default values. -# -# Happy xkb-hacking! ﾘystein Bech "DreymaR" Gadmar diff --git a/console/Colemak_ConsoleMode.txt b/console/Colemak_ConsoleMode.txt new file mode 100644 index 0000000..f952be4 --- /dev/null +++ b/console/Colemak_ConsoleMode.txt @@ -0,0 +1,11 @@ +From http://colemak.com/Unix + +Linux in text console mode +覧覧覧覧覧覧覧覧覧覧覧覧覧覧覧覧覧覧覧覧 + Download, untar/gunzip archive + Under Debian/Ubuntu/Knoppix/Debian derivatives type: install-keymap linux_console/colemak.iso15.kmap to install as the default layout. + Type: loadkeys linux_console/colemak.iso15.kmap to switch layouts. + To switch to a ISO8859-15 compatible font type: consolechars -f lat9v-14 + To switch back to QWERTY type: loadkeys us +覧覧覧覧覧覧覧覧覧覧覧覧覧覧覧覧覧覧覧覧 + diff --git a/console/colemak.iso15.kmap b/console/colemak.iso15.kmap new file mode 100644 index 0000000..eca4f1a --- /dev/null +++ b/console/colemak.iso15.kmap @@ -0,0 +1,75 @@ +# colemak.kmap for Linux console. +# 2006-01-01 Shai Coleman, http://colemak.com/ . Public domain. +alt_is_meta +charset "iso-8859-15" # use a ISO-8859-15 font, e.g.: consolechars -f lat9v-14 +keymaps 0-12 +include "qwerty-layout" +include "linux-with-alt-and-altgr" +strings as usual + +keycode 41 = grave asciitilde dead_tilde asciitilde nul +keycode 2 = one exclam exclamdown onesuperior +keycode 3 = two at masculine twosuperior nul +keycode 4 = three numbersign ordfeminine threesuperior Escape +keycode 5 = four dollar cent sterling Control_backslash +keycode 6 = five percent euro yen Control_bracketright # EuroSign yen +keycode 7 = six asciicircum asciitilde asciitilde Control_asciicircum # hstroke Hstroke +keycode 8 = seven ampersand eth ETH Control_underscore +keycode 9 = eight asterisk thorn THORN Delete +keycode 10 = nine parenleft asciitilde asciitilde # leftsinglequotemark leftdoublequotemark +keycode 11 = zero parenright asciitilde asciitilde # rightsinglequotemark rightdoublequotemark +keycode 12 = minus underscore asciitilde asciitilde Control_underscore # endash emdash +keycode 13 = equal plus multiply division + +keycode 16 = q Q adiaeresis Adiaeresis Control_q +keycode 17 = w W aring Aring Control_w +keycode 18 = f F atilde Atilde Control_f +keycode 19 = p P oslash Ooblique Control_p +keycode 20 = g G asciitilde asciitilde Control_g # dead_ogonek asciitilde +keycode 21 = j J asciitilde asciitilde Control_j # dstroke Dstroke +keycode 22 = l L asciitilde asciitilde Control_l # lstroke Lstroke +keycode 23 = u U uacute Uacute Control_u +keycode 24 = y Y udiaeresis Udiaeresis Control_y +keycode 25 = semicolon colon odiaeresis Odiaeresis +keycode 26 = bracketleft braceleft guillemotleft asciitilde Escape # guillemotleft 0x1002039 +keycode 27 = bracketright braceright guillemotright asciitilde Control_bracketright # guillemotright 0x100203a +keycode 43 = backslash bar asciitilde asciitilde Control_backslash + +keycode 30 = a A aacute Aacute Control_a +keycode 31 = r R dead_grave asciitilde Control_r +keycode 32 = s S ssharp asciitilde Control_s +keycode 33 = t T dead_acute asciitilde Control_t # dead_acute dead_doubleacute +keycode 34 = d D dead_diaeresis asciitilde Control_d +keycode 35 = h H asciitilde asciitilde Control_h # dead_caron asciitilde +keycode 36 = n N ntilde Ntilde Control_n +keycode 37 = e E eacute Eacute Control_e +keycode 38 = i I iacute Iacute Control_i +keycode 39 = o O oacute Oacute Control_o +keycode 40 = apostrophe quotedbl otilde Otilde + +keycode 44 = z Z ae AE Control_z +keycode 45 = x X dead_circumflex asciitilde Control_x +keycode 46 = c C ccedilla Ccedilla Control_c +keycode 47 = v V oe OE Control_v +keycode 48 = b B asciitilde asciitilde Control_b # dead_breve asciitilde +keycode 49 = k K asciitilde asciitilde Control_k # dead_abovering asciitilde +keycode 50 = m M asciitilde asciitilde Control_m # dead_macron asciitilde +keycode 51 = comma less dead_cedilla asciitilde +keycode 52 = period greater asciitilde asciitilde # dead_abovedot asciitilde +keycode 53 = slash question questiondown asciitilde Delete + +keycode 58 = BackSpace BackSpace BackSpace BackSpace +keycode 86 = minus underscore asciitilde asciitilde Control_underscore # endash emdash +keycode 57 = space space space nobreakspace nul + + +keycode 1 = Escape +keycode 14 = Delete +keycode 15 = Tab +keycode 28 = Return + alt keycode 28 = Meta_Control_m +keycode 29 = Control +keycode 42 = Shift +keycode 54 = Shift +keycode 56 = Alt +keycode 97 = Control diff --git a/console/data_keymaps_i386_colemak_en-latin9.map b/console/data_keymaps_i386_colemak_en-latin9.map new file mode 100644 index 0000000..eca4f1a --- /dev/null +++ b/console/data_keymaps_i386_colemak_en-latin9.map @@ -0,0 +1,75 @@ +# colemak.kmap for Linux console. +# 2006-01-01 Shai Coleman, http://colemak.com/ . Public domain. +alt_is_meta +charset "iso-8859-15" # use a ISO-8859-15 font, e.g.: consolechars -f lat9v-14 +keymaps 0-12 +include "qwerty-layout" +include "linux-with-alt-and-altgr" +strings as usual + +keycode 41 = grave asciitilde dead_tilde asciitilde nul +keycode 2 = one exclam exclamdown onesuperior +keycode 3 = two at masculine twosuperior nul +keycode 4 = three numbersign ordfeminine threesuperior Escape +keycode 5 = four dollar cent sterling Control_backslash +keycode 6 = five percent euro yen Control_bracketright # EuroSign yen +keycode 7 = six asciicircum asciitilde asciitilde Control_asciicircum # hstroke Hstroke +keycode 8 = seven ampersand eth ETH Control_underscore +keycode 9 = eight asterisk thorn THORN Delete +keycode 10 = nine parenleft asciitilde asciitilde # leftsinglequotemark leftdoublequotemark +keycode 11 = zero parenright asciitilde asciitilde # rightsinglequotemark rightdoublequotemark +keycode 12 = minus underscore asciitilde asciitilde Control_underscore # endash emdash +keycode 13 = equal plus multiply division + +keycode 16 = q Q adiaeresis Adiaeresis Control_q +keycode 17 = w W aring Aring Control_w +keycode 18 = f F atilde Atilde Control_f +keycode 19 = p P oslash Ooblique Control_p +keycode 20 = g G asciitilde asciitilde Control_g # dead_ogonek asciitilde +keycode 21 = j J asciitilde asciitilde Control_j # dstroke Dstroke +keycode 22 = l L asciitilde asciitilde Control_l # lstroke Lstroke +keycode 23 = u U uacute Uacute Control_u +keycode 24 = y Y udiaeresis Udiaeresis Control_y +keycode 25 = semicolon colon odiaeresis Odiaeresis +keycode 26 = bracketleft braceleft guillemotleft asciitilde Escape # guillemotleft 0x1002039 +keycode 27 = bracketright braceright guillemotright asciitilde Control_bracketright # guillemotright 0x100203a +keycode 43 = backslash bar asciitilde asciitilde Control_backslash + +keycode 30 = a A aacute Aacute Control_a +keycode 31 = r R dead_grave asciitilde Control_r +keycode 32 = s S ssharp asciitilde Control_s +keycode 33 = t T dead_acute asciitilde Control_t # dead_acute dead_doubleacute +keycode 34 = d D dead_diaeresis asciitilde Control_d +keycode 35 = h H asciitilde asciitilde Control_h # dead_caron asciitilde +keycode 36 = n N ntilde Ntilde Control_n +keycode 37 = e E eacute Eacute Control_e +keycode 38 = i I iacute Iacute Control_i +keycode 39 = o O oacute Oacute Control_o +keycode 40 = apostrophe quotedbl otilde Otilde + +keycode 44 = z Z ae AE Control_z +keycode 45 = x X dead_circumflex asciitilde Control_x +keycode 46 = c C ccedilla Ccedilla Control_c +keycode 47 = v V oe OE Control_v +keycode 48 = b B asciitilde asciitilde Control_b # dead_breve asciitilde +keycode 49 = k K asciitilde asciitilde Control_k # dead_abovering asciitilde +keycode 50 = m M asciitilde asciitilde Control_m # dead_macron asciitilde +keycode 51 = comma less dead_cedilla asciitilde +keycode 52 = period greater asciitilde asciitilde # dead_abovedot asciitilde +keycode 53 = slash question questiondown asciitilde Delete + +keycode 58 = BackSpace BackSpace BackSpace BackSpace +keycode 86 = minus underscore asciitilde asciitilde Control_underscore # endash emdash +keycode 57 = space space space nobreakspace nul + + +keycode 1 = Escape +keycode 14 = Delete +keycode 15 = Tab +keycode 28 = Return + alt keycode 28 = Meta_Control_m +keycode 29 = Control +keycode 42 = Shift +keycode 54 = Shift +keycode 56 = Alt +keycode 97 = Control diff --git a/docs_dreymar-xmod/Cmk-phon-locales_X-img/Cmk-X-phon-bg.png b/docs_dreymar-xmod/Cmk-phon-locales_X-img/Cmk-X-phon-bg.png index 9031f31..0719ae8 100644 Binary files a/docs_dreymar-xmod/Cmk-phon-locales_X-img/Cmk-X-phon-bg.png and b/docs_dreymar-xmod/Cmk-phon-locales_X-img/Cmk-X-phon-bg.png differ diff --git a/docs_dreymar-xmod/Cmk-phon-locales_X-img/Cmk-X-phon-bg_2015-02.png b/docs_dreymar-xmod/Cmk-phon-locales_X-img/Cmk-X-phon-bg_2015-02.png new file mode 100644 index 0000000..9031f31 Binary files /dev/null and b/docs_dreymar-xmod/Cmk-phon-locales_X-img/Cmk-X-phon-bg_2015-02.png differ diff --git a/docs_dreymar-xmod/Cmk-phon-locales_X-img/Cmk-X-phon-ru.png b/docs_dreymar-xmod/Cmk-phon-locales_X-img/Cmk-X-phon-ru.png index fa654a9..90aa694 100644 Binary files a/docs_dreymar-xmod/Cmk-phon-locales_X-img/Cmk-X-phon-ru.png and b/docs_dreymar-xmod/Cmk-phon-locales_X-img/Cmk-X-phon-ru.png differ diff --git a/docs_dreymar-xmod/Cmk-phon-locales_X-img/Cmk-X-phon-ru_2015-02.png b/docs_dreymar-xmod/Cmk-phon-locales_X-img/Cmk-X-phon-ru_2015-02.png new file mode 100644 index 0000000..fa654a9 Binary files /dev/null and b/docs_dreymar-xmod/Cmk-phon-locales_X-img/Cmk-X-phon-ru_2015-02.png differ diff --git a/docs_dreymar-xmod/Extend-ISO-NoWi-Linux_90d.png b/docs_dreymar-xmod/Extend-ISO-NoWi-Linux_90d.png new file mode 100644 index 0000000..41df46a Binary files /dev/null and b/docs_dreymar-xmod/Extend-ISO-NoWi-Linux_90d.png differ diff --git a/install-dreymar-xmod.sh b/install-dreymar-xmod.sh index a1c5660..4f2c5fa 100644 --- a/install-dreymar-xmod.sh +++ b/install-dreymar-xmod.sh @@ -2,26 +2,29 @@ ## ================================================================= ## === INSTALL-DREYMAR-XMOD.sh for DreymaR's XKB modifications === -## === by ﾃystein Bech "DreymaR" Gadmar, 2015 === +## === by ﾃystein Bech "DreymaR" Gadmar, -2016 === ## ================================================================= - -HeadStr="DreymaR's Big Bag Of Tricks install script (by GadOE, 2015-01)" +# +HeadStr="DreymaR's Big Bag Of Tricks install script (by GadOE, 2016-06)" DescStr=\ -"Shell script to apply DreymaR's changes to the X keyboard files:\n"\ -" - AngleWide Ergonomic keyboard models for pc104/pc105 keyboards,\n"\ -" - Extend mappings as a Misc option and CapsLock as a chooser (using lv5-8),\n"\ -" - the Colemak [edition DreymaR] layout, using my own lv3-4 mappings,\n"\ -" - locale variants of Colemak[eD] with 'local' or 'unified' symbol keys,\n"\ -" - mirrored Colemak[eD] for one-handed typing,\n"\ -" - and the Tarmak(1-4) transitional (step-by-step) Colemak learning layouts.\n"\ +"\e[1mShell script to apply DreymaR's changes to the X keyboard files:\e[0m\n"\ +" - AngleWide Ergonomic keyboard models for pc104/pc105 keyboards,\n"\ +" - Extend mappings as a Misc option and CapsLock as a chooser (using lv5-8),\n"\ +" - the Colemak [edition DreymaR] layout, using my own lv3-4 mappings,\n"\ +" - locale variants of Colemak[eD] with 'keep local' or 'unified' symbol keys,\n"\ +" - phonetic variants of Colemak for other scripts such as Greek,\n"\ +" - mirrored Colemak[eD] for one-handed typing, (if I ever break an arm...)\n"\ +" - and the Tarmak(1-4) transitional (step-by-step) Colemak learning layouts.\n"\ "\n"\ "- By default, this script creates a backup of the X11 files if none exist.\n"\ "- With '-o', overwrite the system X11 files (makes the mod GUI accessible).\n"\ "- With '-s ', specify a model/layout to activate immediately.\n"\ -" (Shortstr format: -s '[4|5][n|a|w|e|f] loc [ks|us]'; 'loc'(ale) is 2-letter.\n"\ -" Some model shortstr examples: '4n' is pc104, '5e' is pc105AngleWide etc.\n"\ +" (Shortstr format: -s '[4|5][n|a|b|v][w|f] loc [ks|us]'; 'loc'(ale) is 2-letter.\n"\ +" Some model shortstr examples: '4n' is pc104, '5aw' is pc105AngleWide etc.\n"\ " E.g.: -s '5n fr us' is normal pc105 model, French Colemak[eD]'USym'.)\n"\ -"- With '-?', list further instructions and default values.\n" +"- With '-?', list further instructions and default values.\n"\ +"- See http://forum.colemak.com/viewtopic.php?id=1438 for more info\n" +# FootStr="Happy xkb-hacking! ~ ﾃystein Bech 'DreymaR' Gadmar" #"- With '-i ', specify a directory path/name to install in.\n"\ #"- With '-g', also install GTK 2.0/3.0 config for XF86 Cut/Copy/Paste.\n"\ @@ -31,10 +34,10 @@ FootStr="Happy xkb-hacking! ~ ﾃystein Bech 'DreymaR' Gadmar" ## - It has subdirectories like 'xkb' that are to be installed (one, some or all) ## NOTE: This is the new preferred way instead of patching the system files: ## - Backup system xkb to dbak-xkb_ (and the same for any other subdirs) -## - Copy X11/xkb to ${InstDir}/dmod-xkb, then modify files in dmod-xkb -## - Set up setxkb.sh to run from the modified dmod-xkb +## - Copy X11/xkb to ${InstDir}/dxkb, then modify files in dxkb +## - Set up setxkb.sh to run from the modified dxkb [WARNING: This may not work now!] ## - Optionally (-o) overwrite the system files instead -## NOTE: The x-mod dir holds an xkb subfolder; later, there will be a locale dir too. +## NOTE: The x-mod dir now holds x-mod*/xkb; eventually there may be a locale dir too. ##-------------- init ------------------------------------------ @@ -45,7 +48,8 @@ MyNAME=`basename $0` MyPATH=`dirname $0` #~ XVERSION='2-5-1-3ub2' #~ XVERSION='2-10-1-1' -XVERSION='2-12-1' +#~ XVERSION='2-12-1' +XVERSION='2-17-1ub1' ## @@@ The default X11 dir under Debian/Ubuntu/etc is /usr/share/X11 @@@ ## @@@ The default X11 dir under some (older) distros is /usr/lib/X11 @@@ X11DIR='/usr/share/X11'; [ -d "${X11DIR}" ] || X11DIR='/usr/lib/X11' @@ -54,27 +58,27 @@ ModDATE='' DModDir=`dirname $0` # (-d) Path to the script (and mod?) root directory ToolDir="${DModDir}/dreymar-xtools" # The location of tool scripts (like setxkb.sh) DModTag="x-mod_v${XVERSION}_${ModDATE}" # (-t) Mod dir "prefix" -DBakFix='dbak-' # (--) Backup dir prefix -DModFix='dmod-' # (--) Modded dir prefix -#~ InstDir="${X11DIR}" # (-i) Path to install subfolder(s) in -InstDir="${HOME}/drey-xmod" # (-i) Path to install subfolder(s) in -WriteSys='no' # (-o) Overwrite the original xkb dir with the modded one -Restore='0' # (-r) Reverse: Restore from backup # instead of installing -DoBackup='ifnone' # (-n/b) Default backup behavior is "if no backups are found" -SubDirs='all' # (-m) Directory/-ies inside X11 to modify (e.g., 'xkb locale', 'all') -InstGTK='no' # (-g) Whether to install the GTK 2.0/3.0 config (if not present) -SetXMap='no' # (-x) Whether to run the setxkb script after installing -SetXStr='5aw us us' # (-s) Shortcut string for setxkb - 'mmm ll vv' (model layout eD-variant) +DBakFix='dbak-' # (--) Backup dir prefix +DModFix='d' # (--) Modded dir prefix +InstDir="${X11DIR}" # (-i) Path to install subfolder(s) in +#~ InstDir="${HOME}/drey-xmod" # (-i) Path to install subfolder(s) in +WriteSys='no' # (-o) Overwrite the original xkb dir with the modded one +Restore='0' # (-r) Reverse: Restore from backup # instead of installing +DoBackup='ifnone' # (-n/b) Default backup behavior is "if no backups are found" +SubDirs='all' # (-m) Directory/-ies inside X11 to modify (e.g., 'xkb locale', 'all') +InstGTK='no' # (-g) Whether to install the GTK 2.0/3.0 config (if not present) +SetXMap='no' # (-x) Whether to run the setxkb script after installing +SetXStr='5aw us us' # (-s) Shortcut string for setxkb - 'mmm ll vv' (model layout eD-variant) -HelpStr="Usage: bash ${MyNAME} [optional args]\n"\ +HelpStr="\e[1mUsage: bash ${MyNAME} [optional args]\e[0m\n"\ "Run this from the directory containing the x-mod dir\n"\ -"[-o] Overwrite system X11 directory - ${WriteSys}\n"\ +"[-i] - ${InstDir}\n"\ +"[-o] Override install path w/ X11 - ${WriteSys}\n"\ "[-b] Force backup | location - ${X11DIR}\n"\ "[-n] Force no backup | default - ${DoBackup}\n"\ -"[-r] <#> Restore backup - 1 is oldest - ${Restore}\n"\ -"[-m] - ${SubDirs}\n"\ -"[-i] - ${InstDir}\n"\ +"[-r] <#> Restore backup | 1 is oldest - ${Restore}\n"\ "[-d] - ${DModDir}\n"\ +"[-m] - ${SubDirs}\n"\ "[-t] - ${DModTag}\n"\ "[-g] Install GTK 2.0/3.0 edit config - ${InstGTK}\n"\ "[-x] Run the setxkbmap script, yes/no - ${SetXMap}\n"\ @@ -84,17 +88,19 @@ HelpStr="Usage: bash ${MyNAME} [optional args]\n"\ ##-------------- functions and line parser --------------------- -MyMsg() +MyMsg() # Formatted output: last arg is printf 'style[;fgcolor[;bgcolor]]' { - printf "\n@@@ $1 @@@\n\n" + # Style: 0-Off, 1-Bold, 4-Underscore, 5-Blink, 7-Reverse, 8-Concealed + # Color: (3#/4# FG/BG): 0-Black, 1-Red, 2-Green, 3-Yellow, 4-Blue, 5-Magenta, 6-Cyan, 7-White + printf "\n\e[${3:-1;32;40}m@@@ $1 @@@\e[0m\n$2" # default: Bold green on black } PrintHelpAndExit() { - MyMsg "${HeadStr}" + MyMsg "${HeadStr}" "\n" printf "${DescStr}\n" printf "${HelpStr}" - MyMsg "${FootStr}" + MyMsg "${FootStr}" "\n" exit $1 } @@ -104,9 +110,20 @@ MyEcho() [ -z "$2" ] || printf "$1\n" >> "$2" } +MyPoint() +{ + MyEcho "\e[1;32mﾂ､ \e[0m$@" # Bold green +} + +MyWarning() +{ + MyMsg "WARNING: ${@:-'Beware of nargles!'}" "\n" '1;36;44' # Bold cyan on blue +#~ exit 1 +} + MyError() { - MyMsg "$MyNAME - ERROR: ${@:-'Undefined error'}" + MyMsg "$MyNAME - ERROR: ${@:-'Undefined error'}" "\n" '1;37;41' # Bold white on red exit 1 } @@ -115,7 +132,7 @@ MyError() #~ OldDir=`pwd` #~ NewDir=${1:-`pwd`} #~ cd ${NewDir} || MyError "Change to '${NewDir}' failed" - #~ MyEcho "ﾂ､ Changed dir to '${NewDir}'" + #~ MyPoint "Changed dir to '${NewDir}'" #~ } #~ if [ "$#" == 0 ]; then PrintHelpAndExit 2; fi # No args @@ -143,12 +160,12 @@ done ##-------------- main ------------------------------------------ MyMsg "$HeadStr" -#~ MyEcho "ﾂ､ Working from '`pwd`'" +#~ MyPoint "Working from '`pwd`'" ## Check for a mod dir (the latest found) and if found, get its full name DModDir=`find "${DModDir%/}/${DModTag}"* -maxdepth 0 -type d 2>/dev/null | tail -n 1` [ -n "${DModDir}" ] || MyError "Mod root dir not found!" -MyEcho "ﾂ､ Found mod root dir '${DModDir}'" +MyPoint "Found mod root dir '${DModDir}'" ## Read the mod subdirs if [ "${SubDirs}" == "all" ]; then @@ -156,7 +173,7 @@ if [ "${SubDirs}" == "all" ]; then SubDirs=`echo ${SubDirs}` # A trick to make a var space separated for the following echo cmd [ -n "${SubDirs}" ] || MyError "No mod subdirs found!" fi -MyEcho "ﾂ､ Subdirectories to mod: '${SubDirs}'" +MyPoint "Subdirectories to mod: '${SubDirs}'" ## For each subdir, backup if either DoBackup = 'yes' or DoBackup = 'ifnone' and no backup exists BackIt='' @@ -164,7 +181,7 @@ if [ ${DoBackup} == 'yes' ]; then BackIt="${SubDirs}" elif [ ${DoBackup} == 'ifnone' ] && [ ${Restore} == '0' ]; then for That in ${SubDirs}; do - MyEcho "ﾂ､ Looking for '${That}' backup in '${X11DIR}'..." + MyPoint "Looking for '${That}' backup in '${X11DIR}'..." # Test for (at least one) backup dir; if none found then proceed without errors # if [ -z `find "${X11DIR}/${DBakFix}${That}"* -maxdepth 0 -type d 2>/dev/null | head -n 1` ]; then if [ -z `find "${X11DIR}/${DBakFix}${That}"* -maxdepth 0 -type d -print -quit 2>/dev/null` ]; then @@ -173,13 +190,21 @@ elif [ ${DoBackup} == 'ifnone' ] && [ ${Restore} == '0' ]; then fi done fi -[ -z "${BackIt}" ] && MyEcho "ﾂ､ Backing up: None" || MyEcho "ﾂ､ Backing up: '${BackIt}'" +[ -z "${BackIt}" ] && MyPoint "Backing up: None" || MyPoint "Backing up: '${BackIt}'" + +## Check for root privileges (if not root, sudo command); note that root is only needed in some cases! +DoSudo='' +if [ "$EUID" -ne 0 ]; then # not root, so test for and use sudo instead (but some distros don't have it!) + #[ command -v sudo >/dev/null 2>&1 ] || MyError "Root access needed - sudo won't run!" + ( command -v sudo >/dev/null 2>&1 ) || MyWarning "Root/superuser access may be needed!" + DoSudo='sudo' +fi ## Perform the actual backup(s) ## NOTE: cp -a makes an "archive" copy, preserving all attributes and links for That in ${BackIt}; do [ -d "${X11DIR}/${That}" ] || MyError "Unable to backup '${That}': Directory not found!" - sudo cp -a "${X11DIR}/${That}" "${X11DIR}/${DBakFix}${That}_${MyDATE}" || MyError "Copy error!" + ${DoSudo} cp -a "${X11DIR}/${That}" "${X11DIR}/${DBakFix}${That}_${MyDATE}" || MyError "Copy error!" done ## For each subfolder: Restore from backup #, overwrite X11 files or make new mod folder @@ -188,22 +213,28 @@ for That in ${SubDirs}; do ## Restore from backup. Pick a backup # by parameter, 1 being oldest; use 999 or such for the last one BackIt=`find "${X11DIR}/${DBakFix}${That}"* -maxdepth 0 -type d 2>/dev/null | head -n ${Restore} | tail -n 1` [ -d "${BackIt}" ] || MyError "Unable to restore from '$(basename ${BackIt})': Not found!" - MyEcho "ﾂ､ Restoring from backup '$(basename "${BackIt}")'" - sudo cp -a "${BackIt}/"* "${X11DIR}/${That}" 2>/dev/null || MyError "Restore copy error!" + MyPoint "Restoring from backup '$(basename "${BackIt}")'" + ${DoSudo} cp -a "${BackIt}/"* "${X11DIR}/${That}" 2>/dev/null \ + && MyPoint "Restore done" || MyError "Restore copy error!" XKBDir="${X11DIR}/xkb" # Setxkbmap will default to the X11 dir, but this makes it unambigous - elif [ ${WriteSys} == 'yes' ] && [ -d "${DModDir}/${That}" ]; then # Overwrite system files - MyEcho "ﾂ､ Replacing files in '${X11DIR}/${That}' with mod" - sudo cp -a "${DModDir}/${That}/"* "${X11DIR}/${That}" 2>/dev/null || MyError "System files copy error!" + elif [ ${WriteSys} == 'yes' ] || [ ${InstDir} == ${X11DIR} ] && [ -d "${DModDir}/${That}" ]; then # Overwrite OS files + MyPoint "Replacing files in '${X11DIR}/${That}' with mod" + ${DoSudo} cp -a "${DModDir}/${That}/"* "${X11DIR}/${That}" 2>/dev/null \ + && MyPoint "System install done" || MyError "System files copy error!" XKBDir="${X11DIR}/xkb" else ## Make new mod folder (will not show up in keyboard settings GUI; use setxkbmap instead) - DoSudo=''; mkdir -p "${InstDir}" 2>/dev/null && [ -w "${InstDir}" ] || DoSudo='sudo' + DoSudo='' + mkdir -p "${InstDir}" 2>/dev/null && [ -w "${InstDir}" ] || DoSudo='sudo' # check whether sudo is needed MyDir="${InstDir%/}/${DModFix}${That}" #~ MyDir="$(dirname "${MyDir}")/${DModFix}$(basename "${MyDir}")" # Insert prefix in path/name - MyEcho "ﾂ､ Installing mod files in '${MyDir}'" + MyPoint "Installing mod files in '${MyDir}'" + MyWarning "It seems that setxkbmap w/ local dir isn't working now?!" ${DoSudo} mkdir -p "${MyDir}" || MyError "Can't make '${MyDir}'!" ${DoSudo} cp -a "${X11DIR}/${That}/"* "${MyDir}" 2>/dev/null || MyError "Local files copy error!" - ${DoSudo} cp -a "${DModDir}/${That}/"* "${MyDir}" 2>/dev/null || MyError "Local files copy error!" + ${DoSudo} cp -a "${DModDir}/${That}/"* "${MyDir}" 2>/dev/null \ + && MyPoint "Local install done" || MyError "Local files copy error!" XKBDir="${InstDir%/}/${DModFix}xkb" # Prepare for setxkbmap + cp -a setxkb.sh ${InstDir} # Copy over the setxkb.sh script to the new dir fi done @@ -218,15 +249,15 @@ fi #~ MyMsg "Press any key to set the new xkb map${That}, or 'q' to quit" #~ read -p '$>' -n 1 keypress #~ if [ "${keypress}" == 'q' ]; then + ## If selected, call the DreymaR setxkbmap script to activate the new (default) layout if [ "${SetXMap}" != 'yes' ]; then - MyEcho; MyMsg "XKBmap activation skipped" + MyMsg "XKBmap activation skipped" "" '1;33;40' else - #~ "${ToolDir}/setxkb.sh" -p $(dirname "${XKBDir}") -d $(basename "${XKBDir}") || MyError "setxkb.sh failed!" - "./setxkb.sh" -d "${XKBDir}" -s "${SetXStr}" || MyError "setxkb.sh failed!" + bash ./setxkb.sh -d "${XKBDir}" -s "${SetXStr}" || MyError "setxkb.sh failed!" fi -MyMsg "${MyNAME} finished!" +MyMsg "${MyNAME} finished!" "\n" exit 0 ##-------------- misc ------------------------------------------ diff --git a/setxkb.sh b/setxkb.sh index a00555a..648bf8f 100644 --- a/setxkb.sh +++ b/setxkb.sh @@ -7,21 +7,22 @@ HeadStr="DreymaR's setxkbmap script (by GadOE, 2015-01)" DescStr=\ -"Shell script to change X.org keyboard setup\n"\ -" using the 'setxkbmap' command.\n"\ -" To override system settings after logon,\n"\ -" source it, e.g., in your ~/.bashrc file\n" +"\e[1mShell script to change X.org keyboard setup\e[0m\n"\ +" using the 'setxkbmap' command.\n"\ +" To override system settings after logon,\n"\ +" source it, e.g., in your ~/.bashrc file,\n"\ +" or use -a to write the setxkbmap command to a file.\n" FootStr="Happy xkb-hacking! ~ ﾃystein Bech 'DreymaR' Gadmar" ## NOTE: It now works with local xkb(-mod) dir -# By default, setxkbmap checks ./rules first! -# Need a full xkb dir then (not just the xkb-mod files) +# By default, setxkbmap checks ./rules first! +# Need a full xkb dir then (not just the xkb-mod files) ## NOTE: I made a handy shorthand for activating simple cmk_ed model/layout combos. -# Example: -s '5w no us' activates model pc105awide-sl, layout no(cmk_ed_us) -# Options left out of this: Too complex (replace all or add another, and if so, how?) -# Models: 4n 4a(pc104angle-z) 4w(pc104wide-qu) 4e(pc104awide-zqu) 4f(pc104aframe) -# 5n 5a(pc105angle-lg) 5w/5e(pc105awide-sl) +# Example: -s '5w no us' activates model pc105awide-sl, layout no(cmk_ed_us) +# Models: 4n 4a(pc104angle-z) 4w(pc104wide-qu) 4aw(pc104awide-zqu) 4f(pc104aframe) +# 5n 5a(pc105angle-lg) 5w/5aw(pc105awide-sl) +# Options left out of this: Too complex (replace all or add another, and if so, how?) ##-------------- init ------------------------------------------ ## NOTE: '#(-a)' means that the value can be set by a command-line argument '-a ' @@ -35,15 +36,19 @@ X11DIR='/usr/share/X11'; [ -d "${X11DIR}" ] || X11DIR='/usr/lib/X11' #~ XKBmodel=pc104awide-zqu # ANSI-104 keyboard w/ Angle(Z)Wide(Quote) mod XKBmodel=pc105awide-sl # ISO-105 keyboard w/ AngleWide(Slash) mod +#~ XKBmodel=pc105caw-bksl # ISO-105 w/ Curl(DbgHk)AngleWide(Slash) mod #~ XKBlayout='us(cmk_ed_us),gr(colemak),ru(colemak)' XKBlayout='no(cmk_ed_us)' # Norwegian Colemak[eD]'Universal Symbols' layout XKBoption='misc:extend,lv5:caps_switch_lock,grp:shifts_toggle,compose:menu' VerboseLvl=9 # (-v) How much info should setxkbmap print out? KeepXKM='no' # (-k) Retain old /var/lib/xkb/server-*.xkm files? XKBdir="${X11DIR}/xkb" # (-d) The xkb-type dir to run setxkbmap from +AddCmd='no' # (-a) Add setxkbmap cmd to file? +AddDefault="${HOME}/.bashrc" +AddCmdTo=${AddDefault} # (-f) File (such as '~/.bashrc') to add setxkbmap cmd to SetXStr='' #'5aw no us' # (-s) Shortcut string for setxkb - 'model locale eD-variant(sym)' -HelpStr="Usage: bash ${MyNAME} [optional args]\n"\ +HelpStr="\e[1mUsage: bash ${MyNAME} [optional args]\e[0m\n"\ "[-m] - '${XKBmodel}'\n"\ "[-l] - '${XKBlayout}'\n"\ "[-o] - microsoftmult + microsoftmult Microsoft Wireless Multimedia Keyboard 1.0A Microsoft Inc. - microsoftelite + microsoftelite Microsoft Natural Keyboard Elite Microsoft Inc. - microsoftccurve2k + microsoftccurve2k Microsoft Comfort Curve Keyboard 2000 Microsoft Inc. @@ -1295,6 +1295,20 @@ htc + + + teck227 + Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys) + Megawin Technology + + + + + teck229 + Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key) + Megawin Technology + + @@ -1382,7 +1396,7 @@ dvp - English (programmer Dvorak) + English (Programmer Dvorak) @@ -1406,9 +1420,11 @@ altgr-intl English (international AltGr dead keys) - eng - fra - ger + + eng + fra + ger + @@ -1421,11 +1437,13 @@ hbs Serbo-Croatian (US) - eng - bos - hbs - hrv - srp + + eng + bos + hbs + hrv + srp + @@ -1572,6 +1590,12 @@ Arabic (Buckwalter) + + + mac + Arabic (Macintosh) + + @@ -1717,9 +1741,11 @@ be Belgian - ger - nld - fra + + ger + nld + fra + @@ -1774,6 +1800,8 @@ Bangla ben + + sat @@ -1801,6 +1829,8 @@ Bangla (India) ben + + sat @@ -1812,6 +1842,8 @@ Bangla (India, Probhat) ben + + sat @@ -1819,35 +1851,53 @@ ben_baishakhi Bangla (India, Baishakhi) - ben + + ben + + sat + ben_bornona Bangla (India, Bornona) - ben - + + ben + + sat + + ben_gitanjali Bangla (India, Uni Gitanjali) - ben + + ben + + sat + ben_inscript Bangla (India, Baishakhi Inscript) - ben + + ben + + sat + eeyek Manipuri (Eeyek) - mni + + mni + @@ -1933,7 +1983,9 @@ ml Malayalam (enhanced Inscript, with rupee sign) - mal + + mal + @@ -1944,6 +1996,20 @@ Oriya ori + + sat + + + + + + olck + + sat + Ol Chiki + + + sat @@ -2206,6 +2272,12 @@ + + + thinkpad + Portuguese (Brazil, IBM/Lenovo ThinkPad) + + @@ -2326,14 +2398,18 @@ cm English (Cameroon) - eng + + eng + french French (Cameroon) - fra + + fra + @@ -2546,7 +2622,7 @@ ug Uyghur - ug + uig @@ -2630,6 +2706,17 @@ Czech (US Dvorak with CZ UCW support) + + + rus + + ru + Russian (Czech, phonetic) + + rus + + + @@ -2817,8 +2904,10 @@ ar Iraqi - ara - kur + + ara + kur + @@ -2919,7 +3008,9 @@ smi Northern Saami (Finland) - sme + + sme + @@ -2928,6 +3019,12 @@ Finnish (Macintosh) + + + das + Finnish (DAS) + + @@ -3019,6 +3116,12 @@ French (Macintosh) + + + azerty + French (Azerty) + + bre @@ -3232,14 +3335,18 @@ ro Romanian (Germany) - rum + + rum + ro_nodeadkeys Romanian (Germany, eliminate dead keys) - rum + + rum + @@ -3511,6 +3618,12 @@ Icelandic (eliminate dead keys) + + + mac_legacy + Icelandic (Macintosh, legacy) + + mac @@ -3699,16 +3812,20 @@ ru Russian (Kazakhstan, with Kazakh) - kaz - rus + + kaz + rus + kazrus Kazakh (with Russian) - kaz - rus + + kaz + rus + @@ -3728,7 +3845,8 @@ stea Lao (STEA proposed standard layout) - lao + + lao @@ -3786,6 +3904,12 @@ Spanish (Latin American, Sun dead keys) + + + dvorak + Spanish (Latin American, Dvorak) + + @@ -4058,7 +4182,7 @@ Norwegian (Macintosh, eliminate dead keys) - + colemak Norwegian (Colemak) @@ -4120,7 +4244,9 @@ szl Silesian - szl + + szl + @@ -4381,8 +4507,10 @@ srp Serbian (Russia) - rus - srp + + rus + srp + @@ -4403,6 +4531,18 @@ + + + phonetic_azerty + Russian (phonetic azerty) + + + + + phonetic_fr + Russian (phonetic French) + + @@ -4662,7 +4802,9 @@ swl Swedish Sign Language - swl + + swl + @@ -4673,8 +4815,10 @@ de German (Switzerland) - ger - gsw + + ger + gsw + @@ -4865,6 +5009,13 @@ + + + us + us + Sinhala (US keyboard with Sinhala letters) + + @@ -5360,6 +5511,8 @@ Nepali nep + + sat @@ -5531,6 +5684,16 @@ + + + tg + fr-tg + French (Togo) + + fra + + + ke @@ -5572,33 +5735,37 @@ ph Filipino - eng - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war + + eng + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + qwerty-bay Filipino (QWERTY Baybayin) - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war + + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + @@ -5611,16 +5778,18 @@ capewell-dvorak-bay Filipino (Capewell-Dvorak Baybayin) - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war + + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + @@ -5633,16 +5802,18 @@ capewell-qwerf2k6-bay Filipino (Capewell-QWERF 2006 Baybayin) - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war + + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + @@ -5655,16 +5826,18 @@ colemak-bay Filipino (Colemak Baybayin) - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war + + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + @@ -5677,16 +5850,18 @@ dvorak-bay Filipino (Dvorak Baybayin) - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war + + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + @@ -5696,7 +5871,9 @@ md md Moldavian - rum + + rum + @@ -5704,7 +5881,9 @@ gag gag Moldavian (Gagauz) - gag + + gag + @@ -5842,7 +6021,7 @@ grp:rctrl_rshift_toggle Right Ctrl+Right Shift - + + + + @@ -6542,7 +6744,7 @@ + + + korean + Korean Hangul/Hanja keys + + + + + esperanto diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/al b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/al similarity index 100% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/al rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/al diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/at b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/at similarity index 100% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/at rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/at diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/ba b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/ba similarity index 100% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/ba rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/ba diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/be b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/be similarity index 100% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/be rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/be diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/bg b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/bg similarity index 99% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/bg rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/bg index f44b5c6..1de6c30 100644 --- a/x-bak_v2-12-1_2014-08-06/xkb/symbols/bg +++ b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/bg @@ -190,7 +190,7 @@ xkb_symbols "bas_phonetic" { // This is an extended variant of the standard Latin QWERTY layout with // additional symbols in levels 3 and 4. -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "latin" { key {[ grave, asciitilde, U2248, U2245 ]}; diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/br b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/br similarity index 99% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/br rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/br index 85f5f55..b7a76d5 100644 --- a/x-bak_v2-12-1_2014-08-06/xkb/symbols/br +++ b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/br @@ -64,7 +64,7 @@ partial alphanumeric_keys xkb_symbols "thinkpad" { include "br(abnt2)" - name[Group1]="Portuguese (Brazil)"; + name[Group1]="Portuguese (Brazil, IBM/Lenovo ThinkPad)"; key { [ slash, question, degree, questiondown ] }; }; diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/ca b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/ca similarity index 100% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/ca rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/ca diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/cz b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/cz similarity index 64% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/cz rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/cz index 97ab3cf..22caf6d 100644 --- a/x-bak_v2-12-1_2014-08-06/xkb/symbols/cz +++ b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/cz @@ -177,6 +177,76 @@ xkb_symbols "dvorak-ucw" { include "level3(ralt_switch)" }; +// phonetic layout for Russian letters on an CZ (QWERTY) keyboard +// originaly created by Pavel Sorejs + +partial alphanumeric_keys +xkb_symbols "rus" { + + include "cz(qwerty)" + name[Group1]= "Russian (Czech, phonetic)"; + + key { [ plus, ampersand, 1 , 1 ] }; + key { [ Cyrillic_hardsign, 2, 2 , 2 ] }; + key { [ Cyrillic_sha, Cyrillic_SHA, 3 , 3 ] }; + key { [ Cyrillic_che, Cyrillic_CHE, 4 , 4 ] }; + key { [ Cyrillic_shcha, Cyrillic_SHCHA, 5 , 5 ] }; + key { [ Cyrillic_zhe, Cyrillic_ZHE, 6 , 6 ] }; + key { [ quotedbl, 4, 7 , 7 ] }; + key { [ section, 5, 8 , 8 ] }; + key { [ dollar, 6, 9 , 9 ] }; + key { [ equal, 7, 0 , 0 ] }; + key { [ percent, 8 ] }; + key { [ apostrophe, 9 ] }; + + key { [ comma, question ] }; + key { [ period, exclam ] }; + key { [ minus, slash ] }; + + key { [ semicolon, colon ] }; + + key { [ bar, brokenbar ] }; + + key { [ Cyrillic_io, Cyrillic_IO ] }; + + + key { [ numerosign, 1, q, Q ] }; + key { [ Cyrillic_yu, Cyrillic_YU, w, W ] }; + key { [ Cyrillic_ie, Cyrillic_IE, e, E ] }; + key { [ Cyrillic_er, Cyrillic_ER, r, R ] }; + key { [ Cyrillic_te, Cyrillic_TE, t, T ] }; + key { [ Cyrillic_yeru, Cyrillic_YERU, y, Y ] }; + key { [ Cyrillic_u, Cyrillic_U, u, U ] }; + key { [ Cyrillic_i, Cyrillic_I, i, I ] }; + key { [ Cyrillic_o, Cyrillic_O, o, O ] }; + key { [ Cyrillic_pe, Cyrillic_PE, p, P ] }; + key { [ Cyrillic_e, Cyrillic_E, bracketleft, division ] }; + key { [ parenright, parenleft, bracketright, multiply ] }; + + key { [ Cyrillic_a, Cyrillic_A, a, A ] }; + key { [ Cyrillic_es, Cyrillic_ES, s, S ] }; + key { [ Cyrillic_de, Cyrillic_DE, d, D ] }; + key { [ Cyrillic_ef, Cyrillic_EF, f, F ] }; + key { [ Cyrillic_ghe, Cyrillic_GHE, g, G ] }; + key { [ Cyrillic_ha, Cyrillic_HA, h, H ] }; + key { [ Cyrillic_shorti, Cyrillic_SHORTI, j, J ] }; + key { [ Cyrillic_ka, Cyrillic_KA, k, K ] }; + key { [ Cyrillic_el, Cyrillic_EL, l, L ] }; + key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN, less, greater ] }; + + key { [ Cyrillic_ze, Cyrillic_ZE, z, Z ] }; + key { [ Cyrillic_ya, Cyrillic_YA, x, X ] }; + key { [ Cyrillic_tse, Cyrillic_TSE, c, C ] }; + key { [ Cyrillic_ve, Cyrillic_VE, v, V ] }; + key { [ Cyrillic_be, Cyrillic_BE, b, B ] }; + key { [ Cyrillic_en, Cyrillic_EN, n, N ] }; + key { [ Cyrillic_em, Cyrillic_EM, m, M ] }; + + key { [ backslash, brokenbar ] }; + + include "level3(ralt_switch)" +}; + // EXTRAS: partial alphanumeric_keys diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/de b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/de similarity index 84% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/de rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/de index 368456c..c16a462 100644 --- a/x-bak_v2-12-1_2014-08-06/xkb/symbols/de +++ b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/de @@ -43,6 +43,7 @@ xkb_symbols "basic" { key { [ comma, semicolon, periodcentered, multiply ] }; key { [ period, colon, U2026, division ] }; key { [ minus, underscore, endash, emdash ] }; + key { [ less, greater, bar, NoSymbol ] }; include "kpdl(comma)" @@ -338,7 +339,7 @@ xkb_symbols "neo_base" { // Alphanumeric-keys // =============== - key.type[Group1] = "EIGHT_LEVEL"; + key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK"; // Tab as Multi_key (Compose) // -------------------------------------------------------------- @@ -366,7 +367,7 @@ xkb_symbols "neo_base" { // Top row // -------------------------------------------------------------- - key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC"; + key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK"; key { [ x, X, ellipsis, Greek_xi, Prior, Prior, Greek_XI, NoSymbol ] }; key { [ v, V, underscore, NoSymbol, BackSpace, BackSpace, radical, NoSymbol ] }; key { [ l, L, bracketleft, Greek_lambda, Up, Up, Greek_LAMBDA, NoSymbol ] }; @@ -381,12 +382,12 @@ xkb_symbols "neo_base" { key { [ ssharp, U1E9E, U017F, Greek_finalsmallsigma, U2212, NoSymbol, jot, NoSymbol ] }; - key.type[Group1] = "EIGHT_LEVEL"; + key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK"; key { [ dead_acute, dead_tilde, dead_stroke, dead_psili, dead_doubleacute, NoSymbol, dead_breve, NoSymbol ] }; // Middle row // -------------------------------------------------------------- - key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC"; + key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK"; key { [ u, U, backslash, NoSymbol, Home, Home, includedin, NoSymbol ] }; key { [ i, I, slash, Greek_iota, Left, Left, integral, NoSymbol ] }; key { [ a, A, braceleft, Greek_alpha, Down, Down, U2200, NoSymbol ] }; @@ -411,12 +412,12 @@ xkb_symbols "neo_base" { key { [ b, B, plus, Greek_beta, colon, NoSymbol, U21D0, NoSymbol ] }; key { [ m, M, percent, Greek_mu, KP_1, KP_1, ifonlyif, NoSymbol ] }; - key.type[Group1] = "EIGHT_LEVEL"; + key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK"; key { [ comma, endash, quotedbl, U03F1, KP_2, KP_2, U21D2, NoSymbol ] }; key { [ period, enfilledcircbullet, apostrophe, U03D1, KP_3, KP_3, U21A6, NoSymbol ] }; - key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC"; + key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK"; key { [ j, J, semicolon, Greek_theta, semicolon, NoSymbol, Greek_THETA, NoSymbol ] }; - key.type[Group1] = "EIGHT_LEVEL"; + key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK"; // Space key // -------------------------------------------------------------- @@ -472,8 +473,8 @@ xkb_symbols "neo" { include "shift(both_capslock)" include "level3(caps_switch)" include "level3(bksl_switch)" - include "level5(lsgt_switch)" - include "level5(ralt_switch)" + include "level5(lsgt_switch_lock)" + include "level5(ralt_switch_lock)" }; // Copied from macintosh_vndr/de @@ -636,6 +637,40 @@ xkb_symbols "ru" { include "level3(ralt_switch)" }; +partial alphanumeric_keys +xkb_symbols "pl" { + + // Combined layout for entering both German and Polish symbols on a German physical + // keyboard. Based on German (eliminate dead keys) and Polish (basic). Polish diacritics + // on AltGr+"acelnosxz". EuroSign moved to AE04 (AltGr+dollar key) to avoid conflict + // with Polish eogonek. + // + // https://github.com/kontextify/xkeyboard-config + + include "latin(type4)" + + name[Group1]= "Polish (Germany, eliminate dead keys)"; + + include "de(nodeadkeys)" + key { [ 4, dollar, EuroSign, currency ] }; + + key { [ q, Q ] }; + key { [ w, W ] }; + key { [ e, E, eogonek, Eogonek ] }; + key { [ o, O, oacute, Oacute ] }; + key { [ a, A, aogonek, Aogonek ] }; + key { [ s, S, sacute, Sacute ] }; + key { [ f, F ] }; + key { [ z, Z, zabovedot, Zabovedot ] }; + key { [ x, X, zacute, Zacute ] }; + key { [ c, C, cacute, Cacute ] }; + key { [ n, N, nacute, Nacute ] }; + + include "kpdl(comma)" + + include "level3(ralt_switch)" +}; + partial alphanumeric_keys xkb_symbols "htcdream" { include "inet(htcdream)" @@ -753,11 +788,11 @@ partial alphanumeric_keys xkb_symbols "adnw_base" { include "de(neo_base)" - key.type[Group1] = "EIGHT_LEVEL"; + key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK"; key { [ period, enfilledcircbullet, NoSymbol, U03D1, NoSymbol, NoSymbol, U21A6, NoSymbol ] }; key { [ comma, endash, NoSymbol, U03F1, NoSymbol, NoSymbol, U21D2, NoSymbol ] }; - key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC"; + key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK"; key { [ k, K, NoSymbol, Greek_kappa, NoSymbol, NoSymbol, multiply, NoSymbol ] }; key { [ u, U, NoSymbol, NoSymbol, NoSymbol, NoSymbol, includedin, NoSymbol ] }; key { [ udiaeresis, Udiaeresis, NoSymbol, NoSymbol, NoSymbol, NoSymbol, union, NoSymbol ] }; @@ -781,7 +816,7 @@ xkb_symbols "adnw_base" { key { [ ssharp, U1E9E, NoSymbol, Greek_finalsmallsigma, NoSymbol, NoSymbol, jot, NoSymbol ] }; key { [ x, X, NoSymbol, Greek_xi, NoSymbol, NoSymbol, Greek_XI, NoSymbol ] }; key { [ y, Y, NoSymbol, Greek_upsilon, NoSymbol, NoSymbol, nabla, NoSymbol ] }; - key { [ odiaeresis, odiaeresis, NoSymbol, U03F5, NoSymbol, NoSymbol, intersection, NoSymbol ] }; + key { [ odiaeresis, Odiaeresis, NoSymbol, U03F5, NoSymbol, NoSymbol, intersection, NoSymbol ] }; key { [ q, Q, NoSymbol, U03D5, NoSymbol, NoSymbol, U211A, NoSymbol ] }; key { [ b, B, NoSymbol, Greek_beta, NoSymbol, NoSymbol, U21D0, NoSymbol ] }; key { [ p, P, NoSymbol, Greek_pi, NoSymbol, NoSymbol, Greek_PI, NoSymbol ] }; @@ -800,7 +835,61 @@ xkb_symbols "adnw" { include "shift(both_capslock)" include "level3(caps_switch)" include "level3(bksl_switch)" - include "level5(lsgt_switch)" - include "level5(ralt_switch)" + include "level5(lsgt_switch_lock)" + include "level5(ralt_switch_lock)" }; +partial alphanumeric_keys +xkb_symbols "koy_base" { + include "de(neo_base)" + + key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK"; + key { [ period, enfilledcircbullet, NoSymbol, U03D1, NoSymbol, NoSymbol, U21A6, NoSymbol ] }; + key { [ comma, endash, NoSymbol, U03F1, NoSymbol, NoSymbol, U21D2, NoSymbol ] }; + + key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK"; + key { [ k, K, NoSymbol, Greek_kappa, NoSymbol, NoSymbol, multiply, NoSymbol ] }; + key { [ o, O, NoSymbol, Greek_omicron, NoSymbol, NoSymbol, elementof, NoSymbol ] }; + key { [ y, Y, NoSymbol, Greek_upsilon, NoSymbol, NoSymbol, nabla, NoSymbol ] }; + key { [ v, V, NoSymbol, NoSymbol, NoSymbol, NoSymbol, radical, NoSymbol ] }; + key { [ g, G, NoSymbol, Greek_gamma, NoSymbol, NoSymbol, Greek_GAMMA, NoSymbol ] }; + key { [ c, C, NoSymbol, Greek_chi, NoSymbol, NoSymbol, U2102, NoSymbol ] }; + key { [ l, L, NoSymbol, Greek_lambda, NoSymbol, NoSymbol, Greek_LAMBDA, NoSymbol ] }; + key { [ ssharp, U1E9E, NoSymbol, Greek_finalsmallsigma, NoSymbol, NoSymbol, jot, NoSymbol ] }; + key { [ z, Z, NoSymbol, Greek_zeta, NoSymbol, NoSymbol, U2124, NoSymbol ] }; + key { [ h, H, NoSymbol, Greek_psi, NoSymbol, NoSymbol, Greek_PSI, NoSymbol ] }; + key { [ a, A, NoSymbol, Greek_alpha, NoSymbol, NoSymbol, U2200, NoSymbol ] }; + key { [ e, E, NoSymbol, Greek_epsilon, NoSymbol, NoSymbol, U2203, NoSymbol ] }; + key { [ i, I, NoSymbol, Greek_iota, NoSymbol, NoSymbol, integral, NoSymbol ] }; + key { [ u, U, NoSymbol, NoSymbol, NoSymbol, NoSymbol, includedin, NoSymbol ] }; + key { [ d, D, NoSymbol, Greek_delta, NoSymbol, NoSymbol, Greek_DELTA, NoSymbol ] }; + key { [ t, T, NoSymbol, Greek_tau, NoSymbol, NoSymbol, partialderivative, NoSymbol ] }; + key { [ r, R, NoSymbol, Greek_rho, NoSymbol, NoSymbol, U211D, NoSymbol ] }; + key { [ n, N, NoSymbol, Greek_nu, NoSymbol, NoSymbol, U2115, NoSymbol ] }; + key { [ s, S, NoSymbol, Greek_sigma, NoSymbol, NoSymbol, Greek_SIGMA, NoSymbol ] }; + key { [ f, F, NoSymbol, Greek_phi, NoSymbol, NoSymbol, Greek_PHI, NoSymbol ] }; + key { [ x, X, NoSymbol, Greek_xi, NoSymbol, NoSymbol, Greek_XI, NoSymbol ] }; + key { [ q, Q, NoSymbol, U03D5, NoSymbol, NoSymbol, U211A, NoSymbol ] }; + key { [ adiaeresis, Adiaeresis, NoSymbol, Greek_eta, NoSymbol, NoSymbol, U2135, NoSymbol ] }; + key { [ udiaeresis, Udiaeresis, NoSymbol, NoSymbol, NoSymbol, NoSymbol, union, NoSymbol ] }; + key { [ odiaeresis, Odiaeresis, NoSymbol, U03F5, NoSymbol, NoSymbol, intersection, NoSymbol ] }; + key { [ b, B, NoSymbol, Greek_beta, NoSymbol, NoSymbol, U21D0, NoSymbol ] }; + key { [ p, P, NoSymbol, Greek_pi, NoSymbol, NoSymbol, Greek_PI, NoSymbol ] }; + key { [ w, W, NoSymbol, Greek_omega, NoSymbol, NoSymbol, Greek_OMEGA, NoSymbol ] }; + key { [ m, M, NoSymbol, Greek_mu, NoSymbol, NoSymbol, ifonlyif, NoSymbol ] }; + key { [ j, J, NoSymbol, Greek_theta, NoSymbol, NoSymbol, Greek_THETA, NoSymbol ] }; +}; + +partial alphanumeric_keys modifier_keys keypad_keys +xkb_symbols "koy" { + + include "de(koy_base)" + + name[Group1]= "German (KOY)"; + + include "shift(both_capslock)" + include "level3(caps_switch)" + include "level3(bksl_switch)" + include "level5(lsgt_switch_lock)" + include "level5(ralt_switch_lock)" +}; diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/dk b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/dk similarity index 100% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/dk rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/dk diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/epo b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/epo new file mode 100644 index 0000000..1d40009 --- /dev/null +++ b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/epo @@ -0,0 +1,150 @@ +// Esperanto keyboard maps -- "Ekverto" +// +// Ekverto A ("legacy") (2004-01-10) +// Chusslove Illich (ﾄaslavo Iliﾄ頴) +// +// Ekverto B ("basic") (2006-12-02) +// Benno Schulenberg (Beno Sﾄ･ilenberﾄ･) +// Chusslove Illich (ﾄaslavo Iliﾄ頴) + +default partial alphanumeric_keys +xkb_symbols "basic" { + + include "us(basic)" + name[Group1]= "Esperanto"; + + key.type[Group1] = "FOUR_LEVEL_ALPHABETIC"; + + key { [ scircumflex, Scircumflex, q, Q ] }; + key { [ gcircumflex, Gcircumflex, w, W ] }; + key { [ ccircumflex, Ccircumflex, x, X ] }; + key { [ ubreve, Ubreve, y, Y ] }; + + key.type[Group1] = "FOUR_LEVEL_SEMIALPHABETIC"; + + key { [ jcircumflex, Jcircumflex, bracketleft, braceleft ] }; + key { [ hcircumflex, Hcircumflex, bracketright, braceright ] }; + + key { [ o, O, braceleft, braceleft ] }; + key { [ p, P, braceright, braceright ] }; + + key { [ a, A, leftsinglequotemark, NoSymbol ] }; + key { [ s, S, rightsinglequotemark, NoSymbol ] }; + key { [ d, D, leftdoublequotemark, NoSymbol ] }; + key { [ f, F, rightdoublequotemark, NoSymbol ] }; + + key { [ n, N, endash, endash ] }; + key { [ m, M, emdash, emdash ] }; + + key.type[Group1] = "FOUR_LEVEL"; + + key { [ 5, percent, EuroSign, EuroSign ] }; + + include "level3(ralt_switch)" +}; + + +partial alphanumeric_keys +xkb_symbols "legacy" { + + name[Group1]= "Esperanto (displaced semicolon and quote, obsolete)"; + + key.type[Group1] = "FOUR_LEVEL"; + + key { [ grave, asciitilde, NoSymbol, NoSymbol ] }; + key { [ 1, exclam, NoSymbol, NoSymbol ] }; + key { [ 2, quotedbl, NoSymbol, NoSymbol ] }; + key { [ 3, numbersign, NoSymbol, NoSymbol ] }; + key { [ 4, dollar, NoSymbol, NoSymbol ] }; + key { [ 5, percent, NoSymbol, NoSymbol ] }; + key { [ 6, apostrophe, NoSymbol, NoSymbol ] }; + key { [ 7, ampersand, NoSymbol, NoSymbol ] }; + key { [ 8, asterisk, NoSymbol, NoSymbol ] }; + key { [ 9, parenleft, NoSymbol, NoSymbol ] }; + key { [ 0, parenright, NoSymbol, NoSymbol ] }; + key { [ minus, underscore, NoSymbol, NoSymbol ] }; + key { [ equal, plus, NoSymbol, NoSymbol ] }; + + key { [ comma, semicolon, NoSymbol, NoSymbol ] }; + key { [ period, colon, NoSymbol, NoSymbol ] }; + key { [ slash, question, NoSymbol, NoSymbol ] }; + + key { [ bracketleft, braceleft, NoSymbol, NoSymbol ] }; + key { [ bracketright, braceright, NoSymbol, NoSymbol ] }; + + key { [ backslash, bar, NoSymbol, NoSymbol ] }; + key { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] }; + + key.type[Group1] = "FOUR_LEVEL_SEMIALPHABETIC"; + + key { [ scircumflex, Scircumflex, at, NoSymbol ] }; + key { [ jcircumflex, Jcircumflex, asciicircum, NoSymbol ] }; + key { [ e, E, EuroSign, NoSymbol ] }; + key { [ r, R, emdash, NoSymbol ] }; + key { [ t, T, endash, NoSymbol ] }; + key { [ gcircumflex, Gcircumflex, NoSymbol, NoSymbol ] }; + key { [ u, U, NoSymbol, NoSymbol ] }; + key { [ i, I, NoSymbol, NoSymbol ] }; + key { [ o, O, NoSymbol, NoSymbol ] }; + key { [ p, P, NoSymbol, NoSymbol ] }; + + key { [ a, A, less, NoSymbol ] }; + key { [ s, S, greater, NoSymbol ] }; + key { [ d, D, leftdoublequotemark, NoSymbol ] }; + key { [ f, F, rightdoublequotemark, NoSymbol ] }; + key { [ g, G, NoSymbol, NoSymbol ] }; + key { [ h, H, NoSymbol, NoSymbol ] }; + key { [ j, J, NoSymbol, NoSymbol ] }; + key { [ k, K, NoSymbol, NoSymbol ] }; + key { [ l, L, NoSymbol, NoSymbol ] }; + key { [ ubreve, Ubreve, NoSymbol, NoSymbol ] }; + key { [ hcircumflex, Hcircumflex, NoSymbol, NoSymbol ] }; + + key { [ z, Z, leftsinglequotemark, NoSymbol ] }; + key { [ ccircumflex, Ccircumflex, rightsinglequotemark, NoSymbol ] }; + key { [ c, C, NoSymbol, NoSymbol ] }; + key { [ v, V, NoSymbol, NoSymbol ] }; + key { [ b, B, NoSymbol, NoSymbol ] }; + key { [ n, N, NoSymbol, NoSymbol ] }; + key { [ m, M, NoSymbol, NoSymbol ] }; + + include "level3(ralt_switch)" +}; + +// Add the Esperanto supersigned letters to their related keys on a Qwerty keyboard. +// This is a generic "component" that is not used by the other layouts in this file, +// but is meant to be applied to any Qwerty layout. If you have any questions, ask +// J. Pablo Fernﾃ｡ndez . +partial +xkb_symbols "qwerty" { + key { [ NoSymbol, NoSymbol, ccircumflex, Ccircumflex ] }; + key { [ NoSymbol, NoSymbol, gcircumflex, Gcircumflex ] }; + key { [ NoSymbol, NoSymbol, hcircumflex, Hcircumflex ] }; + key { [ NoSymbol, NoSymbol, jcircumflex, Jcircumflex ] }; + key { [ NoSymbol, NoSymbol, scircumflex, Scircumflex ] }; + key { [ NoSymbol, NoSymbol, ubreve, Ubreve ] }; +}; + +// Add the Esperanto supersigned letters to their related keys in a +// Dvorak layout. Similar comment as above applies. +partial +xkb_symbols "dvorak" { + key { [ NoSymbol, NoSymbol, ccircumflex, Ccircumflex ] }; + key { [ NoSymbol, NoSymbol, gcircumflex, Gcircumflex ] }; + key { [ NoSymbol, NoSymbol, hcircumflex, Hcircumflex ] }; + key { [ NoSymbol, NoSymbol, jcircumflex, Jcircumflex ] }; + key { [ NoSymbol, NoSymbol, scircumflex, Scircumflex ] }; + key { [ NoSymbol, NoSymbol, ubreve, Ubreve ] }; +}; + +// Add the Esperanto supersigned letters to their related keys in a +// Colemak layout. Similar comment as above applies. +partial +xkb_symbols "colemak" { + key { [ NoSymbol, NoSymbol, ccircumflex, Ccircumflex ] }; + key { [ NoSymbol, NoSymbol, gcircumflex, Gcircumflex ] }; + key { [ NoSymbol, NoSymbol, hcircumflex, Hcircumflex ] }; + key { [ NoSymbol, NoSymbol, jcircumflex, Jcircumflex ] }; + key { [ NoSymbol, NoSymbol, scircumflex, Scircumflex ] }; + key { [ NoSymbol, NoSymbol, ubreve, Ubreve ] }; +}; diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/es b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/es similarity index 98% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/es rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/es index ab29a05..ce407ff 100644 --- a/x-bak_v2-12-1_2014-08-06/xkb/symbols/es +++ b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/es @@ -86,8 +86,8 @@ xkb_symbols "dvorak" { key {[ apostrophe, question, dead_macron, dead_ogonek ]}; key {[ exclamdown, questiondown, dead_breve, dead_abovedot ]}; - key {[ period, colon, less ]}; - key {[ comma, semicolon, greater ]}; + key {[ period, colon, less, guillemotleft ]}; + key {[ comma, semicolon, greater, guillemotright ]}; key {[ ntilde, Ntilde, lstroke, Lstroke ]}; key {[ p, P, paragraph ]}; key {[ y, Y, yen ]}; diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/fi b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/fi similarity index 70% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/fi rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/fi index 1bf9ff0..85970da 100644 --- a/x-bak_v2-12-1_2014-08-06/xkb/symbols/fi +++ b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/fi @@ -79,7 +79,6 @@ xkb_symbols "kotoistus" { include "nbsp(level3)" include "kpdl(comma)" include "level3(ralt_switch)" - include "compose(rwin)" }; partial alphanumeric_keys @@ -98,7 +97,7 @@ xkb_symbols "classic" { name[Group1]="Finnish (classic)"; }; -partial alphanumeric_keys hidden +hidden partial alphanumeric_keys xkb_symbols "fi" { // Classic Finnish keyboard layout with dead keys @@ -211,3 +210,73 @@ xkb_symbols "sun_type6" { include "sun_vndr/fi(sun_type6)" }; + +partial +xkb_symbols "das" { + + // This is DAS layout for typing Finnish. It is originally designed by + // Cristian Seres (cseres at iki.fi). + // More information about DAS: http://c.seres.fi/DAS_en.html + // This xkeyboard layout is originally made by Joel Lehtonen, + // (joel.lehtonen at iki.fi) on 2008-01-14. He released it under Public + // domain. + + name[Group1]="Finnish (DAS)"; + + key { [ 1, exclam, section ] }; + key { [ 2, quotedbl, twosuperior ] }; + key { [ 3, at, sterling ] }; + key { [ 4, EuroSign, dollar ] }; + key { [ 5, percent, onehalf ] }; + key { [ 6, ampersand ] }; + key { [ 7, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, braceright, degree ] }; + key { [ plus, question, currency ] }; + key { [ equal, numbersign ] }; + + key { [ p, P, Greek_pi ] }; + key { [ h, H ] }; + key { [ r, R, dead_circumflex ] }; + key { [ k, K, dead_caron ] }; + key { [ less, greater ] }; + key { [ apostrophe, bar ] }; + key { [ w, W ] }; + key { [ u, U ] }; + key { [ y, Y ] }; + key { [ b, B ] }; + key { [ q, Q ] }; + key { [ z, Z, zcaron, Zcaron ] }; + + key { [ s, S, scaron, Scaron ] }; + key { [ l, L, dead_acute ] }; + key { [ n, N, dead_grave ] }; + key { [ t, T, dead_diaeresis ] }; + key { [ v, V ] }; + key { [ g, G ] }; + key { [ a, A ] }; + key { [ i, I ] }; + key { [ o, O ] }; + key { [ e, E ] }; + key { [ c, C ] }; + key { [ backslash, dead_tilde ] }; + + key { [ asterisk, slash ] }; + key { [ f, F ] }; + key { [ x, X ] }; + key { [ d, D ] }; + key { [ m, M, mu ] }; + key { [ j, J ] }; + key { [ aring, Aring ] }; + key { [ odiaeresis, Odiaeresis, oe, OE ] }; + key { [ adiaeresis, Adiaeresis, ae, AE ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore, U2013, dead_macron ] }; + key { [ space, space, space, nobreakspace ] }; + + include "kpdl(comma)" + include "level3(ralt_switch)" + include "compose(rwin)" +}; diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/fr b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/fr similarity index 95% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/fr rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/fr index fe5399c..ec407f0 100644 --- a/x-bak_v2-12-1_2014-08-06/xkb/symbols/fr +++ b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/fr @@ -127,7 +127,7 @@ xkb_symbols "oss" { include "latin" include "level3(ralt_switch)" - include "nbsp(level4nl)" + include "nbsp(level4n)" include "keypad(oss)" name[Group1]="French (alternative)"; @@ -985,3 +985,89 @@ partial alphanumeric_keys xkb_symbols "sun_type6" { include "sun_vndr/fr(sun_type6)" }; + + +partial alphanumeric_keys +xkb_symbols "azerty" { + name[Group1]="French (Azerty)"; + + include "level3(ralt_switch)" + +// French AZERTY-Keyboard layout +// Author : 2015, Mats Blakstad +// Based on the layout at https://en.wikipedia.org/wiki/File:KB_France.svg + +// LAYOUT OVERVIEW +// ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ _______ +// | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | ﾂｰ | + | <-- | +// | ﾂｲ | & | ﾃｩ ~| " #| ' {| ( [| - || ﾃｨ `| _ \| ﾃｧ ^| ﾃ @| ) ]| = }| | +// ======================================================================== +// | |<- | A | Z | E | R | T | Y | U | I | O | P | ﾂｨ | $ | , | +// | ->| | a | z | e 竄ｬ| r | t | y | u | i | o | p | ^ | ﾂ｣ ﾂ､| <-' | +// ===================================================================ﾂｬ | +// | | Q | S | D | F | G | H | J | K | L | M | % | ﾂｵ | | +// | MAJ | q | s | d | f | g | h | j | k | l | m | ﾃｹ | * | | +// ======================================================================== +// | ^ | > | W | X | C | V | B | N | ? | . | / | ﾂｧ | ^ | +// | | | < | w | x | c | v | b | n | , | ; | : | ! | | | +// ======================================================================== +// | | | | | | | | | +// | Ctrl | Super| Alt | Space Nobreakspace | AltGr | Super|Menu | Ctrl | +// ﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯ ﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯ ﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯ ﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯ ﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯ ﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯ ﾂｯﾂｯﾂｯﾂｯﾂｯ ﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯ + + // First row + key { [ twosuperior ] }; + key { [ ampersand, 1 ] }; + key { [ eacute, 2, asciitilde ] }; + key { [ quotedbl, 3, numbersign ] }; + key { [ apostrophe, 4, braceleft ] }; + key { [ parenleft, 5, bracketleft ] }; + key { [ minus, 6, bar ] }; + key { [ egrave, 7, grave ] }; + key { [ underscore, 8, backslash ] }; + key { [ ccedilla, 9, asciicircum ] }; + key { [ agrave, 0, at ] }; + key { [ parenright, degree, bracketright ] }; + key { [ equal, plus, braceright ] }; + + // Second row + key { [ a, A ] }; + key { [ z, Z ] }; + key { [ e, E, EuroSign ] }; + key { [ r, R ] }; + key { [ t, T ] }; + key { [ y, Y ] }; + key { [ u, U ] }; + key { [ i, I ] }; + key { [ o, O ] }; + key { [ p, P ] }; + key { [ dead_circumflex,dead_diaeresis ] }; + key { [ dollar, sterling, currency ] }; + + // Third row + key { [ q, Q ] }; + key { [ s, S ] }; + key { [ d, D ] }; + key { [ f, F ] }; + key { [ g, G ] }; + key { [ h, H ] }; + key { [ j, J ] }; + key { [ k, K ] }; + key { [ l, L ] }; + key { [ m, M ] }; + key { [ ugrave, percent ] }; + key { [ asterisk, mu ] }; + + // Fourth row + key { [ less, greater ] }; + key { [ w, W ] }; + key { [ x, X ] }; + key { [ c, C ] }; + key { [ v, V ] }; + key { [ b, B ] }; + key { [ n, N ] }; + key { [ comma, question ] }; + key { [ semicolon, period ] }; + key { [ colon, slash ] }; + key { [ exclam, section ] }; +}; diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/gb b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/gb similarity index 100% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/gb rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/gb diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/gr b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/gr similarity index 100% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/gr rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/gr diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/group b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/group similarity index 98% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/group rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/group index 91be486..722fc1d 100644 --- a/x-bak_v2-12-1_2014-08-06/xkb/symbols/group +++ b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/group @@ -322,12 +322,12 @@ partial modifier_keys xkb_symbols "ctrls_toggle" { virtual_modifiers LControl, RControl; key { - type[Group1]="PC_RCONTROL_LEVEL2", + type[Group1]="PC_CONTROL_LEVEL2", symbols[Group1] = [ NoSymbol, ISO_Prev_Group ], virtualMods= LControl }; key { - type[Group1]="PC_LCONTROL_LEVEL2", + type[Group1]="PC_CONTROL_LEVEL2", symbols[Group1] = [ NoSymbol, ISO_Next_Group ], virtualMods= RControl }; @@ -410,7 +410,7 @@ xkb_symbols "alt_caps_toggle" { }; }; -partial hidden modifier_keys +hidden partial modifier_keys xkb_symbols "olpc" { key { [ ISO_Next_Group, ISO_Prev_Group ] }; }; diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/hr b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/hr similarity index 100% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/hr rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/hr diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/hu b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/hu similarity index 100% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/hu rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/hu diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/il b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/il similarity index 99% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/il rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/il index 48452d6..67487c1 100644 --- a/x-bak_v2-12-1_2014-08-06/xkb/symbols/il +++ b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/il @@ -205,7 +205,7 @@ xkb_symbols "biblical" { key { [ 2, U0599, VoidSymbol, at ] }; key { [ 3, U0592, VoidSymbol, numbersign ] }; key { [ 4, U05AF, NewSheqelSign, dollar ] }; - key { [ 5, VoidSymbol, U200D, percent ] }; + key { [ 5, U05BA, U200D, percent ] }; key { [ 6, U05B9, U200C, asciicircum ] }; key { [ 7, U05BF, U034F, ampersand ] }; key { [ 8, U05C2, U200E, asterisk ] }; diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/is b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/is new file mode 100644 index 0000000..6e785e2 --- /dev/null +++ b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/is @@ -0,0 +1,284 @@ +// based on +// XKB keyboard by Hrafnkell Eiriksson - hkelle@rhi.hi.is +// fixes by Olafur Osvaldsson - oli@isnic.is +// +// "basic" corrected according to the Icelandic standard for keyboards, +// IST 125:1995 (some symbols substituted by a dead diacritic). +// Some positions are according to IST ISO/IEC 9995-3:1994 +// Added nobreakspace + +default partial alphanumeric_keys +xkb_symbols "basic" { + + include "latin(type4)" + + name[Group1]="Icelandic"; + +// = + key { [ 2, quotedbl, twosuperior, oneeighth ] }; + key { [ 4, dollar, onequarter, currency ] }; + key { [odiaeresis, Odiaeresis, backslash, questiondown ] }; + key { [ minus, underscore, dead_cedilla, dead_ogonek ] }; + + key { [ eth, ETH, dead_diaeresis, dead_abovering ] }; + key { [apostrophe, question, asciitilde, dead_macron ] }; + + key { [ d, D, U201e, U201c ] }; + key { [ ae, AE, asciicircum, dead_doubleacute ] }; + key { [dead_acute, dead_acute, dead_circumflex, dead_caron ] }; + key { [dead_abovering, dead_diaeresis, notsign, hyphen ] }; + +// = + key { [ plus, asterisk, grave, dead_breve ] }; + +// = , is in file "pc": pc105 + key { [ thorn, THORN, dead_belowdot, dead_abovedot ] }; + + key { [ space, space, space, space ] }; + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "Sundeadkeys" { + + // modify the basic Icelandic layout to use Sun dead keys + + include "is(basic)" + + name[Group1]="Icelandic (Sun dead keys)"; + + key { [dead_circumflex, degree, notsign, notsign ] }; + key { [dead_acute, dead_grave, dead_cedilla, dead_cedilla ] }; + key { [udiaeresis, Udiaeresis, dead_diaeresis, dead_diaeresis ] }; + key { [ plus, asterisk, dead_tilde, dead_macron ] }; + key { [odiaeresis, Odiaeresis, dead_acute, dead_acute ] }; + key { [adiaeresis, Adiaeresis, dead_circumflex, dead_circumflex ] }; + key { [numbersign, acute, dead_grave, dead_grave ] }; +}; + +partial alphanumeric_keys +xkb_symbols "nodeadkeys" { + + // modify the basic Icelandic layout to not have any dead keys + + include "is(basic)" + + name[Group1]="Icelandic (eliminate dead keys)"; + + key { [asciicircum, degree, notsign, notsign ] }; + key { [apostrophe, grave, cedilla, cedilla ] }; + key { [udiaeresis, Udiaeresis, diaeresis, diaeresis ] }; + key { [ plus, asterisk, asciitilde, macron ] }; + key { [odiaeresis, Odiaeresis, acute, acute ] }; + key { [adiaeresis, Adiaeresis, asciicircum, asciicircum ] }; + key { [numbersign, acute, grave, grave ] }; + key { [ thorn, THORN, dead_belowdot, abovedot ] }; +}; + +// Copyright (C) 2004, 2006 ﾃvar Arnfjﾃｶrﾃｰ Bjarmason +// +// = HISTORY +// * 2004-09-28: +// Initial cleanroom writing of the keymap, I just booted Mac OS X, opened +// TextEdit.app and wrote down what the value produced by each key was when I +// pressed it, a for a, A for shift + a, ﾃ･ for lalt + a etc and made the +// keymap from that information +// +// * 2006-01-14: +// Revised the comments in the file +// +// * 2013-05-30: +// Renamed the old keyboard layout and created a new one that conforms with the later +// model Apple Laptop and Aluminium USB/Bluetooth keyboards (A1243/A1255 and later) +// that are used with the more recent versions of OS X. Also replaced some Unicode +// codes with proper symbol names. +// +// = NOTES +// * 20 characters in this keymap have no named character defined in +// include/keysymdef.h and as a result their Unicode code points in +// hexadecimal are listed here, these can be generated with the following +// perl command: +// $ perl -CA -e 'printf "U%x\n", ord shift' ﾃ +// and converted back like: +// $ perl -CO -le '$_=shift;s/[^a-f0-9]//ig;print chr hex' Uc6 +// * The Apple logo appears twice on this keymap like the Mac OS and Mac OS X +// keymaps. In the MacRoman encoding it has the code point 0xF0 (240) but it +// has no assigned code point in Unicode, the code point Apple uses for it is +// U+F8FF (63743) which is in the BMP's Private Use Area (U+E000窶填+F8FF) +// * This keymap has only been tested on a PowerBook6,5 (iBook G4) but it +// should work on other Apple laptop models which use the same keyboard +// layout. It will probably work on standard sized keyboards with little or +// no modification but it might not support them fully, please report if +// you're able to get it running with such a keyboard + +// Copied from macintosh_vndr/is + +xkb_symbols "mac_legacy" { + name[Group1]= "Icelandic (Macintosh, legacy)"; + + //-- Row 5 (E) --// + key { [ sterling, section, UF8FF, apostrophe ] }; + key { [ 1, exclam, exclamdown, VoidSymbol ] }; + key { [ 2, quotedbl, at, VoidSymbol ] }; + key { [ 3, numbersign, U2122, sterling ] }; + key { [ 4, dollar, U00A2, EuroSign ] }; + key { [ 5, percent, U2030, infinity ] }; + key { [ 6, ampersand, asciicircum, U2044 ] }; + key { [ 7, slash, backslash, U00F7 ] }; + key { [ 8, parenleft, bracketleft, braceleft ] }; + key { [ 9, parenright, bracketright, braceright ] }; + key { [ 0, equal, U2260, U2248 ] }; + key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; + key { [ minus, underscore, endash, emdash ] }; + + + //-- Row 4 (D) --// + key { [ q, Q, paragraph, VoidSymbol ] }; + key { [ w, W, U2211, VoidSymbol ] }; + key { [ e, E, dead_grave, VoidSymbol ] }; + key { [ r, R, registered, VoidSymbol ] }; + key { [ t, T, degree, VoidSymbol ] }; + key { [ y, Y, yen, VoidSymbol ] }; + key { [ u, U, dead_diaeresis, VoidSymbol ] }; + key { [ i, I, U0131, U00AA ] }; + key { [ o, O, dead_circumflex, U00BA ] }; + key { [ p, P, Greek_pi, Greek_PI ] }; + key { [ eth, Eth, U201e, U201c ] }; + key { [ apostrophe, question, questiondown, U00B7 ] }; + + + //-- Row 3 (C) --// + key { [ a, A, aring, Aring ] }; + key { [ s, S, ssharp, abovedot ] }; + key { [ d, D, U2202, U2DA ] }; + key { [ f, F, U192, macron ] }; + key { [ g, G, copyright, breve ] }; + key { [ h, H, bar, VoidSymbol ] }; + key { [ j, J, U2206, U2dd ] }; + key { [ k, K, U00AC, VoidSymbol ] }; + key { [ l, L, U2026, caron ] }; + key { [ ae, AE, oe, OE ] }; + key { [ dead_acute, dead_diaeresis, U201A, U2018 ] }; + key { [ plus, asterisk, U2022, plusminus ] }; + + + //-- Row 2 (B) --// + key { [ less, greater, section, UF8FF ] }; + key { [ z, Z, U3A9, VoidSymbol ] }; + key { [ x, X, asciitilde, VoidSymbol ] }; + key { [ c, C, ccedilla, Ccedilla ] }; + key { [ v, V, U221A, U25CA ] }; + key { [ b, B, U222B, VoidSymbol ] }; + key { [ n, N, dead_tilde, VoidSymbol ] }; + key { [ m, M, U00B5, VoidSymbol ] }; + key { [ comma, semicolon, lessthanequal, guillemotleft ] }; + key { [ period, colon, greaterthanequal, guillemotright ] }; + key { [ thorn, Thorn, U2019, U201d ] }; + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "mac" { + name[Group1]= "Icelandic (Macintosh)"; + + //-- Row 5 (E) --// + key { [ less, greater, bar, UF8FF ] }; + key { [ 1, exclam, exclamdown, VoidSymbol ] }; + key { [ 2, quotedbl, at, VoidSymbol ] }; + key { [ 3, numbersign, trademark, sterling ] }; + key { [ 4, dollar, cent, EuroSign ] }; + key { [ 5, percent, U2030, infinity ] }; + key { [ 6, ampersand, asciicircum, U2044 ] }; + key { [ 7, slash, braceleft, division ] }; + key { [ 8, parenleft, bracketleft, braceleft ] }; + key { [ 9, parenright, bracketright, braceright ] }; + key { [ 0, equal, braceright, approxeq ] }; + key { [ odiaeresis, Odiaeresis, backslash, U2260 ] }; + key { [ minus, underscore, endash, emdash ] }; + + + //-- Row 4 (D) --// + key { [ q, Q, U0040, paragraph ] }; + key { [ w, W, U2211, U00A7 ] }; + key { [ e, E, U20AC, U00BF ] }; + key { [ r, R, registered, VoidSymbol ] }; + key { [ t, T, degree, U2022 ] }; + key { [ y, Y, yen, VoidSymbol ] }; + key { [ u, U, dead_diaeresis, VoidSymbol ] }; + key { [ i, I, idotless, ordfeminine ] }; + key { [ o, O, dead_circumflex, U00BA ] }; + key { [ p, P, Greek_pi, Greek_PI ] }; + key { [ eth, Eth, doublelowquotemark, leftdoublequotemark ] }; + key { [ apostrophe, question, asciitilde, periodcentered ] }; + + + //-- Row 3 (C) --// + key { [ a, A, aring, Aring ] }; + key { [ s, S, ssharp, abovedot ] }; + key { [ d, D, partialderivative, U02DA ] }; + key { [ f, F, function, macron ] }; + key { [ g, G, copyright, breve ] }; + key { [ h, H, bar, U00B8 ] }; + key { [ j, J, U2206, doubleacute ] }; + key { [ k, K, notsign, U2DB ] }; + key { [ l, L, ellipsis, caron ] }; + key { [ ae, AE, oe, OE ] }; + key { [ dead_acute, dead_acute, asciicircum, leftsinglequotemark ] }; + key { [ plus, asterisk, grave, plusminus ] }; + + + //-- Row 2 (B) --// + key { [ degree, dead_diaeresis, oslash, Ooblique ] }; + key { [ z, Z, Greek_OMEGA, VoidSymbol ] }; + key { [ x, X, asciitilde, VoidSymbol ] }; + key { [ c, C, ccedilla, Ccedilla ] }; + key { [ v, V, radical, U25CA ] }; + key { [ b, B, integral, VoidSymbol ] }; + key { [ n, N, dead_tilde, VoidSymbol ] }; + key { [ m, M, mu, VoidSymbol ] }; + key { [ comma, semicolon, lessthanequal, guillemotleft ] }; + key { [ period, colon, greaterthanequal, guillemotright ] }; + key { [ thorn, Thorn, rightsinglequotemark, rightdoublequotemark ] }; + + include "level3(ralt_switch)" +}; + +// This is a modified version of the English Dvorak layout that allows +// you to type all Icelandic letters under X. It's not a full attempt at +// nationalizing the layout as e.g. the Norwegian, Swedish and French +// layouts which modify the primary keys of the basic Dvorak layout +// extensively. + +// Rather it's a simple modification of 5 keys of the US Dvorak layout, +// it adds Germanic/Icelandic style quotation marks (窶樞), eth (ﾃｰﾃ), ae +// (ﾃｦﾃ), endash and emdash (窶凪), thorn (ﾃｾﾃ), EuroSign (竄ｬ) and the German +// Sharp S (ﾃ溂ｺ). These keys aren't used in the US version, making the +// Icelandic version a superset of it. + +// Maybe someone else will make a "full" attempt at an Icelandic layout +// but I was mostly interested in continuing to type English comfortably +// as a primary function while being able to type the full Icelandic +// alphabet as a secondary function. +// -- ﾃvar Arnfjﾃｶrﾃｰ Bjarmason + +// Icelandic Dvorak +partial alphanumeric_keys +xkb_symbols "dvorak" { + + include "us(dvorak)" + include "eurosign(4)" + + name[Group1]= "Icelandic (Dvorak)"; + + key { [ slash, question, U201e, U201c ] }; + key { [ o, O, odiaeresis, Odiaeresis ] }; + key { [ d, D, eth, ETH ] }; + key { [ s, S, ae, AE ] }; + key { [ minus, underscore, endash, emdash ] }; + key { [ z, Z, thorn, Thorn ] }; + key { [ b, B, ssharp, U1E9E ] }; + + include "level3(ralt_switch)" +}; diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/it b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/it similarity index 100% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/it rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/it diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/latam b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/latam new file mode 100644 index 0000000..f6717a4 --- /dev/null +++ b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/latam @@ -0,0 +1,129 @@ +// based on a keyboard +// Modified for a real Latin American Keyboard by Fabian Mandelbaum + +default partial alphanumeric_keys +xkb_symbols "basic" { + + include "latin(type4)" + + name[Group1]="Spanish (Latin American)"; + + key { [ 1, exclam, bar, exclamdown ] }; + key { [ 3, numbersign, periodcentered, sterling ] }; + key { [ 4, dollar, asciitilde, dollar ] }; + key { [ 6, ampersand, notsign, fiveeighths ] }; + key { [apostrophe, question, backslash, questiondown ] }; + key { [questiondown, exclamdown, dead_cedilla, dead_ogonek] }; + + key { [dead_acute, dead_diaeresis, dead_diaeresis, dead_abovering ] }; + key { [ plus, asterisk, asciitilde, dead_macron ] }; + + key { [ ntilde, Ntilde, asciitilde, dead_doubleacute ] }; + key { [ braceleft, bracketleft, dead_circumflex, braceleft] }; + key { [ bar, degree, notsign, notsign ] }; + + key { [braceright, bracketright, dead_grave, braceright ] }; + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "Sundeadkeys" { + include "latam(basic)" + + key { [dead_acute, dead_diaeresis, braceleft, braceleft ] }; + key { [dead_grave, dead_circumflex, bracketleft, dead_abovering ] }; +}; + +partial alphanumeric_keys +xkb_symbols "sundeadkeys" { + include "latam(Sundeadkeys)" + name[Group1]="Spanish (Latin American, Sun dead keys)"; +}; + +partial alphanumeric_keys +xkb_symbols "nodeadkeys" { + + include "latam(basic)" + + name[Group1]="Spanish (Latin American, eliminate dead keys)"; + + key { [questiondown, exclamdown, cedilla, ogonek ] }; + key { [ grave, asciicircum, bracketleft, degree ] }; + key { [ plus, asterisk, bracketright, macron ] }; + key { [ ntilde, Ntilde, asciitilde, doubleacute ] }; + key { [ acute, diaeresis, braceleft, braceleft ] }; + key { [ ccedilla, Ccedilla, braceright, breve ] }; + key { [ minus, underscore, dead_belowdot, abovedot ] }; +}; + +partial alphanumeric_keys +xkb_symbols "deadtilde" { + + include "latam(basic)" + + name[Group1]="Spanish (Latin American, include dead tilde)"; + + key { [ plus, asterisk, dead_tilde, dead_macron ] }; +}; + +// Latin American Spanish Dvorak mapping (note R-H exchange) +partial alphanumeric_keys +xkb_symbols "dvorak" { + + name[Group1]="Spanish (Latin American, Dvorak)"; + + key {[ bar, degree, notsign, notsign ]}; + key {[ 1, exclam, bar, exclamdown ]}; + key {[ 2, quotedbl, at, oneeighth ]}; + key {[ 3, numbersign, periodcentered, sterling ]}; + key {[ 4, dollar, asciitilde, dollar ]}; + key {[ 5, percent, onehalf, threeeighths ]}; + key {[ 6, ampersand, notsign, fiveeighths ]}; + key {[ 7, slash, braceleft, seveneighths ]}; + key {[ 8, parenleft, bracketleft, trademark ]}; + key {[ 9, parenright, bracketright, plusminus ]}; + key {[ 0, equal, braceright, degree ]}; + key {[ apostrophe, question, backslash, questiondown ]}; + key {[ questiondown, exclamdown, dead_cedilla, dead_ogonek ]}; + + key {[ period, colon, at ]}; + key {[ comma, semicolon ]}; + key {[ ntilde, Ntilde, lstroke, Lstroke ]}; + key {[ p, P, paragraph ]}; + key {[ y, Y, yen ]}; + key {[ f, F, tslash, Tslash ]}; + key {[ g, G, dstroke, Dstroke ]}; + key {[ c, C, cent, copyright ]}; + key {[ h, H, hstroke, Hstroke ]}; + key {[ l, L, sterling ]}; + key {[ dead_acute, dead_diaeresis, dead_diaeresis, dead_abovering ]}; + key {[ plus, asterisk, asciitilde, dead_macron ]}; + + key {[ a, A, ae, AE ]}; + key {[ o, O, oslash, Oslash ]}; + key {[ e, E, EuroSign ]}; + key {[ u, U, aring, Aring ]}; + key {[ i, I, oe, OE ]}; + key {[ d, D, eth, ETH ]}; + key {[ r, R, registered, trademark ]}; + key {[ t, T, thorn, THORN ]}; + key {[ n, N, eng, ENG ]}; + key {[ s, S, ssharp, section ]}; + key {[ braceleft, bracketleft, dead_circumflex, braceleft ]}; + key {[ braceright, bracketright, dead_grave, braceright ]}; + + key {[ less, greater, guillemotleft, guillemotright ]}; + key {[ minus, underscore, hyphen, macron ]}; + key {[ q, Q, currency ]}; + key {[ j, J ]}; + key {[ k, K, kra ]}; + key {[ x, X, multiply, division ]}; + key {[ b, B ]}; + key {[ m, M, mu ]}; + key {[ w, W ]}; + key {[ v, V ]}; + key {[ z, Z ]}; + + include "level3(ralt_switch)" +}; diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/level5 b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/level5 similarity index 100% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/level5 rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/level5 diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/nl b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/nl similarity index 100% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/nl rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/nl diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/no b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/no similarity index 100% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/no rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/no diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/pl b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/pl similarity index 100% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/pl rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/pl diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/pt b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/pt similarity index 100% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/pt rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/pt diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/ro b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/ro similarity index 100% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/ro rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/ro diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/rs b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/rs similarity index 98% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/rs rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/rs index c39f4ed..e164f2e 100644 --- a/x-bak_v2-12-1_2014-08-06/xkb/symbols/rs +++ b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/rs @@ -45,7 +45,7 @@ xkb_symbols "yz" { key { [ Cyrillic_ze, Cyrillic_ZE, any, any ] }; // z }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "common" { // "Common" keys: keys that are the same // for both latin and cyrillic keyboards. @@ -73,7 +73,7 @@ xkb_symbols "common" { include "kpdl(comma)" }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "cyralpha" { key.type[Group1] = "FOUR_LEVEL_ALPHABETIC"; @@ -114,7 +114,7 @@ xkb_symbols "cyralpha" { }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "latalpha" { key.type[Group1] = "FOUR_LEVEL_ALPHABETIC"; @@ -127,7 +127,7 @@ xkb_symbols "latalpha" { key { [ zcaron, Zcaron, any, any ] }; // \ | }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "twoletter" { // Letters which are written in latin transcription with two characters. @@ -142,7 +142,7 @@ xkb_symbols "twoletter" { key { [ zcaron, Zcaron, any, any ] }; // z }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "latlevel3" { key { [ any, any, notsign, notsign ] }; // ` ~ key { [ any, any, dead_tilde, asciitilde ] }; // 1 ! @@ -196,7 +196,7 @@ xkb_symbols "latlevel3" { key { [ any, any, emdash, endash ] }; // / ? }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "cyrlevel3" { key { [ any, any, degree, notsign ] }; // ` ~ key { [ any, any, dead_circumflex, NoSymbol ] }; // 3 # diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/ru b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/ru similarity index 89% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/ru rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/ru index 64c862b..0ba9870 100644 --- a/x-bak_v2-12-1_2014-08-06/xkb/symbols/ru +++ b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/ru @@ -21,7 +21,7 @@ xkb_symbols "winkeys" { key { [ backslash, slash ] }; }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "common" { key { [ 1, exclam ] }; @@ -478,11 +478,12 @@ xkb_symbols "srp" { }; // Mari language layout -// http://www.marlamuter.ru/ +// http://www.marlamuter.com/ +// Last edit by Viatcheslav Kileev (slavakileev@yandex.ru) partial alphanumeric_keys xkb_symbols "chm" { - include "ru(common)" + include "ru(winkeys)" name[Group1]= "Mari"; key.type[group1]="FOUR_LEVEL_ALPHABETIC"; @@ -491,13 +492,82 @@ xkb_symbols "chm" { key { [ Cyrillic_u, Cyrillic_U, U04F1, U04F0 ] }; key { [ Cyrillic_yeru, Cyrillic_YERU, U04F9, U04F8 ] }; key { [ Cyrillic_en, Cyrillic_EN, U04A5, U04A4 ] }; - key { [ Cyrillic_e, Cyrillic_E, U04E9, U04E8 ] }; - key { [ Cyrillic_zhe, Cyrillic_ZHE, U04EB, U04EA ] }; - key { [ Cyrillic_ef, Cyrillic_EF, UF537, UF536 ] }; + key { [ Cyrillic_o, Cyrillic_O, U04E7, U04E6 ] }; include "level3(ralt_switch)" }; +partial alphanumeric_keys +xkb_symbols "phonetic_azerty" { + + include "level3(ralt_switch)" + + name[Group1]= "Russian (phonetic azerty)"; + + key { [ ampersand, 1, onesuperior, exclamdown ] }; + key { [ eacute, 2, asciitilde, oneeighth ] }; + key { [ quotedbl, 3, numbersign, sterling ] }; + key { [apostrophe, 4, braceleft, dollar ] }; + key { [ parenleft, 5, bracketleft, threeeighths ] }; + key { [ minus, 6, bar, fiveeighths ] }; + key { [ egrave, 7, grave, seveneighths ] }; + key { [underscore, 8, backslash, trademark ] }; + key { [ ccedilla, 9, asciicircum, plusminus ] }; + key { [ agrave, 0, at, degree ] }; + key { [parenright, degree, bracketright, questiondown ] }; + key { [ equal, plus, braceright, dead_ogonek ] }; + + key { [ comma, question, acute, doubleacute ] }; + key { [ semicolon, period, horizconnector, multiply ] }; + key { [ colon, slash, periodcentered, division ] }; + key { [ exclam, section, dead_belowdot, dead_abovedot ] }; + + key { [ ugrave, percent, asciicircum, caron ] }; + key { [ bar, brokenbar ] }; + + key { [ Cyrillic_yu, Cyrillic_YU ] }; + key { [ Cyrillic_ya, Cyrillic_YA ] }; // Q + key { [ Cyrillic_ze, Cyrillic_ZE ] }; // Z + key { [ Cyrillic_es, Cyrillic_ES ] }; + key { [ Cyrillic_a, Cyrillic_A ] }; + key { [ Cyrillic_ve, Cyrillic_VE ] }; // W + key { [ Cyrillic_tse, Cyrillic_TSE ] }; + key { [Cyrillic_softsign,Cyrillic_SOFTSIGN ] }; + key { [ Cyrillic_de, Cyrillic_DE ] }; + key { [ Cyrillic_ie, Cyrillic_IE ] }; + key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; + key { [ Cyrillic_ef, Cyrillic_EF ] }; + key { [ Cyrillic_te, Cyrillic_TE ] }; + key { [ Cyrillic_er, Cyrillic_ER ] }; + key { [ Cyrillic_en, Cyrillic_EN ] }; + key { [ Cyrillic_be, Cyrillic_BE ] }; + key { [ Cyrillic_ha, Cyrillic_HA ] }; + key { [ Cyrillic_ghe, Cyrillic_GHE ] }; + key { [ Cyrillic_yeru, Cyrillic_YERU ] }; + key { [ Cyrillic_em, Cyrillic_EM ] }; // M + key { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; + key { [ Cyrillic_u, Cyrillic_U ] }; + key { [ Cyrillic_ka, Cyrillic_KA ] }; + key { [ Cyrillic_i, Cyrillic_I ] }; + key { [ Cyrillic_o, Cyrillic_O ] }; + key { [ Cyrillic_el, Cyrillic_EL ] }; + key { [ Cyrillic_pe, Cyrillic_PE ] }; + + key { [ Cyrillic_sha, Cyrillic_SHA ] }; + key { [ Cyrillic_che, Cyrillic_CHE ] }; + key { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; + key { [ Cyrillic_e, Cyrillic_E ] }; +}; + +partial alphanumeric_keys +xkb_symbols "phonetic_fr" { + + include "fr" + include "ru(phonetic_azerty)" + + name[Group1]= "Russian (phonetic French)"; +}; + // EXTRAS: // Church Slavonic language layout diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/se b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/se similarity index 100% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/se rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/se diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/si b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/si similarity index 100% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/si rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/si diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/sk b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/sk similarity index 100% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/sk rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/sk diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/tr b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/tr similarity index 100% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/tr rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/tr diff --git a/x-bak_v2-12-1_2014-08-06/xkb/symbols/us b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/us similarity index 99% rename from x-bak_v2-12-1_2014-08-06/xkb/symbols/us rename to x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/us index d5a6c18..49f684f 100644 --- a/x-bak_v2-12-1_2014-08-06/xkb/symbols/us +++ b/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/us @@ -541,11 +541,12 @@ xkb_symbols "dvorak-classic" { // Main features: Numbers are in shift position (like French), symbols have been // placed in locations that give good hand-alternation and finger rolling with // symbols that usually follows, accented characters are possible for I18N. +// Patch suggestions should be sent upstream. partial alphanumeric_keys xkb_symbols "dvp" { include "us(dvorak)" - name[Group1] = "English (programmer Dvorak)"; + name[Group1] = "English (Programmer Dvorak)"; // Unmodified Shift AltGr Shift+AltGr // symbols row, left side @@ -568,8 +569,8 @@ xkb_symbols "dvp" { // upper row, left side key { [ semicolon, colon, dead_diaeresis ] }; - key { [ comma, less, guillemotleft, ellipsis ] }; - key { [ period, greater, guillemotright ] }; + key { [ comma, less, guillemotleft, U201C ] }; + key { [ period, greater, guillemotright, U201D ] }; key { [ p, P, paragraph, section ] }; key { [ y, Y, udiaeresis, Udiaeresis ] }; @@ -596,9 +597,9 @@ xkb_symbols "dvp" { // lower row, left side key { [ apostrophe, quotedbl, dead_acute ] }; - key { [ m, M, mu ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" }; - include "level3(ralt_switch)" + // do NOT hardcode this switch; use lv3:ralt_switch option instead! + //include "level3(ralt_switch)" }; // phonetic layout for Russian letters on an US keyboard diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/types/level5 b/x-bak_v2-17-1ub1_2016-05-24/xkb/types/level5 new file mode 100644 index 0000000..0570725 --- /dev/null +++ b/x-bak_v2-17-1ub1_2016-05-24/xkb/types/level5 @@ -0,0 +1,214 @@ +partial default xkb_types "default" { + + // Defines a type with an eight-level shift, similar to the three-level + // type used for iso9995, but it lets the Shift key behave "normally". + + virtual_modifiers LevelThree,ScrollLock,LevelFive; + + type "EIGHT_LEVEL" { + modifiers = Shift+LevelThree+LevelFive; + map[None] = Level1; + map[Shift] = Level2; + map[LevelThree] = Level3; + map[Shift+LevelThree] = Level4; + map[LevelFive] = Level5; + map[Shift+LevelFive] = Level6; + map[LevelThree+LevelFive] = Level7; + map[Shift+LevelThree+LevelFive] = Level8; + level_name[Level1] = "Base"; + level_name[Level2] = "Shift"; + level_name[Level3] = "Alt Base"; + level_name[Level4] = "Shift Alt"; + level_name[Level5] = "X"; + level_name[Level6] = "X Shift"; + level_name[Level7] = "X Alt Base"; + level_name[Level8] = "X Shift Alt"; + }; + + type "EIGHT_LEVEL_ALPHABETIC" { + modifiers = Shift+Lock+LevelThree+LevelFive; + map[None] = Level1; + map[Shift] = Level2; + map[Lock] = Level2; + map[LevelThree] = Level3; + map[Shift+LevelThree] = Level4; + map[Lock+LevelThree] = Level4; + map[Lock+Shift+LevelThree] = Level3; + + map[LevelFive] = Level5; + map[Shift+LevelFive] = Level6; + map[Lock+LevelFive] = Level6; + map[LevelThree+LevelFive] = Level7; + map[Shift+LevelThree+LevelFive] = Level8; + map[Lock+LevelThree+LevelFive] = Level8; + map[Lock+Shift+LevelThree+LevelFive] = Level7; + + level_name[Level1] = "Base"; + level_name[Level2] = "Shift"; + level_name[Level3] = "Alt Base"; + level_name[Level4] = "Shift Alt"; + level_name[Level5] = "X"; + level_name[Level6] = "X Shift"; + level_name[Level7] = "X Alt Base"; + level_name[Level8] = "X Shift Alt"; + }; + + type "EIGHT_LEVEL_LEVEL_FIVE_LOCK" { + // Level5-Lock is implemented by using NumLock, because a real modifier + // is required. + + modifiers = Shift + Lock + LevelThree + NumLock + LevelFive; + + map[None] = Level1; + map[Shift] = Level2; + map[LevelThree] = Level3; + map[LevelThree+Shift] = Level4; + + map[LevelFive] = Level5; + map[LevelFive+Shift] = Level6; + map[LevelFive+LevelThree] = Level7; + map[LevelFive+LevelThree+Shift] = Level8; + + map[NumLock] = Level5; + map[NumLock+Shift] = Level6; + map[NumLock+LevelThree] = Level7; + map[NumLock+LevelThree+Shift] = Level8; + + map[NumLock+LevelFive] = Level1; + map[NumLock+LevelFive+Shift] = Level2; + map[NumLock+LevelFive+LevelThree] = Level3; + map[NumLock+LevelFive+LevelThree+Shift] = Level4; + + // Lock has no effect + map[Lock] = Level1; + map[Lock+Shift] = Level2; + map[Lock+LevelThree] = Level3; + map[Lock+LevelThree+Shift] = Level4; + + map[Lock+LevelFive] = Level5; + map[Lock+LevelFive+Shift] = Level6; + map[Lock+LevelFive+LevelThree] = Level7; + map[Lock+LevelFive+LevelThree+Shift] = Level8; + + map[Lock+NumLock] = Level5; + map[Lock+NumLock+Shift] = Level6; + map[Lock+NumLock+LevelThree] = Level7; + map[Lock+NumLock+LevelThree+Shift] = Level8; + + map[Lock+NumLock+LevelFive] = Level1; + map[Lock+NumLock+LevelFive+Shift] = Level2; + map[Lock+NumLock+LevelFive+LevelThree] = Level3; + map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level4; + + preserve[LevelFive+Shift] = Shift; + preserve[NumLock+Shift] = Shift; + preserve[Lock+LevelFive+Shift] = Shift; + preserve[Lock+NumLock+Shift] = Shift; + + level_name[Level1] = "Base"; + level_name[Level2] = "Shift"; + level_name[Level3] = "Alt Base"; + level_name[Level4] = "Shift Alt"; + level_name[Level5] = "X"; + level_name[Level6] = "X Shift"; + level_name[Level7] = "X Alt Base"; + level_name[Level8] = "X Shift Alt"; + }; + + type "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK" { + // Level5-Lock is implemented by using NumLock, because a real modifier + // is required. + + modifiers = Shift + Lock + LevelThree + NumLock + LevelFive; + + map[None] = Level1; + map[Shift] = Level2; + map[LevelThree] = Level3; + map[LevelThree+Shift] = Level4; + + map[LevelFive] = Level5; + map[LevelFive+Shift] = Level6; + map[LevelFive+LevelThree] = Level7; + map[LevelFive+LevelThree+Shift] = Level8; + + map[NumLock] = Level5; + map[NumLock+Shift] = Level6; + map[NumLock+LevelThree] = Level7; + map[NumLock+LevelThree+Shift] = Level8; + + map[NumLock+LevelFive] = Level1; + map[NumLock+LevelFive+Shift] = Level2; + map[NumLock+LevelFive+LevelThree] = Level3; + map[NumLock+LevelFive+LevelThree+Shift] = Level4; + + // Lock interchanges Level1 and Level2 + map[Lock] = Level2; + map[Lock+Shift] = Level1; + map[Lock+LevelThree] = Level3; + map[Lock+LevelThree+Shift] = Level4; + + map[Lock+LevelFive] = Level5; + map[Lock+LevelFive+Shift] = Level6; + map[Lock+LevelFive+LevelThree] = Level7; + map[Lock+LevelFive+LevelThree+Shift] = Level8; + + map[Lock+NumLock] = Level5; + map[Lock+NumLock+Shift] = Level6; + map[Lock+NumLock+LevelThree] = Level7; + map[Lock+NumLock+LevelThree+Shift] = Level8; + + map[Lock+NumLock+LevelFive] = Level2; + map[Lock+NumLock+LevelFive+Shift] = Level1; + map[Lock+NumLock+LevelFive+LevelThree] = Level4; + map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level3; + + preserve[LevelFive+Shift] = Shift; + preserve[NumLock+Shift] = Shift; + + level_name[Level1] = "Base"; + level_name[Level2] = "Shift"; + level_name[Level3] = "Alt Base"; + level_name[Level4] = "Shift Alt"; + level_name[Level5] = "X"; + level_name[Level6] = "X Shift"; + level_name[Level7] = "X Alt Base"; + level_name[Level8] = "X Shift Alt"; + }; + + type "EIGHT_LEVEL_SEMIALPHABETIC" { + modifiers = Shift+Lock+LevelThree+LevelFive; + map[None] = Level1; + map[Shift] = Level2; + map[Lock] = Level2; + map[LevelThree] = Level3; + map[Shift+LevelThree] = Level4; + map[Lock+LevelThree] = Level3; + map[Lock+Shift+LevelThree] = Level4; + + map[LevelFive] = Level5; + map[Shift+LevelFive] = Level6; + map[Lock+LevelFive] = Level6; + map[Lock+Shift+LevelFive] = Level6; + map[LevelThree+LevelFive] = Level7; + map[Shift+LevelThree+LevelFive] = Level8; + map[Lock+LevelThree+LevelFive] = Level7; + map[Lock+Shift+LevelThree+LevelFive] = Level8; + + preserve[Lock+LevelThree] = Lock; + preserve[Lock+Shift+LevelThree] = Lock; + preserve[Lock+LevelFive] = Lock; + preserve[Lock+Shift+LevelFive] = Lock; + preserve[Lock+LevelThree+LevelFive] = Lock; + preserve[Lock+Shift+LevelThree+LevelFive] = Lock; + + level_name[Level1] = "Base"; + level_name[Level2] = "Shift"; + level_name[Level3] = "Alt Base"; + level_name[Level4] = "Shift Alt"; + level_name[Level5] = "X"; + level_name[Level6] = "X Shift"; + level_name[Level7] = "X Alt Base"; + level_name[Level8] = "X Shift Alt"; + }; + +}; diff --git a/x-mod_v2-12-1_2015-01-18/xkb/rules/base b/x-mod_v2-12-1_2015-01-18/xkb/rules/base deleted file mode 100644 index 78d5ac2..0000000 --- a/x-mod_v2-12-1_2015-01-18/xkb/rules/base +++ /dev/null @@ -1,1249 +0,0 @@ -// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY merge.sh FROM rules/*.part -// -// Rules for resolving XKB components for use with XFree86 -// Copyright 1996 by Joseph Moss -// -// 2002 Modifier: Ivan Pascal The XFree86 Project -// - -// If you want non-latin layouts implicitly include the en_US layout -// uncomment lines below -//! $nonlatin = am ara ben bd bg bt by cs deva ge gh gr guj guru il \ -// in ir iku jp kan kh kr la lao lk mk mm mn mv mal ori pk \ -// ru scc sy syr tel th tj tam ua uz - -// PC models -! $pcmodels = pc101 pc102 pc104 pc105 pc104angle-z pc104wide-qu pc104awide-zqu pc104aframe pc105angle-lg pc105awide-sl - -// Microsoft models (using MS geometry) -! $msmodels = microsoft microsoft4000 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 - -// TypeMatrix geometries -! $tmgeometries = tm2020 tm2030PS2 tm2030USB tm2030USB-102 tm2030USB-106 - -// Layouts that provide further specializations for the OLPC -! $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 fi fr gb is it latam nl no pt se us - -! $azerty = be fr -! $qwertz = al cz de hr hu ro si sk - - -// all layouts with 3rd and 4th groups -! $threelevellayouts = al az \ - be br bt \ - ca ch cs cz \ - de dk \ - ee es \ - fi fo fr \ - gb gr \ - hu \ - ie ir is it \ - latam \ - lk lt \ - mn mt \ - nl no \ - pl pt \ - ro \ - se sk \ - tr \ - us \ - vn \ - za - -! $thinkpads = thinkpad thinkpad60 thinkpadz60 - -! $sun = sun_type6_jp sun_type6_usb sun_type6_euro_usb \ - sun_type6_jp_usb sun_type6_unix_usb sun_type7_jp_usb \ - sun_type7_usb sun_type7_euro_usb sun_type7_unix_usb - -! $sun_jp = sun_type6_jp sun_type6_jp_usb sun_type7_jp_usb - -// Sun Type_6_7 keyboards with custom layouts -! $sun_custom = ara be br ca ch cz de dk \ - ee es fi fr gb gr it jp \ - kr lt lv nl no pl pt ro \ - ru se sk tr tw ua us - -! $sun_var = sun_type6 sun_type6_suncompat sun_type6_de sun_type6_fr \ - sun_type7 sun_type7_suncompat suncompat - -! $sun_compat = sun_type6 sun_type6_suncompat sun_type7_suncompat suncompat - -! $htcdreamlayouts = us it de - -! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \ - airkey \ - apple armada azonaRF2300 \ - benqx brother \ - btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \ - cherryblue cherrybluea cherryblueb \ - cherrycyboard cherrycmexpert \ - chicony chicony0108 chicony0420 chicony9885 \ - compalfl90 \ - compaqeak8 compaqik7 compaqik13 compaqik18 \ - creativedw7000 \ - cymotionlinux \ - dell dellm65 inspiron dellusbmm \ - emachines ennyah_dkb1008 evdev \ - genius geniuscomfy2 \ - gyration honeywell_euroboard \ - hp250x hp5xx hp500fa hpdv5 \ - hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \ - ibm_spacesaver ipaq inspiron intel \ - logiaccess logicda logicink \ - logiex110 logiclx300 \ - logiinkse logiinkseusb logiitc logiik \ - logitech_base itouch logiultrax \ - logitech_g15 \ - logidinovo logidinovoedge \ - microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \ - microsoftoffice microsoftmult \ - mx1998 mx2500 mx2750 \ - oretec \ - pc105 \ - presario propeller \ - qtronix \ - rapidaccess rapidaccess2 thinkpad60 \ - samsung4500 samsung4510 \ - silvercrest \ - sk1300 sk2500 sk6200 sk7100 \ - sven sven303 symplon \ - toshiba_s3000 trust trustda \ - unitekkb1925 yahoo - -! $inetmediakbds = acer_ferrari4k acer_laptop btc5090 btc9019u cherryblueb \ - cherrybluea herrycyboard chicony042 compaqik13 compaqik18 \ - armada presario dellm65 inspiron dellusbmm diamond \ - ennyah_dkb1008 genius geniuscomfy2 hpi6 hpxe3gc hpxe3gf \ - hpxt1000 hpzt11xx hpdv5 hpxe4xxx hp5xx thinkpad60 ogitech_base \ - logidinovo logidinovoedge logitech_g15 mx1998 mx2500 mx2750 \ - microsoft4000 microsoft7000 microsoftprooem microsoftmult \ - propeller samsung4500 samsung4510 sk1300 sk2500 sk7100 \ - toshiba_s3000 trust trustda cymotionlinux silvercrest \ - emachines benqx unitekkb1925 creativedw7000 compalfl90 \ - pc105 a4techKB21 a4techKBS8 a4_rfkb23 asus_laptop btc6301urf \ - dexxa dtk2000 fscaa1667g geniuskb19e geniuscomfy latitude \ - microsoftpro precision_m scorpius sp_inet targa_v811 thinkpad \ - tm2030USB-102 tm2030USB-106 trust_slimline - -! $dvoraklayouts = br ca de ee es fr gb no pl se us -! $colemaklayouts = al at ba be bg br ca cz de dk es fi fr gb gr hr hu il is it latam nl no pl pt ro rs ru se si tr us - -! model = keycodes - amiga = amiga(de) - ataritt = ataritt(de) - empty = empty - $sun_jp = sun(type6_jp_usb) - $sun = sun(type6_usb) - pc98 = xfree98(pc98) - $applealu = macintosh(alukbd) - macintosh_hhk = macintosh(hhk) - macintosh_old = macintosh(old) - $macbooks = macintosh+macintosh(goodmap) - $macs = macintosh - thinkpadz60 = xfree86(thinkpadz60) - pc104angle-z = xfree86(pc104angle-z) - pc104wide-qu = xfree86(pc104wide-qu) - pc104awide-zqu = xfree86(pc104awide-zqu) - pc104aframe = xfree86(pc104aframe) - pc105angle-lg = xfree86(pc105angle-lg) - pc105awide-sl = xfree86(pc105awide-sl) - * = xfree86 - -! layout[1] = keycodes - $azerty = +aliases(azerty) - $qwertz = +aliases(qwertz) - * = +aliases(qwerty) - -! layout = keycodes - $azerty = +aliases(azerty) - $qwertz = +aliases(qwertz) - * = +aliases(qwerty) - -//! layout[1] variant = keycodes -// $colemaklayouts cmk_ed_ks = +aliases(colemak) -// $colemaklayouts cmk_ed_us = +aliases(colemak) - -//! layout variant = keycodes -// $colemaklayouts cmk_ed_ks = +aliases(colemak) -// $colemaklayouts cmk_ed_us = +aliases(colemak) - -! option = keycodes - apple:badmap = +macintosh(badmap) - apple:goodmap = +macintosh(goodmap) - -! model layout = geometry - thinkpad us = thinkpad(us) - -! model = geometry - microsoftelite = microsoft(elite) - $msmodels = microsoft(natural) - dell101 = dell(dell101) - dellm65 = dell(dellm65) - latitude = dell(latitude) - flexpro = keytronic(FlexPro) - hp6000 = hp(omnibook) - hpmini110 = hp(mini110) - hpdv5 = hp(dv5) - omnikey101 = northgate(omnikey101) - sanwaskbkg3 = sanwa(sanwaskbkg3) - $pcmodels = pc(%m) - $pcgeometries = pc(%m) - everex = everex(STEPnote) - thinkpad = thinkpad(intl) - thinkpad60 = thinkpad(60) - thinkpadz60 = thinkpad(60) - $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) - sun_type6_jp = sun(type6jp) - sun_type6_usb = sun(type6) - sun_type6_euro_usb = sun(type6tuv) - sun_type6_jp_usb = sun(type6jp) - sun_type6_unix_usb = sun(type6unix) - sun_type7_jp_usb = sun(type6jp) - sun_type7_usb = sun(type7) - sun_type7_euro_usb = sun(type7tuv) - sun_type7_unix_usb = sun(type7unix) - * = pc(pc104) - -! model layout variant = symbols - * ben basic = pc+in(ben) - * ben probhat = pc+in(ben_probhat) - * dev basic = pc+in(deva) - * dvorak $dvoraklayouts = pc+%v(dvorak) - * dvorak basic = pc+us(dvorak) - * dvorak pl_basic = pc+pl(dvorak) - * dvorak pl = pc+pl(dvorak_quotes) - * dvorak pl_altquotes = pc+pl(dvorak_altquotes) - * dzdwi basic = pc+bt(basic) - * fi basic = pc+fi(classic) - * ge azerty_tskapo = pc+fr(geo) - * guj basic = pc+in(guj) - * gur basic = pc+in(guru) - * ie laptop = pc+ie(basic) - * ie CloGaelachLaptop = pc+ie(CloGaelach) - * in urd = pc+in(urd-phonetic) - * iu basic = pc+ca(ike) - * lo basic = pc+la(basic) - * kan basic = pc+in(kan) - * mal basic = pc+in(mal) - * mal mlplusnum = pc+in(mal) - * ogham basic = pc+ie(ogam) - * ogham laptop = pc+ie(ogam) - * ogham is434 = pc+ie(ogam_is434) - * ogham is434laptop = pc+ie(ogam_is434) - * ori basic = pc+in(ori) - * ro de = pc+ro(winkeys) - * ro us = pc+ro(std) - * ro academic = pc+ro(std) - * ro std_comma = pc+ro(std) - * ro comma = pc+ro(basic) - * ru os = pc+ru(os_legacy) - * pk urd = pc+pk(urd-phonetic) - * sapmi basic = pc+no(smi) - * sapmi nodeadkeys = pc+no(smi_nodeadkeys) - * sapmi sefi = pc+fi(smi) - * sin phonetic-static = pc+in(sin_phonetic) - * syr basic = pc+sy(syc) - * syr phonetic = pc+sy(syc_phonetic) - * tam INSCRIPT = pc+in(tam) - * tam UNI = pc+in(tam_unicode) - * tam NUMERAL-KEYBOARD = pc+in(tam_keyboard_with_numerals) - * tam TAB = pc+in(tam_TAB) - * tam TSCII = pc+in(tam_TSCII) - * tel basic = pc+in(tel) - * yu basic = pc+srp(latin) - * yu unicode = pc+srp(latinunicode) - * yu yz = pc+srp(latinyz) - * yu unicodeyz = pc+srp(latinunicodeyz) - 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) - * $sun_custom $sun_var = pc+sun_vndr/%l%(v) - -! model layout = symbols - * ar = pc+ara - * ben = pc+in(ben) - * bs = pc+ba - * cs = pc+rs - * cz_qwerty = pc+cz(qwerty) - * dev = pc+in(deva) - * dvorak = pc+us(dvorak) - * dzdwi = pc+bt - * el = pc+gr - * en_US = pc+latin - * guj = pc+in(guj) - * gur = pc+in(guru) - * iu = pc+ca(ike) - * lo = pc+la - * kan = pc+in(kan) - * mi = pc+mao - * ogham = pc+ie(ogam) - * ori = pc+ie(ori) - * sapmi = pc+no(smi) - * sr = pc+srp - * syr = pc+sy(syc) - * tel = pc+in(tel) - * tml = pc+in(tam) - * yu = pc+srp - * fr-latin9 = pc+fr(latin9) - * us_intl = pc+us(alt-intl) - * ben(basic) = pc+in(ben) - * ben(probhat) = pc+in(ben_probhat) - * dev(basic) = pc+in(deva) - * dvorak($dvoraklayouts) = pc+%v(dvorak) - * dvorak(basic) = pc+us(dvorak) - * dvorak(pl_basic) = pc+pl(dvorak) - * dvorak(pl) = pc+pl(dvorak_quotes) - * dvorak(pl_altquotes) = pc+pl(dvorak_altquotes) - * dzdwi(basic) = pc+bt(basic) - * fi(basic) = pc+fi(classic) - * ge(azerty_tskapo) = pc+fr(geo) - * guj(basic) = pc+in(guj) - * gur(basic) = pc+in(guru) - * ie(laptop) = pc+ie(basic) - * ie(CloGaelachLaptop) = pc+ie(CloGaelach) - * in(urd) = pc+in(urd-phonetic) - * iu(basic) = pc+ca(ike) - * lo(basic) = pc+la(basic) - * kan(basic) = pc+in(kan) - * mal(basic) = pc+in(mal) - * mal(mlplusnum) = pc+in(mal) - * ogham(basic) = pc+ie(ogam) - * ogham(laptop) = pc+ie(ogam) - * ogham(is434) = pc+ie(ogam_is434) - * ogham(is434laptop) = pc+ie(ogam_is434) - * ori(basic) = pc+in(ori) - * ro(de) = pc+ro(winkeys) - * ro(us) = pc+ro(std) - * ro(academic) = pc+ro(std) - * ro(std_comma) = pc+ro(std) - * ro(comma) = pc+ro(basic) - * ru(os) = pc+ru(os_legacy) - * pk(urd) = pc+pk(urd-phonetic) - * sapmi(basic) = pc+no(smi) - * sapmi(nodeadkeys) = pc+no(smi_nodeadkeys) - * sapmi(sefi) = pc+fi(smi) - * sin(phonetic-static) = pc+in(sin_phonetic) - * syr(basic) = pc+sy(syc) - * syr(phonetic) = pc+sy(syc_phonetic) - * tam(INSCRIPT) = pc+in(tam) - * tam(UNI) = pc+in(tam_unicode) - * tam(NUMERAL-KEYBOARD) = pc+in(tam_keyboard_with_numerals) - * tam(TAB) = pc+in(tam_TAB) - * tam(TSCII) = pc+in(tam_TSCII) - * tel(basic) = pc+in(tel) - * yu(basic) = pc+srp(latin) - * yu(unicode) = pc+srp(latinunicode) - * yu(yz) = pc+srp(latinyz) - * yu(unicodeyz) = pc+srp(latinunicodeyz) - ataritt $nonlatin = xfree68_vndr/ataritt(us)+%l%(v):2 - ataritt * = xfree68_vndr/ataritt(us)+%l%(v) - 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) - $sun $sun_custom = pc+sun_vndr/%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) - olpcm $olpclayouts = olpc+%l%(m) - olpcm * = olpc+%l%(v) - $thinkpads br = pc+br(thinkpad) - sl-c3x00 * = pc+sharp_vndr/sl-c3x00(basic) - ws003sh * = pc+sharp_vndr/ws003sh(basic) - ws007sh * = pc+sharp_vndr/ws007sh(basic) - ws011sh * = pc+sharp_vndr/ws011sh(basic) - ws020sh * = pc+sharp_vndr/ws020sh(basic) - htcdream $htcdreamlayouts = %l(htcdream) - * $nonlatin = pc+us+%l%(v):2 - * * = pc+%l%(v) - -! model layout[1] = symbols - * ar = pc+ara%(v[1]) - * ben = pc+in(ben) - * bs = pc+ba%(v[1]) - * cs = pc+rs%(v[1]) - * cz_qwerty = pc+cz(qwerty) - * dev = pc+in(deva) - * dvorak = pc+us(dvorak) - * dzdwi = pc+bt%(v[1]) - * el = pc+gr%(v[1]) - * en_US = pc+latin%(v[1]) - * guj = pc+in(guj) - * gur = pc+in(guru) - * iu = pc+ca(ike) - * lo = pc+la%(v[1]) - * kan = pc+in(kan) - * mi = pc+mao%(v[1]) - * ogham = pc+ie(ogam) - * ori = pc+ie(ori) - * sapmi = pc+no(smi) - * sr = pc+srp%(v[1]) - * syr = pc+sy(syc) - * tel = pc+in(tel) - * tml = pc+in(tam) - * yu = pc+srp%(v[1]) - * fr-latin9 = pc+fr(latin9) - * us_intl = pc+us(alt-intl) - * ben(basic) = pc+in(ben) - * ben(probhat) = pc+in(ben_probhat) - * dev(basic) = pc+in(deva) - * dvorak($dvoraklayouts) = pc+%v(dvorak) - * dvorak(basic) = pc+us(dvorak) - * dvorak(pl_basic) = pc+pl(dvorak) - * dvorak(pl) = pc+pl(dvorak_quotes) - * dvorak(pl_altquotes) = pc+pl(dvorak_altquotes) - * dzdwi(basic) = pc+bt(basic) - * fi(basic) = pc+fi(classic) - * ge(azerty_tskapo) = pc+fr(geo) - * guj(basic) = pc+in(guj) - * gur(basic) = pc+in(guru) - * ie(laptop) = pc+ie(basic) - * ie(CloGaelachLaptop) = pc+ie(CloGaelach) - * in(urd) = pc+in(urd-phonetic) - * iu(basic) = pc+ca(ike) - * lo(basic) = pc+la(basic) - * kan(basic) = pc+in(kan) - * mal(basic) = pc+in(mal) - * mal(mlplusnum) = pc+in(mal) - * ogham(basic) = pc+ie(ogam) - * ogham(laptop) = pc+ie(ogam) - * ogham(is434) = pc+ie(ogam_is434) - * ogham(is434laptop) = pc+ie(ogam_is434) - * ori(basic) = pc+in(ori) - * ro(de) = pc+ro(winkeys) - * ro(us) = pc+ro(std) - * ro(academic) = pc+ro(std) - * ro(std_comma) = pc+ro(std) - * ro(comma) = pc+ro(basic) - * ru(os) = pc+ru(os_legacy) - * pk(urd) = pc+pk(urd-phonetic) - * sapmi(basic) = pc+no(smi) - * sapmi(nodeadkeys) = pc+no(smi_nodeadkeys) - * sapmi(sefi) = pc+fi(smi) - * sin(phonetic-static) = pc+in(sin_phonetic) - * syr(basic) = pc+sy(syc) - * syr(phonetic) = pc+sy(syc_phonetic) - * tam(INSCRIPT) = pc+in(tam) - * tam(UNI) = pc+in(tam_unicode) - * tam(NUMERAL-KEYBOARD) = pc+in(tam_keyboard_with_numerals) - * tam(TAB) = pc+in(tam_TAB) - * tam(TSCII) = pc+in(tam_TSCII) - * tel(basic) = pc+in(tel) - * yu(basic) = pc+srp(latin) - * yu(unicode) = pc+srp(latinunicode) - * yu(yz) = pc+srp(latinyz) - * yu(unicodeyz) = pc+srp(latinunicodeyz) - ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1]) - amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1]) - $sun $sun_custom = pc+sun_vndr/%l[1]%(v[1]) - 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]) - -! model layout[1] variant[1] = symbols - * ben basic = pc+in(ben) - * ben probhat = pc+in(ben_probhat) - * dev basic = pc+in(deva) - * dvorak $dvoraklayouts = pc+%v(dvorak) - * dvorak basic = pc+us(dvorak) - * dvorak pl_basic = pc+pl(dvorak) - * dvorak pl = pc+pl(dvorak_quotes) - * dvorak pl_altquotes = pc+pl(dvorak_altquotes) - * dzdwi basic = pc+bt(basic) - * fi basic = pc+fi(classic) - * ge azerty_tskapo = pc+fr(geo) - * guj basic = pc+in(guj) - * gur basic = pc+in(guru) - * ie laptop = pc+ie(basic) - * ie CloGaelachLaptop = pc+ie(CloGaelach) - * in urd = pc+in(urd-phonetic) - * iu basic = pc+ca(ike) - * lo basic = pc+la(basic) - * kan basic = pc+in(kan) - * mal basic = pc+in(mal) - * mal mlplusnum = pc+in(mal) - * ogham basic = pc+ie(ogam) - * ogham laptop = pc+ie(ogam) - * ogham is434 = pc+ie(ogam_is434) - * ogham is434laptop = pc+ie(ogam_is434) - * ori basic = pc+in(ori) - * ro de = pc+ro(winkeys) - * ro us = pc+ro(std) - * ro academic = pc+ro(std) - * ro std_comma = pc+ro(std) - * ro comma = pc+ro(basic) - * ru os = pc+ru(os_legacy) - * pk urd = pc+pk(urd-phonetic) - * sapmi basic = pc+no(smi) - * sapmi nodeadkeys = pc+no(smi_nodeadkeys) - * sapmi sefi = pc+fi(smi) - * sin phonetic-static = pc+in(sin_phonetic) - * syr basic = pc+sy(syc) - * syr phonetic = pc+sy(syc_phonetic) - * tam INSCRIPT = pc+in(tam) - * tam UNI = pc+in(tam_unicode) - * tam NUMERAL-KEYBOARD = pc+in(tam_keyboard_with_numerals) - * tam TAB = pc+in(tam_TAB) - * tam TSCII = pc+in(tam_TSCII) - * tel basic = pc+in(tel) - * yu basic = pc+srp(latin) - * yu unicode = pc+srp(latinunicode) - * yu yz = pc+srp(latinyz) - * yu unicodeyz = pc+srp(latinunicodeyz) - -! 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 - * 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 - * 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 - nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):2 - nokiarx51 * = +nokia_vndr/rx-51(%l[2]%_v[2]):2 - $sun $sun_custom = +sun_vndr/%l[2]%(v[2]):2 - * * = +%l[2]%(v[2]):2 - -! 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 - * 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 - * 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 - nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):3 - nokiarx51 * = +nokia_vndr/rx-51(%l[3]%_v[3]):3 - $sun $sun_custom = +sun_vndr/%l[3]%(v[3]):3 - * * = +%l[3]%(v[3]):3 - -! 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 - * 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 - * 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 - nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):4 - nokiarx51 * = +nokia_vndr/rx-51(%l[4]%_v[4]):4 - $sun $sun_custom = +sun_vndr/%l[4]%(v[4]):4 - * * = +%l[4]%(v[4]):4 - -! 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 - * 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 - -! 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 - * 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 - -! 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 - * 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 - -! model = symbols - a4techKB21 = +inet(media_nav_common) - a4techKBS8 = +inet(media_nav_acpi_common) - a4_rfkb23 = +inet(media_nav_acpi_common) - asus_laptop = +inet(media_common) - acer_tm_800 = +inet(acer_laptop) - benqx730 = +inet(benqx) - benqx800 = +inet(benqx) - btc5126t = +inet(nav_acpi_common) - btc9116u = +inet(btc9019u) - btc6301urf = +inet(media_nav_acpi_common) - dellsk8125 = +inet(dell) - dellsk8135 = +inet(dell) - cherrybunlim = +inet(nav_common) - dexxa = +inet(media_nav_common) - dtk2000 = +inet(media_nav_acpi_common) - fscaa1667g = +inet(media_nav_common) - geniuskb19e = +inet(media_nav_acpi_common) - geniuscomfy = +inet(media_nav_acpi_common) - geniuskkb2050hs = +inet(dellusbmm) - hpnx9020 = +inet(hpi6) - latitude = +inet(media_common) - logicd = +inet(logitech_base) - logicd_it = +inet(logitech_base) - logicd_nav = +inet(logitech_base) - logicd_opt = +inet(logitech_base) - logiultrax = +inet(logitech_base) - logiclx300 = +inet(logiex110) - logii350 = +inet(logiex110) - logimel = +inet(logiex110) - logicdit = +inet(logicd) - logicdo = +inet(logicd) - logicdp = +inet(logicd) - logicdpa = +inet(logicda) - logiciink = +inet(logicink) - ltcd = +inet(logicda) - microsoftccurve2k = +inet(microsoftprooem) - microsoftpro = +inet(media_nav_acpi_common) - precision_m = +inet(media_nav_common) - scorpius = +inet(media_nav_acpi_common) - sp_inet = +inet(media_nav_acpi_common) - 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) - sun_type7_jp_usb = +sun_vndr/solaris(defaults_type7jp) - $sun = +sun_vndr/solaris(defaults) - -! model layout = symbols - $inetmediakbds jp = +jp(henkan) - -! layout variant = compat - de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) - de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) - jp $sun_compat = complete+japan(kana_lock) - -! layout[1] variant[1] = compat - de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) - de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) - jp $sun_compat = complete+japan(kana_lock) - -! layout[2] variant[2] = compat - de neo = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2 - de adnw = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2 - jp $sun_compat = +complete+japan(kana_lock):2 - -! layout[3] variant[3] = compat - de neo = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3 - de adnw = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3 - jp $sun_compat = +complete+japan(kana_lock):3 - -! layout[4] variant[4] = compat - de neo = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4 - de adnw = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4 - jp $sun_compat = +complete+japan(kana_lock):4 - -! model layout = compat - pc98 nec_vndr/jp = pc98(basic) - * jp = complete+japan - olpc * = olpc - olpcm * = olpc - * * = complete - -! model layout[1] = compat - * * = complete - -! model = types - $macs = complete+numpad(mac) - $applealu = complete+numpad(mac) - $nokiamodels = complete+nokia - * = complete - -! layout option = symbols - $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle) - * misc:typo = +typo(base) - * misc:extend = +extend(basic) - -! layout[1] option = symbols - $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1 - * misc:typo = +typo(base):1 - * misc:extend = +extend(basic):1 - -! layout[2] option = symbols - $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2 - * misc:typo = +typo(base):2 - * misc:extend = +extend(basic):2 - -! layout[3] option = symbols - $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3 - * misc:typo = +typo(base):3 - * misc:extend = +extend(basic):3 - -! layout[4] option = symbols - $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4 - * misc:typo = +typo(base):4 - * misc:extend = +extend(basic):4 - -! option = symbols - grp:shift_toggle = +group(shifts_toggle) - altwin:menu = +altwin(menu) - altwin:meta_alt = +altwin(meta_alt) - altwin:alt_win = +altwin(alt_win) - altwin:ctrl_win = +altwin(ctrl_win) - altwin:ctrl_alt_win = +altwin(ctrl_alt_win) - altwin:meta_win = +altwin(meta_win) - altwin:left_meta_win = +altwin(left_meta_win) - altwin:hyper_win = +altwin(hyper_win) - altwin:alt_super_win = +altwin(alt_super_win) - altwin:swap_alt_win = +altwin(swap_alt_win) - grab:debug = +srvr_ctrl(grab_debug) - grp:switch = +group(switch) - grp:lswitch = +group(lswitch) - grp:win_switch = +group(win_switch) - grp:lwin_switch = +group(lwin_switch) - grp:rwin_switch = +group(rwin_switch) - grp:toggle = +group(toggle) - grp:shifts_toggle = +group(shifts_toggle) - grp:ctrls_toggle = +group(ctrls_toggle) - grp:alts_toggle = +group(alts_toggle) - grp:caps_toggle = +capslock(grouplock) - grp:caps_switch = +capslock(groupshift) - grp:shift_caps_toggle = +group(shift_caps_toggle) - grp:shift_caps_switch = +group(shift_caps_switch) - grp:win_space_toggle = +group(win_space_toggle) - grp:win_menu_switch = +group(win_menu_switch) - grp:alt_caps_toggle = +group(alt_caps_toggle) - grp:alt_space_toggle = +group(alt_space_toggle) - grp:menu_toggle = +group(menu_toggle) - grp:lwin_toggle = +group(lwin_toggle) - grp:rwin_toggle = +group(rwin_toggle) - grp:lshift_toggle = +group(lshift_toggle) - grp:rshift_toggle = +group(rshift_toggle) - grp:lctrl_switch = +group(lctrl_switch) - grp:rctrl_switch = +group(rctrl_switch) - grp:lctrl_toggle = +group(lctrl_toggle) - 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) - grp:lctrl_lwin_rctrl_menu = +group(lctrl_lwin_rctrl_menu) - grp:lctrl_lalt_toggle = +group(lctrl_lalt_toggle) - grp:rctrl_ralt_toggle = +group(rctrl_ralt_toggle) - grp:ctrl_alt_toggle = +group(ctrl_alt_toggle) - grp:ctrl_alt_toggle_bidir = +group(ctrl_alt_toggle_bidir) - grp:lctrl_lshift_toggle = +group(lctrl_lshift_toggle) - grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle) - grp:ctrl_shift_toggle = +group(ctrl_shift_toggle) - grp:ctrl_shift_toggle_bidir = +group(ctrl_shift_toggle_bidir) - grp:rctrl_switch_ctrls_toggle = +group(rctrl_switch_ctrls_toggle) - grp:lalt_lshift_toggle = +group(lalt_lshift_toggle) - grp:ralt_rshift_toggle = +group(ralt_rshift_toggle) - grp:alt_shift_toggle = +group(alt_shift_toggle) - grp:alt_shift_toggle_bidir = +group(alt_shift_toggle_bidir) - lv3:switch = +level3(switch) - lv3:ralt_switch = +level3(ralt_switch) - lv3:ralt_switch_multikey = +level3(ralt_switch_multikey) - lv3:ralt_alt = +level3(ralt_alt) - lv3:lalt_switch = +level3(lalt_switch) - lv3:alt_switch = +level3(alt_switch) - lv3:menu_switch = +level3(menu_switch) - lv3:win_switch = +level3(win_switch) - lv3:lwin_switch = +level3(lwin_switch) - lv3:rwin_switch = +level3(rwin_switch) - lv3:enter_switch = +level3(enter_switch) - caps:capslock = +capslock(capslock) - caps:numlock = +capslock(numlock) - caps:shiftlock = +capslock(shiftlock) - caps:swapescape = +capslock(swapescape) - caps:escape = +capslock(escape) - caps:backspace = +capslock(backspace) - caps:super = +capslock(super) - caps:hyper = +capslock(hyper) - caps:none = +capslock(none) - caps:ctrl_modifier = +capslock(ctrl_modifier) - ctrl:nocaps = +ctrl(nocaps) - ctrl:lctrl_meta = +ctrl(lctrl_meta) - ctrl:swapcaps = +ctrl(swapcaps) - ctrl:ac_ctrl = +ctrl(ac_ctrl) - ctrl:aa_ctrl = +ctrl(aa_ctrl) - ctrl:rctrl_ralt = +ctrl(rctrl_ralt) - ctrl:menu_rctrl = +ctrl(menu_rctrl) - ctrl:ralt_rctrl = +ctrl(ralt_rctrl) - compose:ralt = +compose(ralt) - compose:lwin = +compose(lwin) - compose:lwin-altgr = +compose(lwin-altgr) - compose:rwin = +compose(rwin) - compose:rwin-altgr = +compose(rwin-altgr) - compose:menu = +compose(menu) - compose:menu-altgr = +compose(menu-altgr) - compose:lctrl = +compose(lctrl) - compose:lctrl-altgr = +compose(lctrl-altgr) - compose:rctrl = +compose(rctrl) - compose:rctrl-altgr = +compose(rctrl-altgr) - compose:caps = +compose(caps) - compose:caps-altgr = +compose(caps-altgr) - compose:102 = +compose(102) - compose:102-altgr = +compose(102-altgr) - 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) - eurosign:4 = +eurosign(4) - eurosign:5 = +eurosign(5) - rupeesign:4 = +rupeesign(4) - keypad:oss = +keypad(oss) - keypad:legacy = +keypad(legacy) - keypad:legacy_wang = +keypad(legacy_wang) - keypad:oss_wang = +keypad(oss_wang) - keypad:future = +keypad(future) - keypad:future_wang = +keypad(future_wang) - keypad:hex = +keypad(ops)+keypad(hex) - keypad:atm = +keypad(ops)+keypad(hex)+keypad(atm) - nbsp:none = +nbsp(none) - nbsp:level2 = +nbsp(level2) - nbsp:level3 = +nbsp(level3) - nbsp:level3s = +nbsp(level3s) - nbsp:level3n = +nbsp(level3n) - nbsp:level4 = +nbsp(level4) - nbsp:level4n = +nbsp(level4n) - nbsp:level4nl = +nbsp(level4nl) - japan:nicola_f_bs = +jp(nicola_f_bs) - japan:hztg_escape = +jp(hztg_escape) - kpdl:dot = +kpdl(dot) - kpdl:comma = +kpdl(comma) - kpdl:dotoss = +kpdl(dotoss) - kpdl:dotoss_latin9 = +kpdl(dotoss_latin9) - kpdl:commaoss = +kpdl(commaoss) - kpdl:momayyezoss = +kpdl(momayyezoss) - kpdl:kposs = +kpdl(kposs) - kpdl:semi = +kpdl(semi) - shift:breaks_caps = +shift(breaks_caps) - esperanto:qwerty = +epo(qwerty) - esperanto:dvorak = +epo(dvorak) - esperanto:colemak = +epo(colemak) - terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp) - keypad:pointerkeys = +keypad(pointerkeys) - 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) - shift:both_capslock_cancel = +shift(both_capslock_cancel) - shift:lshift_both_capslock_cancel = +shift(lshift_both_capslock_cancel) - shift:rshift_both_capslock_cancel = +shift(rshift_both_capslock_cancel) - shift:both_shiftlock = +shift(both_shiftlock) - shift:lshift_both_shiftlock = +shift(lshift_both_shiftlock) - shift:rshift_both_shiftlock = +shift(rshift_both_shiftlock) - solaris:sun_compat = +sun_vndr/solaris(sun_compat) - lv3:caps_switch = +level3(caps_switch) - lv3:bksl_switch = +level3(bksl_switch) - lv3:lsgt_switch = +level3(lsgt_switch) - lv3:caps_switch_latch = +level3(caps_switch_latch) - lv3:bksl_switch_latch = +level3(bksl_switch_latch) - lv3:lsgt_switch_latch = +level3(lsgt_switch_latch) - lv5:lsgt_switch_lock = +level5(lsgt_switch_lock) - lv5:ralt_switch_lock = +level5(ralt_switch_lock) - lv5:lwin_switch_lock = +level5(lwin_switch_lock) - lv5:rwin_switch_lock = +level5(rwin_switch_lock) - lv5:caps_switch_lock = +level5(caps_switch_lock) - lv5:lsgt_switch_lock_cancel = +level5(lsgt_switch_lock_cancel) - lv5:ralt_switch_lock_cancel = +level5(ralt_switch_lock_cancel) - lv5:lwin_switch_lock_cancel = +level5(lwin_switch_lock_cancel) - lv5:rwin_switch_lock_cancel = +level5(rwin_switch_lock_cancel) - lv5:caps_switch_lock_cancel = +level5(caps_switch_lock_cancel) - - - -! option = compat - grp_led:num = +lednum(group_lock) - grp_led:caps = +ledcaps(group_lock) - grp_led:scroll = +ledscroll(group_lock) - japan:kana_lock = +japan(kana_lock) - caps:shiftlock = +ledcaps(shift_lock) - grab:break_actions = +xfree86(grab_break) - - -! option = types - caps:internal = +caps(internal) - caps:internal_nocancel = +caps(internal_nocancel) - caps:shift = +caps(shift) - caps:shift_nocancel = +caps(shift_nocancel) - numpad:pc = +numpad(pc) - numpad:mac = +numpad(mac) - numpad:microsoft = +numpad(microsoft) - numpad:shift3 = +numpad(shift3) diff --git a/x-mod_v2-12-1_2015-01-18/xkb/rules/base.lst b/x-mod_v2-12-1_2015-01-18/xkb/rules/base.lst deleted file mode 100644 index 8753b30..0000000 --- a/x-mod_v2-12-1_2015-01-18/xkb/rules/base.lst +++ /dev/null @@ -1,963 +0,0 @@ -! model - pc101 Generic 101-key PC - pc102 Generic 102-key (Intl) PC - pc104 Generic 104-key PC - pc105 Generic 105-key (Intl) PC - pc104angle-z Generic 104-key PC Angle(Z)Ergo - pc104wide-qu Generic 104-key PC Wide(Quote)Ergo - pc104awide-zqu Generic 104-key PC Angle(Z)Wide(Quote)Ergo - pc104aframe Generic 104-key PC AngleFrame(Quote)Ergo - pc105angle-lg Generic 105-key (Intl) PC Angle(LSGT)Ergo - pc105awide-sl Generic 105-key (Intl) PC AngleWide(/)Ergo - dell101 Dell 101-key PC - latitude Dell Latitude series laptop - dellm65 Dell Precision M65 - everex Everex STEPnote - flexpro Keytronic FlexPro - microsoft Microsoft Natural - omnikey101 Northgate OmniKey 101 - winbook Winbook Model XP5 - pc98 PC-98xx Series - a4techKB21 A4Tech KB-21 - a4techKBS8 A4Tech KBS-8 - a4_rfkb23 A4Tech Wireless Desktop RFKB-23 - airkey Acer AirKey V - azonaRF2300 Azona RF2300 wireless Internet Keyboard - scorpius Advance Scorpius KI - brother Brother Internet Keyboard - btc5113rf BTC 5113RF Multimedia - btc5126t BTC 5126T - btc6301urf BTC 6301URF - btc9000 BTC 9000 - btc9000a BTC 9000A - btc9001ah BTC 9001AH - btc5090 BTC 5090 - btc9019u BTC 9019U - btc9116u BTC 9116U Mini Wireless Internet and Gaming - cherryblue Cherry Blue Line CyBo@rd - cherryblueb Cherry CyMotion Master XPress - cherrybluea Cherry Blue Line CyBo@rd (alternate option) - cherrycyboard Cherry CyBo@rd USB-Hub - cherrycmexpert Cherry CyMotion Expert - cherrybunlim Cherry B.UNLIMITED - chicony Chicony Internet Keyboard - chicony0108 Chicony KU-0108 - chicony0420 Chicony KU-0420 - chicony9885 Chicony KB-9885 - compaqeak8 Compaq Easy Access Keyboard - compaqik7 Compaq Internet Keyboard (7 keys) - compaqik13 Compaq Internet Keyboard (13 keys) - compaqik18 Compaq Internet Keyboard (18 keys) - cymotionlinux Cherry CyMotion Master Linux - armada Laptop/notebook Compaq (eg. Armada) Laptop Keyboard - presario Laptop/notebook Compaq (eg. Presario) Internet Keyboard - ipaq Compaq iPaq Keyboard - dell Dell - dellsk8125 Dell SK-8125 - dellsk8135 Dell SK-8135 - dellusbmm Dell USB Multimedia Keyboard - inspiron Dell Laptop/notebook Inspiron 6xxx/8xxx - precision_m Dell Laptop/notebook Precision M series - dexxa Dexxa Wireless Desktop Keyboard - diamond Diamond 9801 / 9802 series - dtk2000 DTK2000 - ennyah_dkb1008 Ennyah DKB-1008 - fscaa1667g Fujitsu-Siemens Computers AMILO laptop - genius Genius Comfy KB-16M / Genius MM Keyboard KWD-910 - geniuscomfy Genius Comfy KB-12e - geniuscomfy2 Genius Comfy KB-21e-Scroll - geniuskb19e Genius KB-19e NB - geniuskkb2050hs Genius KKB-2050HS - gyration Gyration - htcdream HTC Dream - kinesis Kinesis - logitech_base Logitech Generic Keyboard - logitech_g15 Logitech G15 extra keys via G15daemon - hpi6 Hewlett-Packard Internet Keyboard - hp250x Hewlett-Packard SK-250x Multimedia Keyboard - hpxe3gc Hewlett-Packard Omnibook XE3 GC - hpxe3gf Hewlett-Packard Omnibook XE3 GF - hpxt1000 Hewlett-Packard Omnibook XT1000 - hpdv5 Hewlett-Packard Pavilion dv5 - hpzt11xx Hewlett-Packard Pavilion ZT11xx - hp500fa Hewlett-Packard Omnibook 500 FA - hp5xx Hewlett-Packard Omnibook 5xx - hpnx9020 Hewlett-Packard nx9020 - hp6000 Hewlett-Packard Omnibook 6000/6100 - honeywell_euroboard Honeywell Euroboard - hpmini110 Hewlett-Packard Mini 110 Notebook - rapidaccess IBM Rapid Access - rapidaccess2 IBM Rapid Access II - thinkpad IBM ThinkPad 560Z/600/600E/A22E - thinkpad60 IBM ThinkPad R60/T60/R61/T61 - thinkpadz60 IBM ThinkPad Z60m/Z60t/Z61m/Z61t - ibm_spacesaver IBM Space Saver - logiaccess Logitech Access Keyboard - logiclx300 Logitech Cordless Desktop LX-300 - logii350 Logitech Internet 350 Keyboard - logimel Logitech Media Elite Keyboard - logicd Logitech Cordless Desktop - logicd_it Logitech Cordless Desktop iTouch - logicd_nav Logitech Cordless Desktop Navigator - logicd_opt Logitech Cordless Desktop Optical - logicda Logitech Cordless Desktop (alternate option) - logicdpa2 Logitech Cordless Desktop Pro (alternate option 2) - logicfn Logitech Cordless Freedom/Desktop Navigator - logicdn Logitech Cordless Desktop Navigator - logiitc Logitech iTouch Cordless Keyboard (model Y-RB6) - logiik Logitech Internet Keyboard - itouch Logitech iTouch - logicink Logitech Internet Navigator Keyboard - logiex110 Logitech Cordless Desktop EX110 - logiinkse Logitech iTouch Internet Navigator Keyboard SE - logiinkseusb Logitech iTouch Internet Navigator Keyboard SE (USB) - logiultrax Logitech Ultra-X Keyboard - logiultraxc Logitech Ultra-X Cordless Media Desktop Keyboard - logidinovo Logitech diNovo Keyboard - logidinovoedge Logitech diNovo Edge Keyboard - mx1998 Memorex MX1998 - mx2500 Memorex MX2500 EZ-Access Keyboard - mx2750 Memorex MX2750 - microsoft4000 Microsoft Natural Wireless Ergonomic Keyboard 4000 - microsoft7000 Microsoft Natural Wireless Ergonomic Keyboard 7000 - microsoftinet Microsoft Internet Keyboard - microsoftpro Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro - microsoftprousb Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro - microsoftprooem Microsoft Natural Keyboard Pro OEM - vsonku306 ViewSonic KU-306 Internet Keyboard - microsoftprose Microsoft Internet Keyboard Pro, Swedish - microsoftoffice Microsoft Office Keyboard - microsoftmult Microsoft Wireless Multimedia Keyboard 1.0A - microsoftelite Microsoft Natural Keyboard Elite - microsoftccurve2k Microsoft Comfort Curve Keyboard 2000 - oretec Ortek MCK-800 MM/Internet keyboard - propeller Propeller Voyager (KTEZ-1000) - qtronix QTronix Scorpius 98N+ - samsung4500 Samsung SDM 4500P - samsung4510 Samsung SDM 4510P - sanwaskbkg3 Sanwa Supply SKB-KG3 - sk1300 SK-1300 - sk2500 SK-2500 - sk6200 SK-6200 - sk7100 SK-7100 - sp_inet Super Power Multimedia Keyboard - sven SVEN Ergonomic 2500 - sven303 SVEN Slim 303 - symplon Symplon PaceBook (tablet PC) - toshiba_s3000 Toshiba Satellite S3000 - trust Trust Wireless Keyboard Classic - trustda Trust Direct Access Keyboard - trust_slimline Trust Slimline - tm2020 TypeMatrix EZ-Reach 2020 - tm2030PS2 TypeMatrix EZ-Reach 2030 PS2 - tm2030USB TypeMatrix EZ-Reach 2030 USB - tm2030USB-102 TypeMatrix EZ-Reach 2030 USB (102/105:EU mode) - tm2030USB-106 TypeMatrix EZ-Reach 2030 USB (106:JP mode) - yahoo Yahoo! Internet Keyboard - macbook78 MacBook/MacBook Pro - macbook79 MacBook/MacBook Pro (Intl) - macintosh Macintosh - macintosh_old Macintosh Old - macintosh_hhk Happy Hacking Keyboard for Mac - acer_c300 Acer C300 - acer_ferrari4k Acer Ferrari 4000 - acer_laptop Acer Laptop - asus_laptop Asus Laptop - apple Apple - apple_laptop Apple Laptop - applealu_ansi Apple Aluminium Keyboard (ANSI) - applealu_iso Apple Aluminium Keyboard (ISO) - applealu_jis Apple Aluminium Keyboard (JIS) - silvercrest SILVERCREST Multimedia Wireless Keyboard - emachines Laptop/notebook eMachines m68xx - benqx BenQ X-Touch - benqx730 BenQ X-Touch 730 - benqx800 BenQ X-Touch 800 - hhk Happy Hacking Keyboard - classmate Classmate PC - olpc OLPC - sun_type7_usb Sun Type 7 USB - sun_type7_euro_usb Sun Type 7 USB (European layout) - sun_type7_unix_usb Sun Type 7 USB (Unix layout) - sun_type7_jp_usb Sun Type 7 USB (Japanese layout) / Japanese 106-key - sun_type6_usb Sun Type 6/7 USB - sun_type6_euro_usb Sun Type 6/7 USB (European layout) - sun_type6_unix_usb Sun Type 6 USB (Unix layout) - sun_type6_jp_usb Sun Type 6 USB (Japanese layout) - sun_type6_jp Sun Type 6 (Japanese layout) - targa_v811 Targa Visionary 811 - unitekkb1925 Unitek KB-1925 - compalfl90 FL90 - creativedw7000 Creative Desktop Wireless 7000 - htcdream Htc Dream phone - -! layout - us English (US) - af Afghani - ara Arabic - al Albanian - am Armenian - at German (Austria) - az Azerbaijani - by Belarusian - be Belgian - bd Bangla - in Indian - ba Bosnian - br Portuguese (Brazil) - bg Bulgarian - ma Arabic (Morocco) - cm English (Cameroon) - mm Burmese - ca French (Canada) - cd French (Democratic Republic of the Congo) - cn Chinese - hr Croatian - cz Czech - dk Danish - nl Dutch - bt Dzongkha - ee Estonian - ir Persian - iq Iraqi - fo Faroese - fi Finnish - fr French - gh English (Ghana) - gn French (Guinea) - ge Georgian - de German - gr Greek - hu Hungarian - is Icelandic - il Hebrew - it Italian - jp Japanese - kg Kyrgyz - kh Khmer (Cambodia) - kz Kazakh - la Lao - latam Spanish (Latin American) - lt Lithuanian - lv Latvian - mao Maori - me Montenegrin - mk Macedonian - mt Maltese - mn Mongolian - no Norwegian - pl Polish - pt Portuguese - ro Romanian - ru Russian - rs Serbian - si Slovenian - sk Slovak - es Spanish - se Swedish - ch German (Switzerland) - sy Arabic (Syria) - tj Tajik - lk Sinhala (phonetic) - th Thai - tr Turkish - tw Taiwanese - ua Ukrainian - gb English (UK) - uz Uzbek - vn Vietnamese - kr Korean - nec_vndr/jp Japanese (PC-98xx Series) - ie Irish - pk Urdu (Pakistan) - mv Dhivehi - za English (South Africa) - epo Esperanto - np Nepali - ng English (Nigeria) - et Amharic - sn Wolof - brai Braille - tm Turkmen - ml Bambara - tz Swahili (Tanzania) - ke Swahili (Kenya) - bw Tswana - ph Filipino - md Moldavian - -! variant - chr us: Cherokee - euro us: English (US, with euro on 5) - intl us: English (US, international with dead keys) - alt-intl us: English (US, alternative international) - colemak us: English (Colemak) - cmk_ed_us us: English (Colemak, edition DreymaR) - tarmak1_e us: English (Tarmak1 - Colemak transitional) - tarmak2_et us: English (Tarmak2 - Colemak transitional) - tarmak3_etr us: English (Tarmak3 - Colemak transitional) - tarmak4_etro us: English (Tarmak4 - Colemak transitional) - cmk_ed_dvbghm us: English (Colemak[eD], Curl-Dvbg/Hm ergo) - cmk_ed_dbghk us: English (Colemak[eD], Curl-Dbg/Hk ergo) - cmk_ed_mirror us: English (Colemak[eD], mirrored) - dvorak us: English (Dvorak) - dvorak-intl us: English (Dvorak, international with dead keys) - dvorak-alt-intl us: English (Dvorak alternative international no dead keys) - dvorak-l us: English (left handed Dvorak) - dvorak-r us: English (right handed Dvorak) - dvorak-classic us: English (classic Dvorak) - dvp us: English (programmer Dvorak) - rus us: Russian (US, phonetic) - mac us: English (Macintosh) - altgr-intl us: English (international AltGr dead keys) - olpc2 us: English (the divide/multiply keys toggle the layout) - hbs us: Serbo-Croatian (US) - workman us: English (Workman) - workman-intl us: English (Workman, international with dead keys) - ps af: Pashto - uz af: Uzbek (Afghanistan) - olpc-ps af: Pashto (Afghanistan, OLPC) - fa-olpc af: Persian (Afghanistan, Dari OLPC) - uz-olpc af: Uzbek (Afghanistan, OLPC) - azerty ara: Arabic (azerty) - azerty_digits ara: Arabic (azerty/digits) - digits ara: Arabic (digits) - qwerty ara: Arabic (qwerty) - qwerty_digits ara: Arabic (qwerty/digits) - buckwalter ara: Arabic (Buckwalter) - plisi-d1 al: Albanian (Plisi D1) - cmk_ed_ks al: Albanian (Colemak[eD], keep local symbols) - cmk_ed_us al: Albanian (Colemak[eD], unified symbols) - phonetic am: Armenian (phonetic) - phonetic-alt am: Armenian (alternative phonetic) - eastern am: Armenian (eastern) - western am: Armenian (western) - eastern-alt am: Armenian (alternative eastern) - nodeadkeys at: German (Austria, eliminate dead keys) - sundeadkeys at: German (Austria, Sun dead keys) - mac at: German (Austria, Macintosh) - cmk_ed_ks at: German (Austria, Colemak[eD], keep local symbols) - cmk_ed_us at: German (Austria, Colemak[eD], unified symbols) - cyrillic az: Azerbaijani (Cyrillic) - legacy by: Belarusian (legacy) - latin by: Belarusian (Latin) - oss be: Belgian (alternative) - oss_latin9 be: Belgian (alternative, Latin-9 only) - oss_sundeadkeys be: Belgian (alternative, Sun dead keys) - iso-alternate be: Belgian (ISO alternate) - nodeadkeys be: Belgian (eliminate dead keys) - sundeadkeys be: Belgian (Sun dead keys) - wang be: Belgian (Wang model 724 azerty) - cmk_ed_ks be: Belgian (Colemak[eD], keep local symbols) - cmk_ed_us be: Belgian (Colemak[eD], unified symbols) - probhat bd: Bangla (Probhat) - ben in: Bangla (India) - ben_probhat in: Bangla (India, Probhat) - ben_baishakhi in: Bangla (India, Baishakhi) - ben_bornona in: Bangla (India, Bornona) - ben_gitanjali in: Bangla (India, Uni Gitanjali) - ben_inscript in: Bangla (India, Baishakhi Inscript) - eeyek in: Manipuri (Eeyek) - guj in: Gujarati - guru in: Punjabi (Gurmukhi) - jhelum in: Punjabi (Gurmukhi Jhelum) - kan in: Kannada - kan-kagapa in: Kannada (KaGaPa phonetic) - mal in: Malayalam - mal_lalitha in: Malayalam (Lalitha) - mal_enhanced in: Malayalam (enhanced Inscript, with rupee sign) - ori in: Oriya - tam_unicode in: Tamil (Unicode) - tam_keyboard_with_numerals in: Tamil (keyboard with numerals) - tam_TAB in: Tamil (TAB typewriter) - tam_TSCII in: Tamil (TSCII typewriter) - tam in: Tamil - tel in: Telugu - tel-kagapa in: Telugu (KaGaPa phonetic) - urd-phonetic in: Urdu (phonetic) - urd-phonetic3 in: Urdu (alternative phonetic) - urd-winkeys in: Urdu (WinKeys) - bolnagri in: Hindi (Bolnagri) - hin-wx in: Hindi (Wx) - hin-kagapa in: Hindi (KaGaPa phonetic) - san-kagapa in: Sanskrit (KaGaPa phonetic) - mar-kagapa in: Marathi (KaGaPa phonetic) - eng in: English (India, with rupee sign) - alternatequotes ba: Bosnian (with guillemets for quotes) - unicode ba: Bosnian (with Bosnian digraphs) - unicodeus ba: Bosnian (US keyboard with Bosnian digraphs) - us ba: Bosnian (US keyboard with Bosnian letters) - cmk_ed_ks ba: Bosnian (Colemak[eD], keep local symbols) - cmk_ed_us ba: Bosnian (Colemak[eD], unified symbols) - nodeadkeys br: Portuguese (Brazil, eliminate dead keys) - dvorak br: Portuguese (Brazil, Dvorak) - nativo br: Portuguese (Brazil, Nativo) - nativo-us br: Portuguese (Brazil, Nativo for US keyboards) - nativo-epo br: Esperanto (Brazil, Nativo) - cmk_ed_ks br: Portuguese (Brazil, Colemak[eD], keep local symbols) - cmk_ed_us br: Portuguese (Brazil, Colemak[eD], unified symbols) - phonetic bg: Bulgarian (traditional phonetic) - bas_phonetic bg: Bulgarian (new phonetic) - colemak bg: Bulgarian (Colemak, phonetic) - french ma: French (Morocco) - tifinagh ma: Berber (Morocco, Tifinagh) - tifinagh-alt ma: Berber (Morocco, Tifinagh alternative) - tifinagh-alt-phonetic ma: Berber (Morocco, Tifinagh alternative phonetic) - tifinagh-extended ma: Berber (Morocco, Tifinagh extended) - tifinagh-phonetic ma: Berber (Morocco, Tifinagh phonetic) - tifinagh-extended-phonetic ma: Berber (Morocco, Tifinagh extended phonetic) - french cm: French (Cameroon) - qwerty cm: Cameroon Multilingual (qwerty) - azerty cm: Cameroon Multilingual (azerty) - dvorak cm: Cameroon Multilingual (Dvorak) - fr-dvorak ca: French (Canada, Dvorak) - fr-legacy ca: French (Canada, legacy) - multix ca: Canadian Multilingual - multi ca: Canadian Multilingual (first part) - multi-2gr ca: Canadian Multilingual (second part) - cmk_ed_ks ca: Canadian multilingual (Colemak[eD], keep local symbols) - cmk_ed_us ca: Canadian multilingual (Colemak[eD], unified symbols) - ike ca: Inuktitut - eng ca: English (Canada) - tib cn: Tibetan - tib_asciinum cn: Tibetan (with ASCII numerals) - ug cn: Uyghur - alternatequotes hr: Croatian (with guillemets for quotes) - unicode hr: Croatian (with Croatian digraphs) - unicodeus hr: Croatian (US keyboard with Croatian digraphs) - us hr: Croatian (US keyboard with Croatian letters) - cmk_ed_ks hr: Croatian (Colemak[eD], keep local symbols) - cmk_ed_us hr: Croatian (Colemak[eD], unified symbols) - bksl cz: Czech (with <\|> key) - qwerty cz: Czech (qwerty) - qwerty_bksl cz: Czech (qwerty, extended Backslash) - ucw cz: Czech (UCW layout, accented letters only) - dvorak-ucw cz: Czech (US Dvorak with CZ UCW support) - cmk_ed_ks cz: Czech (Colemak[eD], keep local symbols) - cmk_ed_us cz: Czech (Colemak[eD], unified symbols) - nodeadkeys dk: Danish (eliminate dead keys) - winkeys dk: Danish (Winkeys) - mac dk: Danish (Macintosh) - mac_nodeadkeys dk: Danish (Macintosh, eliminate dead keys) - dvorak dk: Danish (Dvorak) - cmk_ed_ks dk: Danish (Colemak[eD], keep local symbols) - cmk_ed_us dk: Danish (Colemak[eD], unified symbols) - sundeadkeys nl: Dutch (Sun dead keys) - mac nl: Dutch (Macintosh) - std nl: Dutch (standard) - cmk_ed_ks nl: Dutch (Colemak[eD], keep local symbols) - cmk_ed_us nl: Dutch (Colemak[eD], unified symbols) - nodeadkeys ee: Estonian (eliminate dead keys) - dvorak ee: Estonian (Dvorak) - us ee: Estonian (US keyboard with Estonian letters) - pes_keypad ir: Persian (with Persian keypad) - ku ir: Kurdish (Iran, Latin Q) - ku_f ir: Kurdish (Iran, F) - ku_alt ir: Kurdish (Iran, Latin Alt-Q) - ku_ara ir: Kurdish (Iran, Arabic-Latin) - ku iq: Kurdish (Iraq, Latin Q) - ku_f iq: Kurdish (Iraq, F) - ku_alt iq: Kurdish (Iraq, Latin Alt-Q) - ku_ara iq: Kurdish (Iraq, Arabic-Latin) - nodeadkeys fo: Faroese (eliminate dead keys) - classic fi: Finnish (classic) - nodeadkeys fi: Finnish (classic, eliminate dead keys) - winkeys fi: Finnish (Winkeys) - smi fi: Northern Saami (Finland) - mac fi: Finnish (Macintosh) - cmk_ed_ks fi: Finnish (Colemak[eD], keep local symbols) - cmk_ed_us fi: Finnish (Colemak[eD], unified symbols) - nodeadkeys fr: French (eliminate dead keys) - sundeadkeys fr: French (Sun dead keys) - oss fr: French (alternative) - oss_latin9 fr: French (alternative, Latin-9 only) - oss_nodeadkeys fr: French (alternative, eliminate dead keys) - oss_sundeadkeys fr: French (alternative, Sun dead keys) - latin9 fr: French (legacy, alternative) - latin9_nodeadkeys fr: French (legacy, alternative, eliminate dead keys) - latin9_sundeadkeys fr: French (legacy, alternative, Sun dead keys) - bepo fr: French (Bepo, ergonomic, Dvorak way) - bepo_latin9 fr: French (Bepo, ergonomic, Dvorak way, Latin-9 only) - dvorak fr: French (Dvorak) - mac fr: French (Macintosh) - bre fr: French (Breton) - cmk_ed_ks fr: French (Colemak[eD], keep local symbols) - cmk_ed_us fr: French (Colemak[eD], unified symbols) - oci fr: Occitan - geo fr: Georgian (France, AZERTY Tskapo) - generic gh: English (Ghana, multilingual) - akan gh: Akan - ewe gh: Ewe - fula gh: Fula - ga gh: Ga - hausa gh: Hausa - avn gh: Avatime - gillbt gh: English (Ghana, GILLBT) - ergonomic ge: Georgian (ergonomic) - mess ge: Georgian (MESS) - ru ge: Russian (Georgia) - os ge: Ossetian (Georgia) - deadacute de: German (dead acute) - deadgraveacute de: German (dead grave acute) - nodeadkeys de: German (eliminate dead keys) - T3 de: German (T3) - ro de: Romanian (Germany) - ro_nodeadkeys de: Romanian (Germany, eliminate dead keys) - dvorak de: German (Dvorak) - sundeadkeys de: German (Sun dead keys) - neo de: German (Neo 2) - mac de: German (Macintosh) - mac_nodeadkeys de: German (Macintosh, eliminate dead keys) - cmk_ed_ks de: German (Colemak[eD], keep local symbols) - cmk_ed_us de: German (Colemak[eD], unified symbols) - dsb de: Lower Sorbian - dsb_qwertz de: Lower Sorbian (qwertz) - qwerty de: German (qwerty) - tr de: Turkish (Germany) - ru de: Russian (Germany, phonetic) - legacy de: German (legacy) - simple gr: Greek (simple) - extended gr: Greek (extended) - nodeadkeys gr: Greek (eliminate dead keys) - polytonic gr: Greek (polytonic) - colemak gr: Greek (Colemak, phonetic) - standard hu: Hungarian (standard) - nodeadkeys hu: Hungarian (eliminate dead keys) - qwerty hu: Hungarian (qwerty) - cmk_ed_ks hu: Hungarian (Colemak[eD], keep local symbols) - cmk_ed_us hu: Hungarian (Colemak[eD], unified symbols) - 101_qwertz_comma_dead hu: Hungarian (101/qwertz/comma/dead keys) - 101_qwertz_comma_nodead hu: Hungarian (101/qwertz/comma/eliminate dead keys) - 101_qwertz_dot_dead hu: Hungarian (101/qwertz/dot/dead keys) - 101_qwertz_dot_nodead hu: Hungarian (101/qwertz/dot/eliminate dead keys) - 101_qwerty_comma_dead hu: Hungarian (101/qwerty/comma/dead keys) - 101_qwerty_comma_nodead hu: Hungarian (101/qwerty/comma/eliminate dead keys) - 101_qwerty_dot_dead hu: Hungarian (101/qwerty/dot/dead keys) - 101_qwerty_dot_nodead hu: Hungarian (101/qwerty/dot/eliminate dead keys) - 102_qwertz_comma_dead hu: Hungarian (102/qwertz/comma/dead keys) - 102_qwertz_comma_nodead hu: Hungarian (102/qwertz/comma/eliminate dead keys) - 102_qwertz_dot_dead hu: Hungarian (102/qwertz/dot/dead keys) - 102_qwertz_dot_nodead hu: Hungarian (102/qwertz/dot/eliminate dead keys) - 102_qwerty_comma_dead hu: Hungarian (102/qwerty/comma/dead keys) - 102_qwerty_comma_nodead hu: Hungarian (102/qwerty/comma/eliminate dead keys) - 102_qwerty_dot_dead hu: Hungarian (102/qwerty/dot/dead keys) - 102_qwerty_dot_nodead hu: Hungarian (102/qwerty/dot/eliminate dead keys) - Sundeadkeys is: Icelandic (Sun dead keys) - nodeadkeys is: Icelandic (eliminate dead keys) - mac is: Icelandic (Macintosh) - dvorak is: Icelandic (Dvorak) - cmk_ed_ks is: Icelandic (Colemak[eD], keep local symbols) - cmk_ed_us is: Icelandic (Colemak[eD], unified symbols) - lyx il: Hebrew (lyx) - phonetic il: Hebrew (phonetic) - biblical il: Hebrew (Biblical, Tiro) - colemak il: Hebrew (Colemak, phonetic) - nodeadkeys it: Italian (eliminate dead keys) - winkeys it: Italian (Winkeys) - mac it: Italian (Macintosh) - us it: Italian (US keyboard with Italian letters) - cmk_ed_ks it: Italian (Colemak[eD], keep local symbols) - cmk_ed_us it: Italian (Colemak[eD], unified symbols) - geo it: Georgian (Italy) - ibm it: Italian (IBM 142) - kana jp: Japanese (Kana) - kana86 jp: Japanese (Kana 86) - OADG109A jp: Japanese (OADG 109A) - mac jp: Japanese (Macintosh) - dvorak jp: Japanese (Dvorak) - phonetic kg: Kyrgyz (phonetic) - ruskaz kz: Russian (Kazakhstan, with Kazakh) - kazrus kz: Kazakh (with Russian) - stea la: Lao (STEA proposed standard layout) - nodeadkeys latam: Spanish (Latin American, eliminate dead keys) - deadtilde latam: Spanish (Latin American, include dead tilde) - sundeadkeys latam: Spanish (Latin American, Sun dead keys) - cmk_ed_ks latam: Spanish (Latin American, Colemak[eD], keep local symbols) - cmk_ed_us latam: Spanish (Latin American, Colemak[eD], unified symbols) - std lt: Lithuanian (standard) - us lt: Lithuanian (US keyboard with Lithuanian letters) - ibm lt: Lithuanian (IBM LST 1205-92) - lekp lt: Lithuanian (LEKP) - lekpa lt: Lithuanian (LEKPa) - apostrophe lv: Latvian (apostrophe variant) - tilde lv: Latvian (tilde variant) - fkey lv: Latvian (F variant) - modern lv: Latvian (modern) - ergonomic lv: Latvian (ergonomic, ﾅｪGJRMV) - adapted lv: Latvian (adapted) - cyrillic me: Montenegrin (Cyrillic) - cyrillicyz me: Montenegrin (Cyrillic, ZE and ZHE swapped) - latinunicode me: Montenegrin (Latin Unicode) - latinyz me: Montenegrin (Latin qwerty) - latinunicodeyz me: Montenegrin (Latin Unicode qwerty) - cyrillicalternatequotes me: Montenegrin (Cyrillic with guillemets) - latinalternatequotes me: Montenegrin (Latin with guillemets) - nodeadkeys mk: Macedonian (eliminate dead keys) - us mt: Maltese (with US layout) - nodeadkeys no: Norwegian (eliminate dead keys) - winkeys no: Norwegian (Winkeys) - dvorak no: Norwegian (Dvorak) - smi no: Northern Saami (Norway) - smi_nodeadkeys no: Northern Saami (Norway, eliminate dead keys) - mac no: Norwegian (Macintosh) - mac_nodeadkeys no: Norwegian (Macintosh, eliminate dead keys) - colemak no: Norwegian (Colemak) - cmk_ed_ks no: Norwegian (Colemak[eD], keep local symbols) - cmk_ed_us no: Norwegian (Colemak[eD], unified symbols) - legacy pl: Polish (legacy) - qwertz pl: Polish (qwertz) - dvorak pl: Polish (Dvorak) - dvorak_quotes pl: Polish (Dvorak, Polish quotes on quotemark key) - dvorak_altquotes pl: Polish (Dvorak, Polish quotes on key 1) - cmk_ed_ks pl: Polish (Colemak[eD], keep local symbols) - cmk_ed_us pl: Polish (Colemak[eD], unified symbols) - csb pl: Kashubian - szl pl: Silesian - ru_phonetic_dvorak pl: Russian (Poland, phonetic Dvorak) - dvp pl: Polish (programmer Dvorak) - nodeadkeys pt: Portuguese (eliminate dead keys) - sundeadkeys pt: Portuguese (Sun dead keys) - mac pt: Portuguese (Macintosh) - mac_nodeadkeys pt: Portuguese (Macintosh, eliminate dead keys) - mac_sundeadkeys pt: Portuguese (Macintosh, Sun dead keys) - cmk_ed_ks pt: Portuguese (Colemak[eD], keep local symbols) - cmk_ed_us pt: Portuguese (Colemak[eD], unified symbols) - nativo pt: Portuguese (Nativo) - nativo-us pt: Portuguese (Nativo for US keyboards) - nativo-epo pt: Esperanto (Portugal, Nativo) - cedilla ro: Romanian (cedilla) - std ro: Romanian (standard) - std_cedilla ro: Romanian (standard cedilla) - winkeys ro: Romanian (WinKeys) - cmk_ed_ks ro: Romanian (Colemak[eD], keep local symbols) - cmk_ed_us ro: Romanian (Colemak[eD], unified symbols) - phonetic ru: Russian (phonetic) - phonetic_winkeys ru: Russian (phonetic WinKeys) - colemak ru: Russian (Colemak, phonetic Rulemak) - typewriter ru: Russian (typewriter) - legacy ru: Russian (legacy) - typewriter-legacy ru: Russian (typewriter, legacy) - tt ru: Tatar - os_legacy ru: Ossetian (legacy) - os_winkeys ru: Ossetian (WinKeys) - cv ru: Chuvash - cv_latin ru: Chuvash (Latin) - udm ru: Udmurt - kom ru: Komi - sah ru: Yakut - xal ru: Kalmyk - dos ru: Russian (DOS) - mac ru: Russian (Macintosh) - srp ru: Serbian (Russia) - bak ru: Bashkirian - chm ru: Mari - yz rs: Serbian (Cyrillic, ZE and ZHE swapped) - latin rs: Serbian (Latin) - latinunicode rs: Serbian (Latin Unicode) - latinyz rs: Serbian (Latin qwerty) - latinunicodeyz rs: Serbian (Latin Unicode qwerty) - alternatequotes rs: Serbian (Cyrillic with guillemets) - latinalternatequotes rs: Serbian (Latin with guillemets) - cmk_ed_ks rs: Serbian (Colemak[eD], keep local symbols) - cmk_ed_us rs: Serbian (Colemak[eD], unified symbols) - rue rs: Pannonian Rusyn - alternatequotes si: Slovenian (with guillemets for quotes) - us si: Slovenian (US keyboard with Slovenian letters) - cmk_ed_ks si: Slovenian (Colemak[eD], keep local symbols) - cmk_ed_us si: Slovenian (Colemak[eD], unified symbols) - bksl sk: Slovak (extended Backslash) - qwerty sk: Slovak (qwerty) - qwerty_bksl sk: Slovak (qwerty, extended Backslash) - nodeadkeys es: Spanish (eliminate dead keys) - winkeys es: Spanish (Winkeys) - deadtilde es: Spanish (include dead tilde) - sundeadkeys es: Spanish (Sun dead keys) - dvorak es: Spanish (Dvorak) - cmk_ed_ks es: Spanish (Colemak[eD], keep local symbols) - cmk_ed_us es: Spanish (Colemak[eD], unified symbols) - ast es: Asturian (Spain, with bottom-dot H and bottom-dot L) - cat es: Catalan (Spain, with middle-dot L) - mac es: Spanish (Macintosh) - nodeadkeys se: Swedish (eliminate dead keys) - dvorak se: Swedish (Dvorak) - rus se: Russian (Sweden, phonetic) - rus_nodeadkeys se: Russian (Sweden, phonetic, eliminate dead keys) - smi se: Northern Saami (Sweden) - mac se: Swedish (Macintosh) - svdvorak se: Swedish (Svdvorak) - swl se: Swedish Sign Language - cmk_ed_ks se: Swedish (Colemak[eD], keep local symbols) - cmk_ed_us se: Swedish (Colemak[eD], unified symbols) - legacy ch: German (Switzerland, legacy) - de_nodeadkeys ch: German (Switzerland, eliminate dead keys) - de_sundeadkeys ch: German (Switzerland, Sun dead keys) - fr ch: French (Switzerland) - fr_nodeadkeys ch: French (Switzerland, eliminate dead keys) - fr_sundeadkeys ch: French (Switzerland, Sun dead keys) - fr_mac ch: French (Switzerland, Macintosh) - de_mac ch: German (Switzerland, Macintosh) - syc sy: Syriac - syc_phonetic sy: Syriac (phonetic) - ku sy: Kurdish (Syria, Latin Q) - ku_f sy: Kurdish (Syria, F) - ku_alt sy: Kurdish (Syria, Latin Alt-Q) - legacy tj: Tajik (legacy) - tam_unicode lk: Tamil (Sri Lanka, Unicode) - tam_TAB lk: Tamil (Sri Lanka, TAB Typewriter) - tis th: Thai (TIS-820.2538) - pat th: Thai (Pattachote) - f tr: Turkish (F) - alt tr: Turkish (Alt-Q) - sundeadkeys tr: Turkish (Sun dead keys) - ku tr: Kurdish (Turkey, Latin Q) - ku_f tr: Kurdish (Turkey, F) - ku_alt tr: Kurdish (Turkey, Latin Alt-Q) - intl tr: Turkish (international with dead keys) - cmk_ed_ks tr: Turkish (Colemak[eD], keep local symbols) - cmk_ed_us tr: Turkish (Colemak[eD], unified symbols) - crh tr: Crimean Tatar (Turkish Q) - crh_f tr: Crimean Tatar (Turkish F) - crh_alt tr: Crimean Tatar (Turkish Alt-Q) - indigenous tw: Taiwanese (indigenous) - saisiyat tw: Saisiyat (Taiwan) - phonetic ua: Ukrainian (phonetic) - typewriter ua: Ukrainian (typewriter) - winkeys ua: Ukrainian (WinKeys) - legacy ua: Ukrainian (legacy) - rstu ua: Ukrainian (standard RSTU) - rstu_ru ua: Russian (Ukraine, standard RSTU) - homophonic ua: Ukrainian (homophonic) - extd gb: English (UK, extended WinKeys) - intl gb: English (UK, international with dead keys) - dvorak gb: English (UK, Dvorak) - dvorakukp gb: English (UK, Dvorak with UK punctuation) - mac gb: English (UK, Macintosh) - mac_intl gb: English (UK, Macintosh international) - colemak gb: English (UK, Colemak) - cmk_ed_ks gb: English (UK, Colemak[eD], keep local symbols) - cmk_ed_us gb: English (UK, Colemak[eD], unified symbols) - latin uz: Uzbek (Latin) - kr104 kr: Korean (101/104 key compatible) - CloGaelach ie: CloGaelach - UnicodeExpert ie: Irish (UnicodeExpert) - ogam ie: Ogham - ogam_is434 ie: Ogham (IS434) - urd-crulp pk: Urdu (Pakistan, CRULP) - urd-nla pk: Urdu (Pakistan, NLA) - ara pk: Arabic (Pakistan) - snd pk: Sindhi - legacy epo: Esperanto (displaced semicolon and quote, obsolete) - igbo ng: Igbo - yoruba ng: Yoruba - hausa ng: Hausa - left_hand brai: Braille (left hand) - right_hand brai: Braille (right hand) - alt tm: Turkmen (Alt-Q) - fr-oss ml: French (Mali, alternative) - us-mac ml: English (Mali, US Macintosh) - us-intl ml: English (Mali, US international) - kik ke: Kikuyu - qwerty-bay ph: Filipino (QWERTY Baybayin) - capewell-dvorak ph: Filipino (Capewell-Dvorak Latin) - capewell-dvorak-bay ph: Filipino (Capewell-Dvorak Baybayin) - capewell-qwerf2k6 ph: Filipino (Capewell-QWERF 2006 Latin) - capewell-qwerf2k6-bay ph: Filipino (Capewell-QWERF 2006 Baybayin) - colemak ph: Filipino (Colemak Latin) - colemak-bay ph: Filipino (Colemak Baybayin) - dvorak ph: Filipino (Dvorak Latin) - dvorak-bay ph: Filipino (Dvorak Baybayin) - gag md: Moldavian (Gagauz) - -! option - grp Switching to another layout - grp:switch Right Alt (while pressed) - grp:lswitch Left Alt (while pressed) - grp:lwin_switch Left Win (while pressed) - grp:rwin_switch Right Win (while pressed) - grp:win_switch Any Win key (while pressed) - grp:caps_switch Caps Lock (while pressed), Alt+Caps Lock does the original capslock action - grp:lctrl_switch Left Ctrl (while pressed) - grp:rctrl_switch Right Ctrl (while pressed) - grp:toggle Right Alt - grp:lalt_toggle Left Alt - grp:caps_toggle Caps Lock - grp:shift_caps_toggle Shift+Caps Lock - grp:shift_caps_switch Caps Lock (to first layout), Shift+Caps Lock (to last layout) - grp:win_menu_switch Left Win (to first layout), Right Win/Menu (to last layout) - grp:lctrl_rctrl_switch Left Ctrl (to first layout), Right Ctrl (to last layout) - grp:alt_caps_toggle Alt+Caps Lock - grp:shifts_toggle Both Shift keys together - grp:alts_toggle Both Alt keys together - grp:ctrls_toggle Both Ctrl keys together - grp:ctrl_shift_toggle Ctrl+Shift - grp:lctrl_lshift_toggle Left Ctrl+Left Shift - grp:rctrl_rshift_toggle Right Ctrl+Right Shift - grp:ctrl_alt_toggle Alt+Ctrl - grp:alt_shift_toggle Alt+Shift - grp:lalt_lshift_toggle Left Alt+Left Shift - grp:alt_space_toggle Alt+Space - grp:menu_toggle Menu - grp:lwin_toggle Left Win - grp:win_space_toggle Win Key+Space - grp:rwin_toggle Right Win - grp:lshift_toggle Left Shift - grp:rshift_toggle Right Shift - grp:lctrl_toggle Left Ctrl - grp:rctrl_toggle Right Ctrl - grp:sclk_toggle Scroll Lock - grp:lctrl_lwin_rctrl_menu LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout) - grp:rctrl_switch_ctrls_toggle Right Ctrl (while pressed), L+R Ctrl toggles layouts - lv3 Key to choose 3rd level - lv3:switch Right Ctrl - lv3:menu_switch Menu - lv3:win_switch Any Win key - lv3:lwin_switch Left Win - lv3:rwin_switch Right Win - lv3:alt_switch Any Alt key - lv3:lalt_switch Left Alt - lv3:ralt_switch Right Alt - lv3:ralt_switch_multikey Right Alt, Shift+Right Alt key is Compose - lv3:ralt_alt Right Alt key never chooses 3rd level - lv3:enter_switch Enter on keypad - lv3:caps_switch Caps Lock - lv3:bksl_switch Backslash - lv3:lsgt_switch <Less/Greater> - lv3:caps_switch_latch Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser - lv3:bksl_switch_latch Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser - lv3:lsgt_switch_latch <Less/Greater> chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser - ctrl Ctrl key position - ctrl:nocaps Caps Lock as Ctrl - ctrl:lctrl_meta Left Ctrl as Meta - ctrl:swapcaps Swap Ctrl and Caps Lock - ctrl:ac_ctrl At left of 'A' - ctrl:aa_ctrl At bottom left - ctrl:rctrl_ralt Right Ctrl as Right Alt - ctrl:menu_rctrl Menu as Right Ctrl - ctrl:ctrl_ralt Right Alt as Right Ctrl - ctrl:swap_lalt_lctl Swap Left Alt key with Left Ctrl key - ctrl:swap_lwin_lctl Swap Left Win key with Left Ctrl key - ctrl:swap_lalt_lctl_lwin Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt - grp_led Use keyboard LED to show alternative layout - grp_led:num Num Lock - grp_led:caps Caps Lock - grp_led:scroll Scroll Lock - keypad Layout of numeric keypad - keypad:legacy Legacy - keypad:oss Unicode additions (arrows and math operators) - keypad:future Unicode additions (arrows and math operators; math operators on default level) - keypad:legacy_wang Legacy Wang 724 - keypad:oss_wang Wang 724 keypad with Unicode additions (arrows and math operators) - keypad:future_wang Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level) - keypad:hex Hexadecimal - keypad:atm ATM/phone-style - kpdl Numeric keypad delete key behaviour - kpdl:dot Legacy key with dot - kpdl:comma Legacy key with comma - kpdl:dotoss Four-level key with dot - kpdl:dotoss_latin9 Four-level key with dot, Latin-9 only - kpdl:commaoss Four-level key with comma - kpdl:momayyezoss Four-level key with momayyez - kpdl:kposs Four-level key with abstract separators - kpdl:semi Semicolon on third level - caps Caps Lock key behavior - caps:internal Caps Lock uses internal capitalization; Shift "pauses" Caps Lock - caps:internal_nocancel Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock - caps:shift Caps Lock acts as Shift with locking; Shift "pauses" Caps Lock - caps:shift_nocancel Caps Lock acts as Shift with locking; Shift doesn't affect Caps Lock - caps:capslock Caps Lock toggles normal capitalization of alphabetic characters - caps:numlock Make Caps Lock an additional Num Lock - caps:swapescape Swap ESC and Caps Lock - caps:escape Make Caps Lock an additional ESC - caps:backspace Make Caps Lock an additional Backspace - caps:super Make Caps Lock an additional Super - caps:hyper Make Caps Lock an additional Hyper - caps:shiftlock Caps Lock toggles ShiftLock (affects all keys) - caps:none Caps Lock is disabled - caps:ctrl_modifier Make Caps Lock an additional Ctrl - altwin Alt/Win key behavior - altwin:menu Add the standard behavior to Menu key - altwin:meta_alt Alt and Meta are on Alt keys - altwin:alt_win Alt is mapped to Win keys (and the usual Alt keys) - altwin:ctrl_win Ctrl is mapped to Win keys (and the usual Ctrl keys) - altwin:ctrl_alt_win Ctrl is mapped to Alt keys, Alt is mapped to Win keys - altwin:meta_win Meta is mapped to Win keys - altwin:left_meta_win Meta is mapped to Left Win - altwin:hyper_win Hyper is mapped to Win keys - altwin:alt_super_win Alt is mapped to Right Win, Super to Menu - altwin:swap_alt_win Alt is swapped with Win - Compose key Position of Compose key - compose:ralt Right Alt - compose:lwin Left Win - compose:lwin-altgr 3rd level of Left Win - compose:rwin Right Win - compose:rwin-altgr 3rd level of Right Win - compose:menu Menu - compose:menu-altgr 3rd level of Menu - compose:lctrl Left Ctrl - compose:lctrl-altgr 3rd level of Left Ctrl - compose:rctrl Right Ctrl - compose:rctrl-altgr 3rd level of Right Ctrl - compose:caps Caps Lock - compose:caps-altgr 3rd level of Caps Lock - compose:102 <Less/Greater> - compose:102-altgr 3rd level of <Less/Greater> - compose:paus Pause - compose:prsc PrtSc - compose:sclk Scroll Lock - compat Miscellaneous compatibility options - numpad:pc Default numeric keypad keys - numpad:mac Numeric keypad keys always enter digits (as in Mac OS) - numpad:microsoft Shift with numeric keypad keys works as in MS Windows - numpad:shift3 Shift does not cancel Num Lock, chooses 3rd level instead - srvrkeys:none Special keys (Ctrl+Alt+<key>) handled in a server - apple:alupckeys Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock) - shift:breaks_caps Shift cancels Caps Lock - misc:typo Enable extra typographic characters - misc:extend Enable level5 Extend mappings (home position arrows etc) - shift:both_capslock Both Shift keys together toggle Caps Lock - shift:both_capslock_cancel Both Shift keys together activate Caps Lock, one Shift key deactivates - shift:both_shiftlock Both Shift keys together toggle ShiftLock - keypad:pointerkeys Shift + NumLock toggles PointerKeys - grab:break_actions Allow breaking grabs with keyboard actions (warning: security risk) - grab:debug Allow grab and window tree logging - currencysign Adding currency signs to certain keys - eurosign:e Euro on E - eurosign:2 Euro on 2 - eurosign:4 Euro on 4 - eurosign:5 Euro on 5 - rupeesign:4 Rupee on 4 - lv5 Key to choose 5th level - lv5:lsgt_switch_lock <Less/Greater> chooses 5th level, locks when pressed together with another 5th-level-chooser - lv5:ralt_switch_lock Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser - lv5:lwin_switch_lock Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser - lv5:rwin_switch_lock Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser - lv5:caps_switch_lock Caps Lock chooses 5th level, locks when pressed together with another 5th-level-chooser - nbsp Using space key to input non-breakable space character - nbsp:none Usual space at any level - nbsp:level2 Non-breakable space character at second level - nbsp:level3 Non-breakable space character at third level - nbsp:level3s Non-breakable space character at third level, nothing at fourth level - nbsp:level3n Non-breakable space character at third level, thin non-breakable space character at fourth level - nbsp:level4 Non-breakable space character at fourth level - nbsp:level4n Non-breakable space character at fourth level, thin non-breakable space character at sixth level - nbsp:level4nl Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift) - nbsp:zwnj2 Zero-width non-joiner character at second level - nbsp:zwnj2zwj3 Zero-width non-joiner character at second level, zero-width joiner character at third level - nbsp:zwnj2zwj3nb4 Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level - nbsp:zwnj2nb3 Zero-width non-joiner character at second level, non-breakable space character at third level - nbsp:zwnj2nb3s Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level - nbsp:zwnj2nb3zwj4 Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level - nbsp:zwnj2nb3nnb4 Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level - nbsp:zwnj3zwj4 Zero-width non-joiner character at third level, zero-width joiner at fourth level - japan Japanese keyboard options - japan:kana_lock Kana Lock key is locking - japan:nicola_f_bs NICOLA-F style Backspace - japan:hztg_escape Make Zenkaku Hankaku an additional ESC - esperanto Adding Esperanto supersigned letters - esperanto:qwerty To the corresponding key in a Qwerty layout - esperanto:dvorak To the corresponding key in a Dvorak layout - esperanto:colemak To the corresponding key in a Colemak layout - solaris Maintain key compatibility with old Solaris keycodes - solaris:sun_compat Sun Key compatibility - terminate Key sequence to kill the X server - terminate:ctrl_alt_bksp Ctrl + Alt + Backspace diff --git a/x-mod_v2-12-1_2015-01-18/xkb/rules/base.xml b/x-mod_v2-12-1_2015-01-18/xkb/rules/base.xml deleted file mode 100644 index 582a0a1..0000000 --- a/x-mod_v2-12-1_2015-01-18/xkb/rules/base.xml +++ /dev/null @@ -1,7320 +0,0 @@ - - - - - - - pc101 - Generic 101-key PC - Generic - - - - - pc102 - Generic 102-key (Intl) PC - Generic - - - - - pc104 - Generic 104-key PC - Generic - - - - - pc105 - Generic 105-key (Intl) PC - Generic - - - - - pc104angle-z - Generic 104-key PC (Angle(Z)Ergo mod) - Generic - - - - - pc104wide-qu - Generic 104-key PC (Wide(Quote)Ergo mod) - Generic - - - - - pc104awide-zqu - Generic 104-key PC (Angle(Z)Wide(Quote)Ergo mod) - Generic - - - - - pc104aframe - Generic 104-key PC (AngleFrame(Quote)Ergo mod) - Generic - - - - - pc105angle-lg - Generic 105-key (Intl) PC (Angle(LSGT)Ergo mod) - Generic - - - - - pc105awide-sl - Generic 105-key (Intl) PC (AngleWide(/)Ergo mod) - Generic - - - - - dell101 - Dell 101-key PC - Dell - - - - - latitude - Dell Latitude series laptop - Dell - - - - - dellm65 - Dell Precision M65 - Dell - - - - - everex - Everex STEPnote - Everex - - - - - flexpro - Keytronic FlexPro - Keytronic - - - - - microsoft - Microsoft Natural - Microsoft Inc. - - - - - omnikey101 - Northgate OmniKey 101 - Northgate - - - - - winbook - Winbook Model XP5 - Generic - - - - - pc98 - PC-98xx Series - Generic - - - - - a4techKB21 - A4Tech KB-21 - A4Tech - - - - - a4techKBS8 - A4Tech KBS-8 - A4Tech - - - - - a4_rfkb23 - A4Tech Wireless Desktop RFKB-23 - A4Tech - - - - - airkey - Acer AirKey V - Acer - - - - - azonaRF2300 - Azona RF2300 wireless Internet Keyboard - Azona - - - - - scorpius - Advance Scorpius KI - Scorpius - - - - - brother - Brother Internet Keyboard - Brother - - - - - btc5113rf - BTC 5113RF Multimedia - BTC - - - - - btc5126t - BTC 5126T - BTC - - - - - btc6301urf - BTC 6301URF - BTC - - - - - btc9000 - BTC 9000 - BTC - - - - - btc9000a - BTC 9000A - BTC - - - - - btc9001ah - BTC 9001AH - BTC - - - - - btc5090 - BTC 5090 - BTC - - - - - btc9019u - BTC 9019U - BTC - - - - - btc9116u - BTC 9116U Mini Wireless Internet and Gaming - - - - - cherryblue - Cherry Blue Line CyBo@rd - - - - - cherryblueb - Cherry CyMotion Master XPress - Cherry - - - - - cherrybluea - Cherry Blue Line CyBo@rd (alternate option) - Cherry - - - - - cherrycyboard - Cherry CyBo@rd USB-Hub - Cherry - - - - - cherrycmexpert - Cherry CyMotion Expert - Cherry - - - - - cherrybunlim - Cherry B.UNLIMITED - Cherry - - - - - chicony - Chicony Internet Keyboard - Chicony - - - - - chicony0108 - Chicony KU-0108 - Chicony - - - - - chicony0420 - Chicony KU-0420 - Chicony - - - - - chicony9885 - Chicony KB-9885 - Chicony - - - - - compaqeak8 - Compaq Easy Access Keyboard - Compaq - - - - - compaqik7 - Compaq Internet Keyboard (7 keys) - Compaq - - - - - compaqik13 - Compaq Internet Keyboard (13 keys) - Compaq - - - - - compaqik18 - Compaq Internet Keyboard (18 keys) - Compaq - - - - - cymotionlinux - Cherry CyMotion Master Linux - Cherry - - - - - armada - Laptop/notebook Compaq (eg. Armada) Laptop Keyboard - Compaq - - - - - presario - Laptop/notebook Compaq (eg. Presario) Internet Keyboard - Compaq - - - - - ipaq - Compaq iPaq Keyboard - Compaq - - - - - dell - Dell - Dell - - - - - dellsk8125 - Dell SK-8125 - Dell - - - - - dellsk8135 - Dell SK-8135 - Dell - - - - - dellusbmm - Dell USB Multimedia Keyboard - Dell - - - - - inspiron - Dell Laptop/notebook Inspiron 6xxx/8xxx - Dell - - - - - precision_m - Dell Laptop/notebook Precision M series - Dell - - - - - dexxa - Dexxa Wireless Desktop Keyboard - Dexxa - - - - - diamond - Diamond 9801 / 9802 series - Diamond - - - - - dtk2000 - DTK2000 - - - - - ennyah_dkb1008 - Ennyah DKB-1008 - Ennyah - - - - - fscaa1667g - Fujitsu-Siemens Computers AMILO laptop - Fujitsu-Siemens - - - - - genius - Genius Comfy KB-16M / Genius MM Keyboard KWD-910 - Genius - - - - - geniuscomfy - Genius Comfy KB-12e - Genius - - - - - geniuscomfy2 - Genius Comfy KB-21e-Scroll - Genius - - - - - geniuskb19e - Genius KB-19e NB - Genius - - - - - geniuskkb2050hs - Genius KKB-2050HS - Genius - - - - - gyration - Gyration - Gyration - - - - - htcdream - HTC Dream - HTC - - - - - kinesis - Kinesis - Kinesis - - - - - logitech_base - Logitech Generic Keyboard - Logitech - - - - - logitech_g15 - Logitech G15 extra keys via G15daemon - Logitech - - - - - hpi6 - Hewlett-Packard Internet Keyboard - Hewlett-Packard - - - - - hp250x - Hewlett-Packard SK-250x Multimedia Keyboard - Hewlett-Packard - - - - - hpxe3gc - Hewlett-Packard Omnibook XE3 GC - Hewlett-Packard - - - - - hpxe3gf - Hewlett-Packard Omnibook XE3 GF - Hewlett-Packard - - - - - hpxt1000 - Hewlett-Packard Omnibook XT1000 - Hewlett-Packard - - - - - hpdv5 - Hewlett-Packard Pavilion dv5 - Hewlett-Packard - - - - - hpzt11xx - Hewlett-Packard Pavilion ZT11xx - Hewlett-Packard - - - - - hp500fa - Hewlett-Packard Omnibook 500 FA - Hewlett-Packard - - - - - hp5xx - Hewlett-Packard Omnibook 5xx - Hewlett-Packard - - - - - hpnx9020 - Hewlett-Packard nx9020 - Hewlett-Packard - - - - - hp6000 - Hewlett-Packard Omnibook 6000/6100 - Hewlett-Packard - - - - - honeywell_euroboard - Honeywell Euroboard - Hewlett-Packard - - - - - hpmini110 - Hewlett-Packard Mini 110 Notebook - Hewlett-Packard - - - - - rapidaccess - IBM Rapid Access - Lenovo (previously IBM) - - - - - rapidaccess2 - IBM Rapid Access II - Lenovo (previously IBM) - - - - - thinkpad - IBM ThinkPad 560Z/600/600E/A22E - Lenovo (previously IBM) - - - - - thinkpad60 - IBM ThinkPad R60/T60/R61/T61 - Lenovo (previously IBM) - - - - - thinkpadz60 - IBM ThinkPad Z60m/Z60t/Z61m/Z61t - Lenovo (previously IBM) - - - - - ibm_spacesaver - IBM Space Saver - Lenovo (previously IBM) - - - - - logiaccess - Logitech Access Keyboard - Logitech - - - - - logiclx300 - Logitech Cordless Desktop LX-300 - Logitech - - - - - logii350 - Logitech Internet 350 Keyboard - Logitech - 046d:c313 - - - - - logimel - Logitech Media Elite Keyboard - Logitech - - - - - logicd - Logitech Cordless Desktop - Logitech - - - - - logicd_it - Logitech Cordless Desktop iTouch - Logitech - - - - - logicd_nav - Logitech Cordless Desktop Navigator - Logitech - - - - - logicd_opt - Logitech Cordless Desktop Optical - Logitech - - - - - logicda - Logitech Cordless Desktop (alternate option) - Logitech - - - - - logicdpa2 - Logitech Cordless Desktop Pro (alternate option 2) - Logitech - - - - - logicfn - Logitech Cordless Freedom/Desktop Navigator - Logitech - - - - - logicdn - Logitech Cordless Desktop Navigator - Logitech - - - - - logiitc - Logitech iTouch Cordless Keyboard (model Y-RB6) - Logitech - - - - - logiik - Logitech Internet Keyboard - Logitech - - - - - itouch - Logitech iTouch - Logitech - - - - - logicink - Logitech Internet Navigator Keyboard - Logitech - - - - - logiex110 - Logitech Cordless Desktop EX110 - Logitech - - - - - logiinkse - Logitech iTouch Internet Navigator Keyboard SE - Logitech - - - - - logiinkseusb - Logitech iTouch Internet Navigator Keyboard SE (USB) - Logitech - - - - - logiultrax - Logitech Ultra-X Keyboard - Logitech - - - - - logiultraxc - Logitech Ultra-X Cordless Media Desktop Keyboard - Logitech - - - - - logidinovo - Logitech diNovo Keyboard - Logitech - - - - - logidinovoedge - Logitech diNovo Edge Keyboard - Logitech - - - - - mx1998 - Memorex MX1998 - Memorex - - - - - mx2500 - Memorex MX2500 EZ-Access Keyboard - Memorex - - - - - mx2750 - Memorex MX2750 - Memorex - - - - - microsoft4000 - Microsoft Natural Wireless Ergonomic Keyboard 4000 - Microsoft Inc. - - - - - microsoft7000 - Microsoft Natural Wireless Ergonomic Keyboard 7000 - Microsoft Inc. - - - - - microsoftinet - Microsoft Internet Keyboard - Microsoft Inc. - - - - - microsoftpro - Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro - Microsoft Inc. - - - - - microsoftprousb - Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro - Microsoft Inc. - - - - - microsoftprooem - Microsoft Natural Keyboard Pro OEM - Microsoft Inc. - - - - - vsonku306 - ViewSonic KU-306 Internet Keyboard - ViewSonic - - - - - microsoftprose - Microsoft Internet Keyboard Pro, Swedish - Microsoft Inc. - - - - - microsoftoffice - Microsoft Office Keyboard - Microsoft Inc. - - - - - microsoftmult - Microsoft Wireless Multimedia Keyboard 1.0A - Microsoft Inc. - - - - - microsoftelite - Microsoft Natural Keyboard Elite - Microsoft Inc. - - - - - microsoftccurve2k - Microsoft Comfort Curve Keyboard 2000 - Microsoft Inc. - - - - - oretec - Ortek MCK-800 MM/Internet keyboard - Ortek - - - - - propeller - Propeller Voyager (KTEZ-1000) - KeyTronic - - - - - qtronix - QTronix Scorpius 98N+ - QTronix - - - - - samsung4500 - Samsung SDM 4500P - Samsung - - - - - samsung4510 - Samsung SDM 4510P - Samsung - - - - - sanwaskbkg3 - Sanwa Supply SKB-KG3 - Sanwa Supply Inc. - - - - - sk1300 - SK-1300 - NEC - - - - - sk2500 - SK-2500 - NEC - - - - - sk6200 - SK-6200 - NEC - - - - - sk7100 - SK-7100 - NEC - - - - - sp_inet - Super Power Multimedia Keyboard - Generic - - - - - sven - SVEN Ergonomic 2500 - SVEN - - - - - sven303 - SVEN Slim 303 - SVEN - - - - - symplon - Symplon PaceBook (tablet PC) - Symplon - - - - - toshiba_s3000 - Toshiba Satellite S3000 - Toshiba - - - - - trust - Trust Wireless Keyboard Classic - Trust - - - - - trustda - Trust Direct Access Keyboard - Trust - - - - - trust_slimline - Trust Slimline - Trust - - - - - tm2020 - TypeMatrix EZ-Reach 2020 - TypeMatrix - - - - - tm2030PS2 - TypeMatrix EZ-Reach 2030 PS2 - TypeMatrix - - - - - tm2030USB - TypeMatrix EZ-Reach 2030 USB - TypeMatrix - - - - - tm2030USB-102 - TypeMatrix EZ-Reach 2030 USB (102/105:EU mode) - TypeMatrix - - - - - tm2030USB-106 - TypeMatrix EZ-Reach 2030 USB (106:JP mode) - TypeMatrix - - - - - yahoo - Yahoo! Internet Keyboard - Yahoo! - - - - - macbook78 - MacBook/MacBook Pro - Apple - - - - - macbook79 - MacBook/MacBook Pro (Intl) - Apple - - - - - macintosh - Macintosh - Apple - - - - - macintosh_old - Macintosh Old - Apple - - - - - macintosh_hhk - Happy Hacking Keyboard for Mac - Fujitsu - - - - - acer_c300 - Acer C300 - Acer - - - - - acer_ferrari4k - Acer Ferrari 4000 - Acer - - - - - acer_laptop - Acer Laptop - Acer - - - - - asus_laptop - Asus Laptop - Asus - - - - - apple - Apple - Apple - - - - - apple_laptop - Apple Laptop - Apple - - - - - applealu_ansi - Apple Aluminium Keyboard (ANSI) - Apple - - - - - applealu_iso - Apple Aluminium Keyboard (ISO) - Apple - - - - - applealu_jis - Apple Aluminium Keyboard (JIS) - Apple - - - - - silvercrest - SILVERCREST Multimedia Wireless Keyboard - Silvercrest - - - - - emachines - Laptop/notebook eMachines m68xx - eMachines - - - - - benqx - BenQ X-Touch - BenQ - - - - - benqx730 - BenQ X-Touch 730 - BenQ - - - - - benqx800 - BenQ X-Touch 800 - BenQ - - - - - hhk - Happy Hacking Keyboard - Fujitsu - - - - - classmate - Classmate PC - Intel - - - - - olpc - OLPC - OLPC - - - - - sun_type7_usb - Sun Type 7 USB - Sun Microsystems - - - - - sun_type7_euro_usb - Sun Type 7 USB (European layout) - Sun Microsystems - - - - - sun_type7_unix_usb - Sun Type 7 USB (Unix layout) - Sun Microsystems - - - - - sun_type7_jp_usb - Sun Type 7 USB (Japanese layout) / Japanese 106-key - Sun Microsystems - - - - - sun_type6_usb - Sun Type 6/7 USB - Sun Microsystems - - - - - sun_type6_euro_usb - Sun Type 6/7 USB (European layout) - Sun Microsystems - - - - - sun_type6_unix_usb - Sun Type 6 USB (Unix layout) - Sun Microsystems - - - - - sun_type6_jp_usb - Sun Type 6 USB (Japanese layout) - Sun Microsystems - - - - - sun_type6_jp - Sun Type 6 (Japanese layout) - Sun Microsystems - - - - - targa_v811 - Targa Visionary 811 - Targa - - - - - unitekkb1925 - Unitek KB-1925 - Unitek Group - - - - - compalfl90 - FL90 - Compal Electronics Inc. - - - - - creativedw7000 - Creative Desktop Wireless 7000 - Creative - - - - - htcdream - Htc Dream phone - htc - - - - - - - us - - en - English (US) - - eng - - - - - - chr - - chr - Cherokee - - chr - - - - - - euro - English (US, with euro on 5) - - - - - intl - English (US, international with dead keys) - - - - - alt-intl - English (US, alternative international) - - - - - colemak - English (Colemak) - - - - - cmk_ed_us - English (Colemak[eD]) - - - - - tarmak1_e - English (Tarmak1 - Colemak transitional) - - - - - tarmak2_et - English (Tarmak2 - Colemak transitional) - - - - - tarmak3_etr - English (Tarmak3 - Colemak transitional) - - - - - tarmak4_etro - English (Tarmak4 - Colemak transitional) - - - - - cmk_ed_dvbghm - English (Colemak[eD], Curl-Dvbg/Hm ergo) - - - - - cmk_ed_dbghk - English (Colemak[eD], Curl-Dbg/Hk ergo) - - - - - cmk_ed_mirror - English (Colemak[eD], mirrored) - - - - - dvorak - English (Dvorak) - - - - - dvorak-intl - English (Dvorak, international with dead keys) - - - - - dvorak-alt-intl - English (Dvorak alternative international no dead keys) - - - - - dvorak-l - English (left handed Dvorak) - - - - - dvorak-r - English (right handed Dvorak) - - - - - dvorak-classic - English (classic Dvorak) - - - - - dvp - English (programmer Dvorak) - - - - - rus - - ru - Russian (US, phonetic) - - rus - - - - - - mac - English (Macintosh) - - - - - altgr-intl - English (international AltGr dead keys) - eng - fra - ger - - - - - olpc2 - English (the divide/multiply keys toggle the layout) - - - - - hbs - Serbo-Croatian (US) - eng - bos - hbs - hrv - srp - - - - - workman - English (Workman) - - - - - workman-intl - English (Workman, international with dead keys) - - - - - - - af - - fa - Afghani - - - - - ps - - ps - Pashto - - pus - - - - - - uz - - uz - Uzbek (Afghanistan) - - uzb - - - - - - olpc-ps - - ps - Pashto (Afghanistan, OLPC) - - pus - - - - - - fa-olpc - - fa - Persian (Afghanistan, Dari OLPC) - - - - - uz-olpc - - uz - Uzbek (Afghanistan, OLPC) - - uzb - - - - - - - - ara - - ar - Arabic - - AE - BH - DZ - EG - EH - JO - KW - LB - LY - MA - MR - OM - PS - QA - SA - SD - SY - TN - YE - - - ara - - - - - - azerty - Arabic (azerty) - - - - - azerty_digits - Arabic (azerty/digits) - - - - - digits - Arabic (digits) - - - - - qwerty - Arabic (qwerty) - - - - - qwerty_digits - Arabic (qwerty/digits) - - - - - buckwalter - Arabic (Buckwalter) - - - - - - - al - - sq - Albanian - - alb - - - - - - plisi-d1 - Albanian (Plisi D1) - - - - - cmk_ed_ks - Albanian (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Albanian (Colemak[eD], unified symbols) - - - - - - - am - - hy - Armenian - - hye - - - - - - phonetic - Armenian (phonetic) - - - - - phonetic-alt - Armenian (alternative phonetic) - - - - - eastern - Armenian (eastern) - - - - - western - Armenian (western) - - - - - eastern-alt - Armenian (alternative eastern) - - - - - - - at - - de - German (Austria) - - ger - - - - - - nodeadkeys - German (Austria, eliminate dead keys) - - - - - sundeadkeys - German (Austria, Sun dead keys) - - - - - mac - German (Austria, Macintosh) - - - - - cmk_ed_ks - German (Austria, Colemak[eD], keep local symbols) - - - - - cmk_ed_us - German (Austria, Colemak[eD], unified symbols) - - - - - - - az - - az - Azerbaijani - - aze - - - - - - cyrillic - Azerbaijani (Cyrillic) - - - - - - - by - - by - Belarusian - - bel - - - - - - legacy - Belarusian (legacy) - - - - - latin - Belarusian (Latin) - - - - - - - be - - be - Belgian - ger - nld - fra - - - - - oss - Belgian (alternative) - - - - - oss_latin9 - Belgian (alternative, Latin-9 only) - - - - - oss_sundeadkeys - Belgian (alternative, Sun dead keys) - - - - - iso-alternate - Belgian (ISO alternate) - - - - - nodeadkeys - Belgian (eliminate dead keys) - - - - - sundeadkeys - Belgian (Sun dead keys) - - - - - wang - Belgian (Wang model 724 azerty) - - - - - cmk_ed_ks - Belgian (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Belgian (Colemak[eD], unified symbols) - - - - - - - bd - - bn - Bangla - - ben - - - - - - probhat - Bangla (Probhat) - - - - - - - in - - in - Indian - - - - - ben - - bn - Bangla (India) - - ben - - - - - - ben_probhat - - bn - Bangla (India, Probhat) - - ben - - - - - - ben_baishakhi - Bangla (India, Baishakhi) - ben - - - - - ben_bornona - Bangla (India, Bornona) - ben - - - - - ben_gitanjali - Bangla (India, Uni Gitanjali) - ben - - - - - ben_inscript - Bangla (India, Baishakhi Inscript) - ben - - - - - eeyek - Manipuri (Eeyek) - mni - - - - - guj - - gu - Gujarati - - guj - - - - - - guru - - pa - Punjabi (Gurmukhi) - - pan - - - - - - jhelum - - pa - Punjabi (Gurmukhi Jhelum) - - pan - - - - - - kan - - kn - Kannada - - kan - - - - - - kan-kagapa - - kn - Kannada (KaGaPa phonetic) - - kan - - - - - - mal - - ml - Malayalam - - mal - - - - - - mal_lalitha - - ml - Malayalam (Lalitha) - - mal - - - - - - mal_enhanced - - ml - Malayalam (enhanced Inscript, with rupee sign) - mal - - - - - ori - - or - Oriya - - ori - - - - - - tam_unicode - - ta - Tamil (Unicode) - - tam - - - - - - tam_keyboard_with_numerals - - ta - Tamil (keyboard with numerals) - - tam - - - - - - tam_TAB - - ta - Tamil (TAB typewriter) - - tam - - - - - - tam_TSCII - - ta - Tamil (TSCII typewriter) - - tam - - - - - - tam - - ta - Tamil - - tam - - - - - - tel - - te - Telugu - - tel - - - - - - tel-kagapa - - te - Telugu (KaGaPa phonetic) - - tel - - - - - - urd-phonetic - - ur - Urdu (phonetic) - - urd - - - - - - urd-phonetic3 - - ur - Urdu (alternative phonetic) - - urd - - - - - - urd-winkeys - - ur - Urdu (WinKeys) - - urd - - - - - - bolnagri - - hi - Hindi (Bolnagri) - - hin - - - - - - hin-wx - - hi - Hindi (Wx) - - hin - - - - - - hin-kagapa - - hi - Hindi (KaGaPa phonetic) - - hin - - - - - - san-kagapa - - sa - Sanskrit (KaGaPa phonetic) - - san - - - - - - mar-kagapa - - mr - Marathi (KaGaPa phonetic) - - mar - - - - - - eng - - en - English (India, with rupee sign) - - eng - - - - - - - - ba - - bs - Bosnian - - bos - - - - - - alternatequotes - Bosnian (with guillemets for quotes) - - - - - unicode - Bosnian (with Bosnian digraphs) - - - - - unicodeus - Bosnian (US keyboard with Bosnian digraphs) - - - - - us - Bosnian (US keyboard with Bosnian letters) - - - - - cmk_ed_ks - Bosnian (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Bosnian (Colemak[eD], unified symbols) - - - - - - - br - - pt - Portuguese (Brazil) - - por - - - - - - nodeadkeys - Portuguese (Brazil, eliminate dead keys) - - - - - dvorak - Portuguese (Brazil, Dvorak) - - - - - nativo - Portuguese (Brazil, Nativo) - - - - - nativo-us - Portuguese (Brazil, Nativo for US keyboards) - - - - - nativo-epo - Esperanto (Brazil, Nativo) - - epo - - - - - - cmk_ed_ks - Portuguese (Brazil, Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Portuguese (Brazil, Colemak[eD], unified symbols) - - - - - - - bg - - bg - Bulgarian - - bul - - - - - - phonetic - Bulgarian (traditional phonetic) - - - - - bas_phonetic - Bulgarian (new phonetic) - - - - - colemak - Bulgarian (Colemak, phonetic) - - - - - - - ma - - ar - Arabic (Morocco) - - - - - french - - fr - French (Morocco) - - fra - - - - - - tifinagh - - ber - Berber (Morocco, Tifinagh) - - ber - - - - - - tifinagh-alt - - ber - Berber (Morocco, Tifinagh alternative) - - ber - - - - - - tifinagh-alt-phonetic - - ber - Berber (Morocco, Tifinagh alternative phonetic) - - ber - - - - - - tifinagh-extended - - ber - Berber (Morocco, Tifinagh extended) - - ber - - - - - - tifinagh-phonetic - - ber - Berber (Morocco, Tifinagh phonetic) - - ber - - - - - - tifinagh-extended-phonetic - - ber - Berber (Morocco, Tifinagh extended phonetic) - - ber - - - - - - - - cm - - cm - English (Cameroon) - eng - - - - - french - French (Cameroon) - fra - - - - - qwerty - Cameroon Multilingual (qwerty) - - eng - bas - nmg - fub - ewo - xmd - mfh - bkm - ozm - lns - sox - pny - wes - lem - nyj - mfk - mcp - ass - xed - dua - anv - bum - btb - bfd - azo - ken - yam - yat - yas - - - - - - azerty - Cameroon Multilingual (azerty) - - fra - bas - nmg - fub - ewo - xmd - mfh - bkm - ozm - lns - sox - pny - wes - lem - nyj - mfk - mcp - ass - xed - dua - anv - bum - btb - bfd - azo - ken - yam - yat - yas - - - - - - dvorak - Cameroon Multilingual (Dvorak) - - - - - - - mm - - my - Burmese - - mya - - - - - - - ca - - fr - French (Canada) - - fra - - - - - - fr-dvorak - - fr - French (Canada, Dvorak) - - - - - fr-legacy - - fr - French (Canada, legacy) - - - - - multix - Canadian Multilingual - - - - - multi - Canadian Multilingual (first part) - - - - - multi-2gr - Canadian Multilingual (second part) - - - - - cmk_ed_ks - Canadian multilingual (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Canadian multilingual (Colemak[eD], unified symbols) - - - - - ike - - ike - Inuktitut - - iku - - - - - - eng - - en - English (Canada) - - eng - - - - - - - - cd - - fr - French (Democratic Republic of the Congo) - - fra - - - - - - - cn - - zh - Chinese - - chi - - - - - - tib - Tibetan - - tib - - - - - - tib_asciinum - Tibetan (with ASCII numerals) - - tib - - - - - - ug - ug - Uyghur - - ug - - - - - - - - hr - - hr - Croatian - - hrv - - - - - - alternatequotes - Croatian (with guillemets for quotes) - - - - - unicode - Croatian (with Croatian digraphs) - - - - - unicodeus - Croatian (US keyboard with Croatian digraphs) - - - - - us - Croatian (US keyboard with Croatian letters) - - - - - cmk_ed_ks - Croatian (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Croatian (Colemak[eD], unified symbols) - - - - - - - cz - - cs - Czech - - cze - - - - - - bksl - Czech (with <\|> key) - - - - - qwerty - Czech (qwerty) - - - - - qwerty_bksl - Czech (qwerty, extended Backslash) - - - - - ucw - Czech (UCW layout, accented letters only) - - - - - dvorak-ucw - Czech (US Dvorak with CZ UCW support) - - - - - cmk_ed_ks - Czech (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Czech (Colemak[eD], unified symbols) - - - - - - - dk - - da - Danish - - dan - - - - - - nodeadkeys - Danish (eliminate dead keys) - - - - - winkeys - Danish (Winkeys) - - - - - mac - Danish (Macintosh) - - - - - mac_nodeadkeys - Danish (Macintosh, eliminate dead keys) - - - - - dvorak - Danish (Dvorak) - - - - - cmk_ed_ks - Danish (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Danish (Colemak[eD], unified symbols) - - - - - - - nl - - nl - Dutch - - nld - - - - - - sundeadkeys - Dutch (Sun dead keys) - - - - - mac - Dutch (Macintosh) - - - - - std - Dutch (standard) - - - - - cmk_ed_ks - Dutch (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Dutch (Colemak[eD], unified symbols) - - - - - - - bt - - dz - Dzongkha - - dzo - - - - - - ee - - et - Estonian - - est - - - - - - nodeadkeys - Estonian (eliminate dead keys) - - - - - dvorak - Estonian (Dvorak) - - - - - us - Estonian (US keyboard with Estonian letters) - - - - - - - ir - - fa - Persian - - per - - - - - - pes_keypad - Persian (with Persian keypad) - - - - - ku - - ku - Kurdish (Iran, Latin Q) - - kur - - - - - - ku_f - - ku - Kurdish (Iran, F) - - kur - - - - - - ku_alt - - ku - Kurdish (Iran, Latin Alt-Q) - - kur - - - - - - ku_ara - - ku - Kurdish (Iran, Arabic-Latin) - - kur - - - - - - - - iq - - ar - Iraqi - ara - kur - - - - - ku - - ku - Kurdish (Iraq, Latin Q) - - kur - - - - - - ku_f - - ku - Kurdish (Iraq, F) - - kur - - - - - - ku_alt - - ku - Kurdish (Iraq, Latin Alt-Q) - - kur - - - - - - ku_ara - - ku - Kurdish (Iraq, Arabic-Latin) - - kur - - - - - - - - fo - - fo - Faroese - - fao - - - - - - nodeadkeys - Faroese (eliminate dead keys) - - - - - - - fi - - fi - Finnish - - fin - - - - - - classic - Finnish (classic) - - - - - nodeadkeys - Finnish (classic, eliminate dead keys) - - - - - winkeys - Finnish (Winkeys) - - - - - smi - Northern Saami (Finland) - sme - - - - - mac - Finnish (Macintosh) - - - - - cmk_ed_ks - Finnish (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Finnish (Colemak[eD], unified symbols) - - - - - - - fr - - fr - French - - fra - - - - - - nodeadkeys - French (eliminate dead keys) - - - - - sundeadkeys - French (Sun dead keys) - - - - - oss - French (alternative) - - - - - oss_latin9 - French (alternative, Latin-9 only) - - - - - oss_nodeadkeys - French (alternative, eliminate dead keys) - - - - - oss_sundeadkeys - French (alternative, Sun dead keys) - - - - - latin9 - French (legacy, alternative) - - - - - latin9_nodeadkeys - French (legacy, alternative, eliminate dead keys) - - - - - latin9_sundeadkeys - French (legacy, alternative, Sun dead keys) - - - - - bepo - French (Bepo, ergonomic, Dvorak way) - - - - - bepo_latin9 - French (Bepo, ergonomic, Dvorak way, Latin-9 only) - - - - - dvorak - French (Dvorak) - - - - - mac - French (Macintosh) - - - - - bre - French (Breton) - - - - - cmk_ed_ks - French (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - French (Colemak[eD], unified symbols) - - - - - oci - Occitan - - oci - - - - - - geo - Georgian (France, AZERTY Tskapo) - - geo - - - - - - - - gh - - en - English (Ghana) - - eng - - - - - - generic - English (Ghana, multilingual) - - - - - akan - - ak - Akan - - aka - - - - - - ewe - - ee - Ewe - - ewe - - - - - - fula - - ff - Fula - - ful - - - - - - ga - - gaa - Ga - - gaa - - - - - - hausa - - ha - Hausa - - hau - - - - - - avn - - avn - Avatime - - avn - - - - - - gillbt - English (Ghana, GILLBT) - - - - - - - gn - - fr - French (Guinea) - - fra - - - - - - - ge - - ka - Georgian - - geo - - - - - - ergonomic - Georgian (ergonomic) - - - - - mess - Georgian (MESS) - - - - - ru - - ru - Russian (Georgia) - - rus - - - - - - os - Ossetian (Georgia) - - oss - - - - - - - - de - - de - German - - ger - - - - - - deadacute - German (dead acute) - - - - - deadgraveacute - German (dead grave acute) - - - - - nodeadkeys - German (eliminate dead keys) - - - - - T3 - German (T3) - - - - - ro - Romanian (Germany) - rum - - - - - ro_nodeadkeys - Romanian (Germany, eliminate dead keys) - rum - - - - - dvorak - German (Dvorak) - - - - - sundeadkeys - German (Sun dead keys) - - - - - neo - German (Neo 2) - - - - - mac - German (Macintosh) - - - - - mac_nodeadkeys - German (Macintosh, eliminate dead keys) - - - - - cmk_ed_ks - German (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - German (Colemak[eD], unified symbols) - - - - - dsb - Lower Sorbian - - dsb - - - - - - dsb_qwertz - Lower Sorbian (qwertz) - - dsb - - - - - - qwerty - German (qwerty) - - - - - tr - Turkish (Germany) - - tr - - - - - - ru - - ru - Russian (Germany, phonetic) - - rus - - - - - - legacy - German (legacy) - - - - - - - gr - - gr - Greek - - gre - - - - - - simple - Greek (simple) - - - - - extended - Greek (extended) - - - - - nodeadkeys - Greek (eliminate dead keys) - - - - - polytonic - Greek (polytonic) - - - - - colemak - Greek (Colemak, phonetic) - - - - - - - hu - - hu - Hungarian - - hun - - - - - - standard - Hungarian (standard) - - - - - nodeadkeys - Hungarian (eliminate dead keys) - - - - - qwerty - Hungarian (qwerty) - - - - - cmk_ed_ks - Hungarian (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Hungarian (Colemak[eD], unified symbols) - - - - - 101_qwertz_comma_dead - Hungarian (101/qwertz/comma/dead keys) - - - - - 101_qwertz_comma_nodead - Hungarian (101/qwertz/comma/eliminate dead keys) - - - - - 101_qwertz_dot_dead - Hungarian (101/qwertz/dot/dead keys) - - - - - 101_qwertz_dot_nodead - Hungarian (101/qwertz/dot/eliminate dead keys) - - - - - 101_qwerty_comma_dead - Hungarian (101/qwerty/comma/dead keys) - - - - - 101_qwerty_comma_nodead - Hungarian (101/qwerty/comma/eliminate dead keys) - - - - - 101_qwerty_dot_dead - Hungarian (101/qwerty/dot/dead keys) - - - - - 101_qwerty_dot_nodead - Hungarian (101/qwerty/dot/eliminate dead keys) - - - - - 102_qwertz_comma_dead - Hungarian (102/qwertz/comma/dead keys) - - - - - 102_qwertz_comma_nodead - Hungarian (102/qwertz/comma/eliminate dead keys) - - - - - 102_qwertz_dot_dead - Hungarian (102/qwertz/dot/dead keys) - - - - - 102_qwertz_dot_nodead - Hungarian (102/qwertz/dot/eliminate dead keys) - - - - - 102_qwerty_comma_dead - Hungarian (102/qwerty/comma/dead keys) - - - - - 102_qwerty_comma_nodead - Hungarian (102/qwerty/comma/eliminate dead keys) - - - - - 102_qwerty_dot_dead - Hungarian (102/qwerty/dot/dead keys) - - - - - 102_qwerty_dot_nodead - Hungarian (102/qwerty/dot/eliminate dead keys) - - - - - - - is - - is - Icelandic - - ice - - - - - - Sundeadkeys - Icelandic (Sun dead keys) - - - - - nodeadkeys - Icelandic (eliminate dead keys) - - - - - mac - Icelandic (Macintosh) - - - - - dvorak - Icelandic (Dvorak) - - - - - cmk_ed_ks - Icelandic (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Icelandic (Colemak[eD], unified symbols) - - - - - - - il - - he - Hebrew - - heb - - - - - - lyx - Hebrew (lyx) - - - - - phonetic - Hebrew (phonetic) - - - - - biblical - Hebrew (Biblical, Tiro) - - - - - colemak - Hebrew (Colemak, phonetic) - - - - - - - it - - it - Italian - - ita - - - - - - nodeadkeys - Italian (eliminate dead keys) - - - - - winkeys - Italian (Winkeys) - - - - - mac - Italian (Macintosh) - - - - - cmk_ed_ks - Italian (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Italian (Colemak[eD], unified symbols) - - - - - us - Italian (US keyboard with Italian letters) - - - - - geo - Georgian (Italy) - - geo - - - - - - ibm - Italian (IBM 142) - - - - - - - jp - - ja - Japanese - - jpn - - - - - - kana - Japanese (Kana) - - - - - kana86 - Japanese (Kana 86) - - - - - OADG109A - Japanese (OADG 109A) - - - - - mac - Japanese (Macintosh) - - - - - dvorak - Japanese (Dvorak) - - - - - - - kg - - ki - Kyrgyz - - kir - - - - - - phonetic - Kyrgyz (phonetic) - - - - - - - kh - - km - Khmer (Cambodia) - - khm - - - - - - - kz - - kk - Kazakh - - kaz - - - - - - ruskaz - - ru - Russian (Kazakhstan, with Kazakh) - kaz - rus - - - - - kazrus - Kazakh (with Russian) - kaz - rus - - - - - - - la - - lo - Lao - - lao - - - - - - stea - Lao (STEA proposed standard layout) - lao - - - - - - - - latam - - es - Spanish (Latin American) - - AR - BO - CL - CO - CR - CU - DO - EC - GT - HN - HT - MX - NI - PA - PE - PR - PY - SV - US - UY - VE - - - spa - - - - - - nodeadkeys - Spanish (Latin American, eliminate dead keys) - - - - - deadtilde - Spanish (Latin American, include dead tilde) - - - - - sundeadkeys - Spanish (Latin American, Sun dead keys) - - - - - cmk_ed_ks - Spanish (Latin American, Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Spanish (Latin American, Colemak[eD], unified symbols) - - - - - - - lt - - lt - Lithuanian - - lit - - - - - - std - Lithuanian (standard) - - - - - us - Lithuanian (US keyboard with Lithuanian letters) - - - - - ibm - Lithuanian (IBM LST 1205-92) - - - - - lekp - Lithuanian (LEKP) - - - - - lekpa - Lithuanian (LEKPa) - - - - - - - lv - - lv - Latvian - - lav - - - - - - apostrophe - Latvian (apostrophe variant) - - - - - tilde - Latvian (tilde variant) - - - - - fkey - Latvian (F variant) - - - - - modern - Latvian (modern) - - - - - ergonomic - Latvian (ergonomic, ﾅｪGJRMV) - - - - - adapted - Latvian (adapted) - - - - - - - mao - - mi - Maori - - mao - - - - - - - me - - sr - Montenegrin - - srp - - - - - - cyrillic - Montenegrin (Cyrillic) - - - - - cyrillicyz - Montenegrin (Cyrillic, ZE and ZHE swapped) - - - - - latinunicode - Montenegrin (Latin Unicode) - - - - - latinyz - Montenegrin (Latin qwerty) - - - - - latinunicodeyz - Montenegrin (Latin Unicode qwerty) - - - - - cyrillicalternatequotes - Montenegrin (Cyrillic with guillemets) - - - - - latinalternatequotes - Montenegrin (Latin with guillemets) - - - - - - - mk - - mk - Macedonian - - mkd - - - - - - nodeadkeys - Macedonian (eliminate dead keys) - - - - - - - mt - - mt - Maltese - - mlt - - - - - - us - Maltese (with US layout) - - - - - - - mn - - mn - Mongolian - - mon - - - - - - - no - - no - Norwegian - - nor - nob - nno - - - - - - nodeadkeys - Norwegian (eliminate dead keys) - - - - - winkeys - Norwegian (Winkeys) - - - - - dvorak - Norwegian (Dvorak) - - - - - cmk_ed_ks - Norwegian (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Norwegian (Colemak[eD], unified symbols) - - - - - smi - Northern Saami (Norway) - - sme - - - - - - smi_nodeadkeys - Northern Saami (Norway, eliminate dead keys) - - sme - - - - - - mac - Norwegian (Macintosh) - - - - - mac_nodeadkeys - Norwegian (Macintosh, eliminate dead keys) - - - - - colemak - Norwegian (Colemak) - - - - - - - pl - - pl - Polish - - pol - - - - - - legacy - Polish (legacy) - - - - - qwertz - Polish (qwertz) - - - - - dvorak - Polish (Dvorak) - - - - - dvorak_quotes - Polish (Dvorak, Polish quotes on quotemark key) - - - - - dvorak_altquotes - Polish (Dvorak, Polish quotes on key 1) - - - - - cmk_ed_ks - Polish (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Polish (Colemak[eD], unified symbols) - - - - - csb - Kashubian - - csb - - - - - - szl - Silesian - szl - - - - - ru_phonetic_dvorak - - ru - Russian (Poland, phonetic Dvorak) - - rus - - - - - - dvp - Polish (programmer Dvorak) - - - - - - - pt - - pt - Portuguese - - por - - - - - - nodeadkeys - Portuguese (eliminate dead keys) - - - - - sundeadkeys - Portuguese (Sun dead keys) - - - - - mac - Portuguese (Macintosh) - - - - - mac_nodeadkeys - Portuguese (Macintosh, eliminate dead keys) - - - - - mac_sundeadkeys - Portuguese (Macintosh, Sun dead keys) - - - - - cmk_ed_ks - Portuguese (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Portuguese (Colemak[eD], unified symbols) - - - - - nativo - Portuguese (Nativo) - - - - - nativo-us - Portuguese (Nativo for US keyboards) - - - - - nativo-epo - Esperanto (Portugal, Nativo) - - epo - - - - - - - - ro - - ro - Romanian - - rum - - - - - - cedilla - Romanian (cedilla) - - - - - std - Romanian (standard) - - - - - std_cedilla - Romanian (standard cedilla) - - - - - winkeys - Romanian (WinKeys) - - - - - cmk_ed_ks - Romanian (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Romanian (Colemak[eD], unified symbols) - - - - - - - ru - - ru - Russian - - rus - - - - - - phonetic - Russian (phonetic) - - - - - phonetic_winkeys - Russian (phonetic WinKeys) - - - - - colemak - Russian (Colemak, phonetic Rulemak) - - - - - typewriter - Russian (typewriter) - - - - - legacy - Russian (legacy) - - - - - typewriter-legacy - Russian (typewriter, legacy) - - - - - tt - Tatar - - tat - - - - - - os_legacy - Ossetian (legacy) - - oss - - - - - - os_winkeys - Ossetian (WinKeys) - - oss - - - - - - cv - Chuvash - - chv - - - - - - cv_latin - Chuvash (Latin) - - chv - - - - - - udm - Udmurt - - udm - - - - - - kom - Komi - - kom - - - - - - sah - Yakut - - sah - - - - - - xal - Kalmyk - - xal - - - - - - dos - Russian (DOS) - - - - - mac - Russian (Macintosh) - - - - - srp - Serbian (Russia) - rus - srp - - - - - bak - Bashkirian - - bak - - - - - - chm - Mari - - chm - - - - - - - - rs - - sr - Serbian - - srp - - - - - - yz - Serbian (Cyrillic, ZE and ZHE swapped) - - - - - latin - Serbian (Latin) - - - - - latinunicode - Serbian (Latin Unicode) - - - - - latinyz - Serbian (Latin qwerty) - - - - - latinunicodeyz - Serbian (Latin Unicode qwerty) - - - - - alternatequotes - Serbian (Cyrillic with guillemets) - - - - - latinalternatequotes - Serbian (Latin with guillemets) - - - - - cmk_ed_ks - Serbian (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Serbian (Colemak[eD], unified symbols) - - - - - rue - Pannonian Rusyn - - rue - - - - - - - - si - - sl - Slovenian - - slv - - - - - - alternatequotes - Slovenian (with guillemets for quotes) - - - - - us - Slovenian (US keyboard with Slovenian letters) - - - - - cmk_ed_ks - Slovenian (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Slovenian (Colemak[eD], unified symbols) - - - - - - - sk - - sk - Slovak - - slo - - - - - - bksl - Slovak (extended Backslash) - - - - - qwerty - Slovak (qwerty) - - - - - qwerty_bksl - Slovak (qwerty, extended Backslash) - - - - - - - es - - es - Spanish - - spa - - - - - - nodeadkeys - Spanish (eliminate dead keys) - - - - - winkeys - Spanish (Winkeys) - - - - - deadtilde - Spanish (include dead tilde) - - - - - sundeadkeys - Spanish (Sun dead keys) - - - - - dvorak - Spanish (Dvorak) - - - - - cmk_ed_ks - Spanish (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Spanish (Colemak[eD], unified symbols) - - - - - ast - Asturian (Spain, with bottom-dot H and bottom-dot L) - - ast - - - - - - cat - Catalan (Spain, with middle-dot L) - - cat - - - - - - mac - Spanish (Macintosh) - - - - - - - se - - sv - Swedish - - swe - - - - - - nodeadkeys - Swedish (eliminate dead keys) - - - - - dvorak - Swedish (Dvorak) - - - - - cmk_ed_ks - Swedish (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Swedish (Colemak[eD], unified symbols) - - - - - rus - - ru - Russian (Sweden, phonetic) - - rus - - - - - - rus_nodeadkeys - - ru - Russian (Sweden, phonetic, eliminate dead keys) - - rus - - - - - - smi - Northern Saami (Sweden) - - sme - - - - - - mac - Swedish (Macintosh) - - - - - svdvorak - Swedish (Svdvorak) - - - - - swl - Swedish Sign Language - swl - - - - - - - ch - - de - German (Switzerland) - ger - gsw - - - - - legacy - German (Switzerland, legacy) - - - - - de_nodeadkeys - - de - German (Switzerland, eliminate dead keys) - - - - - de_sundeadkeys - - de - German (Switzerland, Sun dead keys) - - - - - fr - - fr - French (Switzerland) - - fra - - - - - - fr_nodeadkeys - - fr - French (Switzerland, eliminate dead keys) - - fra - - - - - - fr_sundeadkeys - - fr - French (Switzerland, Sun dead keys) - - fra - - - - - - fr_mac - - fr - French (Switzerland, Macintosh) - - fra - - - - - - de_mac - - de - German (Switzerland, Macintosh) - - - - - - - sy - - ar - Arabic (Syria) - - syr - - - - - - syc - - syc - Syriac - - - - - syc_phonetic - - syc - Syriac (phonetic) - - - - - ku - - ku - Kurdish (Syria, Latin Q) - - kur - - - - - - ku_f - - ku - Kurdish (Syria, F) - - kur - - - - - - ku_alt - - ku - Kurdish (Syria, Latin Alt-Q) - - kur - - - - - - - - tj - - tg - Tajik - - tgk - - - - - - legacy - Tajik (legacy) - - - - - - - lk - - si - Sinhala (phonetic) - - sin - - - - - - tam_unicode - - ta - Tamil (Sri Lanka, Unicode) - - tam - - - - - - tam_TAB - Tamil (Sri Lanka, TAB Typewriter) - - tam - - - - - - - - th - - th - Thai - - tha - - - - - - tis - Thai (TIS-820.2538) - - - - - pat - Thai (Pattachote) - - - - - - - tr - - tr - Turkish - - tur - - - - - - f - Turkish (F) - - - - - alt - Turkish (Alt-Q) - - - - - sundeadkeys - Turkish (Sun dead keys) - - - - - ku - - ku - Kurdish (Turkey, Latin Q) - - kur - - - - - - ku_f - - ku - Kurdish (Turkey, F) - - kur - - - - - - ku_alt - - ku - Kurdish (Turkey, Latin Alt-Q) - - kur - - - - - - intl - Turkish (international with dead keys) - - - - - cmk_ed_ks - Turkish (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - Turkish (Colemak[eD], unified symbols) - - - - - crh - - crh - Crimean Tatar (Turkish Q) - - crh - - - - - - crh_f - - crh - Crimean Tatar (Turkish F) - - crh - - - - - - crh_alt - - crh - Crimean Tatar (Turkish Alt-Q) - - crh - - - - - - - - tw - - zh - Taiwanese - - fox - - - - - - indigenous - Taiwanese (indigenous) - - ami - tay - bnn - ckv - pwn - pyu - dru - ais - ssf - tao - tsu - trv - xnb - sxr - uun - fos - - - - - - saisiyat - - xsy - Saisiyat (Taiwan) - - xsy - - - - - - - - ua - - uk - Ukrainian - - ukr - - - - - - phonetic - Ukrainian (phonetic) - - - - - typewriter - Ukrainian (typewriter) - - - - - winkeys - Ukrainian (WinKeys) - - - - - legacy - Ukrainian (legacy) - - - - - rstu - Ukrainian (standard RSTU) - - - - - rstu_ru - Russian (Ukraine, standard RSTU) - - - - - homophonic - Ukrainian (homophonic) - - - - - - - gb - - en - English (UK) - - eng - - - - - - extd - English (UK, extended WinKeys) - - - - - intl - English (UK, international with dead keys) - - - - - dvorak - English (UK, Dvorak) - - - - - dvorakukp - English (UK, Dvorak with UK punctuation) - - - - - mac - English (UK, Macintosh) - - - - - mac_intl - English (UK, Macintosh international) - - - - - colemak - English (UK, Colemak) - - - - - cmk_ed_ks - English (UK, Colemak[eD], keep local symbols) - - - - - cmk_ed_us - English (UK, Colemak[eD], unified symbols) - - - - - - - uz - - uz - Uzbek - - uzb - - - - - - latin - Uzbek (Latin) - - - - - - - vn - - vi - Vietnamese - - vie - - - - - - - kr - - ko - Korean - - kor - - - - - - kr104 - Korean (101/104 key compatible) - - - - - - - nec_vndr/jp - - ja - Japanese (PC-98xx Series) - - JP - - - jpn - - - - - - - ie - - ie - Irish - - eng - - - - - - CloGaelach - CloGaelach - - gle - - - - - - UnicodeExpert - Irish (UnicodeExpert) - - - - - ogam - Ogham - - sga - - - - - - ogam_is434 - Ogham (IS434) - - sga - - - - - - - - pk - - ur - Urdu (Pakistan) - - urd - - - - - - urd-crulp - Urdu (Pakistan, CRULP) - - - - - urd-nla - Urdu (Pakistan, NLA) - - - - - ara - ar - Arabic (Pakistan) - - ara - - - - - - snd - - sd - Sindhi - - snd - - - - - - - - mv - - dv - Dhivehi - - div - - - - - - - za - - en - English (South Africa) - - eng - - - - - - epo - - eo - Esperanto - - epo - - - - - - legacy - Esperanto (displaced semicolon and quote, obsolete) - - - - - - - np - - ne - Nepali - - nep - - - - - - ng - - en - English (Nigeria) - - eng - - - - - - igbo - - ig - Igbo - - ibo - - - - - - yoruba - - yo - Yoruba - - yor - - - - - - hausa - - ha - Hausa - - hau - - - - - - - - et - - am - Amharic - - amh - - - - - - - sn - - wo - Wolof - - wol - - - - - - - brai - - brl - Braille - - - - - left_hand - Braille (left hand) - - - - - right_hand - Braille (right hand) - - - - - - - tm - - tk - Turkmen - - tuk - - - - - - alt - Turkmen (Alt-Q) - - - - - - - ml - - bm - Bambara - - bam - - - - - - fr-oss - - fr - French (Mali, alternative) - - fra - - - - - - us-mac - - en - English (Mali, US Macintosh) - - eng - - - - - - us-intl - - en - English (Mali, US international) - - eng - - - - - - - - tz - - sw - Swahili (Tanzania) - - swa - - - - - - ke - - sw - Swahili (Kenya) - - swa - - - - - - kik - - ki - Kikuyu - - kik - - - - - - - - bw - - tn - Tswana - - tsn - - - - - - ph - - ph - Filipino - eng - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war - - - - - qwerty-bay - Filipino (QWERTY Baybayin) - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war - - - - - capewell-dvorak - Filipino (Capewell-Dvorak Latin) - - - - - capewell-dvorak-bay - Filipino (Capewell-Dvorak Baybayin) - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war - - - - - capewell-qwerf2k6 - Filipino (Capewell-QWERF 2006 Latin) - - - - - capewell-qwerf2k6-bay - Filipino (Capewell-QWERF 2006 Baybayin) - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war - - - - - colemak - Filipino (Colemak Latin) - - - - - colemak-bay - Filipino (Colemak Baybayin) - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war - - - - - dvorak - Filipino (Dvorak Latin) - - - - - dvorak-bay - Filipino (Dvorak Baybayin) - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war - - - - - - - md - md - Moldavian - rum - - - - - gag - gag - Moldavian (Gagauz) - gag - - - - - - - - - - grp - Switching to another layout - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - lv3 - Key to choose 3rd level - - - - - - - - - - - - - - - - - - - - - - - ctrl - Ctrl key position - - - - - - - - - - - - - - - - - grp_led - Use keyboard LED to show alternative layout - - - - - - - - - keypad - Layout of numeric keypad - - - - - - - - - - - - - - - kpdl - Numeric keypad delete key behaviour - - - - - - - - - - - - - - caps - Caps Lock key behavior - - - - - - - - - - - - - - - - - - - - altwin - Alt/Win key behavior - - - - - - - - - - - - - - - - Compose key - Position of Compose key - - - - - - - - - - - - - - - - - - - - - - - compat - Miscellaneous compatibility options - - - - - - - - - - - - - - - - - - - - - currencysign - Adding currency signs to certain keys - - - - - - - - - - lv5 - Key to choose 5th level - - - - - - - - - - - nbsp - Using space key to input non-breakable space character - - - - - - - - - - - - - - - - - - - - - japan - Japanese keyboard options - - - - - - - - esperanto - Adding Esperanto supersigned letters - - - - - - - - solaris - Maintain key compatibility with old Solaris keycodes - - - - - - terminate - Key sequence to kill the X server - - - - - diff --git a/x-mod_v2-12-1_2015-01-18/xkb/geometry/pc b/x-mod_v2-17-1ub1_2016-06-06/xkb/geometry/pc similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/geometry/pc rename to x-mod_v2-17-1ub1_2016-06-06/xkb/geometry/pc diff --git a/x-mod_v2-12-1_2015-01-18/xkb/keycodes/aliases b/x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/aliases similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/keycodes/aliases rename to x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/aliases diff --git a/x-mod_v2-12-1_2015-01-18/xkb/keycodes/evdev b/x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/evdev similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/keycodes/evdev rename to x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/evdev diff --git a/x-mod_v2-12-1_2015-01-18/xkb/keycodes/xfree86 b/x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/xfree86 similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/keycodes/xfree86 rename to x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/xfree86 diff --git a/x-mod_v2-12-1_2015-01-18/xkb/rules/evdev b/x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev similarity index 95% rename from x-mod_v2-12-1_2015-01-18/xkb/rules/evdev rename to x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev index ea83709..7f2299f 100644 --- a/x-mod_v2-12-1_2015-01-18/xkb/rules/evdev +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev @@ -9,12 +9,15 @@ // If you want non-latin layouts implicitly include the en_US layout // uncomment lines below //! $nonlatin = am ara ben bd bg bt by cs deva ge gh gr guj guru il \ -// in ir iku jp kan kh kr la lao lk mk mm mn mv mal ori pk \ -// ru scc sy syr tel th tj tam ua uz +// in ir iku jp kan kh kr la lao lk mk mm mn mv mal olck \ +// ori pk ru scc sy syr tel th tj tam ua uz // PC models ! $pcmodels = pc101 pc102 pc104 pc105 pc104angle-z pc104wide-qu pc104awide-zqu pc104aframe pc105angle-lg pc105awide-sl +// Jolla devices and keyboards +! $jollamodels = jollasbj + // Microsoft models (using MS geometry) ! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose @@ -92,6 +95,7 @@ ! model = keycodes pc98 = evdev(pc98) applealu_jis = evdev+macintosh(jisevdev) + $jollamodels = evdev+jolla(jolla) olpc = evdev+olpc(olpc) olpcm = evdev+olpc(olpcm) pc104angle-z = evdev(pc104angle-z) @@ -304,6 +308,8 @@ classmate us = pc+%l(classmate) empty * = empty(basic) * empty = empty(basic) + jollasbj $nonlatin = jolla_vndr/sbj(common)+us+%l%(v):2 + jollasbj * = jolla_vndr/sbj(common)+%l%(v) $sun $sun_custom = pc+sun_vndr/%l%(v) pc98 nec_vndr/jp = nec_vndr/jp(pc98) macintosh_old us = macintosh_vndr/us(oldmac) @@ -413,6 +419,7 @@ * yu(unicodeyz) = pc+srp(latinunicodeyz) ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1]) amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1]) + jollasbj * = jolla_vndr/sbj(common)+%l[1]%(v[1]) $sun $sun_custom = pc+sun_vndr/%l[1]%(v[1]) macintosh_old us = macintosh_vndr/us(oldmac) macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) @@ -875,6 +882,7 @@ ! model = symbols $evdevkbds = +inet(evdev)+inet(%m) + chromebook = +inet(evdev)+inet(chromebook) applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys) * = +inet(evdev) @@ -883,26 +891,31 @@ ! layout variant = compat de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) + de koy = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) jp $sun_compat = complete+japan(kana_lock) ! layout[1] variant[1] = compat de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) + de koy = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) jp $sun_compat = complete+japan(kana_lock) ! layout[2] variant[2] = compat de neo = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2 de adnw = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2 + de koy = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2 jp $sun_compat = +complete+japan(kana_lock):2 ! layout[3] variant[3] = compat de neo = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3 de adnw = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3 + de koy = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3 jp $sun_compat = +complete+japan(kana_lock):3 ! layout[4] variant[4] = compat de neo = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4 de adnw = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4 + de koy = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4 jp $sun_compat = +complete+japan(kana_lock):4 ! model layout = compat @@ -925,26 +938,36 @@ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle) * misc:typo = +typo(base) * misc:extend = +extend(basic) + * misc:cmk_curl_dbghk = +colemak(cmk_dbg-hk_ed) + * misc:cmk_curl_dvbghm = +colemak(cmk_dvbg-hm_ed) ! layout[1] option = symbols $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1 * misc:typo = +typo(base):1 * misc:extend = +extend(basic):1 + * misc:cmk_curl_dbghk = +colemak(cmk_dbg-hk_ed):1 + * misc:cmk_curl_dvbghm = +colemak(cmk_dvbg-hm_ed):1 ! layout[2] option = symbols $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2 * misc:typo = +typo(base):2 * misc:extend = +extend(basic):2 +// * misc:cmk_curl_dbghk = +colemak(cmk_dbg-hk_ed):2 +// * misc:cmk_curl_dvbghm = +colemak(cmk_dvbg-hm_ed):2 ! layout[3] option = symbols $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3 * misc:typo = +typo(base):3 * misc:extend = +extend(basic):3 +// * misc:cmk_curl_dbghk = +colemak(cmk_dbg-hk_ed):3 +// * misc:cmk_curl_dvbghm = +colemak(cmk_dvbg-hm_ed):3 ! layout[4] option = symbols $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4 * misc:typo = +typo(base):4 * misc:extend = +extend(basic):4 +// * misc:cmk_curl_dbghk = +colemak(cmk_dbg-hk_ed):4 +// * misc:cmk_curl_dvbghm = +colemak(cmk_dvbg-hm_ed):4 ! option = symbols grp:shift_toggle = +group(shifts_toggle) @@ -957,7 +980,9 @@ altwin:left_meta_win = +altwin(left_meta_win) altwin:hyper_win = +altwin(hyper_win) altwin:alt_super_win = +altwin(alt_super_win) + altwin:swap_lalt_lwin = +altwin(swap_lalt_lwin) altwin:swap_alt_win = +altwin(swap_alt_win) + altwin:prtsc_rwin = +altwin(prtsc_rwin) grab:debug = +srvr_ctrl(grab_debug) grp:switch = +group(switch) grp:lswitch = +group(lswitch) @@ -1021,6 +1046,7 @@ caps:backspace = +capslock(backspace) caps:super = +capslock(super) caps:hyper = +capslock(hyper) + caps:menu = +capslock(menu) caps:none = +capslock(none) caps:ctrl_modifier = +capslock(ctrl_modifier) ctrl:nocaps = +ctrl(nocaps) @@ -1031,6 +1057,10 @@ ctrl:rctrl_ralt = +ctrl(rctrl_ralt) ctrl:menu_rctrl = +ctrl(menu_rctrl) ctrl:ralt_rctrl = +ctrl(ralt_rctrl) + ctrl:swap_lalt_lctl = +ctrl(swap_lalt_lctl) + ctrl:swap_lwin_lctl = +ctrl(swap_lwin_lctl) + ctrl:swap_rwin_rctl = +ctrl(swap_rwin_rctl) + ctrl:swap_lalt_lctl_lwin = +ctrl(swap_lalt_lctl_lwin) compose:ralt = +compose(ralt) compose:lwin = +compose(lwin) compose:lwin-altgr = +compose(lwin-altgr) @@ -1073,6 +1103,8 @@ nbsp:level4nl = +nbsp(level4nl) japan:nicola_f_bs = +jp(nicola_f_bs) japan:hztg_escape = +jp(hztg_escape) + korean:ralt_rctrl = +kr(ralt_hangul)+kr(rctrl_hanja) + korean:rctrl_ralt = +kr(rctrl_hangul)+kr(ralt_hanja) kpdl:dot = +kpdl(dot) kpdl:comma = +kpdl(comma) kpdl:dotoss = +kpdl(dotoss) @@ -1109,11 +1141,13 @@ lv5:lwin_switch_lock = +level5(lwin_switch_lock) lv5:rwin_switch_lock = +level5(rwin_switch_lock) lv5:caps_switch_lock = +level5(caps_switch_lock) + lv5:lctl_switch_lock = +level5(lctl_switch_lock) lv5:lsgt_switch_lock_cancel = +level5(lsgt_switch_lock_cancel) lv5:ralt_switch_lock_cancel = +level5(ralt_switch_lock_cancel) lv5:lwin_switch_lock_cancel = +level5(lwin_switch_lock_cancel) lv5:rwin_switch_lock_cancel = +level5(rwin_switch_lock_cancel) lv5:caps_switch_lock_cancel = +level5(caps_switch_lock_cancel) + lv5:lctl_switch_lock_cancel = +level5(lctl_switch_lock_cancel) diff --git a/x-mod_v2-12-1_2015-01-18/xkb/rules/evdev.lst b/x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev.lst similarity index 94% rename from x-mod_v2-12-1_2015-01-18/xkb/rules/evdev.lst rename to x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev.lst index 8753b30..e78ee92 100644 --- a/x-mod_v2-12-1_2015-01-18/xkb/rules/evdev.lst +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev.lst @@ -6,7 +6,7 @@ pc104angle-z Generic 104-key PC Angle(Z)Ergo pc104wide-qu Generic 104-key PC Wide(Quote)Ergo pc104awide-zqu Generic 104-key PC Angle(Z)Wide(Quote)Ergo - pc104aframe Generic 104-key PC AngleFrame(Quote)Ergo + pc104aframe Generic 104-key PC AngleWing(Quote)Ergo pc105angle-lg Generic 105-key (Intl) PC Angle(LSGT)Ergo pc105awide-sl Generic 105-key (Intl) PC AngleWide(/)Ergo dell101 Dell 101-key PC @@ -118,7 +118,7 @@ mx1998 Memorex MX1998 mx2500 Memorex MX2500 EZ-Access Keyboard mx2750 Memorex MX2750 - microsoft4000 Microsoft Natural Wireless Ergonomic Keyboard 4000 + microsoft4000 Microsoft Natural Ergonomic Keyboard 4000 microsoft7000 Microsoft Natural Wireless Ergonomic Keyboard 7000 microsoftinet Microsoft Internet Keyboard microsoftpro Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro @@ -190,6 +190,8 @@ compalfl90 FL90 creativedw7000 Creative Desktop Wireless 7000 htcdream Htc Dream phone + teck227 Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys) + teck229 Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key) ! layout us English (US) @@ -281,6 +283,7 @@ tm Turkmen ml Bambara tz Swahili (Tanzania) + tg French (Togo) ke Swahili (Kenya) bw Tswana ph Filipino @@ -292,13 +295,16 @@ intl us: English (US, international with dead keys) alt-intl us: English (US, alternative international) colemak us: English (Colemak) - cmk_ed_us us: English (Colemak, edition DreymaR) - tarmak1_e us: English (Tarmak1 - Colemak transitional) - tarmak2_et us: English (Tarmak2 - Colemak transitional) - tarmak3_etr us: English (Tarmak3 - Colemak transitional) - tarmak4_etro us: English (Tarmak4 - Colemak transitional) - cmk_ed_dvbghm us: English (Colemak[eD], Curl-Dvbg/Hm ergo) - cmk_ed_dbghk us: English (Colemak[eD], Curl-Dbg/Hk ergo) + cmk_ed_us us: English (Colemak[eD] - edition DreymaR) + tarmak1_e us: English (Tarmak1 - Colemak[eD] transitional) + tarmak1k_e us: English (Tarmak1k - Colemak[eD] transit. w/ Curl-Hk mod) + tarmak2_et us: English (Tarmak2 - Colemak[eD] transitional) + tarmak2bk_et us: English (Tarmak2bk - Colemak[eD] transit. w/ Curl-DbgHk mod) + tarmak2vm_et us: English (Tarmak2vm - Colemak[eD] transit. w/ Curl-DvbgHm mod) + tarmak3_etr us: English (Tarmak3 - Colemak[eD] transitional) + tarmak4_etro us: English (Tarmak4 - Colemak[eD] transitional) + cmk_ed_dvbghm us: English (Colemak[eD], Curl-DvbgHm ergo) + cmk_ed_dbghk us: English (Colemak[eD], Curl-DbgHk ergo) cmk_ed_mirror us: English (Colemak[eD], mirrored) dvorak us: English (Dvorak) dvorak-intl us: English (Dvorak, international with dead keys) @@ -306,7 +312,7 @@ dvorak-l us: English (left handed Dvorak) dvorak-r us: English (right handed Dvorak) dvorak-classic us: English (classic Dvorak) - dvp us: English (programmer Dvorak) + dvp us: English (Programmer Dvorak) rus us: Russian (US, phonetic) mac us: English (Macintosh) altgr-intl us: English (international AltGr dead keys) @@ -325,6 +331,7 @@ qwerty ara: Arabic (qwerty) qwerty_digits ara: Arabic (qwerty/digits) buckwalter ara: Arabic (Buckwalter) + mac ara: Arabic (Macintosh) plisi-d1 al: Albanian (Plisi D1) cmk_ed_ks al: Albanian (Colemak[eD], keep local symbols) cmk_ed_us al: Albanian (Colemak[eD], unified symbols) @@ -335,9 +342,9 @@ eastern-alt am: Armenian (alternative eastern) nodeadkeys at: German (Austria, eliminate dead keys) sundeadkeys at: German (Austria, Sun dead keys) - mac at: German (Austria, Macintosh) cmk_ed_ks at: German (Austria, Colemak[eD], keep local symbols) cmk_ed_us at: German (Austria, Colemak[eD], unified symbols) + mac at: German (Austria, Macintosh) cyrillic az: Azerbaijani (Cyrillic) legacy by: Belarusian (legacy) latin by: Belarusian (Latin) @@ -367,6 +374,7 @@ mal_lalitha in: Malayalam (Lalitha) mal_enhanced in: Malayalam (enhanced Inscript, with rupee sign) ori in: Oriya + olck in: Ol Chiki tam_unicode in: Tamil (Unicode) tam_keyboard_with_numerals in: Tamil (keyboard with numerals) tam_TAB in: Tamil (TAB typewriter) @@ -396,9 +404,10 @@ nativo-epo br: Esperanto (Brazil, Nativo) cmk_ed_ks br: Portuguese (Brazil, Colemak[eD], keep local symbols) cmk_ed_us br: Portuguese (Brazil, Colemak[eD], unified symbols) + thinkpad br: Portuguese (Brazil, IBM/Lenovo ThinkPad) phonetic bg: Bulgarian (traditional phonetic) bas_phonetic bg: Bulgarian (new phonetic) - colemak bg: Bulgarian (Colemak, phonetic) + colemak bg: Bulgarian (Colemak, phonetic S-Slavic) french ma: French (Morocco) tifinagh ma: Berber (Morocco, Tifinagh) tifinagh-alt ma: Berber (Morocco, Tifinagh alternative) @@ -435,6 +444,7 @@ dvorak-ucw cz: Czech (US Dvorak with CZ UCW support) cmk_ed_ks cz: Czech (Colemak[eD], keep local symbols) cmk_ed_us cz: Czech (Colemak[eD], unified symbols) + rus cz: Russian (Czech, phonetic) nodeadkeys dk: Danish (eliminate dead keys) winkeys dk: Danish (Winkeys) mac dk: Danish (Macintosh) @@ -465,6 +475,7 @@ winkeys fi: Finnish (Winkeys) smi fi: Northern Saami (Finland) mac fi: Finnish (Macintosh) + das fi: Finnish (DAS) cmk_ed_ks fi: Finnish (Colemak[eD], keep local symbols) cmk_ed_us fi: Finnish (Colemak[eD], unified symbols) nodeadkeys fr: French (eliminate dead keys) @@ -479,10 +490,11 @@ bepo fr: French (Bepo, ergonomic, Dvorak way) bepo_latin9 fr: French (Bepo, ergonomic, Dvorak way, Latin-9 only) dvorak fr: French (Dvorak) - mac fr: French (Macintosh) - bre fr: French (Breton) cmk_ed_ks fr: French (Colemak[eD], keep local symbols) cmk_ed_us fr: French (Colemak[eD], unified symbols) + mac fr: French (Macintosh) + azerty fr: French (Azerty) + bre fr: French (Breton) oci fr: Occitan geo fr: Georgian (France, AZERTY Tskapo) generic gh: English (Ghana, multilingual) @@ -504,12 +516,12 @@ ro de: Romanian (Germany) ro_nodeadkeys de: Romanian (Germany, eliminate dead keys) dvorak de: German (Dvorak) + cmk_ed_ks de: German (Colemak[eD], keep local symbols) + cmk_ed_us de: German (Colemak[eD], unified symbols) sundeadkeys de: German (Sun dead keys) neo de: German (Neo 2) mac de: German (Macintosh) mac_nodeadkeys de: German (Macintosh, eliminate dead keys) - cmk_ed_ks de: German (Colemak[eD], keep local symbols) - cmk_ed_us de: German (Colemak[eD], unified symbols) dsb de: Lower Sorbian dsb_qwertz de: Lower Sorbian (qwertz) qwerty de: German (qwerty) @@ -544,6 +556,7 @@ 102_qwerty_dot_nodead hu: Hungarian (102/qwerty/dot/eliminate dead keys) Sundeadkeys is: Icelandic (Sun dead keys) nodeadkeys is: Icelandic (eliminate dead keys) + mac_legacy is: Icelandic (Macintosh, legacy) mac is: Icelandic (Macintosh) dvorak is: Icelandic (Dvorak) cmk_ed_ks is: Icelandic (Colemak[eD], keep local symbols) @@ -572,6 +585,7 @@ nodeadkeys latam: Spanish (Latin American, eliminate dead keys) deadtilde latam: Spanish (Latin American, include dead tilde) sundeadkeys latam: Spanish (Latin American, Sun dead keys) + dvorak latam: Spanish (Latin American, Dvorak) cmk_ed_ks latam: Spanish (Latin American, Colemak[eD], keep local symbols) cmk_ed_us latam: Spanish (Latin American, Colemak[eD], unified symbols) std lt: Lithuanian (standard) @@ -633,7 +647,7 @@ cmk_ed_us ro: Romanian (Colemak[eD], unified symbols) phonetic ru: Russian (phonetic) phonetic_winkeys ru: Russian (phonetic WinKeys) - colemak ru: Russian (Colemak, phonetic Rulemak) + colemak ru: Russian (Colemak, phonetic E-Slavic) typewriter ru: Russian (typewriter) legacy ru: Russian (legacy) typewriter-legacy ru: Russian (typewriter, legacy) @@ -651,6 +665,8 @@ srp ru: Serbian (Russia) bak ru: Bashkirian chm ru: Mari + phonetic_azerty ru: Russian (phonetic azerty) + phonetic_fr ru: Russian (phonetic French) yz rs: Serbian (Cyrillic, ZE and ZHE swapped) latin rs: Serbian (Latin) latinunicode rs: Serbian (Latin Unicode) @@ -704,6 +720,7 @@ legacy tj: Tajik (legacy) tam_unicode lk: Tamil (Sri Lanka, Unicode) tam_TAB lk: Tamil (Sri Lanka, TAB Typewriter) + us lk: Sinhala (US keyboard with Sinhala letters) tis th: Thai (TIS-820.2538) pat th: Thai (Pattachote) f tr: Turkish (F) @@ -836,6 +853,7 @@ ctrl:ctrl_ralt Right Alt as Right Ctrl ctrl:swap_lalt_lctl Swap Left Alt key with Left Ctrl key ctrl:swap_lwin_lctl Swap Left Win key with Left Ctrl key + ctrl:swap_rwin_rctl Swap Right Win key with Right Ctrl key ctrl:swap_lalt_lctl_lwin Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt grp_led Use keyboard LED to show alternative layout grp_led:num Num Lock @@ -871,6 +889,7 @@ caps:backspace Make Caps Lock an additional Backspace caps:super Make Caps Lock an additional Super caps:hyper Make Caps Lock an additional Hyper + caps:menu Make Caps Lock an additional Menu key caps:shiftlock Caps Lock toggles ShiftLock (affects all keys) caps:none Caps Lock is disabled caps:ctrl_modifier Make Caps Lock an additional Ctrl @@ -884,7 +903,9 @@ altwin:left_meta_win Meta is mapped to Left Win altwin:hyper_win Hyper is mapped to Win keys altwin:alt_super_win Alt is mapped to Right Win, Super to Menu + altwin:swap_lalt_lwin Left Alt is swapped with Left Win altwin:swap_alt_win Alt is swapped with Win + altwin:prtsc_rwin Win is mapped to PrtSc (and the usual Win key) Compose key Position of Compose key compose:ralt Right Alt compose:lwin Left Win @@ -907,13 +928,15 @@ compat Miscellaneous compatibility options numpad:pc Default numeric keypad keys numpad:mac Numeric keypad keys always enter digits (as in Mac OS) - numpad:microsoft Shift with numeric keypad keys works as in MS Windows + numpad:microsoft NumLock on: digits, Shift switches to arrow keys, Numlock off: always arrow keys (as in MS Windows) numpad:shift3 Shift does not cancel Num Lock, chooses 3rd level instead srvrkeys:none Special keys (Ctrl+Alt+<key>) handled in a server apple:alupckeys Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock) shift:breaks_caps Shift cancels Caps Lock misc:typo Enable extra typographic characters misc:extend Enable level5 Extend mappings (home position arrows etc) + misc:cmk_curl_dbghk Colemak Curl ergo mod (DbgHk variant) + misc:cmk_curl_dvbghm Colemak Curl ergo mod (DvbgHm variant) shift:both_capslock Both Shift keys together toggle Caps Lock shift:both_capslock_cancel Both Shift keys together activate Caps Lock, one Shift key deactivates shift:both_shiftlock Both Shift keys together toggle ShiftLock @@ -932,6 +955,7 @@ lv5:lwin_switch_lock Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser lv5:rwin_switch_lock Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser lv5:caps_switch_lock Caps Lock chooses 5th level, locks when pressed together with another 5th-level-chooser + lv5:lctl_switch_lock Left Ctrl chooses 5th level, locks when pressed together with another 5th-level-chooser nbsp Using space key to input non-breakable space character nbsp:none Usual space at any level nbsp:level2 Non-breakable space character at second level @@ -953,6 +977,10 @@ japan:kana_lock Kana Lock key is locking japan:nicola_f_bs NICOLA-F style Backspace japan:hztg_escape Make Zenkaku Hankaku an additional ESC + korean Korean Hangul/Hanja keys + korean:hw_keys Hardware Hangul/Hanja keys + korean:ralt_rctrl Right Alt as Hangul, right Ctrl as Hanja + korean:rctrl_ralt Right Ctrl as Hangul, right Alt as Hanja esperanto Adding Esperanto supersigned letters esperanto:qwerty To the corresponding key in a Qwerty layout esperanto:dvorak To the corresponding key in a Dvorak layout diff --git a/x-mod_v2-12-1_2015-01-18/xkb/rules/evdev.xml b/x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev.xml similarity index 94% rename from x-mod_v2-12-1_2015-01-18/xkb/rules/evdev.xml rename to x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev.xml index 582a0a1..c814818 100644 --- a/x-mod_v2-12-1_2015-01-18/xkb/rules/evdev.xml +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev.xml @@ -54,7 +54,7 @@ pc104aframe - Generic 104-key PC (AngleFrame(Quote)Ergo mod) + Generic 104-key PC (AngleWing(Quote)Ergo mod) Generic @@ -836,7 +836,7 @@ microsoft4000 - Microsoft Natural Wireless Ergonomic Keyboard 4000 + Microsoft Natural Ergonomic Keyboard 4000 Microsoft Inc. @@ -898,21 +898,21 @@ - microsoftmult + microsoftmult Microsoft Wireless Multimedia Keyboard 1.0A Microsoft Inc. - microsoftelite + microsoftelite Microsoft Natural Keyboard Elite Microsoft Inc. - microsoftccurve2k + microsoftccurve2k Microsoft Comfort Curve Keyboard 2000 Microsoft Inc. @@ -1337,6 +1337,20 @@ htc + + + teck227 + Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys) + Megawin Technology + + + + + teck229 + Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key) + Megawin Technology + + @@ -1388,43 +1402,61 @@ cmk_ed_us - English (Colemak[eD]) + English (Colemak[eD] - edition DreymaR) tarmak1_e - English (Tarmak1 - Colemak transitional) + English (Tarmak1 - Colemak[eD] transitional) + + + + + tarmak1k_e + English (Tarmak1k - Colemak[eD] transit. w/ Curl-Hk mod) tarmak2_et - English (Tarmak2 - Colemak transitional) + English (Tarmak2 - Colemak[eD] transitional) + + + + + tarmak2bk_et + English (Tarmak2bk - Colemak[eD] transit. w/ Curl-DbgHk mod) + + + + + tarmak2vm_et + English (Tarmak2vm - Colemak[eD] transit. w/ Curl-DvbgHm mod) tarmak3_etr - English (Tarmak3 - Colemak transitional) + English (Tarmak3 - Colemak[eD] transitional) tarmak4_etro - English (Tarmak4 - Colemak transitional) + English (Tarmak4 - Colemak[eD] transitional) cmk_ed_dvbghm - English (Colemak[eD], Curl-Dvbg/Hm ergo) + English (Colemak[eD], Curl-DvbgHm ergo) cmk_ed_dbghk - English (Colemak[eD], Curl-Dbg/Hk ergo) + English (Colemak[eD], Curl-DbgHk ergo) @@ -1472,7 +1504,7 @@ dvp - English (programmer Dvorak) + English (Programmer Dvorak) @@ -1496,9 +1528,11 @@ altgr-intl English (international AltGr dead keys) - eng - fra - ger + + eng + fra + ger + @@ -1511,11 +1545,13 @@ hbs Serbo-Croatian (US) - eng - bos - hbs - hrv - srp + + eng + bos + hbs + hrv + srp + @@ -1662,6 +1698,12 @@ Arabic (Buckwalter) + + + mac + Arabic (Macintosh) + + @@ -1831,9 +1873,11 @@ be Belgian - ger - nld - fra + + ger + nld + fra + @@ -1900,6 +1944,8 @@ Bangla ben + + sat @@ -1927,6 +1973,8 @@ Bangla (India) ben + + sat @@ -1938,6 +1986,8 @@ Bangla (India, Probhat) ben + + sat @@ -1945,35 +1995,53 @@ ben_baishakhi Bangla (India, Baishakhi) - ben + + ben + + sat + ben_bornona Bangla (India, Bornona) - ben - + + ben + + sat + + ben_gitanjali Bangla (India, Uni Gitanjali) - ben + + ben + + sat + ben_inscript Bangla (India, Baishakhi Inscript) - ben + + ben + + sat + eeyek Manipuri (Eeyek) - mni + + mni + @@ -2059,7 +2127,9 @@ ml Malayalam (enhanced Inscript, with rupee sign) - mal + + mal + @@ -2070,6 +2140,20 @@ Oriya ori + + sat + + + + + + olck + + sat + Ol Chiki + + + sat @@ -2356,6 +2440,12 @@ Portuguese (Brazil, Colemak[eD], unified symbols) + + + thinkpad + Portuguese (Brazil, IBM/Lenovo ThinkPad) + + @@ -2384,7 +2474,7 @@ colemak - Bulgarian (Colemak, phonetic) + Bulgarian (Colemak, phonetic S-Slavic) @@ -2482,14 +2572,18 @@ cm English (Cameroon) - eng + + eng + french French (Cameroon) - fra + + fra + @@ -2714,7 +2808,7 @@ ug Uyghur - ug + uig @@ -2822,6 +2916,17 @@ Czech (Colemak[eD], unified symbols) + + + rus + + ru + Russian (Czech, phonetic) + + rus + + + @@ -3033,8 +3138,10 @@ ar Iraqi - ara - kur + + ara + kur + @@ -3135,7 +3242,9 @@ smi Northern Saami (Finland) - sme + + sme + @@ -3144,6 +3253,12 @@ Finnish (Macintosh) + + + das + Finnish (DAS) + + cmk_ed_ks @@ -3241,18 +3356,6 @@ French (Dvorak) - - - mac - French (Macintosh) - - - - - bre - French (Breton) - - cmk_ed_ks @@ -3265,6 +3368,24 @@ French (Colemak[eD], unified symbols) + + + mac + French (Macintosh) + + + + + azerty + French (Azerty) + + + + + bre + French (Breton) + + oci @@ -3472,14 +3593,18 @@ ro Romanian (Germany) - rum + + rum + ro_nodeadkeys Romanian (Germany, eliminate dead keys) - rum + + rum + @@ -3488,6 +3613,18 @@ German (Dvorak) + + + cmk_ed_ks + German (Colemak[eD], keep local symbols) + + + + + cmk_ed_us + German (Colemak[eD], unified symbols) + + sundeadkeys @@ -3512,18 +3649,6 @@ German (Macintosh, eliminate dead keys) - - - cmk_ed_ks - German (Colemak[eD], keep local symbols) - - - - - cmk_ed_us - German (Colemak[eD], unified symbols) - - dsb @@ -3781,6 +3906,12 @@ Icelandic (eliminate dead keys) + + + mac_legacy + Icelandic (Macintosh, legacy) + + mac @@ -3999,16 +4130,20 @@ ru Russian (Kazakhstan, with Kazakh) - kaz - rus + + kaz + rus + kazrus Kazakh (with Russian) - kaz - rus + + kaz + rus + @@ -4028,7 +4163,8 @@ stea Lao (STEA proposed standard layout) - lao + + lao @@ -4086,6 +4222,12 @@ Spanish (Latin American, Sun dead keys) + + + dvorak + Spanish (Latin American, Dvorak) + + cmk_ed_ks @@ -4382,7 +4524,7 @@ Norwegian (Macintosh, eliminate dead keys) - + colemak Norwegian (Colemak) @@ -4456,7 +4598,9 @@ szl Silesian - szl + + szl + @@ -4629,7 +4773,7 @@ colemak - Russian (Colemak, phonetic Rulemak) + Russian (Colemak, phonetic E-Slavic) @@ -4747,8 +4891,10 @@ srp Serbian (Russia) - rus - srp + + rus + srp + @@ -4769,6 +4915,18 @@ + + + phonetic_azerty + Russian (phonetic azerty) + + + + + phonetic_fr + Russian (phonetic French) + + @@ -5076,7 +5234,9 @@ swl Swedish Sign Language - swl + + swl + @@ -5087,8 +5247,10 @@ de German (Switzerland) - ger - gsw + + ger + gsw + @@ -5279,6 +5441,13 @@ + + + us + us + Sinhala (US keyboard with Sinhala letters) + + @@ -5798,6 +5967,8 @@ Nepali nep + + sat @@ -5969,6 +6140,16 @@ + + + tg + fr-tg + French (Togo) + + fra + + + ke @@ -6010,33 +6191,37 @@ ph Filipino - eng - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war + + eng + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + qwerty-bay Filipino (QWERTY Baybayin) - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war + + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + @@ -6049,16 +6234,18 @@ capewell-dvorak-bay Filipino (Capewell-Dvorak Baybayin) - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war + + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + @@ -6071,16 +6258,18 @@ capewell-qwerf2k6-bay Filipino (Capewell-QWERF 2006 Baybayin) - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war + + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + @@ -6093,16 +6282,18 @@ colemak-bay Filipino (Colemak Baybayin) - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war + + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + @@ -6115,16 +6306,18 @@ dvorak-bay Filipino (Dvorak Baybayin) - bik - ceb - fil - hil - ilo - pam - pag - phi - tgl - war + + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + @@ -6134,7 +6327,9 @@ md md Moldavian - rum + + rum + @@ -6142,7 +6337,9 @@ gag gag Moldavian (Gagauz) - gag + + gag + @@ -6286,7 +6483,7 @@ grp:rctrl_rshift_toggle Right Ctrl+Right Shift - + + + + @@ -6992,7 +7212,7 @@ + + + + @@ -7268,6 +7507,30 @@ + + + korean + Korean Hangul/Hanja keys + + + + + esperanto @@ -7317,4 +7580,4 @@ - + \ No newline at end of file diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/al b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/al similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/al rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/al diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/at b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/at similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/at rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/at diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/ba b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ba similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/ba rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ba diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/be b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/be similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/be rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/be diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/bg b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/bg similarity index 92% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/bg rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/bg index 2abc142..6ecee67 100644 --- a/x-mod_v2-12-1_2015-01-18/xkb/symbols/bg +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/bg @@ -190,7 +190,7 @@ xkb_symbols "bas_phonetic" { // This is an extended variant of the standard Latin QWERTY layout with // additional symbols in levels 3 and 4. -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "latin" { key {[ grave, asciitilde, U2248, U2245 ]}; @@ -250,63 +250,66 @@ xkb_symbols "latin" { key { type[Group1] = "KEYPAD", [ KP_Delete, KP_Decimal ]}; }; -// --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/bg +// --> OEystein Bech "DreymaR" Gadmar, 2016-04: Additions to xkb/symbols/bg // "Bulmak[eD]" (Phonetic Colemak variant for Bulgarian Cyrillic script) // 2006-01-01 Shai Coleman, http://colemak.com/ +// Bulmak: 2009-2016 Ivan "Ghoul" Haralamov, using transliteration and "common sense". // See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// Also, the Colemak forum topic on Kyrillic layouts: http://forum.colemak.com/viewtopic.php?id=519 partial alphanumeric_keys xkb_symbols "colemak" { include "colemak(cmk_ed_symbols)" - name[Group1]= "Bulgarian (Colemak, phonetic)"; + name[Group1]= "Bulgarian (Colemak, phonetic S-Slavic)"; - key { [ Cyrillic_yu, Cyrillic_YU, dead_tilde, asciitilde ] }; // U0300 Comb. grave -// key { [ 1, exclam, U0301 ] }; // U0301 Comb. acute -// key { [ 2, at, U030B ] }; // U030B Comb. doubleacute + key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN, dead_tilde, asciitilde ] }; // Bulmak. (U0300 Comb. grave) +// key { [ 1, exclam, U0301 ] }; // (U0301 Comb. acute) +// key { [ 2, at, U030B ] }; // (U030B Comb. doubleacute) key { [ 3, numerosign, dead_horn, numbersign ] }; // key { [ 4, dollar, dead_currency, cent ] }; // key { [ 5, percent, EuroSign ] }; -// key { [ 6, asciicircum, U0306 ] }; // U0306 Comb. breve -// key { [ 7, ampersand, U0307 ] }; // U0307 Comb. dot above -// key { [ 8, asterisk, U0308 ] }; // U0308 Comb. diaeresis +// key { [ 6, asciicircum, U0306 ] }; // (U0306 Comb. breve) +// key { [ 7, ampersand, U0307 ] }; // (U0307 Comb. dot above) +// key { [ 8, asterisk, U0308 ] }; // (U0308 Comb. diaeresis) // key { [ 9, parenleft, dead_breve, guillemotleft ] }; // key { [ 0, parenright, dead_abovering, guillemotright ] }; - key { [ minus, underscore, endash, emdash ] }; -// key { [ Cyrillic_io, Cyrillic_IO, equal, plus ] }; // Cyrillic_io/IO + key { [ minus, underscore, endash, emdash ] }; // Added dashes +// key { [ Cyrillic_io, Cyrillic_IO, equal, plus ] }; // key { [ Cyrillic_ya, Cyrillic_YA, q, Q ] }; - key { [ Cyrillic_ve, Cyrillic_VE, w, W ] }; + key { [ Cyrillic_zhe, Cyrillic_ZHE, w, W ] }; // Bulmak/Rulemak-2016 key { [ Cyrillic_ef, Cyrillic_EF, f, F ] }; key { [ Cyrillic_pe, Cyrillic_PE, p, P ] }; key { [ Cyrillic_ghe, Cyrillic_GHE, g, G ] }; key { [ Cyrillic_shorti, Cyrillic_SHORTI, j, J ] }; key { [ Cyrillic_el, Cyrillic_EL, l, L ] }; key { [ Cyrillic_u, Cyrillic_U, u, U ] }; - key { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, y, Y ] }; - key { [ semicolon, colon, Cyrillic_yeru, Cyrillic_YERU ] }; + key { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, y, Y ] }; // Bulmak + key { [ semicolon, colon, Cyrillic_yeru, Cyrillic_YERU ] }; // Bulmak[eD]-2016 key { [ Cyrillic_sha, Cyrillic_SHA, bracketleft, braceleft ] }; key { [ Cyrillic_shcha, Cyrillic_SHCHA, bracketright, braceright ] }; - key { [ backslash, bar, Cyrillic_e, Cyrillic_E ] }; + key { [ Cyrillic_yu, Cyrillic_YU, backslash, bar ] }; // Bulmak-2016 +// key { [ backslash, bar, Cyrillic_e, Cyrillic_E ] }; // Bulmak[eD]-2014 key { [ Cyrillic_a, Cyrillic_A, a, A ] }; key { [ Cyrillic_er, Cyrillic_ER, r, R ] }; key { [ Cyrillic_es, Cyrillic_ES, s, S ] }; key { [ Cyrillic_te, Cyrillic_TE, t, T ] }; key { [ Cyrillic_de, Cyrillic_DE, d, D ] }; -// key { [ Cyrillic_che, Cyrillic_CHE, h, H ] }; // Ghen's Rulemak - key { [ Cyrillic_ha, Cyrillic_HA, h, H ] }; // Trad. Bulgarian +// key { [ Cyrillic_che, Cyrillic_CHE, h, H ] }; // Rulemak-2016 + key { [ Cyrillic_ha, Cyrillic_HA, h, H ] }; // Bulmak, Trad. Bulg. key { [ Cyrillic_en, Cyrillic_EN, n, N ] }; key { [ Cyrillic_ie, Cyrillic_IE, e, E ] }; key { [ Cyrillic_i, Cyrillic_I, i, I ] }; key { [ Cyrillic_o, Cyrillic_O, o, O ] }; - key { [ apostrophe, quotedbl, Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; + key { [ apostrophe, quotedbl, Cyrillic_e, Cyrillic_E ] }; // Bulmak[eD]-2016 key { [ Cyrillic_ze, Cyrillic_ZE, z, Z ] }; -// key { [ Cyrillic_ha, Cyrillic_HA, x, X ] }; // Ghen's Rulemak - key { [ Cyrillic_che, Cyrillic_CHE, x, X ] }; // DreymaR +// key { [ Cyrillic_ha, Cyrillic_HA, x, X ] }; // Rulemak-2016 + key { [ Cyrillic_che, Cyrillic_CHE, x, X ] }; // Bulmak-2016 key { [ Cyrillic_tse, Cyrillic_TSE, c, C ] }; - key { [ Cyrillic_zhe, Cyrillic_ZHE, v, V ] }; + key { [ Cyrillic_ve, Cyrillic_VE, v, V ] }; // Bulmak/Rulemak-2016 key { [ Cyrillic_be, Cyrillic_BE, b, B ] }; key { [ Cyrillic_ka, Cyrillic_KA, k, K ] }; key { [ Cyrillic_em, Cyrillic_EM, m, M ] }; @@ -314,12 +317,10 @@ xkb_symbols "colemak" { // key { [ period, colon, greater,greaterthanequal ] }; // key { [ slash, question ] }; -// NOTE: In Linux, CapsLock is tweaked in the Keyboard settings (for freedom of choice etc.) +// NOTE: In Linux, CapsLock is tweaked in the Keyboard settings (freedom of choice) // key { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; -// key { [ U0301, asciitilde, grave ] }; // U0301 Comb. acute - key { [ U0300, dead_diaeresis, dead_acute, dead_grave ] }; // U0300 Comb. grave + key { [ U0300, dead_diaeresis, dead_acute, dead_grave ] }; // (U0300 Comb. grave) // key { [ space, space, space, nobreakspace ] }; -// key { [ Mode_switch, Multi_key ] }; include "level3(ralt_switch)" }; diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/br b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/br similarity index 99% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/br rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/br index decaf2e..b42425a 100644 --- a/x-mod_v2-12-1_2015-01-18/xkb/symbols/br +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/br @@ -64,7 +64,7 @@ partial alphanumeric_keys xkb_symbols "thinkpad" { include "br(abnt2)" - name[Group1]="Portuguese (Brazil)"; + name[Group1]="Portuguese (Brazil, IBM/Lenovo ThinkPad)"; key { [ slash, question, degree, questiondown ] }; }; diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/ca b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ca similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/ca rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ca diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/colemak b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak similarity index 89% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/colemak rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak index 40c823d..7d0e0ea 100644 --- a/x-mod_v2-12-1_2015-01-18/xkb/symbols/colemak +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak @@ -151,13 +151,10 @@ xkb_symbols "cmk_ed_letters" { key { [ m, M, multiply, downarrow ] }; // QWE/Cmk M // U0292/01B7 ezh/EZH -//// NOTE: Including the line(s) below will enable the Curl-Dvbg/Hm mod by Stevep99; see below. -// include "colemak(cmk-dvbg_ed)" -// include "colemak(cmk-hm_ed)" -//// NOTE: These are the lighter Curl-Dbg/Hk Colemak ergo mods, keeping V and M in place. - include "colemak(cmk-dbg_ed)" - include "colemak(cmk-hk_ed)" -// TODO: Move Curl to keyboard models instead?!? Modularity would be mostly restored, and locale compatibility. +//// NOTE: Activating the line below will "hard" enable the Curl-Dvbg/Hm mod by Stevep99; see below. +// include "colemak(cmk_dvbg-hm_ed)" +//// NOTE: This is my lighter Curl-Dbg/Hk Colemak ergo mod, keeping V and M in place. +// include "colemak(cmk_dbg-hk_ed)" }; hidden partial alphanumeric_keys @@ -227,20 +224,35 @@ xkb_symbols "cmk_ed_symbols" { // ***** DreymaR/Stevep99: Curl-DH ergonomic mods ***** // ****************************************************** -// This is the Colemak "Curl-D/H" ergo mods by colemak forum users stevep99 and myself. -// See http://colemakmods.github.io/mod-dh/ and http://forum.colemak.com/viewtopic.php?id=1942 -// 窶｢ Stevep99's Dvbg left-hand mod gives the D a good bottom-row place () at the cost of V and B -// 窶｢ DreymaR's Dbg left-hand variant is lighter and avoids moving V as D replaces B directly -// Both left-hand mods put the G back in its QWERTY place at the minor cost of the less frequent B. -// For the D(v)bg mod to work, an Angle mod (such as the pc105awide-sl model) is necessary! -// 窶｢ Stevep99's Hm right-hand mod gives the H a good bottom-row position at the cost of M -// 窶｢ DreymaR's Hk right-hand variant avoids moving the M, bringing the H to K instead -// The Dbg/Hk mods are only intended for normal-staggered keyboards; Dvbg/Hm should work on matrix boards too. -// The Hk/Hm switches will cause trouble with Cmk[eD] locales that remap H (and in rare cases, D/G w/ DBG). -// In the Hk/Hm mods, any H in symbols/locale 'cmk_ed_us' sections must change from to / +// Here are the Colemak "Curl-D/H" ergo mods by colemak forum users stevep99 and myself. +// See http://colemakmods.github.io/mod-dh/ and http://forum.colemak.com/viewtopic.php?id=1942 for more info. +// 窶｢ Stevep99's Dvbg left-hand mod gives the D a good bottom-row place () at the cost of V and B. +// 窶｢ DreymaR's Dbg left-hand variant is lighter and avoids separating V by replacing B with D directly. +// Both left-hand mods put the G back in its QWERTY place at the lesser cost of the less frequent B. +// For the D(v)bg mod to work as intended, an Angle mod (such as the pc105awide-sl model) is necessary! +// 窶｢ Stevep99's Hm right-hand mod gives H a good bottom-row position at the cost of M. +// 窶｢ DreymaR's Hk right-hand variant avoids moving M, swapping H and K instead. +// The Dbg/Hk mods are intended for normal-staggered keyboards; Dvbg/Hm works on matrix boards too. +// The Hk/Hm switches cause lv3-4 trouble with Cmk[eD] locales that remap H (and in rare cases, D(v)bg w/ D/G). +// In the Hk/Hm mods, any H in symbols/locale 'cmk_ed_us' sections must change from to /. +// NOTE: The Curl-DH mod are implemented both as US English layouts and as options (e.g., misc:cmk_curl_dbghk). hidden partial alphanumeric_keys -xkb_symbols "cmk-dvbg_ed" { +xkb_symbols "cmk_dvbg-hm_ed" { + // This is the Curl-DvbgHm ergo mod for Colemak, by stevep99. + include "colemak(cmk_dvbg_ed)" + include "colemak(cmk_hm_ed)" +}; + +hidden partial alphanumeric_keys +xkb_symbols "cmk_dbg-hk_ed" { + // This is the Curl-DbgHk ergo mod for Colemak, by DreymaR, keeping V and M in place. + include "colemak(cmk_dbg_ed)" + include "colemak(cmk_hk_ed)" +}; + +hidden partial alphanumeric_keys +xkb_symbols "cmk_dvbg_ed" { // This is the 'Dvbg' loop for the Colemak Curl-D/H ergo mod by stevep99. key { [ b, B, enfilledcircbullet, Greek_beta ] }; // QWE T Cmk G key { [ g, G, eng, ENG ] }; // QWE G Cmk D @@ -249,7 +261,7 @@ xkb_symbols "cmk-dvbg_ed" { }; hidden partial alphanumeric_keys -xkb_symbols "cmk-dbg_ed" { +xkb_symbols "cmk_dbg_ed" { // This is the 'Dbg' loop for the Colemak Curl-D/H ergo mod, leaving the V in place. key { [ b, B, enfilledcircbullet, Greek_beta ] }; // QWE T Cmk G key { [ g, G, eng, ENG ] }; // QWE G Cmk D @@ -257,7 +269,7 @@ xkb_symbols "cmk-dbg_ed" { }; hidden partial alphanumeric_keys -xkb_symbols "cmk-hm_ed" { +xkb_symbols "cmk_hm_ed" { // This is the 'Hm' switch for the Colemak Curl-D/H ergo mod by stevep99. // N isn't changed in this mod, but the Cmk[eD] arrow symbols are rearranged into a Vim-like line! key { [ m, M, multiply, leftarrow ] }; // QWE/Cmk H @@ -266,7 +278,7 @@ xkb_symbols "cmk-hm_ed" { }; hidden partial alphanumeric_keys -xkb_symbols "cmk-hk_ed" { +xkb_symbols "cmk_hk_ed" { // This is the 'Hk' switch for the Colemak Curl-D/H ergo mod, leaving the M in place. key { [ k, K, ccedilla, Ccedilla ] }; // QWE/Cmk H key { [ h, H, hstroke, Hstroke ] }; // QWE N Cmk K @@ -286,20 +298,32 @@ xkb_symbols "cmk-hk_ed" { partial alphanumeric_keys xkb_symbols "tarmak1_e" { include "colemak(cmk_ed)" - // To exclude the partial (F)EKNJ loop in this step, include its mask below - // Also, comment out the F-J line below + // To exclude the partial (F)EKNJ loop in this step, include its mask and comment out the F-J line below // (This would only be useful if you want to learn the LUI loop as a warmup; if so, comment out that too) //include "colemak(tarmak_mask_fekn_to_eknj)" include "colemak(tarmak_mask_dgt_to_gtf)" include "colemak(tarmak_mask_prs_to_rsd)" include "colemak(tarmak_mask_jyoc_to_yocp)" - // To include the standalone LUI loop in this step, comment out its mask below include "colemak(tarmak_mask_lui_to_uil)" key { [ j, J, U0283, U01A9 ] }; // Cmk F - stray J - // NOTE: Re-enforcing of the V and B keys as below is only necessary when running a DBG/DVBG mod (above) + name[Group1]= "English/Intl (Tarmak1_E - Colemak transitional)"; +}; + +// This is the first Tarmak step for those who want to learn the Curl-DbgHk mod; it includes the Curl-Hk mod. +// There is no step for the Curl-Hm mod, as it doesn't affect the first Tarmak step. It can be learnt independently. +partial alphanumeric_keys +xkb_symbols "tarmak1k_e" { + include "colemak(cmk_ed)" + include "colemak(tarmak_mask_dgt_to_gtf)" + include "colemak(tarmak_mask_prs_to_rsd)" + include "colemak(tarmak_mask_jyoc_to_yocp)" + include "colemak(tarmak_mask_lui_to_uil)" + include "colemak(cmk_hk_ed)" + key { [ j, J, U0283, U01A9 ] }; // Cmk F - stray J + // NOTE: Re-enforcing of the V and B keys as below is only necessary when running a DBG/DVBG mod (see above) key { [ v, V, division, Greek_gamma ] }; // QWE/Cmk V key { [ b, B, enfilledcircbullet, Greek_beta ] }; // QWE/Cmk B - name[Group1]= "English/Intl (Tarmak1_E - Colemak transitional)"; + name[Group1]= "English/Intl (Tarmak1k_E - Colemak transitional w/ Curl-Hk)"; }; // Tarmak symbols for xkb on X.Org Server 7.x @@ -310,15 +334,42 @@ xkb_symbols "tarmak2_et" { include "colemak(cmk_ed)" include "colemak(tarmak_mask_prs_to_rsd)" include "colemak(tarmak_mask_jyoc_to_yocp)" - // To include the standalone LUI loop in this step, comment out its mask below include "colemak(tarmak_mask_lui_to_uil)" key { [ j, J, U0283, U01A9 ] }; // Cmk D - stray J -//// NOTE: The below is for DBG/DVBG mods (VJ/JV on / respectively) -// key { [ v, V, division, Greek_gamma ] }; // QWE/Cmk V -// key { [ j, J, U0283, U01A9 ] }; // QWE/Cmk B - stray J name[Group1]= "English/Intl (Tarmak2_ET - Colemak transitional)"; }; +// The Tarmak2bk(ET) step moves the B>T>F keys to their Colemak-Curl(DbgHk) positions, leaving the J at QWERTY 'B'. +partial alphanumeric_keys +xkb_symbols "tarmak2bk_et" { + include "colemak(cmk_ed)" + include "colemak(tarmak_mask_prs_to_rsd)" + include "colemak(tarmak_mask_jyoc_to_yocp)" + include "colemak(tarmak_mask_lui_to_uil)" +//// NOTE: The below is for DBG/DVBG mods (VJ/JV on / respectively) +//// For the Curl-DbgHk mod, both sides are activated at this point forward. (Activate it normally for step 3窶4.) + include "colemak(cmk_dbg-hk_ed)" + key { [ v, V, division, Greek_gamma ] }; // QWE/Cmk V + key { [ j, J, U0283, U01A9 ] }; // QWE/Cmk B - stray J + name[Group1]= "English/Intl (Tarmak2bk_ET - Colemak transitional w/ Curl-DbgHk)"; +}; + +// The Tarmak2vm(ET) step moves the B>T>F keys to their Colemak-Curl(DvbgHm) positions, leaving the J at QWERTY 'B'. +partial alphanumeric_keys +xkb_symbols "tarmak2vm_et" { + include "colemak(cmk_ed)" + include "colemak(tarmak_mask_prs_to_rsd)" + include "colemak(tarmak_mask_jyoc_to_yocp)" + include "colemak(tarmak_mask_lui_to_uil)" +//// NOTE: The below is for DBG/DVBG mods (VJ/JV on / respectively) +//// For the Curl-DvbgHm mod, activating the right-hand HM switch is still optional. + include "colemak(cmk_dvbg_ed)" +// include "colemak(cmk_dvbg-hm_ed)" + key { [ j, J, U0283, U01A9 ] }; // QWE/Cmk V - stray J + key { [ v, V, division, Greek_gamma ] }; // QWE/Cmk B + name[Group1]= "English/Intl (Tarmak2vm_ET - Colemak transitional w/ Curl-DvbgHm)"; +}; + // Tarmak symbols for xkb on X.Org Server 7.x // See the first Tarmak layout above for more info. This is a QWERTY mask for one Tarmak step. // The Tarmak3(ETR) step moves the R>S>D keys to their Colemak positions, leaving the J at QWERTY 'R'. @@ -326,7 +377,7 @@ partial alphanumeric_keys xkb_symbols "tarmak3_etr" { include "colemak(cmk_ed)" include "colemak(tarmak_mask_jyoc_to_yocp)" - // To include the standalone LUI loop in this step, comment out its mask below + // To include the standalone LUI loop in this or any step, comment out its mask (below) include "colemak(tarmak_mask_lui_to_uil)" key { [ j, J, U0283, U01A9 ] }; // Cmk P - stray J name[Group1]= "English/Intl (Tarmak3_ETR - Colemak transitional)"; diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak_eD_epo b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak_eD_epo new file mode 100644 index 0000000..963da9f --- /dev/null +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak_eD_epo @@ -0,0 +1,89 @@ +// $XKeyboardConfig$ + +// ***************************************************************************************** +// ****** ****** +// ***** Colemak layouts - adding locale variants in a consistent fashion ***** +// ***** by OEystein Bech "DreymaR" Gadmar, 2012- ***** +// ***** (copy this template to a new file then find/replace 'Esperanto'/'epo') ***** +// ***** ('' is usually the ISO-3166 two-letter country code) ***** +// ****** ****** +// ***************************************************************************************** + +// *********************************************** +// *** In the symbols file for Esperanto *** +// *** (its filename is 'epo') *** +// *********************************************** + +// --> OEystein Bech "DreymaR" Gadmar, 2014-01: Additions to xkb/symbols/epo +// Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Esperanto. +// 2006-01-01 Shai Coleman, http://colemak.com/ +// See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 + +// The 'keep local symbols' variant keeps the national symbol and special letter setup. +partial alphanumeric_keys +xkb_symbols "cmk_ed_ks" { + include "colemak(cmk_ed_letters)" + include "colemak(cmk_ed_symbols)" + include "level3(ralt_switch)" + include "epo(colemak)" // remaps only AltGr mappings for Colemak C/G/H/J/S/U + name[Group1]= "Esperanto (Colemak[eD], keep local symbols)"; +}; + +// The 'us' variant uses the US-type symbol key setup (recommended!) as it is nearly an intl. standard. +// For Esperanto, necessary local letters are added to designated flexible spots in the layout. +// For "writing" and "coding" subvariants, move the brackets between lv1-2 and lv3-4 as shown. +partial alphanumeric_keys +xkb_symbols "cmk_ed_us" { + include "colemak(cmk_ed_letters)" + include "colemak(cmk_ed_symbols)" + include "level3(ralt_switch)" + name[Group1]= "Esperanto (Colemak[eD], unified symbols)"; + +// NEEDED: ﾄ案夏愼敍､ﾄ･ﾄｴﾄｵﾅ愬, ﾅｬﾅｭ +// Esperanto letter frequencies: The accented letters add up, so allegedly 6% for the above 6 letters together +// NOTE: Added dead_circumflex to both shifted and unshifted LBracket, so it's easy to use with shifted letters + +// key { [ bracketleft, braceleft, dead_circumflex, dead_circumflex ] }; +// key { [ bracketright, braceright, ubreve, Ubreve ] }; + key { [ dead_circumflex, dead_circumflex, bracketleft, braceleft ] }; // common accent + key { [ ubreve, Ubreve, bracketright, braceright ] }; // from + key { [ h, H, dstroke, Greek_alpha ] }; // keep ﾄ/ﾎｱ +}; +// <-- DreymaR: Additions to xkb/symbols/epo + +// *********************************************** +// *** In the rules/evdev(+base).xml file *** +// *** Under the epo layout variantList *** +// *********************************************** + + + + cmk_ed_ks + Esperanto (Colemak[eD], keep local symbols) + + + + + cmk_ed_us + Esperanto (Colemak[eD], unified symbols) + + + +// *********************************************** +// *** In the rules/evdev(+base).lst file *** +// *** Under '! variant' (norm. epo) *** +// *********************************************** + + cmk_ed_ks epo: Esperanto (Colemak[eD], keep local symbols) + cmk_ed_us epo: Esperanto (Colemak[eD], unified symbols) + +// *********************************************** +// *** (In the main rules/evdev(+base) file *** +// *** no changes should be necessary.) *** +// *********************************************** + +// ***************************************************************************************** +// ****** ****** +// ***** END of DreymaR's Colemak additions (Cmk[eD], National var.) ***** +// ****** ****** +// ***************************************************************************************** diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/colemak_eD_template b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak_eD_template similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/colemak_eD_template rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak_eD_template diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/cz b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/cz similarity index 69% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/cz rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/cz index da25b53..85284aa 100644 --- a/x-mod_v2-12-1_2015-01-18/xkb/symbols/cz +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/cz @@ -177,6 +177,76 @@ xkb_symbols "dvorak-ucw" { include "level3(ralt_switch)" }; +// phonetic layout for Russian letters on an CZ (QWERTY) keyboard +// originaly created by Pavel Sorejs + +partial alphanumeric_keys +xkb_symbols "rus" { + + include "cz(qwerty)" + name[Group1]= "Russian (Czech, phonetic)"; + + key { [ plus, ampersand, 1 , 1 ] }; + key { [ Cyrillic_hardsign, 2, 2 , 2 ] }; + key { [ Cyrillic_sha, Cyrillic_SHA, 3 , 3 ] }; + key { [ Cyrillic_che, Cyrillic_CHE, 4 , 4 ] }; + key { [ Cyrillic_shcha, Cyrillic_SHCHA, 5 , 5 ] }; + key { [ Cyrillic_zhe, Cyrillic_ZHE, 6 , 6 ] }; + key { [ quotedbl, 4, 7 , 7 ] }; + key { [ section, 5, 8 , 8 ] }; + key { [ dollar, 6, 9 , 9 ] }; + key { [ equal, 7, 0 , 0 ] }; + key { [ percent, 8 ] }; + key { [ apostrophe, 9 ] }; + + key { [ comma, question ] }; + key { [ period, exclam ] }; + key { [ minus, slash ] }; + + key { [ semicolon, colon ] }; + + key { [ bar, brokenbar ] }; + + key { [ Cyrillic_io, Cyrillic_IO ] }; + + + key { [ numerosign, 1, q, Q ] }; + key { [ Cyrillic_yu, Cyrillic_YU, w, W ] }; + key { [ Cyrillic_ie, Cyrillic_IE, e, E ] }; + key { [ Cyrillic_er, Cyrillic_ER, r, R ] }; + key { [ Cyrillic_te, Cyrillic_TE, t, T ] }; + key { [ Cyrillic_yeru, Cyrillic_YERU, y, Y ] }; + key { [ Cyrillic_u, Cyrillic_U, u, U ] }; + key { [ Cyrillic_i, Cyrillic_I, i, I ] }; + key { [ Cyrillic_o, Cyrillic_O, o, O ] }; + key { [ Cyrillic_pe, Cyrillic_PE, p, P ] }; + key { [ Cyrillic_e, Cyrillic_E, bracketleft, division ] }; + key { [ parenright, parenleft, bracketright, multiply ] }; + + key { [ Cyrillic_a, Cyrillic_A, a, A ] }; + key { [ Cyrillic_es, Cyrillic_ES, s, S ] }; + key { [ Cyrillic_de, Cyrillic_DE, d, D ] }; + key { [ Cyrillic_ef, Cyrillic_EF, f, F ] }; + key { [ Cyrillic_ghe, Cyrillic_GHE, g, G ] }; + key { [ Cyrillic_ha, Cyrillic_HA, h, H ] }; + key { [ Cyrillic_shorti, Cyrillic_SHORTI, j, J ] }; + key { [ Cyrillic_ka, Cyrillic_KA, k, K ] }; + key { [ Cyrillic_el, Cyrillic_EL, l, L ] }; + key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN, less, greater ] }; + + key { [ Cyrillic_ze, Cyrillic_ZE, z, Z ] }; + key { [ Cyrillic_ya, Cyrillic_YA, x, X ] }; + key { [ Cyrillic_tse, Cyrillic_TSE, c, C ] }; + key { [ Cyrillic_ve, Cyrillic_VE, v, V ] }; + key { [ Cyrillic_be, Cyrillic_BE, b, B ] }; + key { [ Cyrillic_en, Cyrillic_EN, n, N ] }; + key { [ Cyrillic_em, Cyrillic_EM, m, M ] }; + + key { [ backslash, brokenbar ] }; + + include "level3(ralt_switch)" +}; + // EXTRAS: partial alphanumeric_keys diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/de b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/de similarity index 85% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/de rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/de index fecb456..5252c8a 100644 --- a/x-mod_v2-12-1_2015-01-18/xkb/symbols/de +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/de @@ -43,6 +43,7 @@ xkb_symbols "basic" { key { [ comma, semicolon, periodcentered, multiply ] }; key { [ period, colon, U2026, division ] }; key { [ minus, underscore, endash, emdash ] }; + key { [ less, greater, bar, NoSymbol ] }; include "kpdl(comma)" @@ -338,7 +339,7 @@ xkb_symbols "neo_base" { // Alphanumeric-keys // =============== - key.type[Group1] = "EIGHT_LEVEL"; + key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK"; // Tab as Multi_key (Compose) // -------------------------------------------------------------- @@ -366,7 +367,7 @@ xkb_symbols "neo_base" { // Top row // -------------------------------------------------------------- - key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC"; + key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK"; key { [ x, X, ellipsis, Greek_xi, Prior, Prior, Greek_XI, NoSymbol ] }; key { [ v, V, underscore, NoSymbol, BackSpace, BackSpace, radical, NoSymbol ] }; key { [ l, L, bracketleft, Greek_lambda, Up, Up, Greek_LAMBDA, NoSymbol ] }; @@ -381,12 +382,12 @@ xkb_symbols "neo_base" { key { [ ssharp, U1E9E, U017F, Greek_finalsmallsigma, U2212, NoSymbol, jot, NoSymbol ] }; - key.type[Group1] = "EIGHT_LEVEL"; + key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK"; key { [ dead_acute, dead_tilde, dead_stroke, dead_psili, dead_doubleacute, NoSymbol, dead_breve, NoSymbol ] }; // Middle row // -------------------------------------------------------------- - key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC"; + key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK"; key { [ u, U, backslash, NoSymbol, Home, Home, includedin, NoSymbol ] }; key { [ i, I, slash, Greek_iota, Left, Left, integral, NoSymbol ] }; key { [ a, A, braceleft, Greek_alpha, Down, Down, U2200, NoSymbol ] }; @@ -411,12 +412,12 @@ xkb_symbols "neo_base" { key { [ b, B, plus, Greek_beta, colon, NoSymbol, U21D0, NoSymbol ] }; key { [ m, M, percent, Greek_mu, KP_1, KP_1, ifonlyif, NoSymbol ] }; - key.type[Group1] = "EIGHT_LEVEL"; + key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK"; key { [ comma, endash, quotedbl, U03F1, KP_2, KP_2, U21D2, NoSymbol ] }; key { [ period, enfilledcircbullet, apostrophe, U03D1, KP_3, KP_3, U21A6, NoSymbol ] }; - key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC"; + key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK"; key { [ j, J, semicolon, Greek_theta, semicolon, NoSymbol, Greek_THETA, NoSymbol ] }; - key.type[Group1] = "EIGHT_LEVEL"; + key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK"; // Space key // -------------------------------------------------------------- @@ -472,8 +473,8 @@ xkb_symbols "neo" { include "shift(both_capslock)" include "level3(caps_switch)" include "level3(bksl_switch)" - include "level5(lsgt_switch)" - include "level5(ralt_switch)" + include "level5(lsgt_switch_lock)" + include "level5(ralt_switch_lock)" }; // Copied from macintosh_vndr/de @@ -636,6 +637,40 @@ xkb_symbols "ru" { include "level3(ralt_switch)" }; +partial alphanumeric_keys +xkb_symbols "pl" { + + // Combined layout for entering both German and Polish symbols on a German physical + // keyboard. Based on German (eliminate dead keys) and Polish (basic). Polish diacritics + // on AltGr+"acelnosxz". EuroSign moved to AE04 (AltGr+dollar key) to avoid conflict + // with Polish eogonek. + // + // https://github.com/kontextify/xkeyboard-config + + include "latin(type4)" + + name[Group1]= "Polish (Germany, eliminate dead keys)"; + + include "de(nodeadkeys)" + key { [ 4, dollar, EuroSign, currency ] }; + + key { [ q, Q ] }; + key { [ w, W ] }; + key { [ e, E, eogonek, Eogonek ] }; + key { [ o, O, oacute, Oacute ] }; + key { [ a, A, aogonek, Aogonek ] }; + key { [ s, S, sacute, Sacute ] }; + key { [ f, F ] }; + key { [ z, Z, zabovedot, Zabovedot ] }; + key { [ x, X, zacute, Zacute ] }; + key { [ c, C, cacute, Cacute ] }; + key { [ n, N, nacute, Nacute ] }; + + include "kpdl(comma)" + + include "level3(ralt_switch)" +}; + partial alphanumeric_keys xkb_symbols "htcdream" { include "inet(htcdream)" @@ -753,11 +788,11 @@ partial alphanumeric_keys xkb_symbols "adnw_base" { include "de(neo_base)" - key.type[Group1] = "EIGHT_LEVEL"; + key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK"; key { [ period, enfilledcircbullet, NoSymbol, U03D1, NoSymbol, NoSymbol, U21A6, NoSymbol ] }; key { [ comma, endash, NoSymbol, U03F1, NoSymbol, NoSymbol, U21D2, NoSymbol ] }; - key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC"; + key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK"; key { [ k, K, NoSymbol, Greek_kappa, NoSymbol, NoSymbol, multiply, NoSymbol ] }; key { [ u, U, NoSymbol, NoSymbol, NoSymbol, NoSymbol, includedin, NoSymbol ] }; key { [ udiaeresis, Udiaeresis, NoSymbol, NoSymbol, NoSymbol, NoSymbol, union, NoSymbol ] }; @@ -781,7 +816,7 @@ xkb_symbols "adnw_base" { key { [ ssharp, U1E9E, NoSymbol, Greek_finalsmallsigma, NoSymbol, NoSymbol, jot, NoSymbol ] }; key { [ x, X, NoSymbol, Greek_xi, NoSymbol, NoSymbol, Greek_XI, NoSymbol ] }; key { [ y, Y, NoSymbol, Greek_upsilon, NoSymbol, NoSymbol, nabla, NoSymbol ] }; - key { [ odiaeresis, odiaeresis, NoSymbol, U03F5, NoSymbol, NoSymbol, intersection, NoSymbol ] }; + key { [ odiaeresis, Odiaeresis, NoSymbol, U03F5, NoSymbol, NoSymbol, intersection, NoSymbol ] }; key { [ q, Q, NoSymbol, U03D5, NoSymbol, NoSymbol, U211A, NoSymbol ] }; key { [ b, B, NoSymbol, Greek_beta, NoSymbol, NoSymbol, U21D0, NoSymbol ] }; key { [ p, P, NoSymbol, Greek_pi, NoSymbol, NoSymbol, Greek_PI, NoSymbol ] }; @@ -800,8 +835,63 @@ xkb_symbols "adnw" { include "shift(both_capslock)" include "level3(caps_switch)" include "level3(bksl_switch)" - include "level5(lsgt_switch)" - include "level5(ralt_switch)" + include "level5(lsgt_switch_lock)" + include "level5(ralt_switch_lock)" +}; + +partial alphanumeric_keys +xkb_symbols "koy_base" { + include "de(neo_base)" + + key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK"; + key { [ period, enfilledcircbullet, NoSymbol, U03D1, NoSymbol, NoSymbol, U21A6, NoSymbol ] }; + key { [ comma, endash, NoSymbol, U03F1, NoSymbol, NoSymbol, U21D2, NoSymbol ] }; + + key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK"; + key { [ k, K, NoSymbol, Greek_kappa, NoSymbol, NoSymbol, multiply, NoSymbol ] }; + key { [ o, O, NoSymbol, Greek_omicron, NoSymbol, NoSymbol, elementof, NoSymbol ] }; + key { [ y, Y, NoSymbol, Greek_upsilon, NoSymbol, NoSymbol, nabla, NoSymbol ] }; + key { [ v, V, NoSymbol, NoSymbol, NoSymbol, NoSymbol, radical, NoSymbol ] }; + key { [ g, G, NoSymbol, Greek_gamma, NoSymbol, NoSymbol, Greek_GAMMA, NoSymbol ] }; + key { [ c, C, NoSymbol, Greek_chi, NoSymbol, NoSymbol, U2102, NoSymbol ] }; + key { [ l, L, NoSymbol, Greek_lambda, NoSymbol, NoSymbol, Greek_LAMBDA, NoSymbol ] }; + key { [ ssharp, U1E9E, NoSymbol, Greek_finalsmallsigma, NoSymbol, NoSymbol, jot, NoSymbol ] }; + key { [ z, Z, NoSymbol, Greek_zeta, NoSymbol, NoSymbol, U2124, NoSymbol ] }; + key { [ h, H, NoSymbol, Greek_psi, NoSymbol, NoSymbol, Greek_PSI, NoSymbol ] }; + key { [ a, A, NoSymbol, Greek_alpha, NoSymbol, NoSymbol, U2200, NoSymbol ] }; + key { [ e, E, NoSymbol, Greek_epsilon, NoSymbol, NoSymbol, U2203, NoSymbol ] }; + key { [ i, I, NoSymbol, Greek_iota, NoSymbol, NoSymbol, integral, NoSymbol ] }; + key { [ u, U, NoSymbol, NoSymbol, NoSymbol, NoSymbol, includedin, NoSymbol ] }; + key { [ d, D, NoSymbol, Greek_delta, NoSymbol, NoSymbol, Greek_DELTA, NoSymbol ] }; + key { [ t, T, NoSymbol, Greek_tau, NoSymbol, NoSymbol, partialderivative, NoSymbol ] }; + key { [ r, R, NoSymbol, Greek_rho, NoSymbol, NoSymbol, U211D, NoSymbol ] }; + key { [ n, N, NoSymbol, Greek_nu, NoSymbol, NoSymbol, U2115, NoSymbol ] }; + key { [ s, S, NoSymbol, Greek_sigma, NoSymbol, NoSymbol, Greek_SIGMA, NoSymbol ] }; + key { [ f, F, NoSymbol, Greek_phi, NoSymbol, NoSymbol, Greek_PHI, NoSymbol ] }; + key { [ x, X, NoSymbol, Greek_xi, NoSymbol, NoSymbol, Greek_XI, NoSymbol ] }; + key { [ q, Q, NoSymbol, U03D5, NoSymbol, NoSymbol, U211A, NoSymbol ] }; + key { [ adiaeresis, Adiaeresis, NoSymbol, Greek_eta, NoSymbol, NoSymbol, U2135, NoSymbol ] }; + key { [ udiaeresis, Udiaeresis, NoSymbol, NoSymbol, NoSymbol, NoSymbol, union, NoSymbol ] }; + key { [ odiaeresis, Odiaeresis, NoSymbol, U03F5, NoSymbol, NoSymbol, intersection, NoSymbol ] }; + key { [ b, B, NoSymbol, Greek_beta, NoSymbol, NoSymbol, U21D0, NoSymbol ] }; + key { [ p, P, NoSymbol, Greek_pi, NoSymbol, NoSymbol, Greek_PI, NoSymbol ] }; + key { [ w, W, NoSymbol, Greek_omega, NoSymbol, NoSymbol, Greek_OMEGA, NoSymbol ] }; + key { [ m, M, NoSymbol, Greek_mu, NoSymbol, NoSymbol, ifonlyif, NoSymbol ] }; + key { [ j, J, NoSymbol, Greek_theta, NoSymbol, NoSymbol, Greek_THETA, NoSymbol ] }; +}; + +partial alphanumeric_keys modifier_keys keypad_keys +xkb_symbols "koy" { + + include "de(koy_base)" + + name[Group1]= "German (KOY)"; + + include "shift(both_capslock)" + include "level3(caps_switch)" + include "level3(bksl_switch)" + include "level5(lsgt_switch_lock)" + include "level5(ralt_switch_lock)" }; // --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/de diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/dk b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/dk similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/dk rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/dk diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/epo b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/epo new file mode 100644 index 0000000..1d40009 --- /dev/null +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/epo @@ -0,0 +1,150 @@ +// Esperanto keyboard maps -- "Ekverto" +// +// Ekverto A ("legacy") (2004-01-10) +// Chusslove Illich (ﾄaslavo Iliﾄ頴) +// +// Ekverto B ("basic") (2006-12-02) +// Benno Schulenberg (Beno Sﾄ･ilenberﾄ･) +// Chusslove Illich (ﾄaslavo Iliﾄ頴) + +default partial alphanumeric_keys +xkb_symbols "basic" { + + include "us(basic)" + name[Group1]= "Esperanto"; + + key.type[Group1] = "FOUR_LEVEL_ALPHABETIC"; + + key { [ scircumflex, Scircumflex, q, Q ] }; + key { [ gcircumflex, Gcircumflex, w, W ] }; + key { [ ccircumflex, Ccircumflex, x, X ] }; + key { [ ubreve, Ubreve, y, Y ] }; + + key.type[Group1] = "FOUR_LEVEL_SEMIALPHABETIC"; + + key { [ jcircumflex, Jcircumflex, bracketleft, braceleft ] }; + key { [ hcircumflex, Hcircumflex, bracketright, braceright ] }; + + key { [ o, O, braceleft, braceleft ] }; + key { [ p, P, braceright, braceright ] }; + + key { [ a, A, leftsinglequotemark, NoSymbol ] }; + key { [ s, S, rightsinglequotemark, NoSymbol ] }; + key { [ d, D, leftdoublequotemark, NoSymbol ] }; + key { [ f, F, rightdoublequotemark, NoSymbol ] }; + + key { [ n, N, endash, endash ] }; + key { [ m, M, emdash, emdash ] }; + + key.type[Group1] = "FOUR_LEVEL"; + + key { [ 5, percent, EuroSign, EuroSign ] }; + + include "level3(ralt_switch)" +}; + + +partial alphanumeric_keys +xkb_symbols "legacy" { + + name[Group1]= "Esperanto (displaced semicolon and quote, obsolete)"; + + key.type[Group1] = "FOUR_LEVEL"; + + key { [ grave, asciitilde, NoSymbol, NoSymbol ] }; + key { [ 1, exclam, NoSymbol, NoSymbol ] }; + key { [ 2, quotedbl, NoSymbol, NoSymbol ] }; + key { [ 3, numbersign, NoSymbol, NoSymbol ] }; + key { [ 4, dollar, NoSymbol, NoSymbol ] }; + key { [ 5, percent, NoSymbol, NoSymbol ] }; + key { [ 6, apostrophe, NoSymbol, NoSymbol ] }; + key { [ 7, ampersand, NoSymbol, NoSymbol ] }; + key { [ 8, asterisk, NoSymbol, NoSymbol ] }; + key { [ 9, parenleft, NoSymbol, NoSymbol ] }; + key { [ 0, parenright, NoSymbol, NoSymbol ] }; + key { [ minus, underscore, NoSymbol, NoSymbol ] }; + key { [ equal, plus, NoSymbol, NoSymbol ] }; + + key { [ comma, semicolon, NoSymbol, NoSymbol ] }; + key { [ period, colon, NoSymbol, NoSymbol ] }; + key { [ slash, question, NoSymbol, NoSymbol ] }; + + key { [ bracketleft, braceleft, NoSymbol, NoSymbol ] }; + key { [ bracketright, braceright, NoSymbol, NoSymbol ] }; + + key { [ backslash, bar, NoSymbol, NoSymbol ] }; + key { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] }; + + key.type[Group1] = "FOUR_LEVEL_SEMIALPHABETIC"; + + key { [ scircumflex, Scircumflex, at, NoSymbol ] }; + key { [ jcircumflex, Jcircumflex, asciicircum, NoSymbol ] }; + key { [ e, E, EuroSign, NoSymbol ] }; + key { [ r, R, emdash, NoSymbol ] }; + key { [ t, T, endash, NoSymbol ] }; + key { [ gcircumflex, Gcircumflex, NoSymbol, NoSymbol ] }; + key { [ u, U, NoSymbol, NoSymbol ] }; + key { [ i, I, NoSymbol, NoSymbol ] }; + key { [ o, O, NoSymbol, NoSymbol ] }; + key { [ p, P, NoSymbol, NoSymbol ] }; + + key { [ a, A, less, NoSymbol ] }; + key { [ s, S, greater, NoSymbol ] }; + key { [ d, D, leftdoublequotemark, NoSymbol ] }; + key { [ f, F, rightdoublequotemark, NoSymbol ] }; + key { [ g, G, NoSymbol, NoSymbol ] }; + key { [ h, H, NoSymbol, NoSymbol ] }; + key { [ j, J, NoSymbol, NoSymbol ] }; + key { [ k, K, NoSymbol, NoSymbol ] }; + key { [ l, L, NoSymbol, NoSymbol ] }; + key { [ ubreve, Ubreve, NoSymbol, NoSymbol ] }; + key { [ hcircumflex, Hcircumflex, NoSymbol, NoSymbol ] }; + + key { [ z, Z, leftsinglequotemark, NoSymbol ] }; + key { [ ccircumflex, Ccircumflex, rightsinglequotemark, NoSymbol ] }; + key { [ c, C, NoSymbol, NoSymbol ] }; + key { [ v, V, NoSymbol, NoSymbol ] }; + key { [ b, B, NoSymbol, NoSymbol ] }; + key { [ n, N, NoSymbol, NoSymbol ] }; + key { [ m, M, NoSymbol, NoSymbol ] }; + + include "level3(ralt_switch)" +}; + +// Add the Esperanto supersigned letters to their related keys on a Qwerty keyboard. +// This is a generic "component" that is not used by the other layouts in this file, +// but is meant to be applied to any Qwerty layout. If you have any questions, ask +// J. Pablo Fernﾃ｡ndez . +partial +xkb_symbols "qwerty" { + key { [ NoSymbol, NoSymbol, ccircumflex, Ccircumflex ] }; + key { [ NoSymbol, NoSymbol, gcircumflex, Gcircumflex ] }; + key { [ NoSymbol, NoSymbol, hcircumflex, Hcircumflex ] }; + key { [ NoSymbol, NoSymbol, jcircumflex, Jcircumflex ] }; + key { [ NoSymbol, NoSymbol, scircumflex, Scircumflex ] }; + key { [ NoSymbol, NoSymbol, ubreve, Ubreve ] }; +}; + +// Add the Esperanto supersigned letters to their related keys in a +// Dvorak layout. Similar comment as above applies. +partial +xkb_symbols "dvorak" { + key { [ NoSymbol, NoSymbol, ccircumflex, Ccircumflex ] }; + key { [ NoSymbol, NoSymbol, gcircumflex, Gcircumflex ] }; + key { [ NoSymbol, NoSymbol, hcircumflex, Hcircumflex ] }; + key { [ NoSymbol, NoSymbol, jcircumflex, Jcircumflex ] }; + key { [ NoSymbol, NoSymbol, scircumflex, Scircumflex ] }; + key { [ NoSymbol, NoSymbol, ubreve, Ubreve ] }; +}; + +// Add the Esperanto supersigned letters to their related keys in a +// Colemak layout. Similar comment as above applies. +partial +xkb_symbols "colemak" { + key { [ NoSymbol, NoSymbol, ccircumflex, Ccircumflex ] }; + key { [ NoSymbol, NoSymbol, gcircumflex, Gcircumflex ] }; + key { [ NoSymbol, NoSymbol, hcircumflex, Hcircumflex ] }; + key { [ NoSymbol, NoSymbol, jcircumflex, Jcircumflex ] }; + key { [ NoSymbol, NoSymbol, scircumflex, Scircumflex ] }; + key { [ NoSymbol, NoSymbol, ubreve, Ubreve ] }; +}; diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/es b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/es similarity index 98% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/es rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/es index c703f69..f32e464 100644 --- a/x-mod_v2-12-1_2015-01-18/xkb/symbols/es +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/es @@ -86,8 +86,8 @@ xkb_symbols "dvorak" { key {[ apostrophe, question, dead_macron, dead_ogonek ]}; key {[ exclamdown, questiondown, dead_breve, dead_abovedot ]}; - key {[ period, colon, less ]}; - key {[ comma, semicolon, greater ]}; + key {[ period, colon, less, guillemotleft ]}; + key {[ comma, semicolon, greater, guillemotright ]}; key {[ ntilde, Ntilde, lstroke, Lstroke ]}; key {[ p, P, paragraph ]}; key {[ y, Y, yen ]}; diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/extend b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/extend similarity index 92% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/extend rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/extend index 9bb2043..0ed5bc9 100644 --- a/x-mod_v2-12-1_2015-01-18/xkb/symbols/extend +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/extend @@ -8,11 +8,11 @@ // These keys are modified/transposed by holding down the 'extend key' (CapsLock by default): // +------+------+------+------+------+------+------+------+------+------+------+------+------+ // |Esc + |F1 <> |F2 << |F3 >> |F4 <> |F5 <> |F6 << |F7 >> |F8 <> |F9 <> |F10<> |F11<> |F12<> | -// | | Pause| Rew | Fwd | Eject| Sleep| Bri- | Bri+ | MyCmp| WWW | Mail | App1 | App2 | +// | | Pause| Rew | Fwd | Eject| Refr | Bri- | Bri+ | Sleep| WWW | Mail | App1 | App2 | // | Caps | Play | Prev | Next | Stop | Mute | Vol- | Vol+ | Media| Home | Srch | File | Calc | // +======+======+======+======+======+======+======+======+======+======+======+======+======+ // |` 竄ｬ竄ｬ竄ｬ |1 |2 |3 |4 |5 |6 |7 |8 |9 |0 |- |= | -// | Del | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | +// | Cust | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | // +------+------+------+------+------+------+------+------+------+------+------+------+------+ // |Tab |Q 竄ｬ竄ｬ竄ｬ |W *** |F <<> |P <>> |G *** |J ### |L ### |U ### |Y ### |; 竄ｬ竄ｬ竄ｬ |[ 竄ｬ竄ｬ竄ｬ |] 竄ｬ竄ｬ竄ｬ | // | | Esc | *WhUp| BrBck| BrFwd| *MUp | PgUp | Home | Up | End | Del | Esc | Ins | @@ -21,28 +21,30 @@ // | ++++ | Alt | *WhDn| Shift| Ctrl | *MDn | PgDn | Left | Down | Right| Back | Menu | BrFav| // +------+------+------+------+------+------+------+------+------+------+------+------+------+ // |_ *** |Z 竄ｬ竄ｬ竄ｬ |X === |C === |V === |B *** |K *** |M *** |, *** |. *** |/ 竄ｬ竄ｬ竄ｬ |Spc 竄ｬ |Entr竄ｬ | -// | *MOn | Undo | Cut | Copy | Paste| *Bt1 | *Bt2 | *Bt3 | *MLe | *MRi | Multi| Enter| Break| +// | *MOn | Undo | Cut | Copy | Paste| *Bt1 | *Bt2 | *Bt3 | *MLe | *MRi | Multi| Enter| PrtSc| // +------+------+------+------+------+------+------+------+------+------+------+-------------+ // Legend: # Movement; + Modifiers; = GUI edit; * Mouse; <> MultiMedia; 竄ｬ Various commands. // // KeyPad overlay with nav block to the left (lv7-8): // +------+------+------+------+------+------+------+------+------+------+------+------+------+ // |` 竄ｬ竄ｬ竄ｬ |1 |2 |3 |4 ﾂ｣ |5 竄ｬ |6 |7 |8 |9 |0 |- |= | -// | Del | ! | @ | # | $ | % | ^ | KP_7 | KP_8 | KP_9 | KP_* | KP_- | KP_= | +// | Cust | ! | @ | # | $ | % | ^ | KP_7 | KP_8 | KP_9 | KP_* | KP_- | KP_= | // +------+------+------+------+------+------+------+------+------+------+------+------+------+ // |Tab |Q ### |W ### |F ### |P 竄ｬ竄ｬ竄ｬ |G 竄ｬ竄ｬ竄ｬ |J ### |L |U |Y |; |[ { |] } | // | | Home | Up | End | Del | Esc | PgUp | KP_4 | KP_5 | KP_6 | KP_+ | ( | ) | // +------+------+------+------+------+------+------+------+------+------+------+------+------+ // |Caps+ |A ### |R ### |S ### |T 竄ｬ竄ｬ竄ｬ |D |H ### |N |E |I |O |' " |\ | | -// | ++++ | Left | Down | Right| Back | K_Bgn| PgDn | KP_1 | KP_2 | KP_3 | K_Ent| ' | \ | +// | ++++ | Left | Down | Right| Back | K_Lck| PgDn | KP_1 | KP_2 | KP_3 | K_Ent| ' | \ | // +------+------+------+------+------+------+------+------+------+------+------+------+------+ -// |_ *** |Z 竄ｬ竄ｬ竄ｬ |X === |C === |V === |B *** |K |M |, ; |. : |/ |Spc |Entr | -// | *MOn | Undo | Cut | Copy | Paste| *Bt1 | K_Lck| KP_0 | , | KP_. | KP_/ | Spc | K_Ent| +// |_ *** |Z 竄ｬ竄ｬ竄ｬ |X === |C === |V === |B *** |K ; |M |, |. |/ |Spc |Entr | +// | *MOn | Undo | Cut | Copy | Paste| *Bt1 | , | KP_0 | KP_0 | KP_. | KP_/ | Spc | K_Ent| // +------+------+------+------+------+------+------+------+------+------+------+------+------+ // // NOTE: A lv7 (Level5+Level3) modifier might be necessary to use the KeyPad level sensibly // One idea is to use AltGr+Caps as a lv7_lock (Caps+AltGr is already lv7_switch) -// NOTE: If a hex pad is needed, the lv7+KBHDJG -> ABCDEF mappings are one solution +// NOTE: If a hex pad is needed, the lv7(8?)+KBHDJG -> ABCDEF mappings are one solution +// NOTE: There's a KP key named KP_BEGIN; it seems like a hack? Ignored for now. +// NOTE: I've duplicated KP_0 to make it easy to hit. Maybe KP_Enter should've been helped too...? default partial xkb_symbols "basic" { @@ -57,20 +59,24 @@ xkb_symbols "lv5" { // key.type[group1]="EIGHT_LEVEL"; // (Caps)Lock state not used on these keys key.type[group1]="EIGHT_LEVEL_SEMIALPHABETIC"; // Lock affects lv1/5 but not lv3/7 - a bit inflexible but OK I guess -// TODO: If I set lv5-6 of Esc to Caps_Lock, lv1-4 are CapsLock PLUS Esc! Try a LockMods action? -// key { [ Escape , Escape , Escape , Escape , Caps_Lock , Caps_Lock ] }; - key { symbols[Group1]=[ NoSymbol , NoSymbol , NoSymbol , NoSymbol , - Caps_Lock , Caps_Lock , // CapsLock - Caps_Lock , Caps_Lock ], // CapsLock +// NOTE: Earlier, if I set lv5-6 of Esc to Caps_Lock, lv1-4 would be CapsLock PLUS Esc! Is this fixed now? +// If not, I might not have to send the Caps_Lock keysymbol as long as the LockMods action is there? + key { symbols[Group1]=[ NoSymbol , NoSymbol , NoSymbol , NoSymbol , + Caps_Lock , Caps_Lock , // Caps_Lock + Caps_Lock , Caps_Lock ], // Caps_Lock actions[Group1]=[NoAction(),NoAction(),NoAction(),NoAction(), - SetMods(mods=Lock) , SetMods(mods=Lock) , // Lock mod for - NoAction() , NoAction() ] - }; // ScrollLock + LockMods(mods=Lock) , LockMods(mods=Lock) , // Lock mod for + LockMods(mods=Lock) , LockMods(mods=Lock) ] // Lock mod for + }; // ; Esc (one could also use aka ScrollLock for Caps, if desired) - key { symbols[Group1]=[ NoSymbol,NoSymbol,NoSymbol,NoSymbol, XF86AudioPlay , XF86AudioPause ], +// NOTE: Many are used to Ctrl+Alt+ being XF86_Switch_VT_## keys! This is lost with Extend. Use Ext+AltGr+ now. + key { symbols[Group1]=[ NoSymbol , NoSymbol , NoSymbol , NoSymbol , + XF86AudioPlay , XF86AudioPause , // Play/Pause + XF86_Switch_VT_1 , XF86_Switch_VT_1 ], // Virtual Terminal +// key { symbols[Group1]=[ NoSymbol,NoSymbol,NoSymbol,NoSymbol, XF86AudioPlay , XF86AudioPause ], actions[Group1]=[NoAction(),NoAction(),NoAction(),NoAction(), Redirect(key=,clearmods=all), Redirect(key=,clearmods=all), // /(窶｡窶｡) - NoAction() , NoAction() ] + SwitchScreen(screen=1,!same) , SwitchScreen(screen=1,!same) ] }; // F01 key { symbols[Group1]=[ NoSymbol,NoSymbol,NoSymbol,NoSymbol, XF86AudioPrev , XF86AudioRewind ], actions[Group1]=[NoAction(),NoAction(),NoAction(),NoAction(), @@ -87,9 +93,9 @@ xkb_symbols "lv5" { Redirect(key=,clearmods=all), Redirect(key=,clearmods=all), // /(窶｡窶｡) NoAction() , NoAction() ] }; // F04 - key { symbols[Group1]=[ NoSymbol,NoSymbol,NoSymbol,NoSymbol, XF86AudioMute , XF86Sleep ], + key { symbols[Group1]=[ NoSymbol,NoSymbol,NoSymbol,NoSymbol, XF86AudioMute , XF86Reload ], actions[Group1]=[NoAction(),NoAction(),NoAction(),NoAction(), - Redirect(key=,clearmods=all), Redirect(key=,clearmods=all), // /(窶｡窶｡) + Redirect(key=,clearmods=all), Redirect(key=,clearmods=all), // /(窶｡窶｡) NoAction() , NoAction() ] }; // F05 key { symbols[Group1]=[ NoSymbol,NoSymbol,NoSymbol,NoSymbol, XF86AudioLowerVolume , XF86MonBrightnessDown ], @@ -102,10 +108,10 @@ xkb_symbols "lv5" { Redirect(key=,clearmods=all), Redirect(key=,clearmods=all), // /(窶｡窶｡) NoAction() , NoAction() ] }; // F07 - key { symbols[Group1]=[ NoSymbol,NoSymbol,NoSymbol,NoSymbol, XF86AudioMedia , XF86MyComputer ], + key { symbols[Group1]=[ NoSymbol,NoSymbol,NoSymbol,NoSymbol, XF86AudioMedia , XF86Sleep ], actions[Group1]=[NoAction(),NoAction(),NoAction(),NoAction(), - Redirect(key=,clearmods=all), Redirect(key=,clearmods=all), // /(窶｡窶｡) - NoAction() , NoAction() ] // What about XF86Terminal? Not in evdev + Redirect(key=,clearmods=all), Redirect(key=,clearmods=all), // /(窶｡窶｡) + NoAction() , NoAction() ] }; // F08 key { symbols[Group1]=[ NoSymbol,NoSymbol,NoSymbol,NoSymbol, XF86HomePage , XF86WWW ], actions[Group1]=[NoAction(),NoAction(),NoAction(),NoAction(), @@ -206,6 +212,7 @@ xkb_symbols "lv5" { Redirect(key=,clearmods=LevelFive), Redirect(key=,clearmods=LevelFive), NoAction() , NoAction() ] }; // = + +// key {}; // BackSpace key { symbols[Group1]=[ NoSymbol , NoSymbol , NoSymbol , NoSymbol , Escape , Escape , // Esc @@ -292,10 +299,10 @@ xkb_symbols "lv5" { NoAction() , NoAction() ] }; // ] } key { symbols[Group1]=[ NoSymbol , NoSymbol , NoSymbol , NoSymbol , - XF86Favorites , XF86Favorites , // BrFav + XF86Favorites , XF86MyComputer , // BrFav backslash , bar ], // BKSL actions[Group1]=[NoAction(),NoAction(),NoAction(),NoAction(), - Redirect(key=,clearmods=all), Redirect(key=,clearmods=all), // (窶｡窶｡) + Redirect(key=,clearmods=all), Redirect(key=,clearmods=all), // /(窶｡窶｡) NoAction() , NoAction() ] }; // \ | @@ -329,7 +336,7 @@ xkb_symbols "lv5" { }; // Cmk T key { symbols[Group1]=[ NoSymbol , NoSymbol , NoSymbol , NoSymbol , Pointer_Down , Pointer_Down , // PtrDn(窶窶) - KP_Begin , KP_Begin ], // KP_Begin?!? + Num_Lock , Num_Lock ], // NumLock actions[Group1]=[NoAction(),NoAction(),NoAction(),NoAction(), MovePtr(x=+0,y=+8) , MovePtr(x=+0,y=+8) , // PtrDn(窶窶) NoAction() , NoAction() ] @@ -423,7 +430,7 @@ xkb_symbols "lv5" { }; // B key { symbols[Group1]=[ NoSymbol , NoSymbol , NoSymbol , NoSymbol , Pointer_Button2 , Pointer_Button2 , // MBt(窶窶) - Num_Lock , Num_Lock ], // NumLock + comma , semicolon ], // , ; actions[Group1]=[NoAction(),NoAction(),NoAction(),NoAction(), PtrBtn(button=2) , PtrBtn(button=2) , // PtrMBt NoAction() , NoAction() ] @@ -437,7 +444,7 @@ xkb_symbols "lv5" { }; // M key { symbols[Group1]=[ NoSymbol , NoSymbol , NoSymbol , NoSymbol , Pointer_Left , Pointer_Left , // PtrLe(窶窶) - comma , semicolon ], // , ; + KP_0 , U21D5 ], // KP_0 竊 竍 actions[Group1]=[NoAction(),NoAction(),NoAction(),NoAction(), MovePtr(x=-8,y=+0) , MovePtr(x=-8,y=+0) , // PtrLe(窶窶) NoAction() , NoAction() ] @@ -454,16 +461,18 @@ xkb_symbols "lv5" { KP_Divide , KP_Divide ] // KP_/ }; // / ? - key { symbols[Group1]=[ NoSymbol , NoSymbol , NoSymbol , NoSymbol , +// NOTE: The Space key should preserve the Shift state; it's special because both levels have the same symbol. +// One might use a key type that has the 'preserve[Shift] = Shift;' property. However, I fix it directly. + key { symbols[Group1]=[ NoSymbol , NoSymbol , NoSymbol , NoSymbol , Return , Return , // Enter space , nobreakspace ], // Space - actions[Group1]=[NoAction(),NoAction(),NoAction(),NoAction(), + actions[Group1]=[NoAction(),SetMods(modifiers=Shift),NoAction(),SetMods(modifiers=Shift), Redirect(key=) , Redirect(key=) , // NoAction() , NoAction() ] }; // // key { [ NoSymbol,NoSymbol,NoSymbol,NoSymbol ] }; // CapsLock -// ﾂｧﾂｧ: XCV Cut/Copy/Paste seem OK in Firefox but not Gedit!? This is a GTK weakness +// ﾂｧﾂｧ: XCV Cut/Copy/Paste seem OK in Firefox but not Gedit!? This is a GTK weakness I think. // Some bind fiddling in ~/.gtkrc-2.0 and ~/.config/gtk-3.0/gtk.css can get this working // 窶窶: 'Pointer_'mousing needs enabling! Real KP_ keys work but not the Pointer_ mousing symbols // (In the Settings GUI there's a Shift+NumLock option for this, but Pointer_EnableKeys works too) @@ -502,6 +511,7 @@ xkb_symbols "lv5" { // But: The 4 groups are really meant for different locales/scripts/layouts that some people (me!) need. +// ========================================================================================================== //// An attempt at using the Overlay functionality for modifier Extend mappings. //// If the Extend key could both switch lv5 AND Overlay1, maybe the A/S/T modifiers would work? //// The idea would be to map only these as overlay keys, and the rest as lv5+ @@ -597,4 +607,3 @@ xkb_symbols "lv5" { // key { overlay1 = }; //Entr // key { [ Overlay1_Enable ], overlay1 = }; //}; - diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/fi b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/fi similarity index 73% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/fi rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/fi index b80377d..66e7f01 100644 --- a/x-mod_v2-12-1_2015-01-18/xkb/symbols/fi +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/fi @@ -79,7 +79,6 @@ xkb_symbols "kotoistus" { include "nbsp(level3)" include "kpdl(comma)" include "level3(ralt_switch)" - include "compose(rwin)" }; partial alphanumeric_keys @@ -98,7 +97,7 @@ xkb_symbols "classic" { name[Group1]="Finnish (classic)"; }; -partial alphanumeric_keys hidden +hidden partial alphanumeric_keys xkb_symbols "fi" { // Classic Finnish keyboard layout with dead keys @@ -212,6 +211,76 @@ xkb_symbols "sun_type6" { include "sun_vndr/fi(sun_type6)" }; +partial +xkb_symbols "das" { + + // This is DAS layout for typing Finnish. It is originally designed by + // Cristian Seres (cseres at iki.fi). + // More information about DAS: http://c.seres.fi/DAS_en.html + // This xkeyboard layout is originally made by Joel Lehtonen, + // (joel.lehtonen at iki.fi) on 2008-01-14. He released it under Public + // domain. + + name[Group1]="Finnish (DAS)"; + + key { [ 1, exclam, section ] }; + key { [ 2, quotedbl, twosuperior ] }; + key { [ 3, at, sterling ] }; + key { [ 4, EuroSign, dollar ] }; + key { [ 5, percent, onehalf ] }; + key { [ 6, ampersand ] }; + key { [ 7, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, braceright, degree ] }; + key { [ plus, question, currency ] }; + key { [ equal, numbersign ] }; + + key { [ p, P, Greek_pi ] }; + key { [ h, H ] }; + key { [ r, R, dead_circumflex ] }; + key { [ k, K, dead_caron ] }; + key { [ less, greater ] }; + key { [ apostrophe, bar ] }; + key { [ w, W ] }; + key { [ u, U ] }; + key { [ y, Y ] }; + key { [ b, B ] }; + key { [ q, Q ] }; + key { [ z, Z, zcaron, Zcaron ] }; + + key { [ s, S, scaron, Scaron ] }; + key { [ l, L, dead_acute ] }; + key { [ n, N, dead_grave ] }; + key { [ t, T, dead_diaeresis ] }; + key { [ v, V ] }; + key { [ g, G ] }; + key { [ a, A ] }; + key { [ i, I ] }; + key { [ o, O ] }; + key { [ e, E ] }; + key { [ c, C ] }; + key { [ backslash, dead_tilde ] }; + + key { [ asterisk, slash ] }; + key { [ f, F ] }; + key { [ x, X ] }; + key { [ d, D ] }; + key { [ m, M, mu ] }; + key { [ j, J ] }; + key { [ aring, Aring ] }; + key { [ odiaeresis, Odiaeresis, oe, OE ] }; + key { [ adiaeresis, Adiaeresis, ae, AE ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, underscore, U2013, dead_macron ] }; + key { [ space, space, space, nobreakspace ] }; + + include "kpdl(comma)" + include "level3(ralt_switch)" + include "compose(rwin)" +}; + // --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/fi // Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Finnish. // 2006-01-01 Shai Coleman, http://colemak.com/ diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/fr b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/fr similarity index 95% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/fr rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/fr index dd0129a..2128d19 100644 --- a/x-mod_v2-12-1_2015-01-18/xkb/symbols/fr +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/fr @@ -127,7 +127,7 @@ xkb_symbols "oss" { include "latin" include "level3(ralt_switch)" - include "nbsp(level4nl)" + include "nbsp(level4n)" include "keypad(oss)" name[Group1]="French (alternative)"; @@ -986,6 +986,92 @@ partial alphanumeric_keys include "sun_vndr/fr(sun_type6)" }; + +partial alphanumeric_keys +xkb_symbols "azerty" { + name[Group1]="French (Azerty)"; + + include "level3(ralt_switch)" + +// French AZERTY-Keyboard layout +// Author : 2015, Mats Blakstad +// Based on the layout at https://en.wikipedia.org/wiki/File:KB_France.svg + +// LAYOUT OVERVIEW +// ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ _______ +// | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | ﾂｰ | + | <-- | +// | ﾂｲ | & | ﾃｩ ~| " #| ' {| ( [| - || ﾃｨ `| _ \| ﾃｧ ^| ﾃ @| ) ]| = }| | +// ======================================================================== +// | |<- | A | Z | E | R | T | Y | U | I | O | P | ﾂｨ | $ | , | +// | ->| | a | z | e 竄ｬ| r | t | y | u | i | o | p | ^ | ﾂ｣ ﾂ､| <-' | +// ===================================================================ﾂｬ | +// | | Q | S | D | F | G | H | J | K | L | M | % | ﾂｵ | | +// | MAJ | q | s | d | f | g | h | j | k | l | m | ﾃｹ | * | | +// ======================================================================== +// | ^ | > | W | X | C | V | B | N | ? | . | / | ﾂｧ | ^ | +// | | | < | w | x | c | v | b | n | , | ; | : | ! | | | +// ======================================================================== +// | | | | | | | | | +// | Ctrl | Super| Alt | Space Nobreakspace | AltGr | Super|Menu | Ctrl | +// ﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯ ﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯ ﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯ ﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯ ﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯ ﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯ ﾂｯﾂｯﾂｯﾂｯﾂｯ ﾂｯﾂｯﾂｯﾂｯﾂｯﾂｯ + + // First row + key { [ twosuperior ] }; + key { [ ampersand, 1 ] }; + key { [ eacute, 2, asciitilde ] }; + key { [ quotedbl, 3, numbersign ] }; + key { [ apostrophe, 4, braceleft ] }; + key { [ parenleft, 5, bracketleft ] }; + key { [ minus, 6, bar ] }; + key { [ egrave, 7, grave ] }; + key { [ underscore, 8, backslash ] }; + key { [ ccedilla, 9, asciicircum ] }; + key { [ agrave, 0, at ] }; + key { [ parenright, degree, bracketright ] }; + key { [ equal, plus, braceright ] }; + + // Second row + key { [ a, A ] }; + key { [ z, Z ] }; + key { [ e, E, EuroSign ] }; + key { [ r, R ] }; + key { [ t, T ] }; + key { [ y, Y ] }; + key { [ u, U ] }; + key { [ i, I ] }; + key { [ o, O ] }; + key { [ p, P ] }; + key { [ dead_circumflex,dead_diaeresis ] }; + key { [ dollar, sterling, currency ] }; + + // Third row + key { [ q, Q ] }; + key { [ s, S ] }; + key { [ d, D ] }; + key { [ f, F ] }; + key { [ g, G ] }; + key { [ h, H ] }; + key { [ j, J ] }; + key { [ k, K ] }; + key { [ l, L ] }; + key { [ m, M ] }; + key { [ ugrave, percent ] }; + key { [ asterisk, mu ] }; + + // Fourth row + key { [ less, greater ] }; + key { [ w, W ] }; + key { [ x, X ] }; + key { [ c, C ] }; + key { [ v, V ] }; + key { [ b, B ] }; + key { [ n, N ] }; + key { [ comma, question ] }; + key { [ semicolon, period ] }; + key { [ colon, slash ] }; + key { [ exclam, section ] }; +}; + // --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/fr // Colemak[eD]: National/locale Colemak "edition DreymaR" variants for French. // 2006-01-01 Shai Coleman, http://colemak.com/ diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/gb b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/gb similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/gb rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/gb diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/gr b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/gr similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/gr rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/gr diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/group b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/group similarity index 98% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/group rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/group index d33bfde..309cd88 100644 --- a/x-mod_v2-12-1_2015-01-18/xkb/symbols/group +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/group @@ -322,12 +322,12 @@ partial modifier_keys xkb_symbols "ctrls_toggle" { virtual_modifiers LControl, RControl; key { - type[Group1]="PC_RCONTROL_LEVEL2", + type[Group1]="PC_CONTROL_LEVEL2", symbols[Group1] = [ NoSymbol, ISO_Prev_Group ], virtualMods= LControl }; key { - type[Group1]="PC_LCONTROL_LEVEL2", + type[Group1]="PC_CONTROL_LEVEL2", symbols[Group1] = [ NoSymbol, ISO_Next_Group ], virtualMods= RControl }; @@ -410,7 +410,7 @@ xkb_symbols "alt_caps_toggle" { }; }; -partial hidden modifier_keys +hidden partial modifier_keys xkb_symbols "olpc" { key { [ ISO_Next_Group, ISO_Prev_Group ] }; }; diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/hr b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/hr similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/hr rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/hr diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/hu b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/hu similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/hu rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/hu diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/il b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/il similarity index 99% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/il rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/il index 2043e98..72afc15 100644 --- a/x-mod_v2-12-1_2015-01-18/xkb/symbols/il +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/il @@ -205,7 +205,7 @@ xkb_symbols "biblical" { key { [ 2, U0599, VoidSymbol, at ] }; key { [ 3, U0592, VoidSymbol, numbersign ] }; key { [ 4, U05AF, NewSheqelSign, dollar ] }; - key { [ 5, VoidSymbol, U200D, percent ] }; + key { [ 5, U05BA, U200D, percent ] }; key { [ 6, U05B9, U200C, asciicircum ] }; key { [ 7, U05BF, U034F, ampersand ] }; key { [ 8, U05C2, U200E, asterisk ] }; diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/is b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/is similarity index 52% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/is rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/is index f57dba4..22e2649 100644 --- a/x-mod_v2-12-1_2015-01-18/xkb/symbols/is +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/is @@ -23,6 +23,7 @@ xkb_symbols "basic" { key { [ eth, ETH, dead_diaeresis, dead_abovering ] }; key { [apostrophe, question, asciitilde, dead_macron ] }; + key { [ d, D, U201e, U201c ] }; key { [ ae, AE, asciicircum, dead_doubleacute ] }; key { [dead_acute, dead_acute, dead_circumflex, dead_caron ] }; key { [dead_abovering, dead_diaeresis, notsign, hyphen ] }; @@ -87,6 +88,12 @@ xkb_symbols "nodeadkeys" { // * 2006-01-14: // Revised the comments in the file // +// * 2013-05-30: +// Renamed the old keyboard layout and created a new one that conforms with the later +// model Apple Laptop and Aluminium USB/Bluetooth keyboards (A1243/A1255 and later) +// that are used with the more recent versions of OS X. Also replaced some Unicode +// codes with proper symbol names. +// // = NOTES // * 20 characters in this keymap have no named character defined in // include/keysymdef.h and as a result their Unicode code points in @@ -106,68 +113,134 @@ xkb_symbols "nodeadkeys" { // you're able to get it running with such a keyboard // Copied from macintosh_vndr/is + +xkb_symbols "mac_legacy" { + name[Group1]= "Icelandic (Macintosh, legacy)"; + + //-- Row 5 (E) --// + key { [ sterling, section, UF8FF, apostrophe ] }; + key { [ 1, exclam, exclamdown, VoidSymbol ] }; + key { [ 2, quotedbl, at, VoidSymbol ] }; + key { [ 3, numbersign, U2122, sterling ] }; + key { [ 4, dollar, U00A2, EuroSign ] }; + key { [ 5, percent, U2030, infinity ] }; + key { [ 6, ampersand, asciicircum, U2044 ] }; + key { [ 7, slash, backslash, U00F7 ] }; + key { [ 8, parenleft, bracketleft, braceleft ] }; + key { [ 9, parenright, bracketright, braceright ] }; + key { [ 0, equal, U2260, U2248 ] }; + key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; + key { [ minus, underscore, endash, emdash ] }; + + + //-- Row 4 (D) --// + key { [ q, Q, paragraph, VoidSymbol ] }; + key { [ w, W, U2211, VoidSymbol ] }; + key { [ e, E, dead_grave, VoidSymbol ] }; + key { [ r, R, registered, VoidSymbol ] }; + key { [ t, T, degree, VoidSymbol ] }; + key { [ y, Y, yen, VoidSymbol ] }; + key { [ u, U, dead_diaeresis, VoidSymbol ] }; + key { [ i, I, U0131, U00AA ] }; + key { [ o, O, dead_circumflex, U00BA ] }; + key { [ p, P, Greek_pi, Greek_PI ] }; + key { [ eth, Eth, U201e, U201c ] }; + key { [ apostrophe, question, questiondown, U00B7 ] }; + + + //-- Row 3 (C) --// + key { [ a, A, aring, Aring ] }; + key { [ s, S, ssharp, abovedot ] }; + key { [ d, D, U2202, U2DA ] }; + key { [ f, F, U192, macron ] }; + key { [ g, G, copyright, breve ] }; + key { [ h, H, bar, VoidSymbol ] }; + key { [ j, J, U2206, U2dd ] }; + key { [ k, K, U00AC, VoidSymbol ] }; + key { [ l, L, U2026, caron ] }; + key { [ ae, AE, oe, OE ] }; + key { [ dead_acute, dead_diaeresis, U201A, U2018 ] }; + key { [ plus, asterisk, U2022, plusminus ] }; + + + //-- Row 2 (B) --// + key { [ less, greater, section, UF8FF ] }; + key { [ z, Z, U3A9, VoidSymbol ] }; + key { [ x, X, asciitilde, VoidSymbol ] }; + key { [ c, C, ccedilla, Ccedilla ] }; + key { [ v, V, U221A, U25CA ] }; + key { [ b, B, U222B, VoidSymbol ] }; + key { [ n, N, dead_tilde, VoidSymbol ] }; + key { [ m, M, U00B5, VoidSymbol ] }; + key { [ comma, semicolon, lessthanequal, guillemotleft ] }; + key { [ period, colon, greaterthanequal, guillemotright ] }; + key { [ thorn, Thorn, U2019, U201d ] }; + + include "level3(ralt_switch)" +}; + partial alphanumeric_keys xkb_symbols "mac" { name[Group1]= "Icelandic (Macintosh)"; - //-- Row 5 (E) --// - key { [ sterling, section, UF8FF, apostrophe ] }; - key { [ 1, exclam, exclamdown, VoidSymbol ] }; - key { [ 2, quotedbl, at, VoidSymbol ] }; - key { [ 3, numbersign, U2122, sterling ] }; - key { [ 4, dollar, U00A2, EuroSign ] }; - key { [ 5, percent, U2030, infinity ] }; - key { [ 6, ampersand, asciicircum, U2044 ] }; - key { [ 7, slash, backslash, U00F7 ] }; - key { [ 8, parenleft, bracketleft, braceleft ] }; - key { [ 9, parenright, bracketright, braceright ] }; - key { [ 0, equal, U2260, U2248 ] }; - key { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; - key { [ minus, underscore, endash, emdash ] }; + //-- Row 5 (E) --// + key { [ less, greater, bar, UF8FF ] }; + key { [ 1, exclam, exclamdown, VoidSymbol ] }; + key { [ 2, quotedbl, at, VoidSymbol ] }; + key { [ 3, numbersign, trademark, sterling ] }; + key { [ 4, dollar, cent, EuroSign ] }; + key { [ 5, percent, U2030, infinity ] }; + key { [ 6, ampersand, asciicircum, U2044 ] }; + key { [ 7, slash, braceleft, division ] }; + key { [ 8, parenleft, bracketleft, braceleft ] }; + key { [ 9, parenright, bracketright, braceright ] }; + key { [ 0, equal, braceright, approxeq ] }; + key { [ odiaeresis, Odiaeresis, backslash, U2260 ] }; + key { [ minus, underscore, endash, emdash ] }; - //-- Row 4 (D) --// - key { [ q, Q, paragraph, VoidSymbol ] }; - key { [ w, W, U2211, VoidSymbol ] }; - key { [ e, E, dead_grave, VoidSymbol ] }; - key { [ r, R, registered, VoidSymbol ] }; - key { [ t, T, degree, VoidSymbol ] }; - key { [ y, Y, yen, VoidSymbol ] }; - key { [ u, U, dead_diaeresis, VoidSymbol ] }; - key { [ i, I, U0131, U00AA ] }; - key { [ o, O, dead_circumflex,U00BA ] }; - key { [ p, P, Greek_pi, Greek_PI ] }; - key { [ eth, Eth, U201e, U201c ] }; - key { [ apostrophe, question, questiondown, U00B7 ] }; + //-- Row 4 (D) --// + key { [ q, Q, U0040, paragraph ] }; + key { [ w, W, U2211, U00A7 ] }; + key { [ e, E, U20AC, U00BF ] }; + key { [ r, R, registered, VoidSymbol ] }; + key { [ t, T, degree, U2022 ] }; + key { [ y, Y, yen, VoidSymbol ] }; + key { [ u, U, dead_diaeresis, VoidSymbol ] }; + key { [ i, I, idotless, ordfeminine ] }; + key { [ o, O, dead_circumflex, U00BA ] }; + key { [ p, P, Greek_pi, Greek_PI ] }; + key { [ eth, Eth, doublelowquotemark, leftdoublequotemark ] }; + key { [ apostrophe, question, asciitilde, periodcentered ] }; - //-- Row 3 (C) --// - key { [ a, A, aring, Aring ] }; - key { [ s, S, ssharp, abovedot ] }; - key { [ d, D, U2202, U2DA ] }; - key { [ f, F, U192, macron ] }; - key { [ g, G, copyright, breve ] }; - key { [ h, H, bar, VoidSymbol ] }; - key { [ j, J, U2206, U2dd ] }; - key { [ k, K, U00AC, VoidSymbol ] }; - key { [ l, L, U2026, caron ] }; - key { [ ae, AE, oe, OE ] }; - key { [ dead_acute, dead_diaeresis, U201A, U2018 ] }; - key { [ plus, asterisk, U2022, plusminus ] }; + //-- Row 3 (C) --// + key { [ a, A, aring, Aring ] }; + key { [ s, S, ssharp, abovedot ] }; + key { [ d, D, partialderivative, U02DA ] }; + key { [ f, F, function, macron ] }; + key { [ g, G, copyright, breve ] }; + key { [ h, H, bar, U00B8 ] }; + key { [ j, J, U2206, doubleacute ] }; + key { [ k, K, notsign, U2DB ] }; + key { [ l, L, ellipsis, caron ] }; + key { [ ae, AE, oe, OE ] }; + key { [ dead_acute, dead_acute, asciicircum, leftsinglequotemark ] }; + key { [ plus, asterisk, grave, plusminus ] }; - //-- Row 2 (B) --// - key { [ less, greater, section, UF8FF ] }; - key { [ z, Z, U3A9, VoidSymbol ] }; - key { [ x, X, asciitilde, VoidSymbol ] }; - key { [ c, C, ccedilla, Ccedilla ] }; - key { [ v, V, U221A, U25CA ] }; - key { [ b, B, U222B, VoidSymbol ] }; - key { [ n, N, dead_tilde, VoidSymbol ] }; - key { [ m, M, U00B5, VoidSymbol ] }; - key { [ comma, semicolon, lessthanequal, guillemotleft ] }; - key { [ period, colon, greaterthanequal,guillemotright ] }; - key { [ thorn, Thorn, U2019, U201d ] }; + //-- Row 2 (B) --// + key { [ degree, dead_diaeresis, oslash, Ooblique ] }; + key { [ z, Z, Greek_OMEGA, VoidSymbol ] }; + key { [ x, X, asciitilde, VoidSymbol ] }; + key { [ c, C, ccedilla, Ccedilla ] }; + key { [ v, V, radical, U25CA ] }; + key { [ b, B, integral, VoidSymbol ] }; + key { [ n, N, dead_tilde, VoidSymbol ] }; + key { [ m, M, mu, VoidSymbol ] }; + key { [ comma, semicolon, lessthanequal, guillemotleft ] }; + key { [ period, colon, greaterthanequal, guillemotright ] }; + key { [ thorn, Thorn, rightsinglequotemark, rightdoublequotemark ] }; include "level3(ralt_switch)" }; @@ -200,6 +273,7 @@ xkb_symbols "dvorak" { name[Group1]= "Icelandic (Dvorak)"; key { [ slash, question, U201e, U201c ] }; + key { [ o, O, odiaeresis, Odiaeresis ] }; key { [ d, D, eth, ETH ] }; key { [ s, S, ae, AE ] }; key { [ minus, underscore, endash, emdash ] }; diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/it b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/it similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/it rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/it diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/latam b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/latam similarity index 54% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/latam rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/latam index 5f6b5ce..3ff24cd 100644 --- a/x-mod_v2-12-1_2015-01-18/xkb/symbols/latam +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/latam @@ -67,6 +67,67 @@ xkb_symbols "deadtilde" { key { [ plus, asterisk, dead_tilde, dead_macron ] }; }; +// Latin American Spanish Dvorak mapping (note R-H exchange) +partial alphanumeric_keys +xkb_symbols "dvorak" { + + name[Group1]="Spanish (Latin American, Dvorak)"; + + key {[ bar, degree, notsign, notsign ]}; + key {[ 1, exclam, bar, exclamdown ]}; + key {[ 2, quotedbl, at, oneeighth ]}; + key {[ 3, numbersign, periodcentered, sterling ]}; + key {[ 4, dollar, asciitilde, dollar ]}; + key {[ 5, percent, onehalf, threeeighths ]}; + key {[ 6, ampersand, notsign, fiveeighths ]}; + key {[ 7, slash, braceleft, seveneighths ]}; + key {[ 8, parenleft, bracketleft, trademark ]}; + key {[ 9, parenright, bracketright, plusminus ]}; + key {[ 0, equal, braceright, degree ]}; + key {[ apostrophe, question, backslash, questiondown ]}; + key {[ questiondown, exclamdown, dead_cedilla, dead_ogonek ]}; + + key {[ period, colon, at ]}; + key {[ comma, semicolon ]}; + key {[ ntilde, Ntilde, lstroke, Lstroke ]}; + key {[ p, P, paragraph ]}; + key {[ y, Y, yen ]}; + key {[ f, F, tslash, Tslash ]}; + key {[ g, G, dstroke, Dstroke ]}; + key {[ c, C, cent, copyright ]}; + key {[ h, H, hstroke, Hstroke ]}; + key {[ l, L, sterling ]}; + key {[ dead_acute, dead_diaeresis, dead_diaeresis, dead_abovering ]}; + key {[ plus, asterisk, asciitilde, dead_macron ]}; + + key {[ a, A, ae, AE ]}; + key {[ o, O, oslash, Oslash ]}; + key {[ e, E, EuroSign ]}; + key {[ u, U, aring, Aring ]}; + key {[ i, I, oe, OE ]}; + key {[ d, D, eth, ETH ]}; + key {[ r, R, registered, trademark ]}; + key {[ t, T, thorn, THORN ]}; + key {[ n, N, eng, ENG ]}; + key {[ s, S, ssharp, section ]}; + key {[ braceleft, bracketleft, dead_circumflex, braceleft ]}; + key {[ braceright, bracketright, dead_grave, braceright ]}; + + key {[ less, greater, guillemotleft, guillemotright ]}; + key {[ minus, underscore, hyphen, macron ]}; + key {[ q, Q, currency ]}; + key {[ j, J ]}; + key {[ k, K, kra ]}; + key {[ x, X, multiply, division ]}; + key {[ b, B ]}; + key {[ m, M, mu ]}; + key {[ w, W ]}; + key {[ v, V ]}; + key {[ z, Z ]}; + + include "level3(ralt_switch)" +}; + // --> OEystein Bech "DreymaR" Gadmar, 2012-01: Additions to xkb/symbols/latam // Colemak[eD]: National/locale Colemak "edition DreymaR" variants for Spanish (Latin American). // 2006-01-01 Shai Coleman, http://colemak.com/ diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/level5 b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/level5 similarity index 80% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/level5 rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/level5 index 89e548b..e3fcbaf 100644 --- a/x-mod_v2-12-1_2015-01-18/xkb/symbols/level5 +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/level5 @@ -142,7 +142,8 @@ xkb_symbols "rwin_switch_lock_cancel" { }; // --> OEystein Bech "DreymaR" Gadmar, 2011-05: Additions to xkb/symbols/level5 -// The CapsLock Level5 switches are useful for Extend overlay mappings using Caps as an Extend modifier +// The CapsLock Level5 switches are good for Extend overlay mappings using Caps as an Extend modifier +// The Left Ctrl Level5 switches are good for Extend overlay mappings if you're using Caps as Left Ctrl // See "DreymaR's Big Bag of Keyboard Tricks": http://forum.colemak.com/viewtopic.php?pid=9918 // The CapsLock key (while pressed) chooses the fifth shift level. @@ -166,7 +167,7 @@ xkb_symbols "caps_switch_lock" { }; }; -// CapsLock chooses 5th level, latches (acts as one-time lock) when pressed together with another 5th-level-chooser +// CapsLock chooses 5th level, latches (temp lock) when pressed with another 5th-level-chooser partial modifier_keys xkb_symbols "caps_switch_lock_cancel" { include "level5(lock)" @@ -176,4 +177,36 @@ xkb_symbols "caps_switch_lock_cancel" { ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] }; }; + +// The Left Ctrl key (while pressed) chooses the fifth shift level. +partial modifier_keys +xkb_symbols "lctl_switch" { + key { + type[Group1]="ONE_LEVEL", + symbols[Group1] = [ ISO_Level5_Shift ] + }; + include "level5(modifier_mapping)" +}; + +// Left Ctrl chooses 5th level, locks when pressed together with another 5th-level-chooser +partial modifier_keys +xkb_symbols "lctl_switch_lock" { + include "level5(lock)" + key { + type[Group1] = "EIGHT_LEVEL", + symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, + ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] + }; +}; + +// Left Ctrl chooses 5th level, latches (temp lock) when pressed with another 5th-level-chooser +partial modifier_keys +xkb_symbols "lctl_switch_lock_cancel" { + include "level5(lock)" + key { + type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK", + symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, + ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] + }; +}; // <-- DreymaR: Additions to xkb/symbols/level5 diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/nl b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/nl similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/nl rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/nl diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/no b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/no similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/no rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/no diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/pl b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/pl similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/pl rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/pl diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/pt b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/pt similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/pt rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/pt diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/ro b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ro similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/ro rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ro diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/rs b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/rs similarity index 98% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/rs rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/rs index 32087b6..44f0e56 100644 --- a/x-mod_v2-12-1_2015-01-18/xkb/symbols/rs +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/rs @@ -45,7 +45,7 @@ xkb_symbols "yz" { key { [ Cyrillic_ze, Cyrillic_ZE, any, any ] }; // z }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "common" { // "Common" keys: keys that are the same // for both latin and cyrillic keyboards. @@ -73,7 +73,7 @@ xkb_symbols "common" { include "kpdl(comma)" }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "cyralpha" { key.type[Group1] = "FOUR_LEVEL_ALPHABETIC"; @@ -114,7 +114,7 @@ xkb_symbols "cyralpha" { }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "latalpha" { key.type[Group1] = "FOUR_LEVEL_ALPHABETIC"; @@ -127,7 +127,7 @@ xkb_symbols "latalpha" { key { [ zcaron, Zcaron, any, any ] }; // \ | }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "twoletter" { // Letters which are written in latin transcription with two characters. @@ -142,7 +142,7 @@ xkb_symbols "twoletter" { key { [ zcaron, Zcaron, any, any ] }; // z }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "latlevel3" { key { [ any, any, notsign, notsign ] }; // ` ~ key { [ any, any, dead_tilde, asciitilde ] }; // 1 ! @@ -196,7 +196,7 @@ xkb_symbols "latlevel3" { key { [ any, any, emdash, endash ] }; // / ? }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "cyrlevel3" { key { [ any, any, degree, notsign ] }; // ` ~ key { [ any, any, dead_circumflex, NoSymbol ] }; // 3 # diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/ru b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ru similarity index 86% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/ru rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ru index 0e64868..dce67f3 100644 --- a/x-mod_v2-12-1_2015-01-18/xkb/symbols/ru +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ru @@ -21,7 +21,7 @@ xkb_symbols "winkeys" { key { [ backslash, slash ] }; }; -partial hidden alphanumeric_keys +hidden partial alphanumeric_keys xkb_symbols "common" { key { [ 1, exclam ] }; @@ -478,11 +478,12 @@ xkb_symbols "srp" { }; // Mari language layout -// http://www.marlamuter.ru/ +// http://www.marlamuter.com/ +// Last edit by Viatcheslav Kileev (slavakileev@yandex.ru) partial alphanumeric_keys xkb_symbols "chm" { - include "ru(common)" + include "ru(winkeys)" name[Group1]= "Mari"; key.type[group1]="FOUR_LEVEL_ALPHABETIC"; @@ -491,13 +492,82 @@ xkb_symbols "chm" { key { [ Cyrillic_u, Cyrillic_U, U04F1, U04F0 ] }; key { [ Cyrillic_yeru, Cyrillic_YERU, U04F9, U04F8 ] }; key { [ Cyrillic_en, Cyrillic_EN, U04A5, U04A4 ] }; - key { [ Cyrillic_e, Cyrillic_E, U04E9, U04E8 ] }; - key { [ Cyrillic_zhe, Cyrillic_ZHE, U04EB, U04EA ] }; - key { [ Cyrillic_ef, Cyrillic_EF, UF537, UF536 ] }; + key { [ Cyrillic_o, Cyrillic_O, U04E7, U04E6 ] }; include "level3(ralt_switch)" }; +partial alphanumeric_keys +xkb_symbols "phonetic_azerty" { + + include "level3(ralt_switch)" + + name[Group1]= "Russian (phonetic azerty)"; + + key { [ ampersand, 1, onesuperior, exclamdown ] }; + key { [ eacute, 2, asciitilde, oneeighth ] }; + key { [ quotedbl, 3, numbersign, sterling ] }; + key { [apostrophe, 4, braceleft, dollar ] }; + key { [ parenleft, 5, bracketleft, threeeighths ] }; + key { [ minus, 6, bar, fiveeighths ] }; + key { [ egrave, 7, grave, seveneighths ] }; + key { [underscore, 8, backslash, trademark ] }; + key { [ ccedilla, 9, asciicircum, plusminus ] }; + key { [ agrave, 0, at, degree ] }; + key { [parenright, degree, bracketright, questiondown ] }; + key { [ equal, plus, braceright, dead_ogonek ] }; + + key { [ comma, question, acute, doubleacute ] }; + key { [ semicolon, period, horizconnector, multiply ] }; + key { [ colon, slash, periodcentered, division ] }; + key { [ exclam, section, dead_belowdot, dead_abovedot ] }; + + key { [ ugrave, percent, asciicircum, caron ] }; + key { [ bar, brokenbar ] }; + + key { [ Cyrillic_yu, Cyrillic_YU ] }; + key { [ Cyrillic_ya, Cyrillic_YA ] }; // Q + key { [ Cyrillic_ze, Cyrillic_ZE ] }; // Z + key { [ Cyrillic_es, Cyrillic_ES ] }; + key { [ Cyrillic_a, Cyrillic_A ] }; + key { [ Cyrillic_ve, Cyrillic_VE ] }; // W + key { [ Cyrillic_tse, Cyrillic_TSE ] }; + key { [Cyrillic_softsign,Cyrillic_SOFTSIGN ] }; + key { [ Cyrillic_de, Cyrillic_DE ] }; + key { [ Cyrillic_ie, Cyrillic_IE ] }; + key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; + key { [ Cyrillic_ef, Cyrillic_EF ] }; + key { [ Cyrillic_te, Cyrillic_TE ] }; + key { [ Cyrillic_er, Cyrillic_ER ] }; + key { [ Cyrillic_en, Cyrillic_EN ] }; + key { [ Cyrillic_be, Cyrillic_BE ] }; + key { [ Cyrillic_ha, Cyrillic_HA ] }; + key { [ Cyrillic_ghe, Cyrillic_GHE ] }; + key { [ Cyrillic_yeru, Cyrillic_YERU ] }; + key { [ Cyrillic_em, Cyrillic_EM ] }; // M + key { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; + key { [ Cyrillic_u, Cyrillic_U ] }; + key { [ Cyrillic_ka, Cyrillic_KA ] }; + key { [ Cyrillic_i, Cyrillic_I ] }; + key { [ Cyrillic_o, Cyrillic_O ] }; + key { [ Cyrillic_el, Cyrillic_EL ] }; + key { [ Cyrillic_pe, Cyrillic_PE ] }; + + key { [ Cyrillic_sha, Cyrillic_SHA ] }; + key { [ Cyrillic_che, Cyrillic_CHE ] }; + key { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; + key { [ Cyrillic_e, Cyrillic_E ] }; +}; + +partial alphanumeric_keys +xkb_symbols "phonetic_fr" { + + include "fr" + include "ru(phonetic_azerty)" + + name[Group1]= "Russian (phonetic French)"; +}; + // EXTRAS: // Church Slavonic language layout @@ -650,12 +720,12 @@ xkb_symbols "mac" { key { [ Cyrillic_io, Cyrillic_IO ] }; }; -// --> OEystein Bech "DreymaR" Gadmar, 2014-01: Additions to xkb/symbols/ru +// --> OEystein Bech "DreymaR" Gadmar, 2016-01: Additions to xkb/symbols/ru // Rulemak (Phonetic Colemak variant for Russian Cyrillic script) // 2006-01-01 Shai Coleman, http://colemak.com/ -// Rulemak: 2009 Geert Hendrickx, . -// Based on KOI8-R and some "common sense": CHE/HA on H/X, IO close to E/O, soft/hard on '/`. +// Rulemak: 2009-2016 Geert Hendrickx, , using transliteration and "common sense". // See the Colemak forum topic on Cmk[eD] locales: http://forum.colemak.com/viewtopic.php?id=1458 +// Also, the Colemak forum topic on Kyrillic layouts: http://forum.colemak.com/viewtopic.php?id=519 partial alphanumeric_keys xkb_symbols "colemak" { //xkb_symbols "rulemak" { @@ -663,54 +733,58 @@ xkb_symbols "colemak" { include "colemak(cmk_ed_symbols)" // name[Group1]= "Colemak(cyrillic)"; - name[Group1]= "Russian (Colemak, phonetic Rulemak)"; + name[Group1]= "Russian (Colemak, phonetic E-Slavic)"; - key { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, dead_tilde, asciitilde ] }; // U0300 Comb. grave -// key { [ 1, exclam, U0301 ] }; // U0301 Comb. acute -// key { [ 2, at, U030B ] }; // U030B Comb. doubleacute + key { [ Cyrillic_io, Cyrillic_IO, dead_tilde, asciitilde ] }; // Rulemak-2016. (U0300 Comb. grave) +// key { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, dead_tilde, asciitilde ] }; // Rulemak-2013. (U0300 Comb. grave) +// key { [ 1, exclam, U0301 ] }; // (U0301 Comb. acute) +// key { [ 2, at, U030B ] }; // (U030B Comb. doubleacute) key { [ 3, numerosign, dead_horn, numbersign ] }; // key { [ 4, dollar, dead_currency, cent ] }; // key { [ 5, percent, EuroSign ] }; -// key { [ 6, asciicircum, U0306 ] }; // U0306 Comb. breve -// key { [ 7, ampersand, U0307 ] }; // U0307 Comb. dot above -// key { [ 8, asterisk, U0308 ] }; // U0308 Comb. diaeresis +// key { [ 6, asciicircum, U0306 ] }; // (U0306 Comb. breve) +// key { [ 7, ampersand, U0307 ] }; // (U0307 Comb. dot above) +// key { [ 8, asterisk, U0308 ] }; // (U0308 Comb. diaeresis) key { [ 9, parenleft, dead_breve, guillemotleft ] }; key { [ 0, parenright, dead_abovering, guillemotright ] }; key { [ minus, underscore, endash, emdash ] }; - key { [ Cyrillic_io, Cyrillic_IO, equal, plus ] }; + key { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, equal, plus ] }; // Rulemak-2016 +// key { [ Cyrillic_io, Cyrillic_IO, equal, plus ] }; // Rulemak-2013 key { [ Cyrillic_ya, Cyrillic_YA, q, Q ] }; - key { [ Cyrillic_ve, Cyrillic_VE, w, W ] }; + key { [ Cyrillic_zhe, Cyrillic_ZHE, w, W ] }; // Rulemak-2016 +// key { [ Cyrillic_ve, Cyrillic_VE, w, W ] }; // Rulemak-2013 key { [ Cyrillic_ef, Cyrillic_EF, f, F ] }; key { [ Cyrillic_pe, Cyrillic_PE, p, P ] }; key { [ Cyrillic_ghe, Cyrillic_GHE, g, G ] }; key { [ Cyrillic_shorti, Cyrillic_SHORTI, j, J ] }; key { [ Cyrillic_el, Cyrillic_EL, l, L ] }; key { [ Cyrillic_u, Cyrillic_U, u, U ] }; - key { [ Cyrillic_yeru, Cyrillic_YERU, y, Y ] }; - key { [ Cyrillic_yu, Cyrillic_YU, semicolon, colon ] }; - key { [ Cyrillic_sha, Cyrillic_SHA, bracketleft, braceleft ] }; - key { [ Cyrillic_shcha, Cyrillic_SHCHA, bracketright, braceright ] }; - key { [ Cyrillic_e, Cyrillic_E, backslash, bar ] }; + key { [ Cyrillic_yeru, Cyrillic_YERU, y, Y ] }; // Rulemak + key { [ Cyrillic_yu, Cyrillic_YU, semicolon, colon ] }; // Rulemak + key { [ Cyrillic_sha, Cyrillic_SHA, bracketleft, braceleft ] }; // Rulemak + key { [ Cyrillic_shcha, Cyrillic_SHCHA, bracketright, braceright ] }; // Rulemak + key { [ Cyrillic_e, Cyrillic_E, backslash, bar ] }; // Rulemak key { [ Cyrillic_a, Cyrillic_A, a, A ] }; key { [ Cyrillic_er, Cyrillic_ER, r, R ] }; key { [ Cyrillic_es, Cyrillic_ES, s, S ] }; key { [ Cyrillic_te, Cyrillic_TE, t, T ] }; key { [ Cyrillic_de, Cyrillic_DE, d, D ] }; - key { [ Cyrillic_che, Cyrillic_CHE, h, H ] }; // Ghen's solution -// key { [ Cyrillic_ha, Cyrillic_HA, h, H ] }; // KOI-8/transliteration + key { [ Cyrillic_che, Cyrillic_CHE, h, H ] }; // Rulemak-2013/2016 +// key { [ Cyrillic_ha, Cyrillic_HA, h, H ] }; // KOI-8/translit. key { [ Cyrillic_en, Cyrillic_EN, n, N ] }; key { [ Cyrillic_ie, Cyrillic_IE, e, E ] }; key { [ Cyrillic_i, Cyrillic_I, i, I ] }; key { [ Cyrillic_o, Cyrillic_O, o, O ] }; - key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN, apostrophe, quotedbl ] }; + key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN, apostrophe, quotedbl ] }; // Rulemak key { [ Cyrillic_ze, Cyrillic_ZE, z, Z ] }; - key { [ Cyrillic_ha, Cyrillic_HA, x, X ] }; // Ghen's solution + key { [ Cyrillic_ha, Cyrillic_HA, x, X ] }; // Rulemak-2013/2016 // key { [ Cyrillic_che, Cyrillic_CHE, x, X ] }; // Trad./Bulgarian key { [ Cyrillic_tse, Cyrillic_TSE, c, C ] }; - key { [ Cyrillic_zhe, Cyrillic_ZHE, v, V ] }; + key { [ Cyrillic_ve, Cyrillic_VE, v, V ] }; // Rulemak-2016 +// key { [ Cyrillic_zhe, Cyrillic_ZHE, v, V ] }; // Rulemak-2013 key { [ Cyrillic_be, Cyrillic_BE, b, B ] }; key { [ Cyrillic_ka, Cyrillic_KA, k, K ] }; key { [ Cyrillic_em, Cyrillic_EM, m, M ] }; @@ -718,12 +792,10 @@ xkb_symbols "colemak" { key { [ period, colon, greater,greaterthanequal ] }; // key { [ slash, question ] }; -// NOTE: In Linux, CapsLock is tweaked in the Keyboard settings (for freedom of choice etc.) +// NOTE: In Linux, CapsLock is tweaked in the Keyboard settings (freedom of choice) // key { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; -// key { [ U0301, asciitilde, grave ] }; // U0301 Comb. acute - key { [ U0301, dead_diaeresis, dead_acute, dead_grave ] }; // U0301 Comb. acute + key { [ U0301, dead_diaeresis, dead_acute, dead_grave ] }; // (U0301 Comb. acute) // key { [ space, space, space, nobreakspace ] }; -// key { [ Mode_switch, Multi_key ] }; include "level3(ralt_switch)" }; diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/se b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/se similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/se rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/se diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/si b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/si similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/si rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/si diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/sk b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/sk similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/sk rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/sk diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/tr b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/tr similarity index 100% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/tr rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/tr diff --git a/x-mod_v2-12-1_2015-01-18/xkb/symbols/us b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/us similarity index 98% rename from x-mod_v2-12-1_2015-01-18/xkb/symbols/us rename to x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/us index b8c94e7..e269d7f 100644 --- a/x-mod_v2-12-1_2015-01-18/xkb/symbols/us +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/us @@ -541,11 +541,12 @@ xkb_symbols "dvorak-classic" { // Main features: Numbers are in shift position (like French), symbols have been // placed in locations that give good hand-alternation and finger rolling with // symbols that usually follows, accented characters are possible for I18N. +// Patch suggestions should be sent upstream. partial alphanumeric_keys xkb_symbols "dvp" { include "us(dvorak)" - name[Group1] = "English (programmer Dvorak)"; + name[Group1] = "English (Programmer Dvorak)"; // Unmodified Shift AltGr Shift+AltGr // symbols row, left side @@ -568,8 +569,8 @@ xkb_symbols "dvp" { // upper row, left side key { [ semicolon, colon, dead_diaeresis ] }; - key { [ comma, less, guillemotleft, ellipsis ] }; - key { [ period, greater, guillemotright ] }; + key { [ comma, less, guillemotleft, U201C ] }; + key { [ period, greater, guillemotright, U201D ] }; key { [ p, P, paragraph, section ] }; key { [ y, Y, udiaeresis, Udiaeresis ] }; @@ -596,9 +597,9 @@ xkb_symbols "dvp" { // lower row, left side key { [ apostrophe, quotedbl, dead_acute ] }; - key { [ m, M, mu ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" }; - include "level3(ralt_switch)" + // do NOT hardcode this switch; use lv3:ralt_switch option instead! + //include "level3(ralt_switch)" }; // phonetic layout for Russian letters on an US keyboard @@ -822,12 +823,30 @@ xkb_symbols "tarmak1_e" { name[Group1]= "English/Intl (Tarmak1_E - Colemak transitional)"; }; +partial alphanumeric_keys +xkb_symbols "tarmak1k_e" { + include "colemak(tarmak1k_e)" + name[Group1]= "English/Intl (Tarmak1k_E - Colemak transit. w/ Curl-Hk mod)"; +}; + partial alphanumeric_keys xkb_symbols "tarmak2_et" { include "colemak(tarmak2_et)" name[Group1]= "English/Intl (Tarmak2_ET - Colemak transitional)"; }; +partial alphanumeric_keys +xkb_symbols "tarmak2bk_et" { + include "colemak(tarmak2bk_et)" + name[Group1]= "English/Intl (Tarmak2bk_ET - Colemak transit. w/ Curl-DbgHk mod)"; +}; + +partial alphanumeric_keys +xkb_symbols "tarmak2vm_et" { + include "colemak(tarmak2vm_et)" + name[Group1]= "English/Intl (Tarmak2vm_ET - Colemak transit. w/ Curl-DvbgHm mod)"; +}; + partial alphanumeric_keys xkb_symbols "tarmak3_etr" { include "colemak(tarmak3_etr)" @@ -859,8 +878,7 @@ xkb_symbols "tarmak4_etro" { partial alphanumeric_keys xkb_symbols "cmk_ed_dvbghm" { include "colemak(cmk_ed)" - include "colemak(cmk-dvbg_ed)" - include "colemak(cmk-hm_ed)" + include "colemak(cmk_dvbg-hm_ed)" name[Group1]= "English/Intl (Colemak[eD], Curl-DvbgHm ergo)"; }; @@ -868,8 +886,7 @@ xkb_symbols "cmk_ed_dvbghm" { partial alphanumeric_keys xkb_symbols "cmk_ed_dbghk" { include "colemak(cmk_ed)" - include "colemak(cmk-dbg_ed)" - include "colemak(cmk-hk_ed)" + include "colemak(cmk_dbg-hk_ed)" name[Group1]= "English/Intl (Colemak[eD], Curl-DbgHk ergo)"; }; diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/types/level5 b/x-mod_v2-17-1ub1_2016-06-06/xkb/types/level5 new file mode 100644 index 0000000..c553e5c --- /dev/null +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/types/level5 @@ -0,0 +1,220 @@ +partial default xkb_types "default" { + + // Defines a type with an eight-level shift, similar to the three-level + // type used for iso9995, but it lets the Shift key behave "normally". + + virtual_modifiers LevelThree,ScrollLock,LevelFive; + + type "EIGHT_LEVEL" { + modifiers = Shift+LevelThree+LevelFive; + map[None] = Level1; + map[Shift] = Level2; + map[LevelThree] = Level3; + map[Shift+LevelThree] = Level4; + map[LevelFive] = Level5; + map[Shift+LevelFive] = Level6; + map[LevelThree+LevelFive] = Level7; + map[Shift+LevelThree+LevelFive] = Level8; + level_name[Level1] = "Base"; + level_name[Level2] = "Shift"; + level_name[Level3] = "Alt Base"; + level_name[Level4] = "Shift Alt"; + level_name[Level5] = "X"; + level_name[Level6] = "X Shift"; + level_name[Level7] = "X Alt Base"; + level_name[Level8] = "X Shift Alt"; + }; + + type "EIGHT_LEVEL_ALPHABETIC" { + modifiers = Shift+Lock+LevelThree+LevelFive; + map[None] = Level1; + map[Shift] = Level2; + map[Lock] = Level2; + map[LevelThree] = Level3; + map[Shift+LevelThree] = Level4; + map[Lock+LevelThree] = Level4; + map[Lock+Shift+LevelThree] = Level3; + + map[LevelFive] = Level5; + map[Shift+LevelFive] = Level6; + map[Lock+LevelFive] = Level6; + map[LevelThree+LevelFive] = Level7; + map[Shift+LevelThree+LevelFive] = Level8; + map[Lock+LevelThree+LevelFive] = Level8; + map[Lock+Shift+LevelThree+LevelFive] = Level7; + + level_name[Level1] = "Base"; + level_name[Level2] = "Shift"; + level_name[Level3] = "Alt Base"; + level_name[Level4] = "Shift Alt"; + level_name[Level5] = "X"; + level_name[Level6] = "X Shift"; + level_name[Level7] = "X Alt Base"; + level_name[Level8] = "X Shift Alt"; + }; + + type "EIGHT_LEVEL_LEVEL_FIVE_LOCK" { + // Level5-Lock is implemented by using NumLock, because a real modifier + // is required. + + modifiers = Shift + Lock + LevelThree + NumLock + LevelFive; + + map[None] = Level1; + map[Shift] = Level2; + map[LevelThree] = Level3; + map[LevelThree+Shift] = Level4; + + map[LevelFive] = Level5; + map[LevelFive+Shift] = Level6; + map[LevelFive+LevelThree] = Level7; + map[LevelFive+LevelThree+Shift] = Level8; + + map[NumLock] = Level5; + map[NumLock+Shift] = Level6; + map[NumLock+LevelThree] = Level7; + map[NumLock+LevelThree+Shift] = Level8; + + map[NumLock+LevelFive] = Level1; + map[NumLock+LevelFive+Shift] = Level2; + map[NumLock+LevelFive+LevelThree] = Level3; + map[NumLock+LevelFive+LevelThree+Shift] = Level4; + + // Lock has no effect + map[Lock] = Level1; + map[Lock+Shift] = Level2; + map[Lock+LevelThree] = Level3; + map[Lock+LevelThree+Shift] = Level4; + + map[Lock+LevelFive] = Level5; + map[Lock+LevelFive+Shift] = Level6; + map[Lock+LevelFive+LevelThree] = Level7; + map[Lock+LevelFive+LevelThree+Shift] = Level8; + + map[Lock+NumLock] = Level5; + map[Lock+NumLock+Shift] = Level6; + map[Lock+NumLock+LevelThree] = Level7; + map[Lock+NumLock+LevelThree+Shift] = Level8; + + map[Lock+NumLock+LevelFive] = Level1; + map[Lock+NumLock+LevelFive+Shift] = Level2; + map[Lock+NumLock+LevelFive+LevelThree] = Level3; + map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level4; + + preserve[LevelFive+Shift] = Shift; + preserve[NumLock+Shift] = Shift; + preserve[Lock+LevelFive+Shift] = Shift; + preserve[Lock+NumLock+Shift] = Shift; + + level_name[Level1] = "Base"; + level_name[Level2] = "Shift"; + level_name[Level3] = "Alt Base"; + level_name[Level4] = "Shift Alt"; + level_name[Level5] = "X"; + level_name[Level6] = "X Shift"; + level_name[Level7] = "X Alt Base"; + level_name[Level8] = "X Shift Alt"; + }; + + type "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK" { + // Level5-Lock is implemented by using NumLock, because a real modifier + // is required. + + modifiers = Shift + Lock + LevelThree + NumLock + LevelFive; + + map[None] = Level1; + map[Shift] = Level2; + map[LevelThree] = Level3; + map[LevelThree+Shift] = Level4; + + map[LevelFive] = Level5; + map[LevelFive+Shift] = Level6; + map[LevelFive+LevelThree] = Level7; + map[LevelFive+LevelThree+Shift] = Level8; + + map[NumLock] = Level5; + map[NumLock+Shift] = Level6; + map[NumLock+LevelThree] = Level7; + map[NumLock+LevelThree+Shift] = Level8; + + map[NumLock+LevelFive] = Level1; + map[NumLock+LevelFive+Shift] = Level2; + map[NumLock+LevelFive+LevelThree] = Level3; + map[NumLock+LevelFive+LevelThree+Shift] = Level4; + + // Lock interchanges Level1 and Level2 + map[Lock] = Level2; + map[Lock+Shift] = Level1; + map[Lock+LevelThree] = Level3; + map[Lock+LevelThree+Shift] = Level4; + + map[Lock+LevelFive] = Level5; + map[Lock+LevelFive+Shift] = Level6; + map[Lock+LevelFive+LevelThree] = Level7; + map[Lock+LevelFive+LevelThree+Shift] = Level8; + + map[Lock+NumLock] = Level5; + map[Lock+NumLock+Shift] = Level6; + map[Lock+NumLock+LevelThree] = Level7; + map[Lock+NumLock+LevelThree+Shift] = Level8; + + map[Lock+NumLock+LevelFive] = Level2; + map[Lock+NumLock+LevelFive+Shift] = Level1; + map[Lock+NumLock+LevelFive+LevelThree] = Level4; + map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level3; + + preserve[LevelFive+Shift] = Shift; + preserve[NumLock+Shift] = Shift; + + level_name[Level1] = "Base"; + level_name[Level2] = "Shift"; + level_name[Level3] = "Alt Base"; + level_name[Level4] = "Shift Alt"; + level_name[Level5] = "X"; + level_name[Level6] = "X Shift"; + level_name[Level7] = "X Alt Base"; + level_name[Level8] = "X Shift Alt"; + }; + + type "EIGHT_LEVEL_SEMIALPHABETIC" { + modifiers = Shift+Lock+LevelThree+LevelFive; + map[None] = Level1; + map[Shift] = Level2; + map[Lock] = Level2; + map[LevelThree] = Level3; + map[Shift+LevelThree] = Level4; + map[Lock+LevelThree] = Level3; + map[Lock+Shift+LevelThree] = Level4; + + map[LevelFive] = Level5; + map[Shift+LevelFive] = Level6; + map[Lock+LevelFive] = Level6; + map[Lock+Shift+LevelFive] = Level6; + map[LevelThree+LevelFive] = Level7; + map[Shift+LevelThree+LevelFive] = Level8; + map[Lock+LevelThree+LevelFive] = Level7; + map[Lock+Shift+LevelThree+LevelFive] = Level8; + +// --> OEystein Bech "DreymaR" Gadmar, 2015-09: Additions to xkb/types/level5 +// Space+Shift would consume the Shift which is bad for hotkeys; added a preserve[Shift] line +// See "DreymaR's Big Bag of Keyboard Tricks": http://forum.colemak.com/viewtopic.php?pid=9918 + preserve[Shift] = Shift; + preserve[Shift+LevelFive] = Shift; +// <-- DreymaR: Additions to xkb/types/level5 + preserve[Lock+LevelThree] = Lock; + preserve[Lock+Shift+LevelThree] = Lock; + preserve[Lock+LevelFive] = Lock; + preserve[Lock+Shift+LevelFive] = Lock; + preserve[Lock+LevelThree+LevelFive] = Lock; + preserve[Lock+Shift+LevelThree+LevelFive] = Lock; + + level_name[Level1] = "Base"; + level_name[Level2] = "Shift"; + level_name[Level3] = "Alt Base"; + level_name[Level4] = "Shift Alt"; + level_name[Level5] = "X"; + level_name[Level6] = "X Shift"; + level_name[Level7] = "X Alt Base"; + level_name[Level8] = "X Shift Alt"; + }; + +};