Git update xkeyboard-config 28-2-2010

1 files changed, 93 insertions, 113 deletions

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/tr b/xorg-server/xkbdata.src/symbols/sun_vndr/tr
index 7e6d4bf74..3c95110a1 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/tr
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/tr
@@ -1,113 +1,93 @@
-// $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 "sun_vndr/tr(type6Q)"
-};
-
-xkb_symbols "type6Q" {
-
-   key <TLDE> { [ quotedbl, eacute	], [ asciitilde			]};
-   key <AE02> { [ 2, quoteright		]				};
-   key <AE03> { [ 3, asciicircum	], [ numbersign			]};
-   key <AE04> { [ 4, plus		], [ dollar			]};
-   key <AE06> { [ 6, ampersand		]				};
-   key <AE07> { [ 7, slash		], [ braceleft			]};
-   key <AE08> { [ 8, parenleft		], [ bracketright		]};
-   key <AE09> { [ 9, parenright		], [ bracketright		]};
-   key <AE10> { [ 0, equal		], [ braceright			]};
-   key <AE11> { [ asterisk, question	], [ backslash			]};
-   key <AE12> { [ minus, underscore	]				};
-
-   key <AD01> { [ q, Q			], [ at				]};
-   key <AD11> { [ gbreve, Gbreve	], [ gbreve, Gbreve		]};
-   key <AD12> { [ udiaeresis, Udiaeresis], [ asciitilde, Udiaeresis	]};
-
-   key <AC10> { [ scedilla, Scedilla	], [ comma			]};
-   key <AC11> { [ Iabovedot, Iabovedot	], [ Iabovedot, Iabovedot	]};
-   key <BKSL> { [ comma, semicolon	], [ quoteleft			]};
-
-   key <LSGT> { [ less, greater		], [ bar			]};
-   key <AB08> { [ odiaeresis, Odiaeresis], [ odiaeresis, Odiaeresis	]};
-   key <AB09> { [ ccedilla, Ccedilla	], [ ccedilla, Ccedilla		]};
-   key <AB10> { [ period, colon		], [ quotedbl			]};
-   
-};
-
-xkb_symbols "type6F" {
-
-
-   key	<TLDE> { [ plus     ,asterisk		],  [plusminus     ]};
-   key	<AE01> { [ 1	    ,exclam		],  [onesuperior   ]};
-   key	<AE02> { [ 2	    ,quotedbl		],  [twosuperior   ]};
-   key	<AE03> { [ 3	    ,asciicircum  	],  [numbersign    ]};
-   key	<AE04> { [ 4	    ,dollar		],  [onequarter    ]};
-   key	<AE05> { [ 5	    ,percent		],  [onehalf       ]};
-   key	<AE06> { [ 6	    ,ampersand		],  [threequarters ]};
-   key	<AE07> { [ 7	    ,quoteright   	],  [braceleft     ]};
-   key	<AE08> { [ 8	    ,parenleft		],  [bracketleft   ]};
-   key	<AE09> { [ 9	    ,parenright		],  [bracketright  ]};
-   key	<AE10> { [ 0	    ,equal		],  [braceright    ]};
-   key	<AE11> { [ slash    ,question    	],  [backslash     ]};
-   key	<AE12> { [ minus    ,underscore   	],  [bar           ]};
-
-   key  <AD01> { [ f         ,F            ],  [at		]};
-   key  <AD02> { [ g         ,G            ]};
-   key  <AD03> { [ gbreve    ,Gbreve       ],  [gbreve, Gbreve	]};
-   key  <AD04> { [ idotless  ,I            ],  [paragraph	]};
-   key  <AD05> { [ o         ,O            ]};
-   key  <AD06> { [ d         ,D            ],  [yen		]};
-   key  <AD07> { [ r         ,R            ]};
-   key  <AD08> { [ n         ,N            ]};
-   key  <AD09> { [ h         ,H            ],  [degree		]};
-   key  <AD10> { [ p         ,P            ],  [sterling	]};
-   key  <AD11> { [ q         ,Q            ],  [diaeresis	]};
-   key  <AD12> { [ w         ,W            ],  [asciitilde	]};
-   key  <BKSL> { [ x         ,X            ],  [quoteleft	]};
-
-   key  <AC01> { [ u         ,U        	],	[AE			]};
-   key  <AC02> { [ i	     ,Iabovedot	],	[ssharp			]};
-   key  <AC03> { [ e	     ,E  	]};
-   key  <AC04> { [ a	     ,A  	]};
-   key  <AC05> { [ udiaeresis,Udiaeresis]}; 
-   key  <AC06> { [ t	     ,T  	]};
-   key  <AC07> { [ k	     ,K  	]};
-   key  <AC08> { [ m	     ,M  	]};
-   key  <AC10> { [ y         ,Y		],	[quoteright		]};
-   key  <AC11> { [ scedilla  ,Scedilla	],	[numbersign,   Scedilla	]};
-
-   key  <LSGT> { [ less, greater           ],  [bar		]};
-   key  <AB01> { [ j           ,J          ],  [less		]};
-   key  <AB02> { [ odiaeresis  ,Odiaeresis ],  [greater		]};
-   key  <AB03> { [ v           ,V          ],  [cent		]};
-   key  <AB04> { [ c	       ,C          ]};
-   key  <AB05> { [ ccedilla    ,Ccedilla   ],  [ccedilla, Ccedilla	]};
-   key  <AB06> { [ z	       ,Z          ]};
-   key  <AB07> { [ s           ,S          ],  [mu		]};
-   key  <AB08> { [ b           ,B          ],  [multiply	]};
-   key  <AB09> { [ period      ,colon      ],  [division	]};
-   key  <AB10> { [ comma       ,semicolon  ]};
-
-
-};
-
+//

+// 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]="Turkey - (Q)";

+

+    key <TLDE>  { [  quotedbl,     eacute                ] };

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

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

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

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

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

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

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

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

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

+    key <AE11>	{ [  asterisk,   question,     backslash ] };

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

+

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

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

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

+    key <AD11>	{ [    gbreve,     Gbreve               ] };

+    key <AD12>	{ [udiaeresis, Udiaeresis,   asciitilde ] };

+

+    key <AC10>	{ [  scedilla,   Scedilla,        acute ] };

+    key <AC11>	{ [         i,  Iabovedot               ] }; 

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

+

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

+    key <AB08>	{ [odiaeresis, Odiaeresis               ] };

+    key <AB09>	{ [  ccedilla,   Ccedilla               ] };

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

+

+	include "level3(ralt_switch)"

+

+};

+

+partial default alphanumeric_keys

+        xkb_symbols "basic" {

+        include "sun_vndr/tr(type6)"

+};

+