Git update xkeyboard-config 28-2-2010

1 files changed, 141 insertions, 71 deletions

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/it b/xorg-server/xkbdata.src/symbols/sun_vndr/it
index 9be87ced9..960bcfc32 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/it
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/it
@@ -1,71 +1,141 @@
-// $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 "type4" {
-
-    key <BKSL> { [ bracketleft, braceleft ], [ guillemotleft	]	 };
-    key <BRCR> { [ bracketright, braceright ], [ guillemotright ] 	};
-    key <AE02> { [ 2, quotedbl		], [ twosuperior	] 	};
-    key <AE03> { [ 3, sterling		], [ threesuperior	] 	};
-    key <AE06> { [ 6, ampersand		], [ notsign		] 	};
-    key <AE06> { [ 7, slash		]				};
-    key <AE06> { [ 8, parenleft		]				};
-    key <AE09> { [ 9, parenright        ], [ backslash		] 	};
-    key <AE10> { [ 0, equal             ], [ bar		] 	};
-    key <AE11> { [ quoteright, question ], [ quoteleft		] 	};
-    key <AE12> { [ igrave, asciicircum	] };
-
-    key <AD11> { [ egrave, eacute       ]				};
-    key <AD12> { [ plus, asterisk       ], [ asciitilde   	]	};
-
-    key <AC10> { [ ograve, ccedilla 	], [ at			]	};
-    key <AC11> { [ agrave, degree	], [ numbersign		]	};
-    key <TLDE> { [ ugrave, section	]				};
-
-    key <LSGT> { [ less, greater	]				};
-    key <AB08> { [ comma, semicolon	]				};
-    key <AB09> { [ period, colon	]				};
-    key <AB10> { [ minus, underscore	]				};
-    
-
-    key <LALT> { [ Alt_L	       	]              	       		};
-    key <COMP> { [ SunCompose       	]				};
-    key <RALT> { [ SunAltGraph		]				};
-    key <LCTL> { [ Caps_Lock 		] 				};
-    key <CAPS> { [ Control_L 		] 				};
-
-};
-
-xkb_symbols "type5" {
-    include "it"
-
-    key <AE08> { [ 8, parenleft		], [ braceleft			] };
-    key <AE09> { [ 9, parenright	], [ braceright			] };
-
-    key <BKSL> { [ ugrave, section	], [ asciitilde			] };
-};
-
-partial 
-xkb_symbols "type6" {
-    include "sun_vndr/it(type5)"
-};
+//

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

+

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

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

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

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

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

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

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

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

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

+    key <AE11> { [      apostrophe,        question,        grave                  ] };     

+    key <AE12> { [          igrave,     asciicircum                                ] };

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

+    key <AD11> { [          egrave,          eacute,  bracketleft,  dead_abovering ] };

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

+    key <BKSL> { [          ugrave,         section,   asciitilde                  ] };

+    key <AC10> { [          ograve,        ccedilla,           at                  ] };      

+    key <AC11> { [          agrave,          degree,   numbersign                  ] };

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

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

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

+

+        include "level3(ralt_switch)"

+

+};

+

+

+partial alphanumeric_keys

+xkb_symbols "type4" {

+

+    name[Group1]="Italy - Sun type 4";

+ 

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

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

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

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

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

+    key <AE06> { [ 7,            slash                          ] };

+    key <AE06> { [ 8,            parenleft                      ] };

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

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

+    key <AE11> { [ quoteright,   question,     quoteleft        ] };

+    key <AE12> { [ igrave,       asciicircum                    ] };

+ 

+    key <AD11> { [ egrave,       eacute                         ] };

+    key <AD12> { [ plus,         asterisk,     asciitilde       ] };

+ 

+    key <AC10> { [ ograve,       ccedilla,     at               ] };

+    key <AC11> { [ agrave,       degree,       numbersign       ] };

+    key <TLDE> { [ ugrave,       section                        ] };

+ 

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

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

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

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

+     

+ 

+    key <LALT> { [ Alt_L                ] };

+    key <COMP> { [ SunCompose           ] };

+    key <RALT> { [ SunAltGraph          ] };

+    key <LCTL> { [ Caps_Lock            ] };

+    key <CAPS> { [ Control_L            ] };

+ 

+	include "level3(ralt_switch)"

+

+};

+

+ 

+partial alphanumeric_keys

+xkb_symbols "type5" {

+

+    name[Group1]="Italy - Sun type 5";

+

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

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

+    key <BKSL> { [ ugrave, section,     asciitilde                 ] };

+

+	include "level3(ralt_switch)"

+

+};

+ 

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/it(type6)"

+};

+