summaryrefslogtreecommitdiff
path: root/linux/X/symbols/de
diff options
context:
space:
mode:
authorstephan <stephan@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2009-05-28 18:22:07 +0000
committerstephan <stephan@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2009-05-28 18:22:07 +0000
commitaa1558e403c7d626fe38d8ec452557c5f2037dc4 (patch)
tree9be9b1b285c5b87a8b3b7aad4d4475e4082289a4 /linux/X/symbols/de
parentff7ec649a4be75c8200c1c35b8ca6d768d78b546 (diff)
downloadneo-layout-aa1558e403c7d626fe38d8ec452557c5f2037dc4.tar.gz
neo-layout-aa1558e403c7d626fe38d8ec452557c5f2037dc4.tar.bz2
neo-layout-aa1558e403c7d626fe38d8ec452557c5f2037dc4.zip
Alles auf xkeyboard-config Version 1.6 angeglichen.
Modifier mit Hilfe von compat-Regeln definiert. Damit sollten alle Multi-Layout-Bugs behoben sein. Allerdings tritt wahrscheinlich #135 wieder auf. git-svn-id: https://svn.neo-layout.org@1879 b9310e46-f624-0410-8ea1-cfbb3a30dc96
Diffstat (limited to 'linux/X/symbols/de')
-rw-r--r--linux/X/symbols/de32
1 files changed, 18 insertions, 14 deletions
diff --git a/linux/X/symbols/de b/linux/X/symbols/de
index 32d57bc..cd998b9 100644
--- a/linux/X/symbols/de
+++ b/linux/X/symbols/de
@@ -62,7 +62,7 @@ xkb_symbols "nodeadkeys" {
name[Group1]="Germany - Eliminate dead keys";
key <TLDE> { [asciicircum, degree, notsign, notsign ] };
- key <AE12> { [apostrophe, grave, cedilla, cedilla ] };
+ key <AE12> { [ acute, grave, cedilla, cedilla ] };
key <AD11> { [udiaeresis, Udiaeresis, diaeresis, diaeresis ] };
key <AD12> { [ plus, asterisk, asciitilde, macron ] };
key <AC10> { [odiaeresis, Odiaeresis, doubleacute, doubleacute ] };
@@ -211,6 +211,7 @@ xkb_symbols "sundeadkeys" {
name[Group1]="Germany - Sun dead keys";
};
+
// German NEO-Layout Version 2
// adopted 2004 by Hanno Behrens <Hanno.Behrens@gmx.de>
// inspired by Dvorak/de-ergo http://www.goebel-consult.de/de-ergo/
@@ -227,13 +228,7 @@ xkb_symbols "sundeadkeys" {
// $Revision$, $Date$
partial alphanumeric_keys modifier_keys keypad_keys
-xkb_symbols "neo" {
-
- include "shift(both_capslock)"
- include "level3(caps_switch)"
- include "level3(bksl_switch)"
- include "level5(lsgt_switch_numlock)"
- include "level5(ralt_switch_numlock)"
+xkb_symbols "neo_base" {
name[Group1]= "Germany - Neo 2";
@@ -248,7 +243,7 @@ xkb_symbols "neo" {
// Compose (not a level): Mod3 + Tab
// Feststelltaste (Capslock): Shift + Shift
// Mod4-Lock: Mod4 + Mod4
- //
+ // Mod4-Lock: Shift + Mod3 + Tab
// Legend
// ===============
@@ -266,11 +261,8 @@ xkb_symbols "neo" {
// Tab as Multi_key (Compose)
// --------------------------------------------------------------
- key <TAB> {
- symbols[Group1]= [ Tab, ISO_Left_Tab, Multi_key, Num_Lock, NoSymbol, NoSymbol, NoSymbol, Num_Lock ],
- actions[Group1]= [ NoAction(), NoAction(), NoAction(), LockMods(modifiers=NumLock), NoAction(), NoAction(), NoAction(), LockMods(modifiers=NumLock) ]
- };
- modifier_map Mod2 { <TAB> };
+ key <TAB> { [ Tab, ISO_Left_Tab, Multi_key, ISO_Level5_Lock, NoSymbol, NoSymbol, NoSymbol, ISO_Level5_Lock ] };
+
// Number row
// --------------------------------------------------------------
@@ -389,6 +381,18 @@ xkb_symbols "neo" {
key <KPDL> { [ KP_Separator, KP_Decimal, period, apostrophe, KP_Delete, KP_Delete, quotedbl, NoSymbol ] };
};
+partial alphanumeric_keys modifier_keys keypad_keys
+xkb_symbols "neo" {
+
+ include "de(neo_base)"
+
+ include "shift(both_capslock)"
+ include "level3(caps_switch)"
+ include "level3(bksl_switch)"
+ include "level5(lsgt_switch_numlock)"
+ include "level5(ralt_switch_numlock)"
+};
+
// Copied from macintosh_vndr/de
// olh@suse.de very close to MacOS map