svn merge ^/branches/released .

1 files changed, 119 insertions, 75 deletions

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/lt b/xorg-server/xkbdata.src/symbols/sun_vndr/lt
index 8a8d54a64..6e51cb342 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/lt
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/lt
@@ -1,75 +1,119 @@
-// $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.
-//
-// $TOG: hu /main/2 1997/06/13 06:25:05 kaleb $
-default partial alphanumeric_keys 
-xkb_symbols "type5" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Hungarian keyboard.
-
-    // Alphanumeric section
-
-    name[group1]="Lithuanian";
-
-    key <TLDE> {	[	quoteright,	asciitilde	],
-			[	quoteleft,	caron		]	};
-    key <AE02> {	[	2,		quotedbl	],
-			[	at				]	};
-    key <AE03> {	[	3,		slash		],
-			[	numbersign			]	};
-    key <AE04> {	[	4,		semicolon	],
-			[	dollar				]	};
-    key <AE05> {	[	5,		colon		],
-			[	percent				]	};
-    key <AE06> {	[	6,		comma		],
-			[	asciicircum			]	};
-    key <AE07> {	[	7,		period		],
-			[	ampersand			]	};
-    key <AE08> {	[	8,		question	],
-			[	asterisk			]	};
-    key <AE09> {	[	9,		parenleft	],
-			[	bracketleft,	braceleft	]	};
-    key <AE10> {	[	0,		parenright	],
-			[	bracketright,	braceright 	]	};
-    key <AD01> {	[	aogonek,	Aogonek		],
-			[	q,		Q		]	};
-    key <AD02> {	[	zcaron,		Zcaron		],
-			[	w,		W		]	};
-    key <AD11> {	[	iogonek,	Iogonek		]	};
-    key <AD12> {	[	ogonek				]	};
-    key <AC10> {	[	uogonek,	Uogonek		]	};
-    key <AC11> {	[	eabovedot,	Eabovedot	]	};
-    key <BKSL> {	[	asciicircum,	quoteright	]	};
-    key <LSGT> {	[	backslash,	bar		]	};
-    key <AB02> {	[	umacron,	Umacron		],
-			[	x,		X		]	};
-    key <AB08> {	[	ccaron,		Ccaron		],
-			[	less				]	};
-    key <AB09> {	[	scaron,		Scaron		],
-			[	greater				]	};
-    key <AB10> {	[	eogonek,	Eogonek		]	};
-
-    // End alphanumeric section
-};
-
+//

+// 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 default alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Lithuania";

+

+

+

+    key <TLDE>  { [ quoteleft,   asciitilde,	notsign,   brokenbar ]    };

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

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

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

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

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

+    key <AE06>  { [    scaron,       Scaron,	6, asciicircum ]    };

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

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

+    key <AE09>  { [  doublelowquotemark,  parenleft,	9,  parenleft ]    };

+    key <AE10>  { [ leftdoublequotemark, parenright,	0, parenright ]    };

+    key <AE11>  { [     minus,   underscore,	backslash, questiondown ]  };

+    key <AE12>  { [    zcaron,       Zcaron,	equal,         plus ]  };

+

+    key <AD01>  { [         q,          Q,	at,  Greek_OMEGA ] };

+    key <AD02>  { [         w,          W,	lstroke,      Lstroke ] };

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

+    key <AD04>  { [         r,          R,	paragraph,   registered ] };

+    key <AD05>  { [         t,          T,	tslash,       Tslash ] };

+    key <AD06>  { [         y,          Y,	leftarrow,          yen ] };

+    key <AD07>  { [         u,          U,	downarrow,      uparrow ] };

+    key <AD08>  { [         i,          I,	rightarrow,     idotless ] };

+    key <AD09>  { [         o,          O,	oslash,     Ooblique ] };

+    key <AD10>  { [         p,          P,	thorn,        THORN ] };

+    key <AD11>  { [  bracketleft,  braceleft,	dead_diaeresis, dead_abovering ] };

+    key <AD12>  { [ bracketright, braceright,	dead_tilde,    dead_macron ] };

+

+    key <AC01>  { [         a,          A,	ae,           AE ] };

+    key <AC02>  { [         s,          S,	ssharp,      section ] };

+    key <AC03>  { [         d,          D,	eth,          ETH ] };

+    key <AC04>  { [         f,          F,	dstroke,  ordfeminine ] };

+    key <AC05>  { [         g,          G,	eng,          ENG ] };

+    key <AC06>  { [         h,          H,	hstroke,      Hstroke ] };

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

+    key <AC08>  { [         k,          K,	kra,    ampersand ] };

+    key <AC09>  { [         l,          L,	lstroke,      Lstroke ] };

+    key <AC10>  { [  semicolon,     colon,	dead_acute, dead_doubleacute ] };

+    key <AC11>  { [ apostrophe,  quotedbl,	dead_circumflex,  dead_caron ] };

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

+

+    key <BKSL>  { [ backslash,        bar,	dead_grave,   dead_breve ] };

+    key <AB01>  { [         z,          Z,	guillemotleft,        less ] };

+    key <AB02>  { [         x,          X,	guillemotright,    greater ] };

+    key <AB03>  { [         c,          C,	cent,    copyright ] };

+    key <AB04>  { [         v,          V,	leftdoublequotemark, leftsinglequotemark ]   };

+    key <AB05>  { [         b,          B,	rightdoublequotemark, rightsinglequotemark ] };

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

+    key <AB07>  { [         m,          M,	mu,    masculine ] };

+    key <AB08>  { [     comma,       less,	ampersand,     multiply ] };

+    key <AB09>  { [    period,    greater,	periodcentered,   division ] };

+    key <AB10>  { [     slash,   question,	dead_belowdot, dead_abovedot ] };

+

+	include "level3(ralt_switch)"

+

+};

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/lt(type6)"

+};

+