svn merge ^/branches/released .

1 files changed, 130 insertions, 131 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/lk b/xorg-server/xkeyboard-config/symbols/digital_vndr/lk
index 4d311c7e5..82a8c90c6 100644
--- a/xorg-server/xkeyboard-config/symbols/digital_vndr/lk
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/lk
@@ -1,131 +1,130 @@
-// $Xorg: lk,v 1.3 2000/08/17 19:54:44 cpqbld Exp $
-//
-//Copyright (c) 1996  Digital Equipment Corporation
-//
-//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 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 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 DIGITAL EQUIPMENT CORPORATION 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.
-//
-//Except as contained in this notice, the name of the Digital Equipment 
-//Corporation shall not be used in advertising or otherwise to promote
-//the sale, use or other dealings in this Software without prior written
-//authorization from Digital Equipment Corporation.
-//
-// HISTORY
-// Log: lk,v 
-// Revision 1.2  1996/06/18  09:10:09  erik
-// use flags correctly, assorted cleanups and consortium fixes
-//
-// Revision 1.1.2.2  1995/03/10  17:16:52  William_Walker
-// 	Rename to avoid name conflicts with XKB stuff
-// 	[1995/03/10  17:10:33  William_Walker]
-//
-// Revision 1.1.2.2  1994/10/31  15:22:00  William_Walker
-// 	New experimental version.
-// 	[1994/10/31  14:48:37  William_Walker]
-// 
-// EndLog
-// 
-// @(#)RCSfile: lk,v  Revision: 1.2  (DEC) Date: 1996/01/24 12:14:58
-// 
-// Symbols common to all the LK-style keyboards.
-//
-default xkb_symbols "common" {
-
-    // Modifier mappings
-    modifier_map Shift  	{ Shift_L, 	Shift_R	  };
-    modifier_map Lock   	{ Caps_Lock };
-    modifier_map Control	{ Control_L, Control_R };
-    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R };
-    modifier_map Mod2		{ Num_Lock };
-    modifier_map Mod3   	{ Scroll_Lock };
-
-    // Additional alphanumeric keys
-    key <LSGT>		{ [ less,	greater		] };
-    key <LALT>		{ [ Alt_L,	Meta_L		] };
-
-    // "Function" keys
-    key <FK01>		{ [ F1				] };
-    key <FK02>		{ [ F2				] };
-    key <FK03>		{ [ F3				] };
-    key <FK04>		{ [ F4				] };
-    key <FK05>		{ [ F5				] };
-    key <FK06>		{ [ F6				] };
-    key <FK07>		{ [ F7				] };
-    key <FK08>		{ [ F8				] };
-    key <FK09>		{ [ F9				] };
-    key <FK10>		{ [ F10				] };
-    key <FK11>		{ [ Escape,	F11		] };
-    key <FK12>		{ [ F12				] };
-    key <FK13>		{ [ F13				] };
-    key <FK14>		{ [ F14				] };
-    key <FK17>		{ [ F17				] };
-    key <FK18>		{ [ F18				] };
-    key <FK19>		{ [ F19				] };
-    key <FK20>		{ [ F20				] };
-
-    // "Editing" keys
-    key <HELP>		{ [ Help			] };
-    key <DO>		{ [ Menu			] };
-    key <FIND>		{ [ Find			] };
-    key <INS>		{ [ Insert			] };
-    key <DELE>		{ [ Delete			] };
-    key <SELE>		{ [ Select			] };
-    key <PGUP>		{ [ Prior			] };
-    key <PGDN>		{ [ Next			] };
-
-    key <UP>		{ [ Up				] };
-    key <LEFT>		{ [ Left			] };
-    key <DOWN>		{ [ Down			] };
-    key <RGHT>		{ [ Right			] };
-
-    // "Keypad" keys
-    key <KPF1>		{
-				type= "SHIFT+ALT",
-				symbols[Group1]=[ KP_F1,Pointer_EnableKeys ]
-			};
-    key <KPF2>		{ [ KP_F2			] };
-    key <KPF3>		{ [ KP_F3			] };
-    key <KPF4>		{ [ KP_F4			] };
-
-    key <KPCO>		{ [ KP_Separator		] };
-    key <KPSU>		{ [ KP_Subtract			] };
-
-    key <KP7>		{ [ KP_7			] };
-    key <KP8>		{ [ KP_8			] };
-    key <KP9>		{ [ KP_9			] };
-
-    key <KP4>		{ [ KP_4			] };
-    key <KP5>		{ [ KP_5			] };
-    key <KP6>		{ [ KP_6			] };
-
-    key <KP1>		{ [ KP_1			] };
-    key <KP2>		{ [ KP_2			] };
-    key <KP3>		{ [ KP_3			] };
-    key <KPEN>		{ [ KP_Enter			] };
-
-    key <KP0>		{ [ KP_0			] };
-    key <KPDL>		{ [ KP_Decimal			] };
-};
-
-xkb_symbols "lk401" {
-    include "symbols/digital_vndr/lk(common)"
-    key <RALT>              { [ Alt_R,      Meta_R          ] };
-    key <LCMP>              { [ Multi_key                   ] };
-    key <RCMP>              { [ Multi_key                   ] };
-};
+//

+//Copyright (c) 1996  Digital Equipment Corporation

+//

+//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 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 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 DIGITAL EQUIPMENT CORPORATION 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.

+//

+//Except as contained in this notice, the name of the Digital Equipment 

+//Corporation shall not be used in advertising or otherwise to promote

+//the sale, use or other dealings in this Software without prior written

+//authorization from Digital Equipment Corporation.

+//

+// HISTORY

+// Log: lk,v 

+// Revision 1.2  1996/06/18  09:10:09  erik

+// use flags correctly, assorted cleanups and consortium fixes

+//

+// Revision 1.1.2.2  1995/03/10  17:16:52  William_Walker

+// 	Rename to avoid name conflicts with XKB stuff

+// 	[1995/03/10  17:10:33  William_Walker]

+//

+// Revision 1.1.2.2  1994/10/31  15:22:00  William_Walker

+// 	New experimental version.

+// 	[1994/10/31  14:48:37  William_Walker]

+// 

+// EndLog

+// 

+// @(#)RCSfile: lk,v  Revision: 1.2  (DEC) Date: 1996/01/24 12:14:58

+// 

+// Symbols common to all the LK-style keyboards.

+//

+default xkb_symbols "common" {

+

+    // Modifier mappings

+    modifier_map Shift  	{ Shift_L, 	Shift_R	  };

+    modifier_map Lock   	{ Caps_Lock };

+    modifier_map Control	{ Control_L, Control_R };

+    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R };

+    modifier_map Mod2		{ Num_Lock };

+    modifier_map Mod3   	{ Scroll_Lock };

+

+    // Additional alphanumeric keys

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

+    key <LALT>		{ [ Alt_L,	Meta_L		] };

+

+    // "Function" keys

+    key <FK01>		{ [ F1				] };

+    key <FK02>		{ [ F2				] };

+    key <FK03>		{ [ F3				] };

+    key <FK04>		{ [ F4				] };

+    key <FK05>		{ [ F5				] };

+    key <FK06>		{ [ F6				] };

+    key <FK07>		{ [ F7				] };

+    key <FK08>		{ [ F8				] };

+    key <FK09>		{ [ F9				] };

+    key <FK10>		{ [ F10				] };

+    key <FK11>		{ [ Escape,	F11		] };

+    key <FK12>		{ [ F12				] };

+    key <FK13>		{ [ F13				] };

+    key <FK14>		{ [ F14				] };

+    key <FK17>		{ [ F17				] };

+    key <FK18>		{ [ F18				] };

+    key <FK19>		{ [ F19				] };

+    key <FK20>		{ [ F20				] };

+

+    // "Editing" keys

+    key <HELP>		{ [ Help			] };

+    key <DO>		{ [ Menu			] };

+    key <FIND>		{ [ Find			] };

+    key <INS>		{ [ Insert			] };

+    key <DELE>		{ [ Delete			] };

+    key <SELE>		{ [ Select			] };

+    key <PGUP>		{ [ Prior			] };

+    key <PGDN>		{ [ Next			] };

+

+    key <UP>		{ [ Up				] };

+    key <LEFT>		{ [ Left			] };

+    key <DOWN>		{ [ Down			] };

+    key <RGHT>		{ [ Right			] };

+

+    // "Keypad" keys

+    key <KPF1>		{

+				type= "SHIFT+ALT",

+				symbols[Group1]=[ KP_F1,Pointer_EnableKeys ]

+			};

+    key <KPF2>		{ [ KP_F2			] };

+    key <KPF3>		{ [ KP_F3			] };

+    key <KPF4>		{ [ KP_F4			] };

+

+    key <KPCO>		{ [ KP_Separator		] };

+    key <KPSU>		{ [ KP_Subtract			] };

+

+    key <KP7>		{ [ KP_7			] };

+    key <KP8>		{ [ KP_8			] };

+    key <KP9>		{ [ KP_9			] };

+

+    key <KP4>		{ [ KP_4			] };

+    key <KP5>		{ [ KP_5			] };

+    key <KP6>		{ [ KP_6			] };

+

+    key <KP1>		{ [ KP_1			] };

+    key <KP2>		{ [ KP_2			] };

+    key <KP3>		{ [ KP_3			] };

+    key <KPEN>		{ [ KP_Enter			] };

+

+    key <KP0>		{ [ KP_0			] };

+    key <KPDL>		{ [ KP_Decimal			] };

+};

+

+xkb_symbols "lk401" {

+    include "symbols/digital_vndr/lk(common)"

+    key <RALT>              { [ Alt_R,      Meta_R          ] };

+    key <LCMP>              { [ Multi_key                   ] };

+    key <RCMP>              { [ Multi_key                   ] };

+};