| blob | 282e4308bb5b4712ad7b03c0e899fabceb4e76d3 |
1 diff -ur xkeyboard-config-2.3/rules/base.xml.in xkeyboard-config-2.3-mod/rules/base.xml.in
2 --- xkeyboard-config-2.3/rules/base.xml.in 2011-05-31 21:42:18.000000000 +0200
3 +++ xkeyboard-config-2.3-mod/rules/base.xml.in 2011-06-03 15:38:25.139922083 +0200
4 @@ -855,21 +855,21 @@
5 </model>
6 <model>
7 <configItem>
8 - <name>microsoftmult</name>
9 + <name>microsoftmult</name>
10 <_description>Microsoft Wireless Multimedia Keyboard 1.0A</_description>
11 <vendor>Microsoft Inc.</vendor>
12 </configItem>
13 </model>
14 <model>
15 <configItem>
16 - <name>microsoftelite</name>
17 + <name>microsoftelite</name>
18 <_description>Microsoft Natural Keyboard Elite</_description>
19 <vendor>Microsoft Inc.</vendor>
20 </configItem>
21 </model>
22 <model>
23 <configItem>
24 - <name>microsoftccurve2k</name>
25 + <name>microsoftccurve2k</name>
26 <_description>Microsoft Comfort Curve Keyboard 2000</_description>
27 <vendor>Microsoft Inc.</vendor>
28 </configItem>
29 @@ -4046,6 +4046,12 @@
30 </languageList>
31 </configItem>
32 </variant>
33 + <variant>
34 + <configItem>
35 + <name>bepo</name>
36 + <_description>Russian (Bepo, ergonomic, Dvorak way)</_description>
37 + </configItem>
38 + </variant>
39 </variantList>
40 </layout>
41 <layout>
42 @@ -5386,7 +5392,7 @@
43 <name>grp:rctrl_rshift_toggle</name>
44 <_description>Right Ctrl+Right Shift</_description>
45 </configItem>
46 - </option>
47 + </option>
48 <option>
49 <configItem>
50 <name>grp:ctrl_alt_toggle</name>
51 @@ -5760,7 +5766,7 @@
52 </option>
53 </group>
54 <group allowMultipleSelection="false">
55 - <!-- Caps Lock tweaks.
56 + <!-- Caps Lock tweaks.
57 "Internal" capitalization means capitalization using some internal tables.
58 Otherwise "as Shift" - means using next group. -->
59 <configItem>
60 diff -ur xkeyboard-config-2.3/rules/evdev.xml.in xkeyboard-config-2.3-mod/rules/evdev.xml.in
61 --- xkeyboard-config-2.3/rules/evdev.xml.in 2011-05-31 21:45:17.000000000 +0200
62 +++ xkeyboard-config-2.3-mod/rules/evdev.xml.in 2011-06-03 15:41:23.288956967 +0200
63 @@ -855,21 +855,21 @@
64 </model>
65 <model>
66 <configItem>
67 - <name>microsoftmult</name>
68 + <name>microsoftmult</name>
69 <_description>Microsoft Wireless Multimedia Keyboard 1.0A</_description>
70 <vendor>Microsoft Inc.</vendor>
71 </configItem>
72 </model>
73 <model>
74 <configItem>
75 - <name>microsoftelite</name>
76 + <name>microsoftelite</name>
77 <_description>Microsoft Natural Keyboard Elite</_description>
78 <vendor>Microsoft Inc.</vendor>
79 </configItem>
80 </model>
81 <model>
82 <configItem>
83 - <name>microsoftccurve2k</name>
84 + <name>microsoftccurve2k</name>
85 <_description>Microsoft Comfort Curve Keyboard 2000</_description>
86 <vendor>Microsoft Inc.</vendor>
87 </configItem>
88 @@ -4046,6 +4046,12 @@
89 </languageList>
90 </configItem>
91 </variant>
92 + <variant>
93 + <configItem>
94 + <name>bepo</name>
95 + <_description>Russian (Bepo, ergonomic, Dvorak way)</_description>
96 + </configItem>
97 + </variant>
98 </variantList>
99 </layout>
100 <layout>
101 @@ -5386,7 +5392,7 @@
102 <name>grp:rctrl_rshift_toggle</name>
103 <_description>Right Ctrl+Right Shift</_description>
104 </configItem>
105 - </option>
106 + </option>
107 <option>
108 <configItem>
109 <name>grp:ctrl_alt_toggle</name>
110 @@ -5760,7 +5766,7 @@
111 </option>
112 </group>
113 <group allowMultipleSelection="false">
114 - <!-- Caps Lock tweaks.
115 + <!-- Caps Lock tweaks.
116 "Internal" capitalization means capitalization using some internal tables.
117 Otherwise "as Shift" - means using next group. -->
118 <configItem>
119 diff -ur xkeyboard-config-2.3/symbols/ru xkeyboard-config-2.3-mod/symbols/ru
120 --- xkeyboard-config-2.3/symbols/ru 2011-05-31 21:42:18.000000000 +0200
121 +++ xkeyboard-config-2.3-mod/symbols/ru 2011-06-03 15:35:20.214257244 +0200
122 @@ -22,7 +22,7 @@
123 key <BKSL> { [ backslash, slash ] };
124 };
126 -partial hidden alphanumeric_keys
127 +partial hidden alphanumeric_keys
128 xkb_symbols "common" {
130 key <AE01> { [ 1, exclam ] };
131 @@ -242,7 +242,7 @@
133 };
135 -partial alphanumeric_keys
136 +partial alphanumeric_keys
137 xkb_symbols "os_legacy" {
138 include "ru(common)"
140 @@ -253,7 +253,7 @@
141 key <AC11> { [ 0x010004D5, 0x010004D4 ] };
142 };
144 -partial alphanumeric_keys
145 +partial alphanumeric_keys
146 xkb_symbols "os_winkeys" {
147 include "ru(winkeys)"
149 @@ -336,7 +336,7 @@
150 // Vlad Shakhov <lumpen.intellectual@gmail.com>
151 // Last Changes 2007/10/23 by Vlad Shakhov <lumpen.intellectual@gmail.com>
153 -partial alphanumeric_keys
154 +partial alphanumeric_keys
155 xkb_symbols "kom" {
157 include "ru(winkeys)"
158 @@ -345,11 +345,11 @@
160 key.type[group1]="FOUR_LEVEL_ALPHABETIC";
162 -// cyrilllic o with diaeresis
163 - key <AC07> { [ Cyrillic_o, Cyrillic_O,
164 +// cyrilllic o with diaeresis
165 + key <AC07> { [ Cyrillic_o, Cyrillic_O,
166 U04E7, U04E6 ] };
167 -
168 -// hard I as additional key for soft Cyrillic_I
169 +
170 +// hard I as additional key for soft Cyrillic_I
171 key <AB05> { [ Cyrillic_i, Cyrillic_I,
172 Ukrainian_i, Ukrainian_I ] };
174 @@ -404,7 +404,7 @@
175 //based on the Kalmyk language layout: http://soft.oyrat.org/
176 //Nikolay Korneev <halmg@oyrat.org>
177 //Toli Miron <mirontoli@gmail.com>
178 -
179 +
180 partial alphanumeric_keys
181 xkb_symbols "xal" {
182 include "ru(winkeys)"
183 @@ -416,24 +416,24 @@
184 key <AE01> { [ question, exclam, 1 ] };
185 key <AE02> { [ numerosign, quotedbl, 2 ] };
186 key <AE03> { [ Cyrillic_u_straight, Cyrillic_U_straight, 3 ] };
187 - key <AE04> { [ Cyrillic_schwa, Cyrillic_SCHWA, 4 ] };
188 + key <AE04> { [ Cyrillic_schwa, Cyrillic_SCHWA, 4 ] };
189 key <AE05> { [ asterisk, percent, 5 ] };
190 key <AE06> { [ Cyrillic_en_descender, Cyrillic_EN_descender, 6 ] };
191 - key <AE07> { [ Cyrillic_o_bar, Cyrillic_O_bar, 7 ] };
192 - key <AE08> { [ Cyrillic_shha, Cyrillic_SHHA, 8 ] };
193 + key <AE07> { [ Cyrillic_o_bar, Cyrillic_O_bar, 7 ] };
194 + key <AE08> { [ Cyrillic_shha, Cyrillic_SHHA, 8 ] };
195 key <AE09> { [ Cyrillic_zhe_descender, Cyrillic_ZHE_descender, 9 ] };
196 key <AE10> { [ semicolon, colon, 0 ] };
198 key <TLDE> { [ parenleft, parenright, Cyrillic_io, Cyrillic_IO ] };
200 key <AD02> { [ Cyrillic_tse, Cyrillic_TSE, dollar ] };
201 - key <AD03> { [ Cyrillic_u, Cyrillic_U, EuroSign ] };
202 - key <AD04> { [ Cyrillic_ka, Cyrillic_KA, registered ] };
203 - key <AD05> { [ Cyrillic_ie, Cyrillic_IE, trademark ] };
204 - key <AD11> { [ Cyrillic_ha, Cyrillic_HA, bracketleft ] };
205 + key <AD03> { [ Cyrillic_u, Cyrillic_U, EuroSign ] };
206 + key <AD04> { [ Cyrillic_ka, Cyrillic_KA, registered ] };
207 + key <AD05> { [ Cyrillic_ie, Cyrillic_IE, trademark ] };
208 + key <AD11> { [ Cyrillic_ha, Cyrillic_HA, bracketleft ] };
209 key <AD12> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, bracketright ] };
210 key <AC11> { [ Cyrillic_e, Cyrillic_E, apostrophe ] };
211 - key <AB03> { [ Cyrillic_es, Cyrillic_ES, copyright ] };
212 + key <AB03> { [ Cyrillic_es, Cyrillic_ES, copyright ] };
213 key <AB08> { [ Cyrillic_be, Cyrillic_BE, less ] };
214 key <AB09> { [ Cyrillic_yu, Cyrillic_YU, greater ] };
216 @@ -475,8 +475,8 @@
217 key <AE10> { [ numerosign, parenright, 0, 0 ] };
218 key <AE11> { [ minus, percent, minus, underscore ]};
219 key <AE12> { [ 0x010004af, 0x010004ae, equal, plus ]};
220 - key <BKSL> { [ 0x010004a3, 0x010004a2, backslash, slash ]};
221 -
222 + key <BKSL> { [ 0x010004a3, 0x010004a2, backslash, slash ]};
223 +
224 include "level3(ralt_switch)"
225 };
227 @@ -511,7 +511,7 @@
228 partial alphanumeric_keys
229 xkb_symbols "chm" {
230 include "ru(common)"
231 -
232 +
233 name[Group1]= "Mari";
235 key.type[group1]="FOUR_LEVEL_ALPHABETIC";
236 @@ -531,7 +531,7 @@
237 // Church Slavonic language layout
238 // based on
239 // russian standard keyboard
240 -// Aleksandr Andreev and Yuri Shardt
241 +// Aleksandr Andreev and Yuri Shardt
242 // Last Changes 2010/08/01. Contact <aleksandr.andreev@gmail.com>
244 partial alphanumeric_keys
245 @@ -651,3 +651,56 @@
247 include "level3(ralt_switch)"
248 };
249 +
250 +partial alphanumeric_keys
251 +xkb_symbols "bepo" {
252 +
253 + // Bépo pour le russe!
254 +
255 + include "fr(bepo)"
256 + include "keypad(oss_latin9)"
257 +
258 + name[Group1]="Russian, ergonomic, Dvorak way";
259 +
260 + // Second row
261 + key <AD01> { [ Cyrillic_be, Cyrillic_BE, bar, brokenbar ] }; //
262 + key <AD02> { [ Cyrillic_tse, Cyrillic_TSE, dead_acute, dead_doubleacute ] }; //
263 + key <AD03> { [ Cyrillic_pe, Cyrillic_PE, ampersand, section ] }; //
264 + key <AD04> { [ Cyrillic_o, Cyrillic_O, oe, OE ] }; //
265 + key <AD05> { [ Cyrillic_e, Cyrillic_E, dead_grave, grave ] }; //
266 +
267 + key <AD07> { [ Cyrillic_ve, Cyrillic_VE, dead_caron ] }; //
268 + key <AD08> { [ Cyrillic_de, Cyrillic_DE, eth, ETH ] }; //
269 + key <AD09> { [ Cyrillic_el, Cyrillic_EL, dead_stroke ] }; //
270 + key <AD10> { [ Cyrillic_zhe, Cyrillic_ZHE, U0133, U0132 ] }; //
271 + key <AD11> { [ Cyrillic_ze, Cyrillic_ZE, schwa, SCHWA ] }; //
272 + key <AD12> { [ Cyrillic_ya, Cyrillic_YA, dead_breve ] }; //
273 +
274 + // Third row
275 + key <AC01> { [ Cyrillic_a, Cyrillic_A, ae, AE ] }; //
276 + key <AC02> { [ Cyrillic_u, Cyrillic_U, ugrave, Ugrave ] }; //
277 + key <AC03> { [ Cyrillic_i, Cyrillic_I, Cyrillic_shorti, Cyrillic_SHORTI ] }; //
278 + key <AC04> { [ Cyrillic_ie, Cyrillic_IE, Cyrillic_io, Cyrillic_IO ] }; //
279 +
280 + key <AC06> { [ Cyrillic_es, Cyrillic_ES, copyright, U017F ] }; //
281 + key <AC07> { [ Cyrillic_te, Cyrillic_TE, thorn, THORN ] }; //
282 + key <AC08> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN, ssharp, U1E9E ] }; //
283 + key <AC09> { [ Cyrillic_er, Cyrillic_ER, registered, trademark ] }; //
284 + key <AC10> { [ Cyrillic_en, Cyrillic_EN, dead_tilde ] }; //
285 + key <AC11> { [ Cyrillic_em, Cyrillic_EM, dead_macron, masculine ] }; //
286 + key <BKSL> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, dead_cedilla, dead_belowcomma ] }; //
287 +
288 + // Fourth row
289 +
290 + key <AB01> { [ Cyrillic_yu, Cyrillic_YU, backslash ] }; //
291 + key <AB02> { [ Cyrillic_yeru, Cyrillic_YERU, braceleft, leftsinglequotemark ] }; //
292 + key <AB03> { [ Cyrillic_sha, Cyrillic_SHA, Cyrillic_shcha, Cyrillic_SHCHA] }; //
293 +
294 + key <AB05> { [ Cyrillic_ka, Cyrillic_KA, asciitilde ] }; //
295 +
296 + key <AB07> { [ Cyrillic_che, Cyrillic_CHE, dead_abovering, dead_belowdot ] }; //
297 + key <AB08> { [ Cyrillic_ghe, Cyrillic_GHE, mu ] }; //
298 + key <AB09> { [ Cyrillic_ha, Cyrillic_HA, dagger, doubledagger ] }; //
299 + key <AB10> { [ Cyrillic_ef, Cyrillic_EF, dead_ogonek, ordfeminine ] }; //
300 +
301 +};