xkeyboard-config libX11 pixman mesa git update 18 May 2011

3 files changed, 387 insertions, 311 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/am b/xorg-server/xkeyboard-config/symbols/am
index 29931474f..33711c4a8 100644
--- a/xorg-server/xkeyboard-config/symbols/am
+++ b/xorg-server/xkeyboard-config/symbols/am
@@ -138,6 +138,14 @@ xkb_symbols "phonetic-alt" {
 };
 
 partial alphanumeric_keys
+xkb_symbols "olpc-phonetic" {
+    include "am(phonetic-alt)"
+    name[Group1]= "Armenian (OLPC phonetic)";
+
+    include "group(olpc)"
+};
+
+partial alphanumeric_keys
 xkb_symbols "eastern" {
 
     name[Group1]="Armenian (eastern)";
diff --git a/xorg-server/xkeyboard-config/symbols/lt b/xorg-server/xkeyboard-config/symbols/lt
index 709d08a08..5435460ce 100644
--- a/xorg-server/xkeyboard-config/symbols/lt
+++ b/xorg-server/xkeyboard-config/symbols/lt
@@ -1,311 +1,314 @@
-// Separate keymaps merged into one file by Nerijus Baliūnas, 2002

-

-// Lithuanian Numeric layout - Lithuanian letters on the numeric row

-// based on Lithuanian keyboard map by Ričardas Čepas <rch@richard.eu.org>

-// 3rd and 4th levels added by Mantas Kriaučiūnas <mantas@akl.lt>, 2004

-// Minor modifications and cleanup by Rimas Kudelis <rq@akl.lt>, 2010

-//

-// If you want two layouts, use:

-// Option "XkbLayout" "lt,lt(us)"

-partial default alphanumeric_keys modifier_keys

-xkb_symbols "basic" {

-

-    include "latin"

-    include "eurosign(e)"

-    include "level3(ralt_switch)"

-

-    name[Group1]="Lithuanian";

-

-    key <TLDE> {[               grave,   asciitilde,    acute                ]};

-    key <AE01> {[             aogonek,      Aogonek,        1,        exclam ]};

-    key <AE02> {[              ccaron,       Ccaron,        2,            at ]};

-    key <AE03> {[             eogonek,      Eogonek,        3,    numbersign ]};

-    key <AE04> {[           eabovedot,    Eabovedot,        4,        dollar ]};

-    key <AE05> {[             iogonek,      Iogonek,        5,       percent ]};

-    key <AE06> {[              scaron,       Scaron,        6,   asciicircum ]};

-    key <AE07> {[             uogonek,      Uogonek,        7,     ampersand ]};

-    key <AE08> {[             umacron,      Umacron,        8,      asterisk ]};

-    key <AE09> {[  doublelowquotemark,    parenleft,        9,     parenleft ]};

-    key <AE10> {[ leftdoublequotemark,   parenright,        0,    parenright ]};

-    key <AE11> {[               minus,   underscore,   endash                ]};

-    key <AE12> {[              zcaron,       Zcaron,    equal,          plus ]};

-

-    key <LSGT> {[              endash,     EuroSign                          ]};

-};

-

-// Similar to the above, but uses 3rd and 4th levels in the numeric row

-// for Lithuanian letters

-partial alphanumeric_keys modifier_keys

-xkb_symbols "us" {

-

-    include "latin"

-    include "eurosign(e)"

-    include "level3(ralt_switch)"

-

-    name[Group1]="Lithuanian (US keyboard with Lithuanian letters)";

-

-    key <TLDE> {[    grave,    asciitilde,               acute               ]};

-    key <AE01> {[        1,        exclam,             aogonek,      Aogonek ]};

-    key <AE02> {[        2,            at,              ccaron,       Ccaron ]};

-    key <AE03> {[        3,    numbersign,             eogonek,      Eogonek ]};

-    key <AE04> {[        4,        dollar,           eabovedot,    Eabovedot ]};

-    key <AE05> {[        5,       percent,             iogonek,      Iogonek ]};

-    key <AE06> {[        6,   asciicircum,              scaron,       Scaron ]};

-    key <AE07> {[        7,     ampersand,             uogonek,      Uogonek ]};

-    key <AE08> {[        8,      asterisk,             umacron,      Umacron ]};

-    key <AE09> {[        9,     parenleft,  doublelowquotemark,    parenleft ]};

-    key <AE10> {[        0,    parenright, leftdoublequotemark,   parenright ]};

-    key <AE11> {[    minus,    underscore,              endash               ]};

-    key <AE12> {[    equal,          plus,              zcaron,       Zcaron ]};

-

-    key <LSGT> {[   endash,      EuroSign                                    ]};

-};

-

-// Lithuanian keymap LST 1582:2000

-// The standard is described at http://ims.mii.lt/klav/

-// Extensions:  B01 L3 is "<" , B02 L3 is ">" and B03 L3 is endash to make this

-// layout usable with pc101 and pc104 keyboards.

-//

-// Made by Gediminas Paulauskas <menesis@delfi.lt>

-// Minor modifications by Ričardas Čepas and Rimas Kudelis

- 

-partial alphanumeric_keys modifier_keys

-xkb_symbols "std" {

-

-    include "latin"

-    include "eurosign(e)"

-    include "nbsp(level3)"

-    include "kpdl(comma)"

-    include "level3(ralt_switch)"

-

-    name[Group1]="Lithuanian (standard)";

-

-    key <TLDE> {[        grave,  asciitilde,               acute ]};

-    key <AE01> {[       exclam,           1,                  at ]};

-    key <AE02> {[        minus,           2,          underscore ]};

-    key <AE03> {[        slash,           3,          numbersign ]};

-    key <AE04> {[    semicolon,           4,              dollar ]};

-    key <AE05> {[        colon,           5,             section ]};

-    key <AE06> {[        comma,           6,         asciicircum ]};

-    key <AE07> {[       period,           7,           ampersand ]};

-    key <AE08> {[        equal,           8,            asterisk ]};

-    key <AE09> {[    parenleft,           9,         bracketleft ]};

-    key <AE10> {[   parenright,           0,        bracketright ]};

-    key <AE11> {[     question,        plus,          apostrophe ]};

-    key <AE12> {[            x,           X,             percent ]};

-

-    key <AD01> {[      aogonek,     Aogonek                      ]};

-    key <AD02> {[       zcaron,      Zcaron                      ]};

-    key <AD11> {[      iogonek,     Iogonek,           braceleft ]};

-    key <AD12> {[            w,           W,          braceright ]};

-

-    key <AC04> {[       scaron,      Scaron                      ]};

-    key <AC10> {[      uogonek,     Uogonek                      ]};

-    key <AC11> {[    eabovedot,   Eabovedot,            quotedbl ]};

-    key <BKSL> {[            q,           Q,                 bar ]};

-

-    key <LSGT> {[         less,     greater,              endash ]};

-    key <AB01> {[            z,           Z,                less ]};

-    key <AB02> {[      umacron,     Umacron,             greater ]};

-    key <AB03> {[            c,           C,              endash ]};

-    key <AB08> {[       ccaron,      Ccaron,  doublelowquotemark ]};

-    key <AB09> {[            f,           F, leftdoublequotemark ]};

-    key <AB10> {[      eogonek,     Eogonek,           backslash ]};

-};

-

-// Lithuanian keymap LST 1205-92

-// This standard was made deprecated by LST 1582:2000 above.

-// This keyboard is also know as IBM layout.

-// We follow the map shown at: http://www.registrucentras.lt/litwin/kbdlta.gif

-// and info from Edis Tamošauskas <linas_lietus@yahoo.com>

-//

-// Made by Piter PUNK <piterpk@terra.com.br>

-// Minor modifications and cleanup by Rimas Kudelis, 2010

- 

-partial alphanumeric_keys modifier_keys

-xkb_symbols "ibm" {

-

-    include "latin"

-    include "eurosign(e)"

-    include "nbsp(level3)"

-    include "level3(ralt_switch)"

-

-    name[Group1]="Lithuanian (IBM LST 1205-92)";

-

-    key <TLDE> {[              grave,          asciitilde,          acute               ]};

-    key <AE01> {[             exclam,                   1                               ]};

-    key <AE02> {[           quotedbl,                   2,             at               ]};

-    key <AE03> {[              slash,                   3,     numbersign               ]};

-    key <AE04> {[          semicolon,                   4,         dollar               ]};

-    key <AE05> {[              colon,                   5,        percent               ]};

-    key <AE06> {[              comma,                   6,    asciicircum               ]};

-    key <AE07> {[             period,                   7,      ampersand               ]};

-    key <AE08> {[           question,                   8,       asterisk               ]};

-    key <AE09> {[          parenleft,                   9                               ]};

-    key <AE10> {[         parenright,                   0                               ]};

-    key <AE11> {[         underscore,               minus,         endash               ]};

-    key <AE12> {[               plus,               equal                               ]};

-

-    key <AD01> {[            aogonek,             Aogonek,              q,            Q ]};

-    key <AD02> {[             zcaron,              Zcaron,              w,            W ]};

-    key <AD11> {[            iogonek,             Iogonek,    bracketleft,    braceleft ]};

-    key <AD12> {[ doublelowquotemark, leftdoublequotemark,   bracketright,   braceright ]};

-

-    key <AC10> {[            uogonek,             Uogonek,      semicolon,        colon ]};

-    key <AC11> {[          eabovedot,           Eabovedot,     apostrophe,     quotedbl ]};

-

-    key <LSGT> {[               less,             greater,         endash               ]};

-    key <AB02> {[            umacron,             Umacron,              x,            X ]};

-    key <AB08> {[             ccaron,              Ccaron,          comma,         less ]};

-    key <AB09> {[             scaron,              Scaron,         period,      greater ]};

-    key <AB10> {[            eogonek,             Eogonek,          slash,     question ]};

-};

-

-// LEKP and LEKPa layouts 1.0

-// For more info visit http://lekp.info

-// Created by Tautrimas Pajarskas, 2007

-// Made by Ernestas Lukoševičius, 2007

-// Minor cleanup by Rimas Kudelis, 2010

-

-partial alphanumeric_keys modifier_keys

-xkb_symbols "lekp" {

-    

-    include "capslock(backspace)"

-    include "level3(ralt_switch)"

-    

-    name[Group1]="Lithuanian (LEKP)";

-    

-    key <TLDE> {[        grave,          asciitilde,         acute ]};

-    key <AE01> {[        slash,          numbersign,           bar ]};

-    key <AE02> {[    backslash,                  at,       section ]};

-    key <AE03> {[       period,           braceleft                ]};

-    key <AE04> {[        comma,          braceright                ]};

-    key <AE05> {[            f,                   F                ]};

-    key <AE06> {[       exclam,              endash                ]};

-    key <AE07> {[            w,                   W                ]};

-    key <AE08> {[      uogonek,             Uogonek                ]};

-    key <AE09> {[      iogonek,             Iogonek                ]};

-    key <AE10> {[    parenleft,  doublelowquotemark,    registered ]};

-    key <AE11> {[   parenright, leftdoublequotemark,     copyright ]};

-    key <AE12> {[        colon,           ampersand,     trademark ]};

-

-    key <AD01> {[            q,                   Q,      EuroSign ]};

-    key <AD02> {[            g,                   G,             7 ]};

-    key <AD03> {[            r,                   R,             8 ]};

-    key <AD04> {[            l,                   L,             9 ]};

-    key <AD05> {[            d,                   D,       percent ]};

-    key <AD06> {[       ccaron,              Ccaron                ]};

-    key <AD07> {[            j,                   J                ]};

-    key <AD08> {[            u,                   U,        period ]};

-    key <AD09> {[    eabovedot,           Eabovedot,         minus ]};

-    key <AD10> {[      eogonek,             Eogonek,         slash ]};

-    key <AD11> {[     question,         bracketleft,      division ]};

-    key <AD12> {[        equal,        bracketright                ]};

-

-    key <AC01> {[            a,                   A,             0 ]};

-    key <AC02> {[            k,                   K,             4 ]};

-    key <AC03> {[            s,                   S,             5 ]};

-    key <AC04> {[            t,                   T,             6 ]};

-    key <AC05> {[            m,                   M,        dollar ]};

-    key <AC06> {[            p,                   P                ]};

-    key <AC07> {[            n,                   N                ]};

-    key <AC08> {[            e,                   E,         comma ]};

-    key <AC09> {[            i,                   I,          plus ]};

-    key <AC10> {[            o,                   O,      asterisk ]};

-    key <AC11> {[            y,                   Y,      multiply ]};

-    key <BKSL> {[   apostrophe,          underscore                ]};

-

-    key <LSGT> {[    semicolon,            quotedbl,      sterling ]};

-    key <AB01> {[            z,                   Z,   asciicircum ]};

-    key <AB02> {[            x,                   X,             1 ]};

-    key <AB03> {[            c,                   C,             2 ]};

-    key <AB04> {[            v,                   V,             3 ]};

-    key <AB05> {[       zcaron,              Zcaron                ]};

-    key <AB06> {[       scaron,              Scaron                ]};

-    key <AB07> {[            b,                   B,        degree ]};

-    key <AB08> {[      umacron,             Umacron,          less ]};

-    key <AB09> {[      aogonek,             Aogonek,       greater ]};

-    key <AB10> {[            h,                   H                ]};

-};

-

-partial alphanumeric_keys modifier_keys

-xkb_symbols "lekpa" {

-

-    include "capslock(backspace)"

-    include "level3(ralt_switch)"

-

-    name[Group1]="Lithuanian (LEKPa)";

-

-    key <TLDE> {[        grave,          asciitilde,         acute ]};

-    key <AE01> {[        slash,            quotedbl,           bar ]};

-    key <AE02> {[    backslash,                  at,       section ]};

-    key <AE03> {[       period,           braceleft,    numbersign ]};

-    key <AE04> {[        comma,          braceright,      sterling ]};

-    key <AE05> {[            f,                   F,     ampersand ]};

-    key <AE06> {[       exclam,              endash                ]};

-    key <AE07> {[            w,                   W                ]};

-    key <AE08> {[      uogonek,             Uogonek                ]};

-    key <AE09> {[      iogonek,             Iogonek                ]};

-    key <AE10> {[    parenleft,  doublelowquotemark,    registered ]};

-    key <AE11> {[   parenright, leftdoublequotemark,     copyright ]};

-    key <AE12> {[        colon,           semicolon,     trademark ]};

-

-    key <AD01> {[            q,                   Q,      EuroSign ]};

-    key <AD02> {[            g,                   G,             7 ]};

-    key <AD03> {[            r,                   R,             8 ]};

-    key <AD04> {[            l,                   L,             9 ]};

-    key <AD05> {[            d,                   D,       percent ]};

-    key <AD06> {[       ccaron,              Ccaron                ]};

-    key <AD07> {[            j,                   J                ]};

-    key <AD08> {[            u,                   U,        period ]};

-    key <AD09> {[    eabovedot,           Eabovedot,         minus ]};

-    key <AD10> {[      eogonek,             Eogonek,         slash ]};

-    key <AD11> {[     question,         bracketleft,      division ]};

-    key <AD12> {[        equal,        bracketright                ]};

-

-    key <AC01> {[            a,                   A,             0 ]};

-    key <AC02> {[            k,                   K,             4 ]};

-    key <AC03> {[            s,                   S,             5 ]};

-    key <AC04> {[            t,                   T,             6 ]};

-    key <AC05> {[            m,                   M,        dollar ]};

-    key <AC06> {[            p,                   P                ]};

-    key <AC07> {[            n,                   N                ]};

-    key <AC08> {[            e,                   E,         comma ]};

-    key <AC09> {[            i,                   I,          plus ]};

-    key <AC10> {[            o,                   O,      asterisk ]};

-    key <AC11> {[            y,                   Y,      multiply ]};

-    key <BKSL> {[   apostrophe,          underscore                ]};

-

-    key <AB01> {[            z,                   Z,   asciicircum ]};

-    key <AB02> {[            x,                   X,             1 ]};

-    key <AB03> {[            c,                   C,             2 ]};

-    key <AB04> {[            v,                   V,             3 ]};

-    key <AB05> {[       zcaron,              Zcaron                ]};

-    key <AB06> {[       scaron,              Scaron                ]};

-    key <AB07> {[            b,                   B,        degree ]};

-    key <AB08> {[      umacron,             Umacron,          less ]};

-    key <AB09> {[      aogonek,             Aogonek,       greater ]};

-    key <AB10> {[            h,                   H                ]};

-};

-

-partial alphanumeric_keys modifier_keys

-xkb_symbols "dvorak" {

-

-    include "us(dvorak)"

-

-    name[Group1]="Lithuanian (Dvorak)";

-

-    key <AE01>	{ [   aogonek,      Aogonek,        1,      exclam ] };

-    key <AE02>	{ [    ccaron,       Ccaron,        2,          at ] };

-    key <AE03>	{ [   eogonek,      Eogonek,        3,  numbersign ] };

-    key <AE04>	{ [ eabovedot,    Eabovedot,        4,      dollar ] };

-    key <AE05>	{ [   iogonek,      Iogonek,        5,     percent ] };

-    key <AE06>	{ [    scaron,       Scaron,        6, asciicircum ] };

-    key <AE07>	{ [   uogonek,      Uogonek,        7,   ampersand ] };

-    key <AE08>	{ [   umacron,      Umacron,        8,    asterisk ] };

-    key <AE09>	{ [doublelowquotemark,  parenleft,  9,   parenleft ] };

-    key <AE10>	{ [leftdoublequotemark,parenright,  0,  parenright ] };

-    key <AD12>	{ [    zcaron,       Zcaron,    equal,        plus ] };

-

-    include "level3(ralt_switch)"

-};

+// Separate keymaps merged into one file by Nerijus Baliūnas, 2002
+
+// Lithuanian Numeric layout - Lithuanian letters on the numeric row
+// based on Lithuanian keyboard map by Ričardas Čepas <rch@richard.eu.org>
+// 3rd and 4th levels added by Mantas Kriaučiūnas <mantas@akl.lt>, 2004
+// Minor modifications and cleanup by Rimas Kudelis <rq@akl.lt>, 2010
+//
+// If you want two layouts, use:
+// Option "XkbLayout" "lt,lt(us)"
+partial default alphanumeric_keys modifier_keys
+xkb_symbols "basic" {
+
+    include "latin"
+    include "eurosign(e)"
+    include "level3(ralt_switch)"
+
+    name[Group1]="Lithuanian";
+
+    key <TLDE> {[               grave,   asciitilde,    acute                ]};
+    key <AE01> {[             aogonek,      Aogonek,        1,        exclam ]};
+    key <AE02> {[              ccaron,       Ccaron,        2,            at ]};
+    key <AE03> {[             eogonek,      Eogonek,        3,    numbersign ]};
+    key <AE04> {[           eabovedot,    Eabovedot,        4,        dollar ]};
+    key <AE05> {[             iogonek,      Iogonek,        5,       percent ]};
+    key <AE06> {[              scaron,       Scaron,        6,   asciicircum ]};
+    key <AE07> {[             uogonek,      Uogonek,        7,     ampersand ]};
+    key <AE08> {[             umacron,      Umacron,        8,      asterisk ]};
+    key <AE09> {[  doublelowquotemark,    parenleft,        9,     parenleft ]};
+    key <AE10> {[ leftdoublequotemark,   parenright,        0,    parenright ]};
+    key <AE11> {[               minus,   underscore,   endash                ]};
+    key <AE12> {[              zcaron,       Zcaron,    equal,          plus ]};
+
+    key <LSGT> {[              endash,     EuroSign                          ]};
+};
+
+// Similar to the above, but uses 3rd and 4th levels in the numeric row
+// for Lithuanian letters
+partial alphanumeric_keys modifier_keys
+xkb_symbols "us" {
+
+    include "latin"
+    include "eurosign(e)"
+    include "level3(ralt_switch)"
+
+    name[Group1]="Lithuanian (US keyboard with Lithuanian letters)";
+
+    key <TLDE> {[    grave,    asciitilde,               acute               ]};
+    key <AE01> {[        1,        exclam,             aogonek,      Aogonek ]};
+    key <AE02> {[        2,            at,              ccaron,       Ccaron ]};
+    key <AE03> {[        3,    numbersign,             eogonek,      Eogonek ]};
+    key <AE04> {[        4,        dollar,           eabovedot,    Eabovedot ]};
+    key <AE05> {[        5,       percent,             iogonek,      Iogonek ]};
+    key <AE06> {[        6,   asciicircum,              scaron,       Scaron ]};
+    key <AE07> {[        7,     ampersand,             uogonek,      Uogonek ]};
+    key <AE08> {[        8,      asterisk,             umacron,      Umacron ]};
+    key <AE09> {[        9,     parenleft,  doublelowquotemark,    parenleft ]};
+    key <AE10> {[        0,    parenright, leftdoublequotemark,   parenright ]};
+    key <AE11> {[    minus,    underscore,              endash               ]};
+    key <AE12> {[    equal,          plus,              zcaron,       Zcaron ]};
+
+    key <LSGT> {[   endash,      EuroSign                                    ]};
+};
+
+// Lithuanian keymap LST 1582:2000
+// The standard is described at http://ims.mii.lt/klav/
+// Extensions:  B01 L3 is "<" , B02 L3 is ">" and B03 L3 is endash to make this
+// layout usable with pc101 and pc104 keyboards.
+//
+// Made by Gediminas Paulauskas <menesis@delfi.lt>
+// Minor modifications by Ričardas Čepas and Rimas Kudelis
+ 
+partial alphanumeric_keys modifier_keys
+xkb_symbols "std" {
+
+    include "latin"
+    include "eurosign(e)"
+    include "nbsp(level3)"
+    include "kpdl(comma)"
+    include "level3(ralt_switch)"
+
+    name[Group1]="Lithuanian (standard)";
+
+    key <TLDE> {[        grave,  asciitilde,               acute ]};
+    key <AE01> {[       exclam,           1,                  at ]};
+    key <AE02> {[        minus,           2,          underscore ]};
+    key <AE03> {[        slash,           3,          numbersign ]};
+    key <AE04> {[    semicolon,           4,              dollar ]};
+    key <AE05> {[        colon,           5,             section ]};
+    key <AE06> {[        comma,           6,         asciicircum ]};
+    key <AE07> {[       period,           7,           ampersand ]};
+    key <AE08> {[        equal,           8,            asterisk ]};
+    key <AE09> {[    parenleft,           9,         bracketleft ]};
+    key <AE10> {[   parenright,           0,        bracketright ]};
+    key <AE11> {[     question,        plus,          apostrophe ]};
+    key <AE12> {[            x,           X,             percent ]};
+
+    key <AD01> {[      aogonek,     Aogonek                      ]};
+    key <AD02> {[       zcaron,      Zcaron                      ]};
+    key <AD11> {[      iogonek,     Iogonek,           braceleft ]};
+    key <AD12> {[            w,           W,          braceright ]};
+
+    key <AC04> {[       scaron,      Scaron                      ]};
+    key <AC10> {[      uogonek,     Uogonek                      ]};
+    key <AC11> {[    eabovedot,   Eabovedot,            quotedbl ]};
+    key <BKSL> {[            q,           Q,                 bar ]};
+
+    key <LSGT> {[         less,     greater,              endash ]};
+    key <AB01> {[            z,           Z,                less ]};
+    key <AB02> {[      umacron,     Umacron,             greater ]};
+    key <AB03> {[            c,           C,              endash ]};
+    key <AB08> {[       ccaron,      Ccaron,  doublelowquotemark ]};
+    key <AB09> {[            f,           F, leftdoublequotemark ]};
+    key <AB10> {[      eogonek,     Eogonek,           backslash ]};
+};
+
+// Lithuanian keymap LST 1205-92
+// This standard was made deprecated by LST 1582:2000 above.
+// This keyboard is also know as IBM layout.
+// We follow the map shown at: http://www.registrucentras.lt/litwin/kbdlta.gif
+// and info from Edis Tamošauskas <linas_lietus@yahoo.com>
+//
+// Made by Piter PUNK <piterpk@terra.com.br>
+// Minor modifications and cleanup by Rimas Kudelis, 2010
+ 
+partial alphanumeric_keys modifier_keys
+xkb_symbols "ibm" {
+
+    include "latin"
+    include "eurosign(e)"
+    include "nbsp(level3)"
+    include "level3(ralt_switch)"
+
+    name[Group1]="Lithuanian (IBM LST 1205-92)";
+
+    key <TLDE> {[              grave,          asciitilde,          acute               ]};
+    key <AE01> {[             exclam,                   1                               ]};
+    key <AE02> {[           quotedbl,                   2,             at               ]};
+    key <AE03> {[              slash,                   3,     numbersign               ]};
+    key <AE04> {[          semicolon,                   4,         dollar               ]};
+    key <AE05> {[              colon,                   5,        percent               ]};
+    key <AE06> {[              comma,                   6,    asciicircum               ]};
+    key <AE07> {[             period,                   7,      ampersand               ]};
+    key <AE08> {[           question,                   8,       asterisk               ]};
+    key <AE09> {[          parenleft,                   9                               ]};
+    key <AE10> {[         parenright,                   0                               ]};
+    key <AE11> {[         underscore,               minus,         endash               ]};
+    key <AE12> {[               plus,               equal                               ]};
+
+    key <AD01> {[            aogonek,             Aogonek,              q,            Q ]};
+    key <AD02> {[             zcaron,              Zcaron,              w,            W ]};
+    key <AD11> {[            iogonek,             Iogonek,    bracketleft,    braceleft ]};
+    key <AD12> {[ doublelowquotemark, leftdoublequotemark,   bracketright,   braceright ]};
+
+    key <AC10> {[            uogonek,             Uogonek,      semicolon,        colon ]};
+    key <AC11> {[          eabovedot,           Eabovedot,     apostrophe,     quotedbl ]};
+
+    key <LSGT> {[               less,             greater,         endash               ]};
+    key <AB02> {[            umacron,             Umacron,              x,            X ]};
+    key <AB08> {[             ccaron,              Ccaron,          comma,         less ]};
+    key <AB09> {[             scaron,              Scaron,         period,      greater ]};
+    key <AB10> {[            eogonek,             Eogonek,          slash,     question ]};
+};
+
+// LEKP and LEKPa layouts 1.0
+// For more info visit http://lekp.info
+// Created by Tautrimas Pajarskas, 2007
+// Made by Ernestas Lukoševičius, 2007
+// Minor cleanup by Rimas Kudelis, 2010
+
+partial alphanumeric_keys modifier_keys
+xkb_symbols "lekp" {
+    
+    include "capslock(backspace)"
+    include "level3(ralt_switch)"
+    
+    name[Group1]="Lithuanian (LEKP)";
+    
+    key <TLDE> {[        grave,          asciitilde,         acute ]};
+    key <AE01> {[        slash,          numbersign,           bar ]};
+    key <AE02> {[    backslash,                  at,       section ]};
+    key <AE03> {[       period,           braceleft                ]};
+    key <AE04> {[        comma,          braceright                ]};
+    key <AE05> {[            f,                   F                ]};
+    key <AE06> {[       exclam,              endash                ]};
+    key <AE07> {[            w,                   W                ]};
+    key <AE08> {[      uogonek,             Uogonek                ]};
+    key <AE09> {[      iogonek,             Iogonek                ]};
+    key <AE10> {[    parenleft,  doublelowquotemark,    registered ]};
+    key <AE11> {[   parenright, leftdoublequotemark,     copyright ]};
+    key <AE12> {[        colon,           ampersand,     trademark ]};
+
+    key <AD01> {[            q,                   Q,      EuroSign ]};
+    key <AD02> {[            g,                   G,             7 ]};
+    key <AD03> {[            r,                   R,             8 ]};
+    key <AD04> {[            l,                   L,             9 ]};
+    key <AD05> {[            d,                   D,       percent ]};
+    key <AD06> {[       ccaron,              Ccaron                ]};
+    key <AD07> {[            j,                   J                ]};
+    key <AD08> {[            u,                   U,        period ]};
+    key <AD09> {[    eabovedot,           Eabovedot,         minus ]};
+    key <AD10> {[      eogonek,             Eogonek,         slash ]};
+    key <AD11> {[     question,         bracketleft,      division ]};
+    key <AD12> {[        equal,        bracketright                ]};
+
+    key <AC01> {[            a,                   A,             0 ]};
+    key <AC02> {[            k,                   K,             4 ]};
+    key <AC03> {[            s,                   S,             5 ]};
+    key <AC04> {[            t,                   T,             6 ]};
+    key <AC05> {[            m,                   M,        dollar ]};
+    key <AC06> {[            p,                   P                ]};
+    key <AC07> {[            n,                   N                ]};
+    key <AC08> {[            e,                   E,         comma ]};
+    key <AC09> {[            i,                   I,          plus ]};
+    key <AC10> {[            o,                   O,      asterisk ]};
+    key <AC11> {[            y,                   Y,      multiply ]};
+    key <BKSL> {[   apostrophe,          underscore                ]};
+
+    key <LSGT> {[    semicolon,            quotedbl,      sterling ]};
+    key <AB01> {[            z,                   Z,   asciicircum ]};
+    key <AB02> {[            x,                   X,             1 ]};
+    key <AB03> {[            c,                   C,             2 ]};
+    key <AB04> {[            v,                   V,             3 ]};
+    key <AB05> {[       zcaron,              Zcaron                ]};
+    key <AB06> {[       scaron,              Scaron                ]};
+    key <AB07> {[            b,                   B,        degree ]};
+    key <AB08> {[      umacron,             Umacron,          less ]};
+    key <AB09> {[      aogonek,             Aogonek,       greater ]};
+    key <AB10> {[            h,                   H                ]};
+};
+
+partial alphanumeric_keys modifier_keys
+xkb_symbols "lekpa" {
+
+    include "capslock(backspace)"
+    include "level3(ralt_switch)"
+
+    name[Group1]="Lithuanian (LEKPa)";
+
+    key <TLDE> {[        grave,          asciitilde,         acute ]};
+    key <AE01> {[        slash,            quotedbl,           bar ]};
+    key <AE02> {[    backslash,                  at,       section ]};
+    key <AE03> {[       period,           braceleft,    numbersign ]};
+    key <AE04> {[        comma,          braceright,      sterling ]};
+    key <AE05> {[            f,                   F,     ampersand ]};
+    key <AE06> {[       exclam,              endash                ]};
+    key <AE07> {[            w,                   W                ]};
+    key <AE08> {[      uogonek,             Uogonek                ]};
+    key <AE09> {[      iogonek,             Iogonek                ]};
+    key <AE10> {[    parenleft,  doublelowquotemark,    registered ]};
+    key <AE11> {[   parenright, leftdoublequotemark,     copyright ]};
+    key <AE12> {[        colon,           semicolon,     trademark ]};
+
+    key <AD01> {[            q,                   Q,      EuroSign ]};
+    key <AD02> {[            g,                   G,             7 ]};
+    key <AD03> {[            r,                   R,             8 ]};
+    key <AD04> {[            l,                   L,             9 ]};
+    key <AD05> {[            d,                   D,       percent ]};
+    key <AD06> {[       ccaron,              Ccaron                ]};
+    key <AD07> {[            j,                   J                ]};
+    key <AD08> {[            u,                   U,        period ]};
+    key <AD09> {[    eabovedot,           Eabovedot,         minus ]};
+    key <AD10> {[      eogonek,             Eogonek,         slash ]};
+    key <AD11> {[     question,         bracketleft,      division ]};
+    key <AD12> {[        equal,        bracketright                ]};
+
+    key <AC01> {[            a,                   A,             0 ]};
+    key <AC02> {[            k,                   K,             4 ]};
+    key <AC03> {[            s,                   S,             5 ]};
+    key <AC04> {[            t,                   T,             6 ]};
+    key <AC05> {[            m,                   M,        dollar ]};
+    key <AC06> {[            p,                   P                ]};
+    key <AC07> {[            n,                   N                ]};
+    key <AC08> {[            e,                   E,         comma ]};
+    key <AC09> {[            i,                   I,          plus ]};
+    key <AC10> {[            o,                   O,      asterisk ]};
+    key <AC11> {[            y,                   Y,      multiply ]};
+    key <BKSL> {[   apostrophe,          underscore                ]};
+
+    key <AB01> {[            z,                   Z,   asciicircum ]};
+    key <AB02> {[            x,                   X,             1 ]};
+    key <AB03> {[            c,                   C,             2 ]};
+    key <AB04> {[            v,                   V,             3 ]};
+    key <AB05> {[       zcaron,              Zcaron                ]};
+    key <AB06> {[       scaron,              Scaron                ]};
+    key <AB07> {[            b,                   B,        degree ]};
+    key <AB08> {[      umacron,             Umacron,          less ]};
+    key <AB09> {[      aogonek,             Aogonek,       greater ]};
+    key <AB10> {[            h,                   H                ]};
+};
+
+// EXTRAS:
+
+partial alphanumeric_keys modifier_keys
+xkb_symbols "us_dvorak" {
+
+    include "us(dvorak)"
+
+    name[Group1]="Lithuanian (US Dvorak with Lithuanian letters)";
+
+    key <AE01>	{ [        1,      exclam,    aogonek,      Aogonek ] };
+    key <AE02>	{ [        2,          at,     ccaron,       Ccaron ] };
+    key <AE03>	{ [        3,  numbersign,    eogonek,      Eogonek ] };
+    key <AE04>	{ [        4,      dollar,  eabovedot,    Eabovedot ] };
+    key <AE05>	{ [        5,     percent,    iogonek,      Iogonek ] };
+    key <AE06>	{ [        6, asciicircum,     scaron,       Scaron ] };
+    key <AE07>	{ [        7,   ampersand,    uogonek,      Uogonek ] };
+    key <AE08>	{ [        8,    asterisk,    umacron,      Umacron ] };
+    key <AE09>	{ [        9,   parenleft, doublelowquotemark,  parenleft ] };
+    key <AE10>	{ [        0,  parenright, leftdoublequotemark,parenright ] };
+    key <AD12>	{ [    equal,        plus,     zcaron,       Zcaron ] };
+
+    include "level3(ralt_switch)"
+};
+
diff --git a/xorg-server/xkeyboard-config/symbols/ru b/xorg-server/xkeyboard-config/symbols/ru
index 7cbb28f46..fdf82539d 100644
--- a/xorg-server/xkeyboard-config/symbols/ru
+++ b/xorg-server/xkeyboard-config/symbols/ru
@@ -586,3 +586,68 @@ xkb_symbols "chu"
 	    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU, U2DFB	]	};
 	    key <AB10> {        [          period,    comma, semicolon, exclam      ]       };
 };
+
+
+// RUU (Russian-Ukrainian United keyboard layout).
+// Modified Russian standart keyboard with third level contains ukrainian
+// and belorusian alphabetic letters and commonly used Unicode symbols.
+// Description http://wiki.opennet.ru/RUU [russian]
+// Vasyĺ V. Vercynśkyj <fuckel@ukr.net>
+// Last Changes 2011/05/11
+//
+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
+// │ ' ~ │ ! ≈ │ " ∞ │ № ₴ │ ; € │ % ‰ │ : ≤ │ ? ≥ │ * × │ ( { │ ) } │ _ – │ + ± ┃ ⌫       ┃
+// │ ’  ́ │ 1 ÷ │ 2 ¤ │ 3 § │ 4 $ │ 5 ° │ 6 < │ 7 > │ 8 • │ 9 [ │ 0 ] │ - — │ = ≠ ┃Backspace┃
+// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
+// ┃       ┃ Й   │ Ц   │ У Ў │ К   │ Е Ё │ Н   │ Г Ґ │ Ш   │ Щ   │ З   │ Х   │ Ъ Ї ┃ Enter ┃
+// ┃ Tab ↹ ┃ й   │ ц   │ у ў │ к ® │ е ё │ н   │ г ґ │ ш   │ щ   │ з   │ х   │ ъ ї ┃   ⏎   ┃
+// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃
+// ┃ Caps   ┃ Ф   │ Ы І │ В   │ А   │ П   │ Р   │ О   │ Л   │ Д   │ Ж   │ Э Є │ | ¦ ┃      ┃
+// ┃ Lock ⇬ ┃ ф   │ ы і │ в   │ а   │ п   │ р   │ о   │ л   │ д   │ ж   │ э є │ / \ ┃      ┃
+// ┣━━━━━━━━┻━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┲━━━┷━━━━━┻━━━━━━┫
+// ┃          ┃ Я   │ Ч   │ С   │ М   │ И   │ Т   │ Ь   │ Б „ │ Ю “ │ , … ┃                ┃
+// ┃  Shift ⇧ ┃ я   │ ч   │ с © │ м   │ и   │ т ™ │ ь µ │ б « │ ю » │ . / ┃     Shift ⇧    ┃
+// ┣━━━━━━━┳━━┻━━━━┳┷━━━━━┷┱────┴─────┴─────┴─────┴─────┴─────┴┲━━━━┷━━┳━━┻━━━━┳━━━━━━━┳━━━┛
+// ┃       ┃       ┃       ┃                                   ┃       ┃       ┃       ┃
+// ┃ Ctrl  ┃ Meta  ┃  Alt  ┃                Space              ┃AltGr ⇮┃ Menu  ┃ Ctrl  ┃
+// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
+
+
+
+partial alphanumeric_keys
+xkb_symbols "ruu" {
+    include "ru(common)"
+
+    name[Group1]= "Russian (with UKR and BEL layout)";
+
+    key <TLDE> {    [	U2019,		apostrophe,	U0301,		asciitilde	]	};	// Apostrophe and Stress symbol
+    key <AE01> {    [	1,		exclam,		U00F7,		U2248		]	};	// Division Sign and Almost Equal To
+    key <AE02> {    [	2,		quotedbl,	currency,	infinity	]	};
+    key <AE03> {    [	3,		numerosign,	U00A7,		U20B4		]	};	// Paragraph and Hryvnia sign
+    key <AE04> {    [	4,		semicolon,	dollar,		EuroSign	]	};
+    key <AE05> {    [	5,		percent,	degree,		U2030		]	};	// Per Mille Sign
+    key <AE06> {    [	6,		colon,		less,		U2264		]	};	// Less-Than Or Equal To
+    key <AE07> {    [	7,		question,	greater,	U2265		]	};	// Greater-Than Or Equal To
+    key <AE08> {    [	8,		asterisk,	enfilledcircbullet, U00D7	]	};	// Multiplication Sign
+    key <AE09> {    [	9,		parenleft,	bracketleft,	braceleft	]	};
+    key <AE10> {    [	0,		parenright,	bracketright,	braceright	]	};
+    key <AE11> {    [	minus,		underscore,	emdash,		endash		]	};
+    key <AE12> {    [	equal,		plus,		notequal,	plusminus	]	};
+    key <AD03> {    [	Cyrillic_u,	Cyrillic_U, Byelorussian_shortu, Byelorussian_SHORTU ]	};
+    key <AD04> {    [	Cyrillic_ka,	Cyrillic_KA,	registered			]	};	// Registered tm
+    key <AD05> {    [	Cyrillic_ie,	Cyrillic_IE,	Cyrillic_io,	Cyrillic_IO	]	};
+    key <AD07> {    [Cyrillic_ge, Cyrillic_GE, Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
+    key <AD10> {    [	Cyrillic_ze,	Cyrillic_ZE,	U00B6				]	};	// Pilcrow Sign
+    key <AD12> {    [Cyrillic_hardsign,	Cyrillic_HARDSIGN, Ukrainian_yi, Ukrainian_YI	]	};
+    key <AC02> {    [	Cyrillic_yeru,	Cyrillic_YERU,	Ukrainian_i,  Ukrainian_I	]	};
+    key <AC11> {    [	Cyrillic_e,	Cyrillic_E,	Ukrainian_ie,Ukrainian_IE	]	};
+    key <BKSL> {    [	slash,		bar,		backslash,	U00A6		]	};	// Broken Bar
+    key <AB03> {    [	Cyrillic_es,	Cyrillic_ES,	copyright			]	};
+    key <AB06> {    [	Cyrillic_te,	Cyrillic_TE,	trademark			]	};
+    key <AB07> {    [	Cyrillic_softsign, Cyrillic_SOFTSIGN, U00B5			]	};	// Micro Sign
+    key <AB08> {    [	Cyrillic_be,	Cyrillic_BE,	guillemotleft,	doublelowquotemark ]	};
+    key <AB09> {    [	Cyrillic_yu,	Cyrillic_YU,	guillemotright,	leftdoublequotemark ]	};
+    key <AB10> {    [	period,		comma,		slash,		ellipsis	]	};
+
+    include "level3(ralt_switch)"
+};