From 9370f043060a1d08bb51484a58c52db85a4ea656 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 28 Feb 2010 20:02:05 +0000 Subject: Git update xkeyboard-config 28-2-2010 --- xorg-server/xkbdata.src/symbols/sun_vndr/nl | 211 ++++++++++++++++++++-------- 1 file changed, 149 insertions(+), 62 deletions(-) (limited to 'xorg-server/xkbdata.src/symbols/sun_vndr/nl') diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/nl b/xorg-server/xkbdata.src/symbols/sun_vndr/nl index f6564d132..703614277 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/nl +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/nl @@ -1,62 +1,149 @@ -// $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" { - include "sun_vndr/us(type4basic)" - // A few keys are different - - key { [ at, section ], [notsign ] }; - key { [ backslash, bar ] }; - key { [ 1, exclam ], [onesuperior ] }; - key { [ 2, quotedbl ], [twosuperior ] }; - key { [ 3, numbersign ], [threesuperior] }; - key { [ 4, dollar ], [onequarter ] }; - key { [ 5, percent ], [onehalf ] }; - key { [ 6, ampersand ], [threequarters] }; - key { [ 7, underscore ], [sterling ] }; - key { [ 8, parenleft ], [braceleft ] }; - key { [ 9, parenright ], [braceright ] }; - key { [ 0, quoteright ], [quoteleft ] }; - key { [ slash, question ] }; - key { [ degree, SunFA_Tilde ], [SunFA_Cedilla] }; - key { [ e, E ], [EuroSign ] }; - key { [ SunFA_Diaeresis, asciicircum], [SunFA_Circum]}; - key { [ asterisk, brokenbar ], [asciitilde ] }; - key { [ S, NoSymbol ], [ssharp ] }; - key { [ plus, plusminus ] }; - key { [ SunFA_Acute, SunFA_Grave] }; - key { [ less, greater ] }; - key { [ bracketright, bracketleft] }; - key { [ Z, NoSymbol ], [guillemotleft] }; - key { [ X, NoSymbol ], [guillemotright] }; - key { [ C, NoSymbol ], [cent ] }; - key { [ M, NoSymbol ], [mu ] }; - key { [ comma, semicolon ] }; - key { [ period, colon ] }; - key { [ minus, equal ] }; - key { [ SunAltGraph ] }; -// key { [ SunCompose ] }; - key { [ Caps_Lock ] }; - -}; - +// +// 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 +// + +default partial alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Netherlands"; + + key { [ at, section, notsign ] }; + key { [ 1, exclam, onesuperior ] }; + key { [ 2, quotedbl, twosuperior ] }; + key { [ 3, numbersign, threesuperior ] }; + key { [ 4, dollar, onequarter ] }; + key { [ 5, percent, onehalf ] }; + key { [ 6, ampersand, threequarters ] }; + key { [ 7, underscore, sterling ] }; + key { [ 8, parenleft, braceleft ] }; + key { [ 9, parenright, braceright ] }; + key { [ 0, quoteright, quoteleft ] }; + key { [ slash, question, backslash ] }; + key { [ degree, dead_tilde, dead_cedilla ] }; + + key { [ e, E, EuroSign ] }; + key { [ t, T ] }; + key { [ y, Y ] }; + key { [ u, U ] }; + key { [ i, I ] }; + key { [ o, O ] }; + key { [ p, P ] }; + key { [dead_diaeresis, dead_circumflex ] }; + key { [ asterisk, bar, asciitilde ] }; + + key { [ a, A ] }; + key { [ s, S, ssharp ] }; + key { [ f, F ] }; + key { [ plus, plusminus ] }; + key { [dead_acute, dead_grave ] }; + key { [ less, greater, asciicircum ] }; + + key { [bracketright, bracketleft, brokenbar ] }; + key { [ z, Z, guillemotleft ] }; + key { [ x, X, guillemotright ] }; + key { [ c, C, cent ] }; + key { [ n, N ] }; + key { [ m, M, mu ] }; + key { [ comma, semicolon ] }; + key { [ period, colon ] }; + key { [ minus, equal ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys +xkb_symbols "type4" { + + name[Group1]="Netherlands - Sun type 4"; + + key { [ at, section, notsign ] }; + key { [ backslash, bar ] }; + key { [ 1, exclam, onesuperior ] }; + key { [ 2, quotedbl, twosuperior ] }; + key { [ 3, numbersign, threesuperior] }; + key { [ 4, dollar, onequarter ] }; + key { [ 5, percent, onehalf ] }; + key { [ 6, ampersand, threequarters] }; + key { [ 7, underscore, sterling ] }; + key { [ 8, parenleft, braceleft ] }; + key { [ 9, parenright, braceright ] }; + key { [ 0, quoteright, quoteleft ] }; + key { [ slash, question, backslash ] }; + key { [ degree, dead_tilde, dead_cedilla] }; + key { [ e, E, EuroSign, Eacute ]}; + key { [ dead_diaeresis, dead_circumflex, asciitilde, asciicircum]}; + key { [ asterisk, bar, asciitilde ] }; + key { [ S, S, ssharp ] }; + key { [ plus, plusminus ] }; + key { [ dead_acute, dead_grave ] }; + key { [ less, greater, asciicircum ] }; + key { [ bracketleft, bracketright, brokenbar ] }; + key { [ z, Z, guillemotleft] }; + key { [ x, X, guillemotright] }; + key { [ c, C, cent ] }; + key { [ m, M, Greek_mu, masculine ] }; + key { [ comma, semicolon, cedilla, guillemotleft] }; + key { [ period, colon, periodcentered, guillemotright ] }; + key { [ minus, equal, hyphen ] }; + key { [ SunAltGraph ] }; +// key { [ SunCompose ] }; + key { [ Caps_Lock ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/nl(type6)" +}; + -- cgit v1.2.3