From b395c3c85251d4e8761704d8e3a3c9f9fa5b45cc Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 12 Dec 2012 08:35:50 +0100 Subject: fontconfig mesa pixman xkeyboard-config git update 12 dev 2012 fontconfig: 9ce36f4bbebc702a35d0cd9f1a59d5b828549bc6 mesa: 621259b3de1f15c879620bbf17764fd8a27ae6f5 pixman: fdab3c1b6cd9c5e197ec3f6bc0a03da32880e317 xkeyboard-config: 378597a9d525f069c049fdd6d04ff628123f82c7 --- xorg-server/xkeyboard-config/rules/base.xml.in | 6 ++++++ xorg-server/xkeyboard-config/symbols/de | 10 ++++++++++ xorg-server/xkeyboard-config/symbols/pl | 2 -- 3 files changed, 16 insertions(+), 2 deletions(-) (limited to 'xorg-server/xkeyboard-config') diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 5f0618166..8d8075004 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -1596,6 +1596,12 @@ + + + legacy + <_description>German (legacy) + + nodeadkeys diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de index 9793952d6..6ac1e6711 100644 --- a/xorg-server/xkeyboard-config/symbols/de +++ b/xorg-server/xkeyboard-config/symbols/de @@ -49,6 +49,16 @@ xkb_symbols "basic" { include "level3(ralt_switch)" }; +partial alphanumeric_keys +xkb_symbols "legacy" { + // previous standard German layout with tilde as dead key + + include "de(basic)" + name[Group1]="German (legacy)"; + + key { [ plus, asterisk, dead_tilde, dead_macron ] }; +}; + partial alphanumeric_keys xkb_symbols "nodeadkeys" { diff --git a/xorg-server/xkeyboard-config/symbols/pl b/xorg-server/xkeyboard-config/symbols/pl index 1fbc6aa04..b769307ce 100644 --- a/xorg-server/xkeyboard-config/symbols/pl +++ b/xorg-server/xkeyboard-config/symbols/pl @@ -283,8 +283,6 @@ xkb_symbols "dvp" { // home row, right side key { [ n, N, nacute, Nacute ] }; key { [ s, S, sacute, Sacute ] }; - key { [ minus, underscore, hyphen ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" }; - key { [ backslash, bar ] }; // lower row, left side key { [ j, J, doublelowquotemark, rightdoublequotemark ] }; -- cgit v1.2.3