diff -urN xkb.orig/rules/xorg.xml xkb/rules/xorg.xml --- xkb.orig/rules/xorg.xml 2005-10-29 22:45:43.000000000 -0400 +++ xkb/rules/xorg.xml 2005-12-19 20:04:53.000000000 -0500 @@ -3513,6 +3513,21 @@ + phonetic2 + Phonetic2 + Fonetické N2 + Fonetisk N2 + Phonétique N2 + fonetikus N2 + Fonetisch N2 + Фонетическая N2 + Fonetické N2 + фонетски N2 + Fonetik N2 + + + + typewriter "Typewriter" "Psací stroj" diff -urN xkb.orig/symbols/pc/ru xkb/symbols/pc/ru --- xkb.orig/symbols/pc/ru 2005-10-29 22:45:41.000000000 -0400 +++ xkb/symbols/pc/ru 2005-12-19 19:40:08.000000000 -0500 @@ -163,3 +163,64 @@ key { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; key { [ Cyrillic_e, Cyrillic_E ] }; }; + +partial alphanumeric_keys +xkb_symbols "phonetic2" { + + name[Group1]= "Russian(phonetic2)"; + +key.type[group1]="ALPHABETIC"; + + key { [ 1, exclam ] }; + key { [ 2, at ] }; + key { [ 3, Cyrillic_hardsign ] }; + key { [ 4, Cyrillic_HARDSIGN ] }; + key { [ 5, Cyrillic_io ] }; + key { [ 6, Cyrillic_IO ] }; + key { [ 7, ampersand ] }; + key { [ 8, asterisk ] }; + key { [ 9, parenleft ] }; + key { [ 0, parenright ] }; + + key { [ period, greater ] }; + key { [ slash, question ] }; + key { [ comma, less ] }; + key { [ semicolon, colon ] }; + key { [ apostrophe, quotedbl ] }; + key { [ less, greater ] }; + + key { [ Cyrillic_che, Cyrillic_CHE ] }; + key { [ Cyrillic_ya, Cyrillic_YA ] }; + key { [ Cyrillic_ze, Cyrillic_ZE ] }; + key { [ Cyrillic_es, Cyrillic_ES ] }; + key { [ Cyrillic_a, Cyrillic_A ] }; + key { [ Cyrillic_ve, Cyrillic_VE ] }; + key { [ Cyrillic_tse, Cyrillic_TSE ] }; + key { [Cyrillic_softsign,Cyrillic_SOFTSIGN ] }; + key { [ Cyrillic_de, Cyrillic_DE ] }; + key { [ Cyrillic_ie, Cyrillic_IE ] }; + key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; + key { [ Cyrillic_ef, Cyrillic_EF ] }; + key { [ Cyrillic_te, Cyrillic_TE ] }; + key { [ Cyrillic_er, Cyrillic_ER ] }; + key { [ Cyrillic_en, Cyrillic_EN ] }; + key { [ Cyrillic_be, Cyrillic_BE ] }; + key { [ Cyrillic_ha, Cyrillic_HA ] }; + key { [ Cyrillic_ghe, Cyrillic_GHE ] }; + key { [ Cyrillic_yeru, Cyrillic_YERU ] }; + key { [ Cyrillic_em, Cyrillic_EM ] }; + key { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; + key { [ Cyrillic_u, Cyrillic_U ] }; + key { [ Cyrillic_ka, Cyrillic_KA ] }; + key { [ Cyrillic_i, Cyrillic_I ] }; + key { [ Cyrillic_o, Cyrillic_O ] }; + key { [ Cyrillic_el, Cyrillic_EL ] }; + key { [ Cyrillic_pe, Cyrillic_PE ] }; + + key { [ minus, underscore ] }; + key { [ Cyrillic_sha, Cyrillic_SHA ] }; + key { [ Cyrillic_yu, Cyrillic_YU ] }; + key { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; + key { [ Cyrillic_e, Cyrillic_E ] }; +}; + diff -urN xkb.orig/symbols/ru xkb/symbols/ru --- xkb.orig/symbols/ru 2005-10-29 22:45:40.000000000 -0400 +++ xkb/symbols/ru 2005-12-19 19:34:07.000000000 -0500 @@ -295,3 +295,120 @@ modifier_map Control{ Control_L }; modifier_map Mod3 { Mode_switch }; }; + +partial alphanumeric_keys +xkb_symbols "phonetic2" { + name[Group1]= "US/ASCII"; + name[Group2]= "Russian"; + + key { [ 1, exclam ], + [ 1, exclam ] }; + key { [ 2, at ], + [ 2, at ] }; + key { [ 3, numbersign ], + [ 3, Cyrillic_hardsign ] }; + key { [ 4, dollar ], + [ 4, Cyrillic_HARDSIGN ] }; + key { [ 5, percent ], + [ 5, Cyrillic_io ] }; + key { [ 6, asciicircum ], + [ 6, Cyrillic_IO ] }; + key { [ 7, ampersand ], + [ 7, ampersand ] }; + key { [ 8, asterisk ], + [ 8, asterisk ] }; + key { [ 9, parenleft ], + [ 9, parenleft ] }; + key { [ 0, parenright ], + [ 0, parenright ] }; + + key { [ period, greater ], + [ period, greater ] }; + key { [ slash, question ], + [ slash, question ] }; + key { [ comma, less ], + [ comma, less ] }; + key { [ semicolon, colon ], + [ semicolon, colon ] }; + key { [ apostrophe, quotedbl ], + [ apostrophe, quotedbl ] }; + key { [ less, greater ], + [ less, greater ] }; + +key.type[group2]="ALPHABETIC"; + + key { [ grave, asciitilde ], + [ Cyrillic_che, Cyrillic_CHE ] }; + key { [ q, Q ], + [ Cyrillic_ya, Cyrillic_YA ] }; + key { [ z, Z ], + [ Cyrillic_ze, Cyrillic_ZE ] }; + key { [ s, S ], + [ Cyrillic_es, Cyrillic_ES ] }; + key { [ a, A ], + [ Cyrillic_a, Cyrillic_A ] }; + key { [ w, W ], + [ Cyrillic_ve, Cyrillic_VE ] }; + key { [ c, C ], + [ Cyrillic_tse, Cyrillic_TSE ] }; + key { [ x, X ], + [Cyrillic_softsign,Cyrillic_SOFTSIGN ] }; + key { [ d, D ], + [ Cyrillic_de, Cyrillic_DE ] }; + key { [ e, E ], + [ Cyrillic_ie, Cyrillic_IE ] }; + key { [ v, V ], + [ Cyrillic_zhe, Cyrillic_ZHE ] }; + key { [ f, F ], + [ Cyrillic_ef, Cyrillic_EF ] }; + key { [ t, T ], + [ Cyrillic_te, Cyrillic_TE ] }; + key { [ r, R ], + [ Cyrillic_er, Cyrillic_ER ] }; + key { [ n, N ], + [ Cyrillic_en, Cyrillic_EN ] }; + key { [ b, B ], + [ Cyrillic_be, Cyrillic_BE ] }; + key { [ h, H ], + [ Cyrillic_ha, Cyrillic_HA ] }; + key { [ g, G ], + [ Cyrillic_ghe, Cyrillic_GHE ] }; + key { [ y, Y ], + [ Cyrillic_yeru, Cyrillic_YERU ] }; + key { [ m, M ], + [ Cyrillic_em, Cyrillic_EM ] }; + key { [ j, J ], + [ Cyrillic_shorti, Cyrillic_SHORTI ] }; + key { [ u, U ], + [ Cyrillic_u, Cyrillic_U ] }; + key { [ k, K ], + [ Cyrillic_ka, Cyrillic_KA ] }; + key { [ i, I ], + [ Cyrillic_i, Cyrillic_I ] }; + key { [ o, O ], + [ Cyrillic_o, Cyrillic_O ] }; + key { [ l, L ], + [ Cyrillic_el, Cyrillic_EL ] }; + key { [ p, P ], + [ Cyrillic_pe, Cyrillic_PE ] }; + key { [ minus, underscore ], + [ minus, underscore ] }; + key { [ bracketleft, braceleft ], + [ Cyrillic_sha, Cyrillic_SHA ] }; + key { [ equal, plus ], + [ Cyrillic_yu, Cyrillic_YU ] }; + key { [ bracketright, braceright ], + [ Cyrillic_shcha, Cyrillic_SHCHA ] }; + key { [ backslash, bar ], + [ Cyrillic_e, Cyrillic_E ] }; + +key.type[group2]="TWO_LEVEL"; + + key { [ Multi_key ] }; + + modifier_map Shift { Shift_L }; + modifier_map Lock { Caps_Lock, ISO_Lock }; + modifier_map Control{ Control_L }; + modifier_map Mod3 { Mode_switch }; +}; + diff -urN xkb.orig/symbols.dir xkb/symbols.dir --- xkb.orig/symbols.dir 2005-10-29 22:45:39.000000000 -0400 +++ xkb/symbols.dir 2005-12-19 18:51:24.000000000 -0500 @@ -162,6 +162,7 @@ --p----- a------- ru(winkeys) --p----- a------- ru(typewriter) --p----- a------- ru(phonetic) +--p----- a------- ru(phonetic2) -dp----- a------- de_CH(basic) --p----- a------- de_CH(Sundeadkeys) --p----- a------- de_CH(sundeadkeys)