svn merge ^/branches/released .

1 files changed, 112 insertions, 46 deletions

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ru b/xorg-server/xkbdata.src/symbols/sun_vndr/ru
index 101cad72d..833576dcc 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/ru
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/ru
@@ -1,46 +1,112 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-xkb_symbols "basic" {
-    include "ru"
-    // A few keys are different
-    key	<BKSL> {	[	backslash,	       bar	],
-			[	slash,           question	]	};
-   key	<AB10> {	[	    slash,	  question	],
-			[	  ediaeresis,	Ediaeresis	]	};
-
-};
-
-// layout for a Sun Type 6 Russian keyboard
-partial
-xkb_symbols "type6" {
-    include "sun_vndr/ru(basic)"
-
-    key <AE03> {        [               3,      numbersign      ],
-                        [               3,      numerosign      ]       };
-    key	<AE04> {	[		4,	dollar		],
-			[		4,	percent		]	};
-
-    key	<LSGT> {	[	backslash,	       bar	] };
-};
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+partial alphanumeric_keys

+xkb_symbols "type6" {

+

+     name[Group1]= "Russia";

+

+     key.type[group1]="FOUR_LEVEL";

+

+

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

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

+    key	<AE03> { [		3,      numerosign, 3,  numbersign	] };

+    key	<AE04> { [		4,       percent, 4,      dollar 	] };

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

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

+    key	<AE08> { [		8,	 semicolon, 8, asterisk 	] };

+    key	<BKSL> { [           slash,        question, backslash,             bar	] };

+    key	<AB10> { [      ediaeresis,      Ediaeresis,	    slash,	  question 	] };

+    key <LSGT> { [       backslash,             bar      ] };

+

+    key	<AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI, q, Q	] };

+    key	<AD02> { [    Cyrillic_tse,    Cyrillic_TSE, w, W	] };

+    key	<AD03> { [      Cyrillic_u,	Cyrillic_U, e, E	] };

+    key	<AD04> { [     Cyrillic_ka,     Cyrillic_KA, r, R	] };

+    key	<AD05> { [     Cyrillic_ie,     Cyrillic_IE, t, T	] };

+    key	<AD06> { [     Cyrillic_en,     Cyrillic_EN, y, Y	] };

+    key	<AD07> { [    Cyrillic_ghe,    Cyrillic_GHE, u, U	] };

+    key	<AD08> { [    Cyrillic_sha,    Cyrillic_SHA, i, I	] };

+    key	<AD09> { [  Cyrillic_shcha,  Cyrillic_SHCHA, o, O	] };

+    key	<AD10> { [     Cyrillic_ze,     Cyrillic_ZE, p, P	] };

+    key	<AD11> { [     Cyrillic_ha,     Cyrillic_HA, bracketleft,       braceleft	] };

+    key	<AD12> { [Cyrillic_hardsign,Cyrillic_HARDSIGN, bracketright,      braceright	] };

+    key	<AC01> { [     Cyrillic_ef,     Cyrillic_EF, a, A	] };

+    key	<AC02> { [   Cyrillic_yeru,   Cyrillic_YERU, s, S	] };

+    key	<AC03> { [     Cyrillic_ve,     Cyrillic_VE, d, D	] };

+    key	<AC04> { [      Cyrillic_a,	Cyrillic_A, f, F	] };

+    key	<AC05> { [     Cyrillic_pe,     Cyrillic_PE, g, G	] };

+    key	<AC06> { [     Cyrillic_er,     Cyrillic_ER, h, H	] };

+    key	<AC07> { [      Cyrillic_o,	Cyrillic_O, j, J	] };

+    key	<AC08> { [     Cyrillic_el,     Cyrillic_EL, k, K	] };

+    key	<AC09> { [     Cyrillic_de,     Cyrillic_DE, l, L	] };

+    key	<AC10> { [    Cyrillic_zhe,    Cyrillic_ZHE, semicolon,           colon	] };

+    key	<AC11> { [      Cyrillic_e,	Cyrillic_E, apostrophe,        quotedbl	] };

+    key	<AB01> { [     Cyrillic_ya,     Cyrillic_YA, z, Z	] };

+    key	<AB02> { [    Cyrillic_che,    Cyrillic_CHE, x, X	] };

+    key	<AB03> { [     Cyrillic_es,     Cyrillic_ES, c, C	] };

+    key	<AB04> { [     Cyrillic_em,     Cyrillic_EM, v, V	] };

+    key	<AB05> { [      Cyrillic_i,	Cyrillic_I, b, B	] };

+    key	<AB06> { [     Cyrillic_te,     Cyrillic_TE, n, N	] };

+    key	<AB07> { [Cyrillic_softsign,Cyrillic_SOFTSIGN, m, M	] };

+    key	<AB08> { [     Cyrillic_be,     Cyrillic_BE, comma,            less	] };

+    key	<AB09> { [     Cyrillic_yu,     Cyrillic_YU, period,         greater	] };

+

+    include "level3(ralt_switch)"

+

+};

+

+

+partial default alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/ru(type6)"

+};

+