diff -Naur xkeyboard-config-2.5/rules/base.xml.in xkeyboard-config-2.5.new/rules/base.xml.in
--- xkeyboard-config-2.5/rules/base.xml.in 2012-01-20 00:27:04.000000000 +0100
+++ xkeyboard-config-2.5.new/rules/base.xml.in 2012-01-21 21:56:44.899510087 +0100
@@ -856,21 +856,21 @@
- microsoftmult
+ microsoftmult
<_description>Microsoft Wireless Multimedia Keyboard 1.0A
Microsoft Inc.
- microsoftelite
+ microsoftelite
<_description>Microsoft Natural Keyboard Elite
Microsoft Inc.
- microsoftccurve2k
+ microsoftccurve2k
<_description>Microsoft Comfort Curve Keyboard 2000
Microsoft Inc.
@@ -4044,6 +4044,12 @@
+ bepo
+ <_description>Russian (Bepo, ergonomic, Dvorak way)
+
+
+
+
phonetic
<_description>Russian (phonetic)
@@ -5589,7 +5595,7 @@
grp:rctrl_rshift_toggle
<_description>Right Ctrl+Right Shift
-
+
-
diff -Naur xkeyboard-config-2.5/rules/evdev.xml.in xkeyboard-config-2.5.new/rules/evdev.xml.in
--- xkeyboard-config-2.5/rules/evdev.xml.in 2012-01-20 00:30:58.000000000 +0100
+++ xkeyboard-config-2.5.new/rules/evdev.xml.in 2012-01-21 21:57:28.706177055 +0100
@@ -856,21 +856,21 @@
- microsoftmult
+ microsoftmult
<_description>Microsoft Wireless Multimedia Keyboard 1.0A
Microsoft Inc.
- microsoftelite
+ microsoftelite
<_description>Microsoft Natural Keyboard Elite
Microsoft Inc.
- microsoftccurve2k
+ microsoftccurve2k
<_description>Microsoft Comfort Curve Keyboard 2000
Microsoft Inc.
@@ -4044,6 +4044,12 @@
+ bepo
+ <_description>Russian (Bepo, ergonomic, Dvorak way)
+
+
+
+
phonetic
<_description>Russian (phonetic)
@@ -5589,7 +5595,7 @@
grp:rctrl_rshift_toggle
<_description>Right Ctrl+Right Shift
-
+
-
diff -Naur xkeyboard-config-2.5/symbols/ru xkeyboard-config-2.5.new/symbols/ru
--- xkeyboard-config-2.5/symbols/ru 2012-01-20 00:21:06.000000000 +0100
+++ xkeyboard-config-2.5.new/symbols/ru 2012-01-21 21:58:46.052844255 +0100
@@ -22,7 +22,7 @@
key { [ backslash, slash ] };
};
-partial hidden alphanumeric_keys
+partial hidden alphanumeric_keys
xkb_symbols "common" {
key { [ 1, exclam ] };
@@ -242,7 +242,7 @@
};
-partial alphanumeric_keys
+partial alphanumeric_keys
xkb_symbols "os_legacy" {
include "ru(common)"
@@ -253,7 +253,7 @@
key { [ 0x010004D5, 0x010004D4 ] };
};
-partial alphanumeric_keys
+partial alphanumeric_keys
xkb_symbols "os_winkeys" {
include "ru(winkeys)"
@@ -336,7 +336,7 @@
// Vlad Shakhov
// Last Changes 2007/10/23 by Vlad Shakhov
-partial alphanumeric_keys
+partial alphanumeric_keys
xkb_symbols "kom" {
include "ru(winkeys)"
@@ -345,11 +345,11 @@
key.type[group1]="FOUR_LEVEL_ALPHABETIC";
-// cyrilllic o with diaeresis
- key { [ Cyrillic_o, Cyrillic_O,
+// cyrilllic o with diaeresis
+ key { [ Cyrillic_o, Cyrillic_O,
U04E7, U04E6 ] };
-
-// hard I as additional key for soft Cyrillic_I
+
+// hard I as additional key for soft Cyrillic_I
key { [ Cyrillic_i, Cyrillic_I,
Ukrainian_i, Ukrainian_I ] };
@@ -404,7 +404,7 @@
//based on the Kalmyk language layout: http://soft.oyrat.org/
//Nikolay Korneev
//Toli Miron
-
+
partial alphanumeric_keys
xkb_symbols "xal" {
include "ru(winkeys)"
@@ -416,24 +416,24 @@
key { [ question, exclam, 1 ] };
key { [ numerosign, quotedbl, 2 ] };
key { [ Cyrillic_u_straight, Cyrillic_U_straight, 3 ] };
- key { [ Cyrillic_schwa, Cyrillic_SCHWA, 4 ] };
+ key { [ Cyrillic_schwa, Cyrillic_SCHWA, 4 ] };
key { [ asterisk, percent, 5 ] };
key { [ Cyrillic_en_descender, Cyrillic_EN_descender, 6 ] };
- key { [ Cyrillic_o_bar, Cyrillic_O_bar, 7 ] };
- key { [ Cyrillic_shha, Cyrillic_SHHA, 8 ] };
+ key { [ Cyrillic_o_bar, Cyrillic_O_bar, 7 ] };
+ key { [ Cyrillic_shha, Cyrillic_SHHA, 8 ] };
key { [ Cyrillic_zhe_descender, Cyrillic_ZHE_descender, 9 ] };
key { [ semicolon, colon, 0 ] };
key { [ parenleft, parenright, Cyrillic_io, Cyrillic_IO ] };
key { [ Cyrillic_tse, Cyrillic_TSE, dollar ] };
- key { [ Cyrillic_u, Cyrillic_U, EuroSign ] };
- key { [ Cyrillic_ka, Cyrillic_KA, registered ] };
- key { [ Cyrillic_ie, Cyrillic_IE, trademark ] };
- key { [ Cyrillic_ha, Cyrillic_HA, bracketleft ] };
+ key { [ Cyrillic_u, Cyrillic_U, EuroSign ] };
+ key { [ Cyrillic_ka, Cyrillic_KA, registered ] };
+ key { [ Cyrillic_ie, Cyrillic_IE, trademark ] };
+ key { [ Cyrillic_ha, Cyrillic_HA, bracketleft ] };
key { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, bracketright ] };
key { [ Cyrillic_e, Cyrillic_E, apostrophe ] };
- key { [ Cyrillic_es, Cyrillic_ES, copyright ] };
+ key { [ Cyrillic_es, Cyrillic_ES, copyright ] };
key { [ Cyrillic_be, Cyrillic_BE, less ] };
key { [ Cyrillic_yu, Cyrillic_YU, greater ] };
@@ -475,8 +475,8 @@
key { [ numerosign, parenright, 0, 0 ] };
key { [ minus, percent, minus, underscore ]};
key { [ 0x010004af, 0x010004ae, equal, plus ]};
- key { [ 0x010004a3, 0x010004a2, backslash, slash ]};
-
+ key { [ 0x010004a3, 0x010004a2, backslash, slash ]};
+
include "level3(ralt_switch)"
};
@@ -511,7 +511,7 @@
partial alphanumeric_keys
xkb_symbols "chm" {
include "ru(common)"
-
+
name[Group1]= "Mari";
key.type[group1]="FOUR_LEVEL_ALPHABETIC";
@@ -531,7 +531,7 @@
// Church Slavonic language layout
// based on
// russian standard keyboard
-// Aleksandr Andreev and Yuri Shardt
+// Aleksandr Andreev and Yuri Shardt
// Last Changes 2010/08/01. Contact
partial alphanumeric_keys
@@ -651,3 +651,56 @@
include "level3(ralt_switch)"
};
+
+partial alphanumeric_keys
+xkb_symbols "bepo" {
+
+ // Bépo pour le russe!
+
+ include "fr(bepo)"
+ include "keypad(oss_latin9)"
+
+ name[Group1]="Russian, ergonomic, Dvorak way";
+
+ // Second row
+ key { [ Cyrillic_be, Cyrillic_BE, bar, brokenbar ] }; //
+ key { [ Cyrillic_tse, Cyrillic_TSE, dead_acute, dead_doubleacute ] }; //
+ key { [ Cyrillic_pe, Cyrillic_PE, ampersand, section ] }; //
+ key { [ Cyrillic_o, Cyrillic_O, oe, OE ] }; //
+ key { [ Cyrillic_e, Cyrillic_E, dead_grave, grave ] }; //
+
+ key { [ Cyrillic_ve, Cyrillic_VE, dead_caron ] }; //
+ key { [ Cyrillic_de, Cyrillic_DE, eth, ETH ] }; //
+ key { [ Cyrillic_el, Cyrillic_EL, dead_stroke ] }; //
+ key { [ Cyrillic_zhe, Cyrillic_ZHE, U0133, U0132 ] }; //
+ key { [ Cyrillic_ze, Cyrillic_ZE, schwa, SCHWA ] }; //
+ key { [ Cyrillic_ya, Cyrillic_YA, dead_breve ] }; //
+
+ // Third row
+ key { [ Cyrillic_a, Cyrillic_A, ae, AE ] }; //
+ key { [ Cyrillic_u, Cyrillic_U, ugrave, Ugrave ] }; //
+ key { [ Cyrillic_i, Cyrillic_I, Cyrillic_shorti, Cyrillic_SHORTI ] }; //
+ key { [ Cyrillic_ie, Cyrillic_IE, Cyrillic_io, Cyrillic_IO ] }; //
+
+ key { [ Cyrillic_es, Cyrillic_ES, copyright, U017F ] }; //
+ key { [ Cyrillic_te, Cyrillic_TE, thorn, THORN ] }; //
+ key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN, ssharp, U1E9E ] }; //
+ key { [ Cyrillic_er, Cyrillic_ER, registered, trademark ] }; //
+ key { [ Cyrillic_en, Cyrillic_EN, dead_tilde ] }; //
+ key { [ Cyrillic_em, Cyrillic_EM, dead_macron, masculine ] }; //
+ key { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, dead_cedilla, dead_belowcomma ] }; //
+
+ // Fourth row
+
+ key { [ Cyrillic_yu, Cyrillic_YU, backslash ] }; //
+ key { [ Cyrillic_yeru, Cyrillic_YERU, braceleft, leftsinglequotemark ] }; //
+ key { [ Cyrillic_sha, Cyrillic_SHA, Cyrillic_shcha, Cyrillic_SHCHA] }; //
+
+ key { [ Cyrillic_ka, Cyrillic_KA, asciitilde ] }; //
+
+ key { [ Cyrillic_che, Cyrillic_CHE, dead_abovering, dead_belowdot ] }; //
+ key { [ Cyrillic_ghe, Cyrillic_GHE, mu ] }; //
+ key { [ Cyrillic_ha, Cyrillic_HA, dagger, doubledagger ] }; //
+ key { [ Cyrillic_ef, Cyrillic_EF, dead_ogonek, ordfeminine ] }; //
+
+};