svn merge ^/branches/released .

1 files changed, 102 insertions, 51 deletions

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/pl b/xorg-server/xkbdata.src/symbols/sun_vndr/pl
index deb58190d..684b54911 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/pl
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/pl
@@ -1,51 +1,102 @@
-// $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 "type5" {
-    include "sun_vndr/us(type5basic)"
-    // A few keys are different
-    key <TLDE> { [ quoteleft, asciitilde], [ degree, degree ]	};
-    key <AE02> { [ 2, quotedbl		], [ at		]	};
-    key <AE03> { [ 3, colon		], [ numbersign	]	};
-    key <AE04> { [ 4, question		], [ dollar	]	};
-    key <AE06> { [ 6, plus		], [ asciicircum ]	};
-    key <AE07> { [ 7, underscore	], [ ampersand	]	};
-    key <AE08> { [ 8, parenleft		], [ asterisk	]	};
-    key <AE09> { [ 9, parenright	]			};
-    key <AE10> { [ 0, equal		]			};
-    key <AE11> { [ zabovedot, Zabovedot	]			};
-    key <AE12> { [ dead_ogonek, Aacute ]			};
-    key <AD11> { [ oacute, zacute	], [ bracketleft, braceleft ] };
-    key <AD12> { [ slash, section	], [ bracketright, braceright ] };
-    key <AC02> { [ s, S			], [ ssharp	]	};
-    key <AC08> { [ k, K			], [ ampersand	]	};
-    key <AC10> { [ lstroke, Lstroke	]			};
-    key <AC11> { [ aogonek, eogonek	], [ quoteright	]	};
-    key <BKSL> { [ backslash, semicolon	], [ currency, bar ]	};
-    key <LSGT> { [ less, greater	]			};
-    key <AB08> { [ comma, sacute	], [ less	]	};
-    key <AB09> { [ period, nacute	], [ greater	]	};
-    key <AB10> { [ minus, cacute	]			};
-};
-
+//

+// 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]="Polish Developers";

+

+    key <TLDE> { [ grave, 	 asciitilde					] };

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

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

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

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

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

+    key <AE06> { [ 6,		 asciicirum					] };

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

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

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

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

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

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

+

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

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

+    key <AD09> { [ o,		 O,		oacute,		Oacute		] };

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

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

+

+    key <AC01> { [ a,		 A,		aogonek,	Aogonek		] };

+    key <AC02> { [ s,		 S,		sacute,		Sacute		] };

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

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

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

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

+

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

+    key <AB01> { [ z, 		 Z,		zabovedot,	Zabovedot	] };

+    key <AB02> { [ x,		 X,		zacute,		Zacute		] };

+    key <AB03> { [ c,		 C,		cacute,		Cacute		] };

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

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

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

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

+

+	include "level3(ralt_switch)"

+

+};

+

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/pl(type6)"

+};

+