From f4babb3a422e27cd33fba36f7a21eb67b7dee25d Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 13 Jun 2011 19:54:55 +0200
Subject: libX11 mesa xkeyboard-config libXmu libXext libXdmcp libxtrans
 x11proto git update 13 Jun 2011

---
 .../xkeyboard-config/rules/base.extras.xml.in      | 10 ++++++++
 .../rules/compat/variantsMapping.lst               |  2 +-
 xorg-server/xkeyboard-config/symbols/de            | 27 ++++++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

(limited to 'xorg-server')

diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index 119636500..4f8e3800b 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -55,6 +55,16 @@
             </languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>hu</name>
+            <_description>German (with Hungarian letters and no dead keys)</_description>
+            <languageList>
+              <iso639Id>ger</iso639Id>
+              <iso639Id>hun</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
diff --git a/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst b/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst
index d88336fce..80745519d 100644
--- a/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst
+++ b/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst
@@ -1,5 +1,5 @@
 ben	basic		in	ben
-ben	probhat		in	ben_probhat	
+ben	probhat		in	ben_probhat
 dev	basic		in	deva
 dvorak	$dvoraklayouts	%v	dvorak
 dvorak	basic		us	dvorak
diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de
index 7e052986b..df1eaa0ca 100644
--- a/xorg-server/xkeyboard-config/symbols/de
+++ b/xorg-server/xkeyboard-config/symbols/de
@@ -580,6 +580,8 @@ xkb_symbols "htcdream" {
         include "level3(alt_switch)"
 };
 
+// EXTRAS:
+
 partial alphanumeric_keys
 xkb_symbols "us" {
     include "us"
@@ -599,3 +601,28 @@ xkb_symbols "us" {
 
     include "level3(ralt_switch)"
 };
+
+partial alphanumeric_keys
+xkb_symbols "hu" {
+
+    // modify the basic German layout to not have any dead keys and add Hungarian letters
+
+    include "de(basic)"
+    name[Group1]="German (with Hungarian letters and no dead keys)";
+
+    key <AB01> { [         y,          Y, guillemotleft,        less ] };
+    key <AC10> { [odiaeresis, Odiaeresis,        eacute,      Eacute ] };
+    key <AC11> { [adiaeresis, Adiaeresis,        aacute,       Aacute] };
+    key <AD03> { [         e,          E,      EuroSign,    EuroSign ] };
+    key <AD06> { [         z,          Z,     leftarrow,         yen ] };
+    key <AD07> { [         u,          U,        uacute,      Uacute ] };
+    key <AD08> { [         i,          I,        iacute,      Iacute ] };
+    key <AD09> { [         o,          O,  odoubleacute,Odoubleacute ] };
+    key <AD11> { [udiaeresis, Udiaeresis,  udoubleacute,Udoubleacute ] };
+    key <AD12> { [      plus,   asterisk,    asciitilde,      macron ] };
+    key <AE12> { [     acute,      grave,        oacute,      Oacute ] };
+    key <BKSL> { [numbersign, apostrophe,         grave,       grave ] };
+    key <TLDE> { [asciicircum,    degree,       notsign,     notsign ] };
+    
+    
+};
-- 
cgit v1.2.3